diff options
| author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-14 23:36:24 +0100 |
|---|---|---|
| committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-14 23:36:24 +0100 |
| commit | b93854c0f0f9fe011aab6bdef324d236fd8dadc8 (patch) | |
| tree | 98808e8b96b588b9d805f5001e8915d1cb367c43 /frontend/src/app/app-routing.module.ts | |
| parent | 6aeb963fa64af9dc0ddf2f9aeaf1903a7db26afc (diff) | |
| parent | 7ff5981a464b17f84b7e0268077c5ba6ec131e21 (diff) | |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into frontendNaslovna
# Conflicts:
# frontend/angular.json
# frontend/src/app/app-routing.module.ts
# frontend/src/app/app.module.ts
Diffstat (limited to 'frontend/src/app/app-routing.module.ts')
| -rw-r--r-- | frontend/src/app/app-routing.module.ts | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts index 775f3d76..9ce08a8f 100644 --- a/frontend/src/app/app-routing.module.ts +++ b/frontend/src/app/app-routing.module.ts @@ -8,6 +8,7 @@ import { RegisterPageComponent } from './_pages/register-page/register-page.comp import { AddModelComponent } from './_pages/add-model/add-model.component'; import { LoginModalComponent } from './_modals/login-modal/login-modal.component'; import { HomeComponent } from './_pages/home/home.component'; +import { RegisterModalComponent } from './_modals/register-modal/register-modal.component'; const routes: Routes = [ { path: '', component: HomeComponent }, @@ -15,7 +16,8 @@ const routes: Routes = [ { path: 'register', component: RegisterPageComponent }, { path: 'only-authorized', component: OnlyAuthorizedComponent, canActivate: [AuthGuardService] }, { path: 'add-model', component: AddModelComponent }, - { path: 'login-modal-test', component: LoginModalComponent } + { path: 'login-modal-test', component: LoginModalComponent }, + { path: 'register-modal-test', component: RegisterModalComponent } ]; @NgModule({ |