diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 775209769d..fef78b65f0 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -168,8 +168,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: 'submit', - loadChildren: () => import('./submit-page/submit-page.module') - .then((m) => m.SubmitPageModule), + loadChildren: () => import('./submit-page/submit-page-routes') + .then((m) => m.ROUTES), canActivate: [EndUserAgreementCurrentUserGuard] }, { diff --git a/src/app/submit-page/submit-page-routes.ts b/src/app/submit-page/submit-page-routes.ts new file mode 100644 index 0000000000..30d1bc0f90 --- /dev/null +++ b/src/app/submit-page/submit-page-routes.ts @@ -0,0 +1,18 @@ +import { Route } from '@angular/router'; + +import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; +import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component'; +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; + +export const ROUTES: Route[] = [ + { + canActivate: [AuthenticatedGuard], + path: '', + pathMatch: 'full', + component: ThemedSubmissionSubmitComponent, + resolve: { + breadcrumb: I18nBreadcrumbResolver + }, + data: {title: 'submission.submit.title', breadcrumbKey: 'submission.submit'} + } +]; diff --git a/src/app/submit-page/submit-page-routing.module.ts b/src/app/submit-page/submit-page-routing.module.ts deleted file mode 100644 index 1572580b6a..0000000000 --- a/src/app/submit-page/submit-page-routing.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { AuthenticatedGuard } from '../core/auth/authenticated.guard'; -import { ThemedSubmissionSubmitComponent } from '../submission/submit/themed-submission-submit.component'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - canActivate: [AuthenticatedGuard], - path: '', - pathMatch: 'full', - component: ThemedSubmissionSubmitComponent, - resolve: { - breadcrumb: I18nBreadcrumbResolver - }, - data: { title: 'submission.submit.title', breadcrumbKey: 'submission.submit' } - } - ]) - ] -}) -/** - * This module defines the default component to load when navigating to the submit page path. - */ -export class SubmitPageRoutingModule { } diff --git a/src/app/submit-page/submit-page.module.ts b/src/app/submit-page/submit-page.module.ts deleted file mode 100644 index 2cae5f4efd..0000000000 --- a/src/app/submit-page/submit-page.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { CommonModule } from '@angular/common'; -import { NgModule } from '@angular/core'; -import { SubmitPageRoutingModule } from './submit-page-routing.module'; -import { SubmissionModule } from '../submission/submission.module'; -import { FormModule } from '../shared/form/form.module'; - -@NgModule({ - imports: [ - SubmitPageRoutingModule, - CommonModule, - SubmissionModule, - FormModule, - ], -}) -/** - * This module handles all modules that need to access the submit page. - */ -export class SubmitPageModule { - -}