diff --git a/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts
index b3b1988e..4b8bf50d 100644
--- a/explore/src/app/app-routing.module.ts
+++ b/explore/src/app/app-routing.module.ts
@@ -1,35 +1,36 @@
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
-import {OpenaireErrorPageComponent} from './error/errorPage.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 = [
// Other Pages
{path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}},
{path: 'home', redirectTo: '', pathMatch: 'full'},
- {path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)},
- {path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}},
+ {path: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)},
+ {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: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}},
// ORCID Pages
- {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: 'orcid', loadChildren: () => import('./openaireLibrary/orcid/orcid.module').then(m => m.OrcidModule)},
+ {path: 'my-orcid-links', loadChildren: () => import('./openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module').then(m => m.MyOrcidLinksModule)},
// Landing Pages
- {path: 'search/result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
- {path: 'search/publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
- {path: 'search/dataset', loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
- {path: 'search/software', loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
- {path: 'search/other', loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
- {path: 'search/project', loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), 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('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'publication', community: 'openaire'}},
+ {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('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'software', community: 'openaire'}},
+ {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('./openaireLibrary/landingPages/project/project.module').then(m => m.ProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}},
{
path: 'search/dataprovider',
- loadChildren: () => import('././landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule),
- data: {hasQuickContact: false, hasMenuSearchBar: true}
+ loadChildren: () => import('./openaireLibrary/landingPages/dataProvider/dataProvider.module').then(m => m.DataProviderModule),
+ data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
},
{
path: 'search/organization',
- loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule),
- data: {hasQuickContact: false, hasMenuSearchBar: true}
+ loadChildren: () => import('./openaireLibrary/landingPages/organization/organization.module').then(m => m.OrganizationModule),
+ data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
},
// Search Pages
@@ -99,10 +100,10 @@ const routes: Routes = [
},
// { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule'},
// help pages - do not exist in Admin portal/api/db
- {path: 'reload', loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule)},
- {path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)},
- {path: 'error', component: OpenaireErrorPageComponent},
- {path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
+ {path: 'reload', loadChildren: () => import('./openaireLibrary/reload/reload.module').then(m => m.ReloadModule)},
+ {path: 'user-info', loadChildren: () => import('./openaireLibrary/login/user.module').then(m => m.UserModule)},
+ {path: 'error', component: ErrorPageComponent},
+ {path: '**', pathMatch: 'full', component: ErrorPageComponent}
];
@NgModule({
diff --git a/explore/src/app/app.module.ts b/explore/src/app/app.module.ts
index 6d95092c..16371cb7 100755
--- a/explore/src/app/app.module.ts
+++ b/explore/src/app/app.module.ts
@@ -9,7 +9,6 @@ import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigation
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
import {ErrorModule} from './openaireLibrary/error/error.module';
-import {OpenaireErrorPageComponent} from './error/errorPage.component';
import {AppRoutingModule} from './app-routing.module';
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module";
@@ -36,7 +35,7 @@ import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
QuickContactModule,
AlertModalModule, LoadingModule
],
- declarations: [AppComponent, OpenaireErrorPageComponent],
+ declarations: [AppComponent],
exports: [AppComponent],
providers: [
{provide: APP_ID, useValue: 'explore'},
diff --git a/explore/src/app/error/errorPage.component.ts b/explore/src/app/error/errorPage.component.ts
deleted file mode 100644
index 52073bcc..00000000
--- a/explore/src/app/error/errorPage.component.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'openaire-error',
- template: `
-
- `
-})
-
-export class OpenaireErrorPageComponent {
-
-}
diff --git a/explore/src/app/fos/fos-routing.module.ts b/explore/src/app/fos/fos-routing.module.ts
deleted file mode 100644
index f5d36cd6..00000000
--- a/explore/src/app/fos/fos-routing.module.ts
+++ /dev/null
@@ -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 { }
\ No newline at end of file
diff --git a/explore/src/app/fos/fos.component.ts b/explore/src/app/fos/fos.component.ts
deleted file mode 100644
index 4c85da4f..00000000
--- a/explore/src/app/fos/fos.component.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";
-
-@Component({
- selector: 'explore-fos',
- template: `
-
- `
-})
-
-export class ExploreFosComponent {}
diff --git a/explore/src/app/fos/fos.module.ts b/explore/src/app/fos/fos.module.ts
deleted file mode 100644
index bf657703..00000000
--- a/explore/src/app/fos/fos.module.ts
+++ /dev/null
@@ -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 { }
\ No newline at end of file
diff --git a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts b/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
deleted file mode 100644
index c6155835..00000000
--- a/explore/src/app/landingPages/dataProvider/dataProvider-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/dataProvider/dataProvider.component.ts b/explore/src/app/landingPages/dataProvider/dataProvider.component.ts
deleted file mode 100644
index 70fdcd58..00000000
--- a/explore/src/app/landingPages/dataProvider/dataProvider.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-dataprovider',
- template: ``,
- })
-export class OpenaireDataProviderComponent{
- constructor ( ) {
-
- }
-
- ngOnInit() {
-}
-
-
-
-}
diff --git a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts b/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts
deleted file mode 100644
index 3cefefe1..00000000
--- a/explore/src/app/landingPages/dataProvider/libDataProvider.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/dataset/dataset-routing.module.ts b/explore/src/app/landingPages/dataset/dataset-routing.module.ts
deleted file mode 100644
index 643183ef..00000000
--- a/explore/src/app/landingPages/dataset/dataset-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/dataset/dataset.component.ts b/explore/src/app/landingPages/dataset/dataset.component.ts
deleted file mode 100644
index 892493f4..00000000
--- a/explore/src/app/landingPages/dataset/dataset.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-dataset',
- template: ``,
- })
-export class OpenaireDatasetComponent{}
diff --git a/explore/src/app/landingPages/dataset/libDataset.module.ts b/explore/src/app/landingPages/dataset/libDataset.module.ts
deleted file mode 100644
index e29bae2b..00000000
--- a/explore/src/app/landingPages/dataset/libDataset.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/organization/libOrganization.module.ts b/explore/src/app/landingPages/organization/libOrganization.module.ts
deleted file mode 100644
index ed43d01e..00000000
--- a/explore/src/app/landingPages/organization/libOrganization.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/organization/organization-routing.module.ts b/explore/src/app/landingPages/organization/organization-routing.module.ts
deleted file mode 100644
index 70f8f0c1..00000000
--- a/explore/src/app/landingPages/organization/organization-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/organization/organization.component.ts b/explore/src/app/landingPages/organization/organization.component.ts
deleted file mode 100644
index 467b895e..00000000
--- a/explore/src/app/landingPages/organization/organization.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-organization',
- template: ``,
- })
-export class OpenaireOrganizationComponent{
- constructor ( ) {
-
- }
-
- ngOnInit() {
-}
-
-
-
-}
diff --git a/explore/src/app/landingPages/orp/libOrp.module.ts b/explore/src/app/landingPages/orp/libOrp.module.ts
deleted file mode 100644
index 02c5ef75..00000000
--- a/explore/src/app/landingPages/orp/libOrp.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/orp/orp-routing.module.ts b/explore/src/app/landingPages/orp/orp-routing.module.ts
deleted file mode 100644
index fb399309..00000000
--- a/explore/src/app/landingPages/orp/orp-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/orp/orp.component.ts b/explore/src/app/landingPages/orp/orp.component.ts
deleted file mode 100644
index 1b5ff4de..00000000
--- a/explore/src/app/landingPages/orp/orp.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-orp',
- template: ``,
- })
-export class OpenaireOrpComponent{}
diff --git a/explore/src/app/landingPages/project/libProject.module.ts b/explore/src/app/landingPages/project/libProject.module.ts
deleted file mode 100644
index f68204c5..00000000
--- a/explore/src/app/landingPages/project/libProject.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/project/project-routing.module.ts b/explore/src/app/landingPages/project/project-routing.module.ts
deleted file mode 100644
index db65850e..00000000
--- a/explore/src/app/landingPages/project/project-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/project/project.component.ts b/explore/src/app/landingPages/project/project.component.ts
deleted file mode 100644
index a3964dae..00000000
--- a/explore/src/app/landingPages/project/project.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-project',
- template: ``,
- })
-export class OpenaireProjectComponent{
- constructor ( ) {
-
- }
-
- ngOnInit() {
-}
-
-
-
-}
diff --git a/explore/src/app/landingPages/publication/libPublication.module.ts b/explore/src/app/landingPages/publication/libPublication.module.ts
deleted file mode 100644
index b94b9adf..00000000
--- a/explore/src/app/landingPages/publication/libPublication.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/publication/publication-routing.module.ts b/explore/src/app/landingPages/publication/publication-routing.module.ts
deleted file mode 100644
index dbccb6d4..00000000
--- a/explore/src/app/landingPages/publication/publication-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/publication/publication.component.ts b/explore/src/app/landingPages/publication/publication.component.ts
deleted file mode 100644
index e82ff254..00000000
--- a/explore/src/app/landingPages/publication/publication.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-publication',
- template: `
- `,
-})
-export class OpenairePublicationComponent {}
diff --git a/explore/src/app/landingPages/result/libResult.module.ts b/explore/src/app/landingPages/result/libResult.module.ts
deleted file mode 100644
index 39be4780..00000000
--- a/explore/src/app/landingPages/result/libResult.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/result/result-routing.module.ts b/explore/src/app/landingPages/result/result-routing.module.ts
deleted file mode 100644
index 666fcc64..00000000
--- a/explore/src/app/landingPages/result/result-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/result/result.component.ts b/explore/src/app/landingPages/result/result.component.ts
deleted file mode 100644
index 860e4010..00000000
--- a/explore/src/app/landingPages/result/result.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-publication',
- template: ``,
- })
-export class OpenaireResultComponent{}
diff --git a/explore/src/app/landingPages/software/libSoftware.module.ts b/explore/src/app/landingPages/software/libSoftware.module.ts
deleted file mode 100644
index 04a89717..00000000
--- a/explore/src/app/landingPages/software/libSoftware.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/software/software-routing.module.ts b/explore/src/app/landingPages/software/software-routing.module.ts
deleted file mode 100644
index daa33916..00000000
--- a/explore/src/app/landingPages/software/software-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/landingPages/software/software.component.ts b/explore/src/app/landingPages/software/software.component.ts
deleted file mode 100644
index 17d10ef3..00000000
--- a/explore/src/app/landingPages/software/software.component.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-software',
- template: ``,
- })
-export class OpenaireSoftwareComponent{}
diff --git a/explore/src/app/login/libUser.module.ts b/explore/src/app/login/libUser.module.ts
deleted file mode 100644
index b1040ceb..00000000
--- a/explore/src/app/login/libUser.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/login/user-routing.module.ts b/explore/src/app/login/user-routing.module.ts
deleted file mode 100644
index 1a8ad90c..00000000
--- a/explore/src/app/login/user-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/login/user.component.ts b/explore/src/app/login/user.component.ts
deleted file mode 100644
index 4e9f00d0..00000000
--- a/explore/src/app/login/user.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-user',
- template: ``
- })
-
-export class OpenaireUserComponent {
-
-}
diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts
deleted file mode 100644
index 232b8c5e..00000000
--- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts
deleted file mode 100644
index 71975443..00000000
--- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-my-orcid-links',
- template: `
-
- `
-})
-
-export class OpenaireMyOrcidLinksComponent {
-
- constructor() {}
-
- public ngOnInit() {}
-}
-
diff --git a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts b/explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts
deleted file mode 100644
index ace58ca7..00000000
--- a/explore/src/app/orcid/my-orcid-links/myOrcidLinks.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/orcid/orcid-routing.module.ts b/explore/src/app/orcid/orcid-routing.module.ts
deleted file mode 100644
index a2cb0053..00000000
--- a/explore/src/app/orcid/orcid-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/orcid/orcid.component.ts b/explore/src/app/orcid/orcid.component.ts
deleted file mode 100644
index 65976b8a..00000000
--- a/explore/src/app/orcid/orcid.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector: 'openaire-orcid',
- template: `
-
- `
-})
-
-export class OpenaireOrcidComponent {}
\ No newline at end of file
diff --git a/explore/src/app/orcid/orcid.module.ts b/explore/src/app/orcid/orcid.module.ts
deleted file mode 100644
index fb566187..00000000
--- a/explore/src/app/orcid/orcid.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts
deleted file mode 100644
index c48b4ecc..00000000
--- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid-routing.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts
deleted file mode 100644
index 8e11400e..00000000
--- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.component.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-import {Component} from '@angular/core';
-
-@Component({
- selector: 'openaire-search-recommended-results-for-orcid',
- template: `
-
- `
-})
-
-export class OpenaireSearchRecommendedResultsForOrcidComponent {
-
- constructor() {}
-
- public ngOnInit() {}
-}
-
diff --git a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts b/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts
deleted file mode 100644
index 0ee0dcc3..00000000
--- a/explore/src/app/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module.ts
+++ /dev/null
@@ -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 { }
diff --git a/explore/src/app/reload/libReload.module.ts b/explore/src/app/reload/libReload.module.ts
deleted file mode 100644
index d33a6e82..00000000
--- a/explore/src/app/reload/libReload.module.ts
+++ /dev/null
@@ -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 {
-}
diff --git a/explore/src/app/sdg/sdg-routing.module.ts b/explore/src/app/sdg/sdg-routing.module.ts
deleted file mode 100644
index 2634df2c..00000000
--- a/explore/src/app/sdg/sdg-routing.module.ts
+++ /dev/null
@@ -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 { }
\ No newline at end of file
diff --git a/explore/src/app/sdg/sdg.component.ts b/explore/src/app/sdg/sdg.component.ts
deleted file mode 100644
index 2f78b9e7..00000000
--- a/explore/src/app/sdg/sdg.component.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import {Component} from "@angular/core";
-import {properties} from "../../environments/environment";
-
-@Component({
- selector: 'explore-sdg',
- template: `
-
- `
-})
-export class ExploreSdgComponent {}
diff --git a/explore/src/app/sdg/sdg.module.ts b/explore/src/app/sdg/sdg.module.ts
deleted file mode 100644
index dcded98a..00000000
--- a/explore/src/app/sdg/sdg.module.ts
+++ /dev/null
@@ -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 { }
\ No newline at end of file