[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
This commit is contained in:
parent
2d888181a0
commit
c069b69c5e
|
@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core';
|
|||
|
||||
@Component({
|
||||
selector: 'openaire-dataset',
|
||||
template: `<dataset></dataset>`,
|
||||
template: `<result-landing type="dataset" [activeTab]="'References'"></result-landing>`,
|
||||
})
|
||||
export class OpenaireDatasetComponent{
|
||||
constructor ( ) {
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core';
|
|||
|
||||
@Component({
|
||||
selector: 'openaire-orp',
|
||||
template: `<orp></orp>`,
|
||||
template: `<result-landing type="orp" [activeTab]="'References'"></result-landing>`,
|
||||
})
|
||||
export class OpenaireOrpComponent{
|
||||
constructor ( ) {
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core';
|
|||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
template: `<publication></publication>`,
|
||||
template: `<result-landing type="publication" [activeTab]="'References'"></result-landing>`,
|
||||
})
|
||||
export class OpenairePublicationComponent{
|
||||
constructor ( ) {
|
||||
|
|
|
@ -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]
|
||||
|
|
|
@ -2,7 +2,7 @@ import {Component, ViewChild, ElementRef} from '@angular/core';
|
|||
|
||||
@Component({
|
||||
selector: 'openaire-software',
|
||||
template: `<software></software>`,
|
||||
template: `<result-landing type="software" [activeTab]="'Related Research Results'"></result-landing>`,
|
||||
})
|
||||
export class OpenaireSoftwareComponent{
|
||||
constructor ( ) {
|
||||
|
|
|
@ -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: [
|
||||
|
|
Loading…
Reference in New Issue