diff --git a/src/app/landingPages/dataset/dataset.component.ts b/src/app/landingPages/dataset/dataset.component.ts index 7052cdc..915dabc 100644 --- a/src/app/landingPages/dataset/dataset.component.ts +++ b/src/app/landingPages/dataset/dataset.component.ts @@ -6,7 +6,8 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper'; @Component({ selector: 'openaire-dataset', template: ` - `, + + `, }) export class OpenaireDatasetComponent { piwikSiteId = null; diff --git a/src/app/landingPages/dataset/libDataset.module.ts b/src/app/landingPages/dataset/libDataset.module.ts index f167d67..0bc8fb5 100644 --- a/src/app/landingPages/dataset/libDataset.module.ts +++ b/src/app/landingPages/dataset/libDataset.module.ts @@ -1,17 +1,12 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { DatasetModule } from '../../openaireLibrary/landingPages/dataset/dataset.module'; import { OpenaireDatasetComponent } from './dataset.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {DatasetRoutingModule} from './dataset-routing.module'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ - imports: [DatasetModule, DatasetRoutingModule], + imports: [DatasetRoutingModule, ResultLandingModule], declarations:[OpenaireDatasetComponent], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], exports:[OpenaireDatasetComponent] diff --git a/src/app/landingPages/orp/libOrp.module.ts b/src/app/landingPages/orp/libOrp.module.ts index 37071c4..80c0e00 100644 --- a/src/app/landingPages/orp/libOrp.module.ts +++ b/src/app/landingPages/orp/libOrp.module.ts @@ -1,20 +1,14 @@ -//import {MaterialModule} from '@angular/material'; import {NgModule} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {FormsModule} from '@angular/forms'; -import {RouterModule} from '@angular/router'; - -import {SharedModule} from '../../shared/shared.module'; -import {OrpModule} from '../../openaireLibrary/landingPages/orp/orp.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {OpenaireOrpComponent} from './orp.component'; import {OrpRoutingModule} from './orp-routing.module'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ imports: [ - OrpModule, OrpRoutingModule + OrpRoutingModule, ResultLandingModule ], declarations: [ OpenaireOrpComponent diff --git a/src/app/landingPages/orp/orp.component.ts b/src/app/landingPages/orp/orp.component.ts index 49ca563..75c0999 100644 --- a/src/app/landingPages/orp/orp.component.ts +++ b/src/app/landingPages/orp/orp.component.ts @@ -5,7 +5,9 @@ import {ConnectHelper} from '../../openaireLibrary/connect/co @Component({ selector: 'openaire-orp', - template: `>`, + template: ` + + `, }) export class OpenaireOrpComponent { diff --git a/src/app/landingPages/publication/libPublication.module.ts b/src/app/landingPages/publication/libPublication.module.ts index 8a8eae2..556f6b4 100644 --- a/src/app/landingPages/publication/libPublication.module.ts +++ b/src/app/landingPages/publication/libPublication.module.ts @@ -1,18 +1,13 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '../../shared/shared.module'; -import { RouterModule } from '@angular/router'; -import { PublicationModule } from '../../openaireLibrary/landingPages/publication/publication.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenairePublicationComponent } from './publication.component'; import {PublicationRoutingModule} from './publication-routing.module'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ - imports: [PublicationModule, PublicationRoutingModule], + imports: [PublicationRoutingModule, ResultLandingModule], declarations:[OpenairePublicationComponent], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], exports:[OpenairePublicationComponent] diff --git a/src/app/landingPages/publication/publication.component.ts b/src/app/landingPages/publication/publication.component.ts index f5c215f..d6bd7cf 100644 --- a/src/app/landingPages/publication/publication.component.ts +++ b/src/app/landingPages/publication/publication.component.ts @@ -6,7 +6,8 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper'; @Component({ selector: 'openaire-publication', template: ` - `, + + `, }) export class OpenairePublicationComponent { piwikSiteId = null; diff --git a/src/app/landingPages/software/libSoftware.module.ts b/src/app/landingPages/software/libSoftware.module.ts index 2d11fad..d203c19 100644 --- a/src/app/landingPages/software/libSoftware.module.ts +++ b/src/app/landingPages/software/libSoftware.module.ts @@ -1,17 +1,12 @@ -//import {MaterialModule} from '@angular/material'; import { NgModule} from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { RouterModule } from '@angular/router'; -import { SoftwareModule } from '../../openaireLibrary/landingPages/software/software.module'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import { OpenaireSoftwareComponent } from './software.component'; import {SoftwareRoutingModule} from './software-routing.module'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ - imports: [SoftwareModule, SoftwareRoutingModule], + imports: [SoftwareRoutingModule, ResultLandingModule], declarations:[OpenaireSoftwareComponent], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], exports:[OpenaireSoftwareComponent] diff --git a/src/app/landingPages/software/software.component.ts b/src/app/landingPages/software/software.component.ts index edd4365..fc7c87c 100644 --- a/src/app/landingPages/software/software.component.ts +++ b/src/app/landingPages/software/software.component.ts @@ -6,7 +6,8 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper'; @Component({ selector: 'openaire-software', template: ` - `, + + `, }) export class OpenaireSoftwareComponent { piwikSiteId = null;