diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 16e1eb35b3..e2ef98d930 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -204,7 +204,7 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: INFO_MODULE_PATH, - loadChildren: () => import('./info/info.module').then((m) => m.InfoModule) + loadChildren: () => import('./info/info-routes').then((m) => m.ROUTES) }, { path: REQUEST_COPY_MODULE_PATH, diff --git a/src/app/info/info-routes.ts b/src/app/info/info-routes.ts new file mode 100644 index 0000000000..45ec369887 --- /dev/null +++ b/src/app/info/info-routes.ts @@ -0,0 +1,30 @@ +import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; +import { END_USER_AGREEMENT_PATH, FEEDBACK_PATH, PRIVACY_PATH } from './info-routing-paths'; +import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component'; +import { ThemedPrivacyComponent } from './privacy/themed-privacy.component'; +import { ThemedFeedbackComponent } from './feedback/themed-feedback.component'; +import { FeedbackGuard } from '../core/feedback/feedback.guard'; +import { environment } from '../../environments/environment'; + + +export const ROUTES = [ + { + path: FEEDBACK_PATH, + component: ThemedFeedbackComponent, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + data: {title: 'info.feedback.title', breadcrumbKey: 'info.feedback'}, + canActivate: [FeedbackGuard] + }, + environment.info.enableEndUserAgreement ? { + path: END_USER_AGREEMENT_PATH, + component: ThemedEndUserAgreementComponent, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + data: {title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement'} + } : undefined, + environment.info.enablePrivacyStatement ? { + path: PRIVACY_PATH, + component: ThemedPrivacyComponent, + resolve: {breadcrumb: I18nBreadcrumbResolver}, + data: {title: 'info.privacy.title', breadcrumbKey: 'info.privacy'} + } : undefined +]; diff --git a/src/app/info/info-routing.module.ts b/src/app/info/info-routing.module.ts deleted file mode 100644 index 4c497461e7..0000000000 --- a/src/app/info/info-routing.module.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver'; -import { PRIVACY_PATH, END_USER_AGREEMENT_PATH, FEEDBACK_PATH } from './info-routing-paths'; -import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component'; -import { ThemedPrivacyComponent } from './privacy/themed-privacy.component'; -import { ThemedFeedbackComponent } from './feedback/themed-feedback.component'; -import { FeedbackGuard } from '../core/feedback/feedback.guard'; -import { environment } from '../../environments/environment'; - - -const imports = [ - RouterModule.forChild([ - { - path: FEEDBACK_PATH, - component: ThemedFeedbackComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, - data: { title: 'info.feedback.title', breadcrumbKey: 'info.feedback' }, - canActivate: [FeedbackGuard] - } - ]) -]; - - if (environment.info.enableEndUserAgreement) { - imports.push( - RouterModule.forChild([ - { - path: END_USER_AGREEMENT_PATH, - component: ThemedEndUserAgreementComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, - data: { title: 'info.end-user-agreement.title', breadcrumbKey: 'info.end-user-agreement' } - } - ])); - } - if (environment.info.enablePrivacyStatement) { - imports.push( - RouterModule.forChild([ - { - path: PRIVACY_PATH, - component: ThemedPrivacyComponent, - resolve: { breadcrumb: I18nBreadcrumbResolver }, - data: { title: 'info.privacy.title', breadcrumbKey: 'info.privacy' } - } - ])); - } - -@NgModule({ - imports: [ - ...imports - ] -}) -/** - * Module for navigating to components within the info module - */ -export class InfoRoutingModule { -} diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts index d02334d40b..cd1ab082a0 100644 --- a/src/app/info/info.module.ts +++ b/src/app/info/info.module.ts @@ -1,8 +1,9 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { EndUserAgreementComponent } from './end-user-agreement/end-user-agreement.component'; -import { InfoRoutingModule } from './info-routing.module'; -import { EndUserAgreementContentComponent } from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component'; +import { + EndUserAgreementContentComponent +} from './end-user-agreement/end-user-agreement-content/end-user-agreement-content.component'; import { PrivacyComponent } from './privacy/privacy.component'; import { PrivacyContentComponent } from './privacy/privacy-content/privacy-content.component'; import { ThemedEndUserAgreementComponent } from './end-user-agreement/themed-end-user-agreement.component'; @@ -30,7 +31,6 @@ const DECLARATIONS = [ @NgModule({ imports: [ CommonModule, - InfoRoutingModule, ...DECLARATIONS ], exports: [