[develop | DONE | CHANGED]: Removed folders: error, fos, landingPages, login, orcid, reload, sdg (were just calling library components) | app.module.ts: Removed declaration of OpenaireErrorPageComponent | app-routing.module.ts: Updates routes for 'sdgs', 'fields-of-science', 'orcid', 'my-orcid-links', landing pages routes, 'reload', 'user-info' to import library modules instead of intermediate project specific modules & replaced OpenaireErrorPageComponent with ErrorPageComponent (from library).
This commit is contained in:
parent
f3115b9f98
commit
17165e83ae
|
|
@ -1,35 +1,36 @@
|
||||||
import {NgModule} from '@angular/core';
|
import {NgModule} from '@angular/core';
|
||||||
import {RouterModule, Routes} from '@angular/router';
|
import {RouterModule, Routes} from '@angular/router';
|
||||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
|
||||||
import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component";
|
import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component";
|
||||||
|
import {SdgModule} from "./openaireLibrary/sdg/sdg.module";
|
||||||
|
import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component";
|
||||||
|
|
||||||
const routes: Routes = [
|
const routes: Routes = [
|
||||||
// Other Pages
|
// Other Pages
|
||||||
{path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}},
|
{path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}},
|
||||||
{path: 'home', redirectTo: '', pathMatch: 'full'},
|
{path: 'home', redirectTo: '', pathMatch: 'full'},
|
||||||
{path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)},
|
{path: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)},
|
||||||
{path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}},
|
{path: 'fields-of-science', loadChildren: () => import('./openaireLibrary/fos/fos.module').then(m => m.FosModule), data: {extraOffset: 100}},
|
||||||
{path: 'funders', loadChildren: () => import('./funders/funders.module').then(m => m.FundersModule)},
|
{path: 'funders', loadChildren: () => import('./funders/funders.module').then(m => m.FundersModule)},
|
||||||
{path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}},
|
{path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}},
|
||||||
// ORCID Pages
|
// ORCID Pages
|
||||||
{path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)},
|
{path: 'orcid', loadChildren: () => import('./openaireLibrary/orcid/orcid.module').then(m => m.OrcidModule)},
|
||||||
{path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)},
|
{path: 'my-orcid-links', loadChildren: () => import('./openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module').then(m => m.MyOrcidLinksModule)},
|
||||||
// Landing Pages
|
// Landing Pages
|
||||||
{path: 'search/result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
{path: 'search/result', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'result', community: 'openaire'}},
|
||||||
{path: 'search/publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
{path: 'search/publication', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'publication', community: 'openaire'}},
|
||||||
{path: 'search/dataset', loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
{path: 'search/dataset', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'dataset', community: 'openaire'}},
|
||||||
{path: 'search/software', loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
{path: 'search/software', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'software', community: 'openaire'}},
|
||||||
{path: 'search/other', loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
{path: 'search/other', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'orp', community: 'openaire'}},
|
||||||
{path: 'search/project', loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
{path: 'search/project', loadChildren: () => import('./openaireLibrary/landingPages/project/project.module').then(m => m.ProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}},
|
||||||
{
|
{
|
||||||
path: 'search/dataprovider',
|
path: 'search/dataprovider',
|
||||||
loadChildren: () => import('././landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule),
|
loadChildren: () => import('./openaireLibrary/landingPages/dataProvider/dataProvider.module').then(m => m.DataProviderModule),
|
||||||
data: {hasQuickContact: false, hasMenuSearchBar: true}
|
data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: 'search/organization',
|
path: 'search/organization',
|
||||||
loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule),
|
loadChildren: () => import('./openaireLibrary/landingPages/organization/organization.module').then(m => m.OrganizationModule),
|
||||||
data: {hasQuickContact: false, hasMenuSearchBar: true}
|
data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
|
||||||
},
|
},
|
||||||
|
|
||||||
// Search Pages
|
// Search Pages
|
||||||
|
|
@ -99,10 +100,10 @@ const routes: Routes = [
|
||||||
},
|
},
|
||||||
// { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule'},
|
// { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule'},
|
||||||
// help pages - do not exist in Admin portal/api/db
|
// help pages - do not exist in Admin portal/api/db
|
||||||
{path: 'reload', loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule)},
|
{path: 'reload', loadChildren: () => import('./openaireLibrary/reload/reload.module').then(m => m.ReloadModule)},
|
||||||
{path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)},
|
{path: 'user-info', loadChildren: () => import('./openaireLibrary/login/user.module').then(m => m.UserModule)},
|
||||||
{path: 'error', component: OpenaireErrorPageComponent},
|
{path: 'error', component: ErrorPageComponent},
|
||||||
{path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
|
{path: '**', pathMatch: 'full', component: ErrorPageComponent}
|
||||||
];
|
];
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,6 @@ import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigation
|
||||||
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
|
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
|
||||||
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
|
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
|
||||||
import {ErrorModule} from './openaireLibrary/error/error.module';
|
import {ErrorModule} from './openaireLibrary/error/error.module';
|
||||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
|
||||||
import {AppRoutingModule} from './app-routing.module';
|
import {AppRoutingModule} from './app-routing.module';
|
||||||
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
|
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
|
||||||
import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module";
|
import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module";
|
||||||
|
|
@ -36,7 +35,7 @@ import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
|
||||||
QuickContactModule,
|
QuickContactModule,
|
||||||
AlertModalModule, LoadingModule
|
AlertModalModule, LoadingModule
|
||||||
],
|
],
|
||||||
declarations: [AppComponent, OpenaireErrorPageComponent],
|
declarations: [AppComponent],
|
||||||
exports: [AppComponent],
|
exports: [AppComponent],
|
||||||
providers: [
|
providers: [
|
||||||
{provide: APP_ID, useValue: 'explore'},
|
{provide: APP_ID, useValue: 'explore'},
|
||||||
|
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
import { Component } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-error',
|
|
||||||
template: `
|
|
||||||
<error></error>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
|
|
||||||
export class OpenaireErrorPageComponent {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import {NgModule} from "@angular/core";
|
|
||||||
import {RouterModule} from "@angular/router";
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {ExploreFosComponent} from "./fos.component";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
component: ExploreFosComponent,
|
|
||||||
canDeactivate: [PreviousRouteRecorder]
|
|
||||||
}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class LibFosRoutingModule { }
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
import {Component} from "@angular/core";
|
|
||||||
import {properties} from "../../environments/environment";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'explore-fos',
|
|
||||||
template: `
|
|
||||||
<fos></fos>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
|
|
||||||
export class ExploreFosComponent {}
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
import {CommonModule} from "@angular/common";
|
|
||||||
import {NgModule} from "@angular/core";
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {LibFosRoutingModule} from "./fos-routing.module";
|
|
||||||
import {FosRoutingModule} from "../openaireLibrary/fos/fos-routing.module";
|
|
||||||
import {FosModule} from "../openaireLibrary/fos/fos.module";
|
|
||||||
import {ExploreFosComponent} from "./fos.component";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
LibFosRoutingModule,
|
|
||||||
FosRoutingModule,
|
|
||||||
FosModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
ExploreFosComponent
|
|
||||||
],
|
|
||||||
exports: [
|
|
||||||
ExploreFosComponent
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
PreviousRouteRecorder
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class LibFosModule { }
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireDataProviderComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class DataProviderRoutingModule { }
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-dataprovider',
|
|
||||||
template: `<dataprovider></dataprovider>`,
|
|
||||||
})
|
|
||||||
export class OpenaireDataProviderComponent{
|
|
||||||
constructor ( ) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
|
|
||||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
|
||||||
import {DataProviderRoutingModule} from './dataProvider-routing.module';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [DataProviderModule, DataProviderRoutingModule],
|
|
||||||
declarations:[OpenaireDataProviderComponent],
|
|
||||||
providers:[ PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireDataProviderComponent]
|
|
||||||
})
|
|
||||||
export class LibDataProviderModule { }
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import { OpenaireDatasetComponent } from './dataset.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireDatasetComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class DatasetRoutingModule { }
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-dataset',
|
|
||||||
template: `<result-landing type="dataset"></result-landing>`,
|
|
||||||
})
|
|
||||||
export class OpenaireDatasetComponent{}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import { OpenaireDatasetComponent } from './dataset.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {DatasetRoutingModule} from './dataset-routing.module';
|
|
||||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
|
||||||
@NgModule({
|
|
||||||
imports: [DatasetRoutingModule, ResultLandingModule],
|
|
||||||
declarations:[OpenaireDatasetComponent],
|
|
||||||
providers:[PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireDatasetComponent]
|
|
||||||
})
|
|
||||||
export class LibDatasetModule { }
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import { OpenaireOrganizationComponent } from './organization.component';
|
|
||||||
import {OrganizationRoutingModule} from './organization-routing.module';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [OrganizationModule, OrganizationRoutingModule],
|
|
||||||
declarations:[OpenaireOrganizationComponent],
|
|
||||||
providers:[ PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireOrganizationComponent]
|
|
||||||
})
|
|
||||||
export class LibOrganizationModule { }
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import { OpenaireOrganizationComponent } from './organization.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireOrganizationComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class OrganizationRoutingModule { }
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-organization',
|
|
||||||
template: `<organization></organization>`,
|
|
||||||
})
|
|
||||||
export class OpenaireOrganizationComponent{
|
|
||||||
constructor ( ) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,12 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import { OpenaireOrpComponent } from './orp.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {OrpRoutingModule} from './orp-routing.module';
|
|
||||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
|
||||||
@NgModule({
|
|
||||||
imports: [OrpRoutingModule, ResultLandingModule],
|
|
||||||
declarations:[OpenaireOrpComponent],
|
|
||||||
providers:[ PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireOrpComponent]
|
|
||||||
})
|
|
||||||
export class LibOrpModule { }
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import { OpenaireOrpComponent } from './orp.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireOrpComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class OrpRoutingModule { }
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-orp',
|
|
||||||
template: `<result-landing type="orp"></result-landing>`,
|
|
||||||
})
|
|
||||||
export class OpenaireOrpComponent{}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import { OpenaireProjectComponent } from './project.component';
|
|
||||||
import {ProjectRoutingModule} from './project-routing.module';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [ProjectModule, ProjectRoutingModule],
|
|
||||||
declarations:[OpenaireProjectComponent],
|
|
||||||
providers:[ PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireProjectComponent]
|
|
||||||
})
|
|
||||||
export class LibProjectModule { }
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import { OpenaireProjectComponent } from './project.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireProjectComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class ProjectRoutingModule { }
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-project',
|
|
||||||
template: `<project></project>`,
|
|
||||||
})
|
|
||||||
export class OpenaireProjectComponent{
|
|
||||||
constructor ( ) {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
ngOnInit() {
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import { OpenairePublicationComponent } from './publication.component';
|
|
||||||
import {PublicationRoutingModule} from './publication-routing.module';
|
|
||||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [PublicationRoutingModule, ResultLandingModule],
|
|
||||||
declarations:[OpenairePublicationComponent],
|
|
||||||
providers:[ PreviousRouteRecorder],
|
|
||||||
exports:[OpenairePublicationComponent]
|
|
||||||
})
|
|
||||||
export class LibPublicationModule { }
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import {OpenairePublicationComponent } from './publication.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenairePublicationComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class PublicationRoutingModule { }
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-publication',
|
|
||||||
template: `
|
|
||||||
<result-landing type="publication"></result-landing>`,
|
|
||||||
})
|
|
||||||
export class OpenairePublicationComponent {}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {OpenaireResultComponent} from './result.component';
|
|
||||||
import {ResultRoutingModule} from './result-routing.module';
|
|
||||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [ResultRoutingModule, ResultLandingModule],
|
|
||||||
declarations:[OpenaireResultComponent],
|
|
||||||
providers:[PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireResultComponent]
|
|
||||||
})
|
|
||||||
export class LibResultModule { }
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import {OpenaireResultComponent } from './result.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireResultComponent, data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class ResultRoutingModule { }
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-publication',
|
|
||||||
template: `<result-landing type="result"></result-landing>`,
|
|
||||||
})
|
|
||||||
export class OpenaireResultComponent{}
|
|
||||||
|
|
@ -1,13 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
import { OpenaireSoftwareComponent } from './software.component';
|
|
||||||
import {SoftwareRoutingModule} from './software-routing.module';
|
|
||||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
|
||||||
@NgModule({
|
|
||||||
imports: [SoftwareRoutingModule, ResultLandingModule],
|
|
||||||
declarations:[OpenaireSoftwareComponent],
|
|
||||||
providers:[PreviousRouteRecorder],
|
|
||||||
exports:[OpenaireSoftwareComponent]
|
|
||||||
})
|
|
||||||
export class LibSoftwareModule { }
|
|
||||||
|
|
@ -1,14 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import {OpenaireSoftwareComponent } from './software.component';
|
|
||||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireSoftwareComponent, canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class SoftwareRoutingModule { }
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-software',
|
|
||||||
template: `<result-landing type="software"></result-landing>`,
|
|
||||||
})
|
|
||||||
export class OpenaireSoftwareComponent{}
|
|
||||||
|
|
@ -1,23 +0,0 @@
|
||||||
import { NgModule} from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
|
|
||||||
import {OpenaireUserComponent } from './user.component';
|
|
||||||
import { UserRoutingModule } from './user-routing.module';
|
|
||||||
import { UserModule} from '../openaireLibrary/login/user.module';
|
|
||||||
|
|
||||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, FormsModule,
|
|
||||||
UserRoutingModule, UserModule
|
|
||||||
|
|
||||||
],
|
|
||||||
providers:[PreviousRouteRecorder],
|
|
||||||
declarations: [
|
|
||||||
OpenaireUserComponent
|
|
||||||
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class LibUserModule { }
|
|
||||||
|
|
@ -1,15 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import {OpenaireUserComponent } from './user.component';
|
|
||||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireUserComponent, canDeactivate: [PreviousRouteRecorder]},
|
|
||||||
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class UserRoutingModule { }
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-user',
|
|
||||||
template: `<user></user>`
|
|
||||||
})
|
|
||||||
|
|
||||||
export class OpenaireUserComponent {
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {OpenaireMyOrcidLinksComponent} from "./myOrcidLinks.component";
|
|
||||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireMyOrcidLinksComponent,
|
|
||||||
canActivate: [LoginGuard], data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},
|
|
||||||
canDeactivate: [PreviousRouteRecorder]
|
|
||||||
}
|
|
||||||
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class MyOrcidLinksRoutingModule { }
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-my-orcid-links',
|
|
||||||
template: `
|
|
||||||
<my-orcid-links></my-orcid-links>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
|
|
||||||
export class OpenaireMyOrcidLinksComponent {
|
|
||||||
|
|
||||||
constructor() {}
|
|
||||||
|
|
||||||
public ngOnInit() {}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {OpenaireMyOrcidLinksComponent} from './myOrcidLinks.component';
|
|
||||||
import {MyOrcidLinksModule} from "../../openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module";
|
|
||||||
import {MyOrcidLinksRoutingModule} from "./myOrcidLinks-routing.module";
|
|
||||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, FormsModule,
|
|
||||||
MyOrcidLinksModule,
|
|
||||||
MyOrcidLinksRoutingModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
OpenaireMyOrcidLinksComponent
|
|
||||||
],
|
|
||||||
exports: [
|
|
||||||
OpenaireMyOrcidLinksComponent
|
|
||||||
],
|
|
||||||
providers: [PreviousRouteRecorder, LoginGuard]
|
|
||||||
})
|
|
||||||
export class LibMyOrcidLinksModule { }
|
|
||||||
|
|
@ -1,21 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
|
|
||||||
import {OpenaireOrcidComponent} from './orcid.component';
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
|
|
||||||
import {properties} from "../../environments/environment";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{ path: '', component: OpenaireOrcidComponent,
|
|
||||||
canActivate: [LoginGuard], data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},
|
|
||||||
canDeactivate: [PreviousRouteRecorder] }
|
|
||||||
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class OrcidRoutingModule { }
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
import { Component } from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-orcid',
|
|
||||||
template: `
|
|
||||||
<orcid></orcid>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
|
|
||||||
export class OpenaireOrcidComponent {}
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
|
|
||||||
import {OpenaireOrcidComponent} from './orcid.component';
|
|
||||||
import {OrcidRoutingModule} from './orcid-routing.module';
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {FormsModule} from "@angular/forms";
|
|
||||||
import {OrcidModule} from "../openaireLibrary/orcid/orcid.module";
|
|
||||||
import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, FormsModule,
|
|
||||||
OrcidModule, OrcidRoutingModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
OpenaireOrcidComponent
|
|
||||||
],
|
|
||||||
providers: [PreviousRouteRecorder, LoginGuard],
|
|
||||||
exports: [
|
|
||||||
OpenaireOrcidComponent
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class LibOrcidModule { }
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { RouterModule } from '@angular/router';
|
|
||||||
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
|
|
||||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
|
|
||||||
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
|
|
||||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
|
||||||
import {properties} from "../../../environments/environment";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
// { path: '', component: OpenaireSearchMyResultsInOrcidComponent, canActivate: [IsRouteEnabled], data: {
|
|
||||||
{ path: '', component: OpenaireSearchRecommendedResultsForOrcidComponent,
|
|
||||||
canActivate: [LoginGuard], data: {
|
|
||||||
redirect: properties.errorLink, community : 'openaire'
|
|
||||||
},
|
|
||||||
canDeactivate: [PreviousRouteRecorder]
|
|
||||||
}
|
|
||||||
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class SearchRecommendedResultsForOrcidRoutingModule { }
|
|
||||||
|
|
@ -1,16 +0,0 @@
|
||||||
import {Component} from '@angular/core';
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'openaire-search-recommended-results-for-orcid',
|
|
||||||
template: `
|
|
||||||
<search-recommended-results-for-orcid></search-recommended-results-for-orcid>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
|
|
||||||
export class OpenaireSearchRecommendedResultsForOrcidComponent {
|
|
||||||
|
|
||||||
constructor() {}
|
|
||||||
|
|
||||||
public ngOnInit() {}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
import { NgModule } from '@angular/core';
|
|
||||||
import { CommonModule } from '@angular/common';
|
|
||||||
import { FormsModule } from '@angular/forms';
|
|
||||||
import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
|
|
||||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
|
|
||||||
import {SearchRecommendedResultsForOrcidModule} from "../../openaireLibrary/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module";
|
|
||||||
import {SearchRecommendedResultsForOrcidRoutingModule} from "./searchRecommendedResultsForOrcid-routing.module";
|
|
||||||
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
|
|
||||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, FormsModule,
|
|
||||||
SearchRecommendedResultsForOrcidModule,
|
|
||||||
SearchRecommendedResultsForOrcidRoutingModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
OpenaireSearchRecommendedResultsForOrcidComponent
|
|
||||||
],
|
|
||||||
exports: [
|
|
||||||
OpenaireSearchRecommendedResultsForOrcidComponent
|
|
||||||
],
|
|
||||||
// providers: [PreviousRouteRecorder, IsRouteEnabled]
|
|
||||||
providers: [PreviousRouteRecorder, LoginGuard]
|
|
||||||
})
|
|
||||||
export class LibSearchRecommendedResultsForOrcidModule { }
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
import {NgModule} from '@angular/core';
|
|
||||||
import {CommonModule} from '@angular/common';
|
|
||||||
import {FormsModule} from '@angular/forms';
|
|
||||||
import {RouterModule} from '@angular/router';
|
|
||||||
|
|
||||||
import {ReloadModule} from '../openaireLibrary/reload/reload.module';
|
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule, FormsModule, RouterModule, ReloadModule
|
|
||||||
],
|
|
||||||
declarations: [],
|
|
||||||
providers: [],
|
|
||||||
exports: []
|
|
||||||
})
|
|
||||||
export class LibReloadModule {
|
|
||||||
}
|
|
||||||
|
|
@ -1,17 +0,0 @@
|
||||||
import {NgModule} from "@angular/core";
|
|
||||||
import {RouterModule} from "@angular/router";
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {ExploreSdgComponent} from "./sdg.component";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
RouterModule.forChild([
|
|
||||||
{
|
|
||||||
path: '',
|
|
||||||
component: ExploreSdgComponent,
|
|
||||||
canDeactivate: [PreviousRouteRecorder]
|
|
||||||
}
|
|
||||||
])
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class LibSdgRoutingModule { }
|
|
||||||
|
|
@ -1,10 +0,0 @@
|
||||||
import {Component} from "@angular/core";
|
|
||||||
import {properties} from "../../environments/environment";
|
|
||||||
|
|
||||||
@Component({
|
|
||||||
selector: 'explore-sdg',
|
|
||||||
template: `
|
|
||||||
<sdg></sdg>
|
|
||||||
`
|
|
||||||
})
|
|
||||||
export class ExploreSdgComponent {}
|
|
||||||
|
|
@ -1,26 +0,0 @@
|
||||||
import {CommonModule} from "@angular/common";
|
|
||||||
import {NgModule} from "@angular/core";
|
|
||||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
|
||||||
import {LibSdgRoutingModule} from "./sdg-routing.module";
|
|
||||||
import {SdgRoutingModule} from "../openaireLibrary/sdg/sdg-routing.module";
|
|
||||||
import {SdgModule} from "../openaireLibrary/sdg/sdg.module";
|
|
||||||
import {ExploreSdgComponent} from "./sdg.component";
|
|
||||||
|
|
||||||
@NgModule({
|
|
||||||
imports: [
|
|
||||||
CommonModule,
|
|
||||||
LibSdgRoutingModule,
|
|
||||||
SdgRoutingModule,
|
|
||||||
SdgModule
|
|
||||||
],
|
|
||||||
declarations: [
|
|
||||||
ExploreSdgComponent
|
|
||||||
],
|
|
||||||
exports: [
|
|
||||||
ExploreSdgComponent
|
|
||||||
],
|
|
||||||
providers: [
|
|
||||||
PreviousRouteRecorder
|
|
||||||
]
|
|
||||||
})
|
|
||||||
export class LibSdgModule { }
|
|
||||||
Loading…
Reference in New Issue