diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 74b5ff3..a9911c9 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -27,11 +27,11 @@ const routes: Routes = [ loadChildren: () => import('./admin/admin.module').then(m => m.AdminModule), data: {title: Irish.METADATA_PREFIX + ' Admin | '}, }, + {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule)}, { path: '', loadChildren: () => import('./national/national.module').then(m => m.NationalModule) }, - {path: 'participate', loadChildren: () => import('./claims/claims.module').then(m => m.ClaimsModule)}, {path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)}, {path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)}, {path: 'error', component: ErrorPageComponent}, diff --git a/src/app/claims/directLinking/directLinking-routing.module.ts b/src/app/claims/directLinking/directLinking-routing.module.ts index 7d260fc..7e4b9ad 100644 --- a/src/app/claims/directLinking/directLinking-routing.module.ts +++ b/src/app/claims/directLinking/directLinking-routing.module.ts @@ -1,17 +1,16 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import { OpenaireDirectLinkingComponent } from './directLinking.component'; +import {OpenaireDirectLinkingComponent} from './directLinking.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { + { path: '', component: OpenaireDirectLinkingComponent, canActivate: [LoginGuard], data: { redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder]}, diff --git a/src/app/claims/linking/linking-routing.module.ts b/src/app/claims/linking/linking-routing.module.ts index 469c7e2..8df055a 100644 --- a/src/app/claims/linking/linking-routing.module.ts +++ b/src/app/claims/linking/linking-routing.module.ts @@ -1,16 +1,15 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; -import { OpenaireLinkingComponent } from './linkingGeneric.component'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; +import {OpenaireLinkingComponent} from './linkingGeneric.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {properties} from "../../../environments/environment"; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: { + { path: '', component: OpenaireLinkingComponent, canActivate: [ LoginGuard], data: { redirect: properties.errorLink, community : 'openaire' }, canDeactivate: [PreviousRouteRecorder]}, diff --git a/src/app/claims/myClaims/myClaims-routing.module.ts b/src/app/claims/myClaims/myClaims-routing.module.ts index 949ae69..e689cc6 100644 --- a/src/app/claims/myClaims/myClaims-routing.module.ts +++ b/src/app/claims/myClaims/myClaims-routing.module.ts @@ -1,10 +1,9 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; +import {NgModule} from '@angular/core'; +import {RouterModule} from '@angular/router'; -import {OpenaireMyClaimsComponent } from './myClaims.component'; +import {OpenaireMyClaimsComponent} from './myClaims.component'; import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; -import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {properties} from "../../../environments/environment"; @@ -12,7 +11,7 @@ import {properties} from "../../../environments/environment"; imports: [ RouterModule.forChild([ { path: '', component: OpenaireMyClaimsComponent, canActivate: [LoginGuard], - data: {redirect: properties.errorLink, community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}]) + data: {redirect: properties.errorLink}, canDeactivate: [PreviousRouteRecorder]}]) ] }) export class MyClaimsRoutingModule { }