diff --git a/src/app/affiliations/affiliations.component.html b/src/app/affiliations/affiliations.component.html index 857498f..1a81378 100644 --- a/src/app/affiliations/affiliations.component.html +++ b/src/app/affiliations/affiliations.component.html @@ -69,7 +69,7 @@ -
+
- -
- + + + diff --git a/src/app/affiliations/affiliations.component.ts b/src/app/affiliations/affiliations.component.ts index 8e3fbc2..f16020c 100644 --- a/src/app/affiliations/affiliations.component.ts +++ b/src/app/affiliations/affiliations.component.ts @@ -15,6 +15,8 @@ export class AffiliationsComponent { @Input() fullView: boolean = false; @Input() affiliationsInSlider: number = 5; @Input() affiliations: Affiliation[] = []; + @Input() sliderOptions = ''; + @Input() arrows = true; communityId: string; properties:EnvProperties; diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index 1f94e03..325d118 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -304,20 +304,14 @@ Zenodo communities {{zenodoCommunityIdS.length + ((masterZenodoCommunity)?1:0)}}{{" "}} - +
-
-
- Cuartors Section -
Curated by: - {{manager.substr(0, manager.indexOf('@'))}}{{manager}}, - -
-
+
+
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index 85f4ac5..8b62c64 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -22,6 +22,7 @@ import {SearchDataprovidersServiceModule} from "../openaireLibrary/connect/conte import {SearchProjectsServiceModule} from '../openaireLibrary/connect/projects/searchProjectsService.module'; import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/searchResearchResultsService.module"; import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module"; +import {CuratorsModule} from "../curators/curators.module"; import {AffiliationsModule} from "../affiliations/affiliations.module"; @NgModule({ @@ -29,7 +30,7 @@ import {AffiliationsModule} from "../affiliations/affiliations.module"; CommonModule, FormsModule, RouterModule, SubscribeModule, StatisticsModule, ManageModule, InviteModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule, - SearchResearchResultsServiceModule, SearchResultsModule, AffiliationsModule + SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule ], declarations: [ diff --git a/src/app/curators/curators-routing.module.ts b/src/app/curators/curators-routing.module.ts index 0f9234c..bebf174 100644 --- a/src/app/curators/curators-routing.module.ts +++ b/src/app/curators/curators-routing.module.ts @@ -1,11 +1,14 @@ import { NgModule} from '@angular/core'; import { RouterModule } from '@angular/router'; import {CuratorsComponent} from "./curators.component"; +import {FreeGuard} from "../openaireLibrary/login/freeGuard.guard"; +import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard"; +import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard"; @NgModule({ imports: [ RouterModule.forChild([ - { path: '', component: CuratorsComponent} + { path: '', component: CuratorsComponent, canActivate: [FreeGuard/*, IsRouteEnabled*/], canDeactivate: [PreviousRouteRecorder]} ]) ] }) diff --git a/src/app/curators/curators.component.html b/src/app/curators/curators.component.html index a7a70e1..01f7e93 100644 --- a/src/app/curators/curators.component.html +++ b/src/app/curators/curators.component.html @@ -1,19 +1,19 @@ -
- -
-
+
-
+
+ +
+

Curators ({{curators.length}})

-
-
+
+
@@ -70,75 +70,48 @@
- - - +
+
+ diff --git a/src/app/curators/curators.component.ts b/src/app/curators/curators.component.ts index 8a58622..6c44753 100644 --- a/src/app/curators/curators.component.ts +++ b/src/app/curators/curators.component.ts @@ -8,7 +8,7 @@ import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class"; @Component({ - selector: 'showAuthors', + selector: 'curators', templateUrl: './curators.component.html' }) @@ -36,12 +36,11 @@ export class CuratorsComponent { this.showLoading = true; this.properties = data.envSpecific; this.downloadUrl = this.properties.downloadUrl; - console.log(this.downloadUrl) if(!this.main) { let emails = this.managers.join(); console.log(emails); this.curatorsService.getCurators(this.properties, - this.properties.adminToolsAPIURL + 'curator?emails=' + emails).subscribe(curators => { + this.properties.adminToolsAPIURL + '/curator?emails=' + emails).subscribe(curators => { this.curators = curators; for(let i = 0; i < this.curators.length; i++) { this.showMore[i]= false; @@ -75,7 +74,7 @@ export class CuratorsComponent { this.managers = community[0].managers; let emails = this.managers.join(); this.curatorsService.getCurators(this.properties, - this.properties.adminToolsAPIURL + 'curator?emails=' + emails).subscribe(curators => { + this.properties.adminToolsAPIURL + '/curator?emails=' + emails).subscribe(curators => { this.curators = curators; for(let i = 0; i < this.curators.length; i++) { this.showMore[i]= false; diff --git a/src/app/curators/curators.module.ts b/src/app/curators/curators.module.ts index 9798eaa..0f8b93e 100644 --- a/src/app/curators/curators.module.ts +++ b/src/app/curators/curators.module.ts @@ -1,4 +1,4 @@ -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'; @@ -21,19 +21,4 @@ import {AffiliationsModule} from "../affiliations/affiliations.module"; CuratorsComponent ] }) -export class CuratorsModule { - static forChild(): NgModule { - return { - imports: [ - CommonModule, FormsModule, - ], - declarations: [ - CuratorsComponent - ], - providers: [CuratorService], - exports: [ - CuratorsComponent - ] - } - } -} +export class CuratorsModule {}