-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into deps/patch-all-minor-patch
- Loading branch information
Showing
33 changed files
with
204 additions
and
256 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,103 +1,111 @@ | ||
| /* eslint-disable */ | ||
| import {NgModule} from '@angular/core' | ||
| import {RouterModule, Routes} from '@angular/router' | ||
| import { NgModule } from '@angular/core' | ||
| import { RouterModule, Routes } from '@angular/router' | ||
| // Layouts | ||
| import {ConsentInfoComponent} from './consent-info.component' | ||
| import {FullLayoutComponent} from './layouts/full-layout.component' | ||
| import {MemberGuardService} from './member-guard.service' | ||
| import {RegistrationInfoComponent} from './registration-info.component' | ||
| import {LoggedInGuard} from './logged-in-guard.service' | ||
| import {CreditsCalculatorComponent} from './credits-calculator/credits-calculator.component' | ||
| import {VoGuardService} from './shared/guards/vo-guard.service'; | ||
| import { ConsentInfoComponent } from './consent-info.component' | ||
| import { FullLayoutComponent } from './layouts/full-layout.component' | ||
| import { MemberGuardService } from './member-guard.service' | ||
| import { RegistrationInfoComponent } from './registration-info.component' | ||
| import { LoggedInGuard } from './logged-in-guard.service' | ||
| import { CreditsCalculatorComponent } from './credits-calculator/credits-calculator.component' | ||
| import { VoGuardService } from './shared/guards/vo-guard.service' | ||
|
|
||
| export const routes: Routes = [ | ||
| { | ||
| path: '', | ||
| redirectTo: 'userinfo', | ||
| pathMatch: 'full', | ||
| { | ||
| path: '', | ||
| redirectTo: 'userinfo', | ||
| pathMatch: 'full', | ||
| data: { | ||
| title: 'de.NBI Cloud Portal - Profile', | ||
| }, | ||
| { | ||
| path: 'registration-info', | ||
| component: RegistrationInfoComponent, | ||
| pathMatch: 'full', | ||
| }, | ||
| { | ||
| path: 'registration-info', | ||
| component: RegistrationInfoComponent, | ||
| pathMatch: 'full', | ||
| data: { | ||
| title: 'de.NBI Cloud Portal - Registration Info', | ||
| }, | ||
| { | ||
| path: 'consent-info', | ||
| component: ConsentInfoComponent, | ||
| pathMatch: 'full', | ||
| }, | ||
| { | ||
| path: 'consent-info', | ||
| component: ConsentInfoComponent, | ||
| pathMatch: 'full', | ||
| data: { | ||
| title: 'de.NBI Cloud Portal - Consent Info', | ||
| }, | ||
| { | ||
| path: '', | ||
| component: FullLayoutComponent, | ||
| canActivate: [MemberGuardService], | ||
| data: { | ||
| title: 'de.NBI Cloud Portal', | ||
| }, | ||
| children: [ | ||
| { | ||
| path: 'userinfo', | ||
| canActivate: [LoggedInGuard], | ||
| }, | ||
| { | ||
| path: '', | ||
| component: FullLayoutComponent, | ||
| canActivate: [MemberGuardService], | ||
| data: { | ||
| title: 'de.NBI Cloud Portal', | ||
| }, | ||
| children: [ | ||
| { | ||
| path: 'userinfo', | ||
| canActivate: [LoggedInGuard], | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/promise-function-async | ||
| loadChildren: () => import('./userinfo/userinfo.module').then(m => m.UserinfoModule), | ||
| }, | ||
| { | ||
| path: 'help', | ||
| canActivate: [LoggedInGuard], | ||
| loadChildren: () => import('./userinfo/userinfo.module').then(m => m.UserinfoModule), | ||
| }, | ||
| { | ||
| path: 'help', | ||
| canActivate: [LoggedInGuard], | ||
|
|
||
| // eslint-disable-next-line @typescript-eslint/promise-function-async | ||
| loadChildren: () => import('./help/help.module').then(m => m.HelpModule), | ||
| }, | ||
| { | ||
| path: 'project-management', | ||
| canActivate: [LoggedInGuard], | ||
| loadChildren: () => import('./help/help.module').then(m => m.HelpModule), | ||
| }, | ||
| { | ||
| path: 'project-management', | ||
| canActivate: [LoggedInGuard], | ||
|
|
||
| loadChildren: () => import('./projectmanagement/projectmanagement.module').then(m => m.ProjectManagementModule), | ||
| }, | ||
| { | ||
| path: 'applications', | ||
| canActivate: [LoggedInGuard], | ||
| loadChildren: () => import('./projectmanagement/projectmanagement.module').then(m => m.ProjectManagementModule), | ||
| }, | ||
| { | ||
| path: 'applications', | ||
| canActivate: [LoggedInGuard], | ||
|
|
||
| loadChildren: () => import('./applications/applications.module').then(m => m.ApplicationsModule), | ||
| }, | ||
| { | ||
| path: 'virtualmachines', | ||
| canActivate: [LoggedInGuard], | ||
| loadChildren: () => import('./applications/applications.module').then(m => m.ApplicationsModule), | ||
| }, | ||
| { | ||
| path: 'virtualmachines', | ||
| canActivate: [LoggedInGuard], | ||
|
|
||
| loadChildren: () => import('./virtualmachines/vm.module').then(m => m.VmModule), | ||
| }, | ||
| { | ||
| path: 'vo-manager', | ||
| loadChildren: () => import('./vo_manager/VoManager.module').then(m => m.VoManagerModule), | ||
| canActivate: [VoGuardService] | ||
| }, | ||
| { | ||
| path: 'facility-manager', | ||
| canActivate: [LoggedInGuard], | ||
| loadChildren: () => import('./virtualmachines/vm.module').then(m => m.VmModule), | ||
| }, | ||
| { | ||
| path: 'vo-manager', | ||
| loadChildren: () => import('./vo_manager/VoManager.module').then(m => m.VoManagerModule), | ||
| canActivate: [VoGuardService], | ||
| }, | ||
| { | ||
| path: 'facility-manager', | ||
| canActivate: [LoggedInGuard], | ||
|
|
||
| loadChildren: () => import('./facility_manager/facilitymanager.module').then(m => m.FacilitymanagerModule), | ||
| }, | ||
| { | ||
| path: 'credits-calculator', | ||
| canActivate: [LoggedInGuard], | ||
| component: CreditsCalculatorComponent, | ||
| loadChildren: () => import('./facility_manager/facilitymanager.module').then(m => m.FacilitymanagerModule), | ||
| }, | ||
| { | ||
| path: 'credits-calculator', | ||
| canActivate: [LoggedInGuard], | ||
| component: CreditsCalculatorComponent, | ||
|
|
||
| loadChildren: () => | ||
| import('./credits-calculator/credits-calculator.module').then(m => m.CreditsCalculatorModule), | ||
| }, | ||
| ], | ||
| }, | ||
| loadChildren: () => | ||
| import('./credits-calculator/credits-calculator.module').then(m => m.CreditsCalculatorModule), | ||
| }, | ||
| ], | ||
| }, | ||
| ] | ||
|
|
||
| /** | ||
| * App routing module. | ||
| */ | ||
| @NgModule({ | ||
| imports: [RouterModule.forRoot(routes, {})], | ||
| exports: [RouterModule], | ||
| providers: [MemberGuardService, LoggedInGuard], | ||
| imports: [RouterModule.forRoot(routes, {})], | ||
| exports: [RouterModule], | ||
| providers: [MemberGuardService, LoggedInGuard], | ||
| }) | ||
| export class AppRoutingModule { | ||
| } | ||
| export class AppRoutingModule {} | ||
|
|
||
| /* eslint-enable */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.