diff --git a/src/app/aggregator/aggregator-routing.module.ts b/src/app/aggregator/aggregator-routing.module.ts
deleted file mode 100644
index 24e4551..0000000
--- a/src/app/aggregator/aggregator-routing.module.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-
-const routes: Routes = [
- {path: '', loadChildren: '../home/home.module#HomeModule'},
- { path: 'search/result',
- loadChildren: '../landingPages/result/libResult.module#LibResultModule'
- },
- {
- path: 'search/publication',
- loadChildren: '../landingPages/publication/libPublication.module#LibPublicationModule'
- },
- {
- path: 'search/dataset',
- loadChildren: '../landingPages/dataset/libDataset.module#LibDatasetModule'
- },
- {
- path: 'search/software',
- loadChildren: '../landingPages/software/libSoftware.module#LibSoftwareModule'
- },
- {
- path: 'search/other',
- loadChildren: '../landingPages/orp/libOrp.module#LibOrpModule'
- },
- {
- path: 'search/project',
- loadChildren: '../landingPages/project/libProject.module#LibProjectModule'
- },
- {
- path: 'search/dataprovider',
- loadChildren: '../landingPages/dataProvider/libDataProvider.module#LibDataProviderModule'
- },
- {
- path: 'search/organization',
- loadChildren: '../landingPages/organization/libOrganization.module#LibOrganizationModule'
- },
- {
- path: 'search/find',
- loadChildren: '../searchPages/find/libSearch.module#LibMainSearchModule'
- },
- { path: 'search/find/research-outcomes', loadChildren: '../searchPages/simple/searchResearchResults.module#OpenaireSearchResearchResultsModule'
- },
- {
- path: 'search/find/projects',
- loadChildren: '../searchPages/simple/searchProjects.module#LibSearchProjectsModule'
- },
- {
- path: 'search/find/dataproviders',
- loadChildren: '../searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule'
- },
- {
- path: 'search/find/organizations',
- loadChildren: '../searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule'
- },
- { path: 'search/advanced/research-outcomes',
- loadChildren: '../searchPages/advanced/searchResearchResults.module#OpenaireAdvancedSearchResearchResultsModule'
- },
- {
- path: 'search/advanced/organizations',
- loadChildren: '../searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule'
- },
- {
- path: 'search/advanced/dataproviders',
- loadChildren: '../searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule'
- },
- {
- path: 'search/advanced/projects',
- loadChildren: '../searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule'
- },
- {
- path: 'project-report',
- loadChildren: '../landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule'
- },
-];
-
-@NgModule({
- imports: [RouterModule.forChild(routes)],
- exports: [RouterModule],
-})
-export class AggregatorRoutingModule {
-}
diff --git a/src/app/aggregator/aggregator.module.ts b/src/app/aggregator/aggregator.module.ts
deleted file mode 100755
index 6bec93b..0000000
--- a/src/app/aggregator/aggregator.module.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import {NgModule} from '@angular/core';
-import {CommonModule} from '@angular/common';
-import {HttpClientModule} from "@angular/common/http";
-import {AggregatorRoutingModule} from "./aggregator-routing.module";
-import {EnvironmentSpecificResolver} from "../openaireLibrary/utils/properties/environmentSpecificResolver";
-import {SharedModule} from "../shared/shared.module";
-
-@NgModule({
-
- imports: [
- SharedModule,
- CommonModule,
- HttpClientModule,
- AggregatorRoutingModule
- ],
- providers: [
- EnvironmentSpecificResolver
- ],
-})
-
-export class AggregatorModule {
-}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index c3d3c69..47bed8c 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -1,17 +1,105 @@
-import { NgModule } from '@angular/core';
-import { Routes, RouterModule } from '@angular/router';
+import {NgModule} from '@angular/core';
+import {Routes, RouterModule} from '@angular/router';
-import { EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
-import { EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
+import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
+import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
-import { OpenaireErrorPageComponent } from './error/errorPage.component';
+import {OpenaireErrorPageComponent} from './error/errorPage.component';
const routes: Routes = [
- { path: '', loadChildren: './aggregator/aggregator.module#AggregatorModule'},
- { path: ':id', loadChildren: './aggregator/aggregator.module#AggregatorModule'},
- { path: 'error', component: OpenaireErrorPageComponent},
- { path: '**',pathMatch: 'full',component: OpenaireErrorPageComponent}
+ {path: '', loadChildren: './home/home.module#HomeModule'},
+ {
+ path: 'search/result',
+ loadChildren: './landingPages/result/libResult.module#LibResultModule'
+ },
+ {
+ path: 'search/publication',
+ loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule'
+ },
+ {
+ path: 'search/dataset',
+ loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule'
+ },
+ {
+ path: 'search/software',
+ loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule'
+ },
+ {
+ path: 'search/other',
+ loadChildren: './landingPages/orp/libOrp.module#LibOrpModule'
+ },
+ {
+ path: 'search/project',
+ loadChildren: './landingPages/project/libProject.module#LibProjectModule'
+ },
+ {
+ path: 'search/dataprovider',
+ loadChildren: './landingPages/dataProvider/libDataProvider.module#LibDataProviderModule'
+ },
+ {
+ path: 'search/organization',
+ loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule'
+ },
+ {
+ path: 'search/find',
+ loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule'
+ },
+ {
+ path: 'search/find/research-outcomes',
+ loadChildren: './searchPages/simple/searchResearchResults.module#OpenaireSearchResearchResultsModule'
+ },
+ {
+ path: 'search/find/projects',
+ loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule'
+ },
+ {
+ path: 'search/find/dataproviders',
+ loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule'
+ },
+ {
+ path: 'search/find/organizations',
+ loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule'
+ },
+ {
+ path: 'search/advanced/research-outcomes',
+ loadChildren: './searchPages/advanced/searchResearchResults.module#OpenaireAdvancedSearchResearchResultsModule'
+ },
+ {
+ path: 'search/advanced/organizations',
+ loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule'
+ },
+ {
+ path: 'search/advanced/dataproviders',
+ loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule'
+ },
+ {
+ path: 'search/advanced/projects',
+ loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule'
+ },
+ {
+ path: 'project-report',
+ loadChildren: './landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule'
+ },
+ // Deposit Pages
+ { path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
+ { path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
+ { path: 'participate/deposit-subject-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
+ { path: 'participate/deposit-publications', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
+ { path: 'participate/deposit-publications-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
+
+ { path: 'participate/deposit/learn-how', loadChildren: './deposit/deposit.module#LibDepositModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'participate/deposit/search', loadChildren: './deposit/searchDataprovidersToDeposit.module#LibSearchDataprovidersToDepositModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+
+ // Linking Pages
+ { path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'claims', loadChildren: './claims/claimsAdmin/claimsAdmin.module#LibClaimsAdminModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule', resolve: { envSpecific: EnvironmentSpecificResolver }},
+ {path: 'user-info', loadChildren: './login/libUser.module#LibUserModule'},
+ {path: 'error', component: OpenaireErrorPageComponent},
+ {path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
];
@NgModule({
@@ -19,4 +107,5 @@ const routes: Routes = [
exports: [RouterModule],
providers: [EnvironmentSpecificResolver, EnvironmentSpecificService]
})
-export class AppRoutingModule { }
+export class AppRoutingModule {
+}
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 6b58744..d71d9bb 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -10,152 +10,122 @@ import {UserManagementService} from "./openaireLibrary/services/user-management.
import {User} from "./openaireLibrary/login/utils/helper.class";
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
import {portalProperties} from "../environments/environment-aggregator";
+import {properties} from "../environments/environment";
+import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
@Component({
- //changeDetection: ChangeDetectionStrategy.Default,
- //encapsulation: ViewEncapsulation.Emulated,
selector: 'app-root',
- styles: [`
- `],
template: `
-
-