Merge branch 'master' into w2p-71429_Features-support-part-1

Conflicts:
	src/app/+admin/admin-sidebar/admin-sidebar.component.ts
	src/app/app-routing.module.ts
	src/app/core/core.module.ts
This commit is contained in:
Kristof De Langhe
2020-07-06 16:16:17 +02:00
146 changed files with 5153 additions and 247 deletions

View File

@@ -122,6 +122,7 @@ export function getUnauthorizedPath() {
path: PROFILE_MODULE_PATH,
loadChildren: './profile-page/profile-page.module#ProfilePageModule', canActivate: [AuthenticatedGuard]
},
{ path: 'processes', loadChildren: './process-page/process-page.module#ProcessPageModule', canActivate: [AuthenticatedGuard] },
{ path: UNAUTHORIZED_PATH, component: UnauthorizedComponent },
{ path: '**', pathMatch: 'full', component: PageNotFoundComponent },
],