From c069b69c5eacd97ebc725d512e628a3acd1c1f14 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 5 Sep 2019 09:01:24 +0000 Subject: [PATCH] [Trunk | Explore]: Merging branch "mergeResultLandingPages" into Trunk 56952:56970 git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@56971 d315682c-612b-4755-9ff5-7f18f6832af3 --- explore/src/app/landingPages/dataset/dataset.component.ts | 2 +- explore/src/app/landingPages/dataset/libDataset.module.ts | 4 ++-- explore/src/app/landingPages/orp/libOrp.module.ts | 4 ++-- explore/src/app/landingPages/orp/orp.component.ts | 2 +- .../app/landingPages/publication/libPublication.module.ts | 4 ++-- .../app/landingPages/publication/publication.component.ts | 2 +- explore/src/app/landingPages/software/libSoftware.module.ts | 4 ++-- explore/src/app/landingPages/software/software.component.ts | 2 +- explore/webpack.server.config.js | 6 +++--- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/explore/src/app/landingPages/dataset/dataset.component.ts b/explore/src/app/landingPages/dataset/dataset.component.ts index 8bf5e065..88bc7adf 100644 --- a/explore/src/app/landingPages/dataset/dataset.component.ts +++ b/explore/src/app/landingPages/dataset/dataset.component.ts @@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core'; @Component({ selector: 'openaire-dataset', - template: ``, + template: ``, }) export class OpenaireDatasetComponent{ constructor ( ) { diff --git a/explore/src/app/landingPages/dataset/libDataset.module.ts b/explore/src/app/landingPages/dataset/libDataset.module.ts index f167d67b..0cec1847 100644 --- a/explore/src/app/landingPages/dataset/libDataset.module.ts +++ b/explore/src/app/landingPages/dataset/libDataset.module.ts @@ -4,14 +4,14 @@ 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/explore/src/app/landingPages/orp/libOrp.module.ts b/explore/src/app/landingPages/orp/libOrp.module.ts index 813c5e6f..fad0ec43 100644 --- a/explore/src/app/landingPages/orp/libOrp.module.ts +++ b/explore/src/app/landingPages/orp/libOrp.module.ts @@ -4,14 +4,14 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { SharedModule } from '../../shared/shared.module'; import { RouterModule } from '@angular/router'; -import { OrpModule } from '../../openaireLibrary/landingPages/orp/orp.module'; import { OpenaireOrpComponent } from './orp.component'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {OrpRoutingModule} from './orp-routing.module'; +import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module"; @NgModule({ - imports: [OrpModule, OrpRoutingModule], + imports: [OrpRoutingModule, ResultLandingModule], declarations:[OpenaireOrpComponent], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], exports:[OpenaireOrpComponent] diff --git a/explore/src/app/landingPages/orp/orp.component.ts b/explore/src/app/landingPages/orp/orp.component.ts index a63b6fa2..990b3dd9 100644 --- a/explore/src/app/landingPages/orp/orp.component.ts +++ b/explore/src/app/landingPages/orp/orp.component.ts @@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core'; @Component({ selector: 'openaire-orp', - template: ``, + template: ``, }) export class OpenaireOrpComponent{ constructor ( ) { diff --git a/explore/src/app/landingPages/publication/libPublication.module.ts b/explore/src/app/landingPages/publication/libPublication.module.ts index 8a8eae27..cb00d54e 100644 --- a/explore/src/app/landingPages/publication/libPublication.module.ts +++ b/explore/src/app/landingPages/publication/libPublication.module.ts @@ -4,15 +4,15 @@ 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/explore/src/app/landingPages/publication/publication.component.ts b/explore/src/app/landingPages/publication/publication.component.ts index 41209509..e761b0c3 100644 --- a/explore/src/app/landingPages/publication/publication.component.ts +++ b/explore/src/app/landingPages/publication/publication.component.ts @@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core'; @Component({ selector: 'openaire-publication', - template: ``, + template: ``, }) export class OpenairePublicationComponent{ constructor ( ) { diff --git a/explore/src/app/landingPages/software/libSoftware.module.ts b/explore/src/app/landingPages/software/libSoftware.module.ts index 2d11fad7..d534488c 100644 --- a/explore/src/app/landingPages/software/libSoftware.module.ts +++ b/explore/src/app/landingPages/software/libSoftware.module.ts @@ -4,14 +4,14 @@ 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/explore/src/app/landingPages/software/software.component.ts b/explore/src/app/landingPages/software/software.component.ts index b0730667..e42b178e 100644 --- a/explore/src/app/landingPages/software/software.component.ts +++ b/explore/src/app/landingPages/software/software.component.ts @@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core'; @Component({ selector: 'openaire-software', - template: ``, + template: ``, }) export class OpenaireSoftwareComponent{ constructor ( ) { diff --git a/explore/webpack.server.config.js b/explore/webpack.server.config.js index fcfe2b5b..36243dc7 100644 --- a/explore/webpack.server.config.js +++ b/explore/webpack.server.config.js @@ -25,13 +25,13 @@ module.exports = { }, module: { rules: [ - { test: /\.ts$/, loader: 'ts-loader' } - ,{ + { test: /\.ts$/, loader: 'ts-loader' }, + { // Mark files inside `@angular/core` as using SystemJS style dynamic imports. // Removing this will cause deprecation warnings to appear. test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/, parser: { system: true }, - }, + } ] }, plugins: [