hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Merge branch 'task/update-datatable-module'

pull/10/head
Florian Hartwich 2017-09-13 12:32:54 +02:00
parent 72b42aa95b d19c26f0dd
commit 3b7f997352
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
static/src/app/app.routing.ts
View File

@ -19,14 +19,6 @@ export const appRoutes: Routes = [
path: RouteConfig.statsPath,
loadChildren: './statistic/stats.module#StatsModule'
},
{
path: RouteConfig.loginPath,
component: LoginComponent
},
{
path: RouteConfig.signUpPath,
component: SignupComponent
},
{
path: RouteConfig.request,
loadChildren: './request/request.module#RequestModule'
@ -56,6 +48,14 @@ export const appRoutes: Routes = [
loadChildren: './admin/admin.module#AdminModule',
canActivate: [LoginGuardAdmin]
},
{
path: RouteConfig.loginPath,
component: LoginComponent
},
{
path: RouteConfig.signUpPath,
component: SignupComponent
},
/** Redirect Configuration **/
{
@ -70,6 +70,6 @@ export const appRoutes: Routes = [
export const appRouting = RouterModule.forRoot(appRoutes);
export const routingComponents = [LoginComponent, SignupComponent, ...armyRoutingComponents, NotFoundComponent];
export const routingComponents = [...armyRoutingComponents, LoginComponent, SignupComponent, NotFoundComponent];
export const routingProviders = [LoginGuardSQL, LoginGuardHL, LoginGuardMT, LoginGuardAdmin];
export const routingProviders = [LoginGuardHL, LoginGuardAdmin];