From d73fc0f0734fbf2ea96986a866715a95bd7eac08 Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Wed, 10 Jan 2024 10:14:43 +0100 Subject: [PATCH] [DURACOM-191] change routing for register-page, delete register-page.module.ts --- src/app/app-routing.module.ts | 4 +-- src/app/register-page/register-page-routes.ts | 29 +++++++++++++++ .../register-page-routing.module.ts | 35 ------------------- src/app/register-page/register-page.module.ts | 30 ---------------- 4 files changed, 31 insertions(+), 67 deletions(-) create mode 100644 src/app/register-page/register-page-routes.ts delete mode 100644 src/app/register-page/register-page-routing.module.ts delete mode 100644 src/app/register-page/register-page.module.ts diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index c4d5717acd..1e9bacc133 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -86,8 +86,8 @@ import { ThemedPageErrorComponent } from './page-error/themed-page-error.compone }, { path: REGISTER_PATH, - loadChildren: () => import('./register-page/register-page.module') - .then((m) => m.RegisterPageModule), + loadChildren: () => import('./register-page/register-page-routes') + .then((m) => m.ROUTES), canActivate: [SiteRegisterGuard] }, { diff --git a/src/app/register-page/register-page-routes.ts b/src/app/register-page/register-page-routes.ts new file mode 100644 index 0000000000..9a7980b25f --- /dev/null +++ b/src/app/register-page/register-page-routes.ts @@ -0,0 +1,29 @@ +import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component'; +import { ItemPageResolver } from '../item-page/item-page.resolver'; +import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; +import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; +import { RegistrationGuard } from './registration.guard'; +import { Route } from '@angular/router'; + + +export const ROUTES: Route[] = [ + { + path: '', + component: ThemedRegisterEmailComponent, + providers: [ + ItemPageResolver + ], + data: {title: 'register-email.title'}, + }, + { + path: ':token', + component: ThemedCreateProfileComponent, + providers: [ + ItemPageResolver + ], + canActivate: [ + RegistrationGuard, + EndUserAgreementCookieGuard, + ], + } +]; diff --git a/src/app/register-page/register-page-routing.module.ts b/src/app/register-page/register-page-routing.module.ts deleted file mode 100644 index 31a7681851..0000000000 --- a/src/app/register-page/register-page-routing.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component'; -import { ItemPageResolver } from '../item-page/item-page.resolver'; -import { EndUserAgreementCookieGuard } from '../core/end-user-agreement/end-user-agreement-cookie.guard'; -import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; -import { RegistrationGuard } from './registration.guard'; - -@NgModule({ - imports: [ - RouterModule.forChild([ - { - path: '', - component: ThemedRegisterEmailComponent, - data: {title: 'register-email.title'}, - }, - { - path: ':token', - component: ThemedCreateProfileComponent, - canActivate: [ - RegistrationGuard, - EndUserAgreementCookieGuard, - ], - } - ]) - ], - providers: [ - ItemPageResolver - ] -}) -/** - * Module related to the navigation to components used to register a new user - */ -export class RegisterPageRoutingModule { -} diff --git a/src/app/register-page/register-page.module.ts b/src/app/register-page/register-page.module.ts deleted file mode 100644 index 40b6e01853..0000000000 --- a/src/app/register-page/register-page.module.ts +++ /dev/null @@ -1,30 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RegisterPageRoutingModule } from './register-page-routing.module'; -import { RegisterEmailComponent } from './register-email/register-email.component'; -import { CreateProfileComponent } from './create-profile/create-profile.component'; -import { RegisterEmailFormModule } from '../register-email-form/register-email-form.module'; -import { ProfilePageModule } from '../profile-page/profile-page.module'; -import { ThemedCreateProfileComponent } from './create-profile/themed-create-profile.component'; -import { ThemedRegisterEmailComponent } from './register-email/themed-register-email.component'; - -@NgModule({ - imports: [ - CommonModule, - RegisterPageRoutingModule, - RegisterEmailFormModule, - ProfilePageModule, - RegisterEmailComponent, - ThemedRegisterEmailComponent, - CreateProfileComponent, - ThemedCreateProfileComponent - ], - providers: [] -}) - -/** - * Module related to components used to register a new user - */ -export class RegisterPageModule { - -}