diff --git a/src/app/admin/admin-routing.module.ts b/src/app/admin/admin-routing.module.ts index 843b6e736..4c5ea23f4 100644 --- a/src/app/admin/admin-routing.module.ts +++ b/src/app/admin/admin-routing.module.ts @@ -1,10 +1,17 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; +import { AdminGuard } from '../_guards/admin.guard'; import { UsersComponent } from './users/users.component'; const routes: Routes = [ {path: '**', component: UsersComponent, pathMatch: 'full'}, - {path: '/users', component: UsersComponent} + { + runGuardsAndResolvers: 'always', + canActivate: [AdminGuard], + children: [ + {path: '/users', component: UsersComponent} + ] + } ]; @NgModule({ diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2742a730b..e23518db7 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -1,16 +1,16 @@ import { NgModule } from '@angular/core'; import { Routes, RouterModule } from '@angular/router'; import { HomeComponent } from './home/home.component'; +import { LibraryComponent } from './library/library.component'; import { AdminGuard } from './_guards/admin.guard'; const routes: Routes = [ {path: '', component: HomeComponent}, { path: 'admin', - runGuardsAndResolvers: 'always', - canActivate: [AdminGuard], loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule) }, + {path: 'library', component: LibraryComponent}, {path: '**', component: HomeComponent, pathMatch: 'full'} ]; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 4478940a0..65bc4f25b 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -13,13 +13,15 @@ import { JwtInterceptor } from './_interceptors/jwt.interceptor'; import { UserLoginComponent } from './user-login/user-login.component'; import { ToastrModule } from 'ngx-toastr'; import { ErrorInterceptor } from './_interceptors/error.interceptor'; +import { LibraryComponent } from './library/library.component'; @NgModule({ declarations: [ AppComponent, HomeComponent, NavHeaderComponent, - UserLoginComponent + UserLoginComponent, + LibraryComponent ], imports: [ HttpClientModule, diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 281165878..ed3774985 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -38,7 +38,7 @@ export class HomeComponent implements OnInit { console.log('Registering: ', this.model); this.accountService.register(this.model).subscribe(resp => { - this.router.navigateByUrl('/libraries'); + this.router.navigateByUrl('/library'); }, err => { console.log('validation errors from interceptor', err); }); diff --git a/src/app/library/library.component.html b/src/app/library/library.component.html new file mode 100644 index 000000000..cedd8c65f --- /dev/null +++ b/src/app/library/library.component.html @@ -0,0 +1 @@ +
library works!
diff --git a/src/app/library/library.component.scss b/src/app/library/library.component.scss new file mode 100644 index 000000000..e69de29bb diff --git a/src/app/library/library.component.ts b/src/app/library/library.component.ts new file mode 100644 index 000000000..2bc468f5c --- /dev/null +++ b/src/app/library/library.component.ts @@ -0,0 +1,15 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-library', + templateUrl: './library.component.html', + styleUrls: ['./library.component.scss'] +}) +export class LibraryComponent implements OnInit { + + constructor() { } + + ngOnInit(): void { + } + +} diff --git a/src/app/user-login/user-login.component.ts b/src/app/user-login/user-login.component.ts index 0b97d6e6e..5fa445fd3 100644 --- a/src/app/user-login/user-login.component.ts +++ b/src/app/user-login/user-login.component.ts @@ -26,7 +26,7 @@ export class UserLoginComponent implements OnInit { this.accountService.login(this.model).subscribe(user => { if (user) { this.loginForm.reset(); - this.router.navigateByUrl('/libraries'); + this.router.navigateByUrl('/library'); } }); }