From 8939c18335dbe44e4f1576c68e70651996ab268f Mon Sep 17 00:00:00 2001
From: Tom Bloor <t.bloor@shadowcat.co.uk>
Date: Tue, 15 Aug 2017 16:12:55 +0100
Subject: [PATCH] Redid 404 and 500 routing, and redid authguard to point to
 /login

---
 src/app/_guards/auth.guard.ts | 12 ++++++------
 src/app/app.module.ts         |  6 ++++++
 src/app/app.routing.ts        | 20 ++++++--------------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/app/_guards/auth.guard.ts b/src/app/_guards/auth.guard.ts
index a73f94e..5c64d59 100644
--- a/src/app/_guards/auth.guard.ts
+++ b/src/app/_guards/auth.guard.ts
@@ -1,21 +1,21 @@
 import { Injectable } from '@angular/core';
 import { Router, CanActivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
- 
+
 @Injectable()
 export class AuthGuard implements CanActivate {
- 
+
     constructor(private router: Router) { }
- 
+
     canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
         if (localStorage.getItem('sessionKey')) {
             console.log('session key found')
 			// logged in so return true
             return true;
         }
- 
+
         // not logged in so redirect to login page with the return url
         console.log('no session key found')
-		this.router.navigate(['/pages/login'], { queryParams: { returnUrl: state.url }});
+		this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
         return false;
     }
-}
\ No newline at end of file
+}
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 0ee9598..b3efada 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,6 +21,10 @@ import { AuthGuard } from './_guards/auth.guard';
 import { FullLayoutComponent } from './layouts/full-layout.component';
 import { SimpleLayoutComponent } from './layouts/simple-layout.component';
 
+// Error Pages
+import { P404Component } from './pages/404.component';
+import { P500Component } from './pages/500.component';
+
 // Submodules
 import { AuthModule } from './auth/auth.module';
 
@@ -42,6 +46,8 @@ import { AuthModule } from './auth/auth.module';
     BreadcrumbsComponent,
     SIDEBAR_TOGGLE_DIRECTIVES,
     AsideToggleDirective,
+    P404Component,
+    P500Component,
   ],
   providers: [
 	AuthGuard,
diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts
index e0a2466..4815994 100644
--- a/src/app/app.routing.ts
+++ b/src/app/app.routing.ts
@@ -6,10 +6,13 @@ import { AuthGuard } from './_guards/auth.guard';
 import { FullLayoutComponent } from './layouts/full-layout.component';
 import { SimpleLayoutComponent } from './layouts/simple-layout.component';
 
+import { P404Component } from './pages/404.component';
+import { P500Component } from './pages/500.component';
+
 export const routes: Routes = [
   {
     path: '',
-    redirectTo: 'dashboard',
+    redirectTo: '/dashboard',
     pathMatch: 'full',
   },
   {
@@ -38,19 +41,8 @@ export const routes: Routes = [
       }
     ]
   },
-  {
-    path: 'pages',
-    component: SimpleLayoutComponent,
-    data: {
-      title: 'Pages'
-    },
-    children: [
-      {
-        path: '',
-        loadChildren: './pages/pages.module#PagesModule',
-      }
-    ]
-  }
+  { path: '404', component: P404Component },
+  { path: '500', component: P500Component },
 ];
 
 @NgModule({