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

[DURACOM-191] merge fixes

Browse Source
This commit is contained in:
Andrea Barbasso
2024-03-04 16:30:46 +01:00
parent 914ca68ca2
commit 5a57035b61
20 changed files with 106 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,6 @@ import { storeModuleConfig } from './app.reducer';
import { EffectsModule } from '@ngrx/effects';
import { submissionReducers, SubmissionState } from './submission/submission.reducers';
import { submissionEffects } from './submission/submission.effects';
import { NOTIFICATIONS_MODULE_PATH } from './admin/admin-routing-paths';
import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
@NgModule({
@@ -161,18 +160,19 @@ import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-c
.then((m) => m.ROUTES),
canActivate: [EndUserAgreementCurrentUserGuard]
},
{
path: NOTIFICATIONS_MODULE_PATH,
loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
.then((m) => m.AdminNotificationsModule),
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
},
{
path: NOTIFICATIONS_MODULE_PATH,
loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages.module')
.then((m) => m.NotificationsPageModule),
canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
},
// TODO: switch routing modules to routing files
// {
// path: NOTIFICATIONS_MODULE_PATH,
// loadChildren: () => import('./admin/admin-notifications/admin-notifications.module')
// .then((m) => m.AdminNotificationsModule),
// canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
// },
// {
// path: NOTIFICATIONS_MODULE_PATH,
// loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages.module')
// .then((m) => m.NotificationsPageModule),
// canActivate: [AuthenticatedGuard, EndUserAgreementCurrentUserGuard]
// },
{
path: 'login',
loadChildren: () => import('./login-page/login-page-routes')