hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 18:14:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'w2p-72699_Hard-redirect-after-log-in' into w2p-72541_User-agreement-and-Privacy-statement

Browse Source 
Conflicts:
	src/app/app-routing.module.ts
This commit is contained in:
Kristof De Langhe
2020-09-08 10:17:44 +02:00
parent de9f642bf9 4141ae7ad7
commit c5e975601a
36 changed files with 1479 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/app-routing.module.ts
View File

@@ -50,6 +50,7 @@ import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-
{ path: 'login', loadChildren: './+login-page/login-page.module#LoginPageModule' },
{ path: 'logout', loadChildren: './+logout-page/logout-page.module#LogoutPageModule' },
{ path: 'submit', loadChildren: './+submit-page/submit-page.module#SubmitPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
{ path: 'import-external', loadChildren: './+import-external-page/import-external-page.module#ImportExternalPageModule', canActivate: [EndUserAgreementCurrentUserGuard] },
{
path: 'workspaceitems',
loadChildren: './+workspaceitems-edit-page/workspaceitems-edit-page.module#WorkspaceitemsEditPageModule',