MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 14 Wiki Activity

[Trunk | Connect]: Merging branch "mergeResultLandingPages" into Trunk 56933:56969 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@56970 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
konstantina.galouni 2019-09-05 08:56:01 +00:00
parent fd4585791e
commit f6246b9f79
8 changed files with 17 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/landingPages/dataset/dataset.component.ts
View File

@ -6,7 +6,8 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@Component({ @Component({
selector: 'openaire-dataset', selector: 'openaire-dataset',
template: ` template: `
<dataset [piwikSiteId]=piwikSiteId [communityId]="communityId"></dataset>`, <result-landing type="dataset" [piwikSiteId]="piwikSiteId" [communityId]="communityId" [activeTab]="'References'"></result-landing>
`,
}) })
export class OpenaireDatasetComponent { export class OpenaireDatasetComponent {
piwikSiteId = null; piwikSiteId = null;

9
src/app/landingPages/dataset/libDataset.module.ts
View File

@ -1,17 +1,12 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; 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 { OpenaireDatasetComponent } from './dataset.component';
import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {DatasetRoutingModule} from './dataset-routing.module'; import {DatasetRoutingModule} from './dataset-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [DatasetModule, DatasetRoutingModule], imports: [DatasetRoutingModule, ResultLandingModule],
declarations:[OpenaireDatasetComponent], declarations:[OpenaireDatasetComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[OpenaireDatasetComponent] exports:[OpenaireDatasetComponent]

10
src/app/landingPages/orp/libOrp.module.ts
View File

@ -1,20 +1,14 @@
//import {MaterialModule} from '@angular/material';
import {NgModule} from '@angular/core'; 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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import {OpenaireOrpComponent} from './orp.component'; import {OpenaireOrpComponent} from './orp.component';
import {OrpRoutingModule} from './orp-routing.module'; import {OrpRoutingModule} from './orp-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [ imports: [
OrpModule, OrpRoutingModule OrpRoutingModule, ResultLandingModule
], ],
declarations: [ declarations: [
OpenaireOrpComponent OpenaireOrpComponent

4
src/app/landingPages/orp/orp.component.ts
View File

@ -5,7 +5,9 @@ import {ConnectHelper} from '../../openaireLibrary/connect/co
@Component({ @Component({
selector: 'openaire-orp', selector: 'openaire-orp',
template: `<orp [piwikSiteId]=piwikSiteId [communityId]="communityId">></orp>`, template: `
<result-landing type="orp" [piwikSiteId]="piwikSiteId" [communityId]="communityId" [activeTab]="'References'"></result-landing>
`,
}) })
export class OpenaireOrpComponent { export class OpenaireOrpComponent {

9
src/app/landingPages/publication/libPublication.module.ts
View File

@ -1,18 +1,13 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; 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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenairePublicationComponent } from './publication.component'; import { OpenairePublicationComponent } from './publication.component';
import {PublicationRoutingModule} from './publication-routing.module'; import {PublicationRoutingModule} from './publication-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [PublicationModule, PublicationRoutingModule], imports: [PublicationRoutingModule, ResultLandingModule],
declarations:[OpenairePublicationComponent], declarations:[OpenairePublicationComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[OpenairePublicationComponent] exports:[OpenairePublicationComponent]

3
src/app/landingPages/publication/publication.component.ts
View File

@ -6,7 +6,8 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@Component({ @Component({
selector: 'openaire-publication', selector: 'openaire-publication',
template: ` template: `
<publication [piwikSiteId]=piwikSiteId [communityId]="communityId"></publication>`, <result-landing type="publication" [piwikSiteId]="piwikSiteId" [communityId]="communityId" [activeTab]="'References'"></result-landing>
`,
}) })
export class OpenairePublicationComponent { export class OpenairePublicationComponent {
piwikSiteId = null; piwikSiteId = null;

9
src/app/landingPages/software/libSoftware.module.ts
View File

@ -1,17 +1,12 @@
//import {MaterialModule} from '@angular/material';
import { NgModule} from '@angular/core'; 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 {FreeGuard} from '../../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard'; import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
import { OpenaireSoftwareComponent } from './software.component'; import { OpenaireSoftwareComponent } from './software.component';
import {SoftwareRoutingModule} from './software-routing.module'; import {SoftwareRoutingModule} from './software-routing.module';
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
@NgModule({ @NgModule({
imports: [SoftwareModule, SoftwareRoutingModule], imports: [SoftwareRoutingModule, ResultLandingModule],
declarations:[OpenaireSoftwareComponent], declarations:[OpenaireSoftwareComponent],
providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled], providers:[FreeGuard, PreviousRouteRecorder, IsRouteEnabled],
exports:[OpenaireSoftwareComponent] exports:[OpenaireSoftwareComponent]

3
src/app/landingPages/software/software.component.ts
View File

@ -6,7 +6,8 @@ import {ConnectHelper} from '../../openaireLibrary/connect/connectHelper';
@Component({ @Component({
selector: 'openaire-software', selector: 'openaire-software',
template: ` template: `
<software [piwikSiteId]=piwikSiteId [communityId]="communityId"></software>`, <result-landing type="software" [piwikSiteId]="piwikSiteId" [communityId]="communityId" [activeTab]="'Related Research Results'"></result-landing>
`,
}) })
export class OpenaireSoftwareComponent { export class OpenaireSoftwareComponent {
piwikSiteId = null; piwikSiteId = null;