[plugins-functionality | WIP] move curators component in openaireLibrary, update submodules
This commit is contained in:
parent
f6a50d81bb
commit
25629733e9
|
|
@ -37,12 +37,12 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div *ngIf="affiliations.length > 0 && communityFirstPage && !longView" class="uk-margin-large-top uk-margin-large-bottom uk-grid" uk-grid>
|
||||
<div *ngIf="affiliations.length > 0 && communityFirstPage && !longView" class="uk-grid uk-grid-large" uk-grid>
|
||||
<div class="uk-width-1-3@m">
|
||||
<h2>
|
||||
<h2 class="uk-h1">
|
||||
Supporting Organizations
|
||||
</h2>
|
||||
<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text uk-margin-top"
|
||||
<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text uk-text-default uk-margin-top"
|
||||
routerLinkActive="router-link-active" routerLink="/organizations">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Browse all</span>
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
</a>
|
||||
</div>
|
||||
<div class="uk-width-2-3@m">
|
||||
<div class="uk-grid uk-child-width-1-3@m uk-child-width-1-2@s supportingOrganizations" uk-grid>
|
||||
<div class="uk-grid uk-grid-large uk-child-width-1-3@m uk-child-width-1-2@s supportingOrganizations" uk-grid>
|
||||
<div *ngFor="let affiliation of affiliations.slice(0,9);">
|
||||
<a *ngIf="affiliation.website_url" target="_blank" [href]="affiliation.website_url | urlPrefix" class="uk-link-reset">
|
||||
<ng-container *ngTemplateOutlet="card; context: {organization: affiliation, fullView: false}"></ng-container>
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ const routes: Routes = [
|
|||
// },
|
||||
{
|
||||
path: 'curators',
|
||||
loadChildren: () => import('./curators/curators.module').then(m => m.CuratorsModule),
|
||||
loadChildren: () => import('./openaireLibrary/connect/components/curators/curators.module').then(m => m.CuratorsModule),
|
||||
data: {hasQuickContact: false}, canActivate: [IsCommunity]
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ import {
|
|||
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 {CuratorsModule} from "../openaireLibrary/connect/components/curators/curators.module";
|
||||
import {AffiliationsModule} from "../affiliations/affiliations.module";
|
||||
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
|
||||
import {MatSelectModule} from "@angular/material/select";
|
||||
|
|
@ -40,6 +40,8 @@ import {InputModule} from '../openaireLibrary/sharedComponents/input/input.modul
|
|||
import {QuickSelectionsModule} from '../openaireLibrary/searchPages/searchUtils/quick-selections.module';
|
||||
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
|
||||
import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-paging.module';
|
||||
import {NumberRoundModule} from '../openaireLibrary/utils/pipes/number-round.module';
|
||||
import {PluginsService} from '../openaireLibrary/services/plugins.service';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -49,16 +51,17 @@ import {NoLoadPaging} from '../openaireLibrary/searchPages/searchUtils/no-load-p
|
|||
SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule,
|
||||
SEOServiceModule, MatSelectModule, EntitiesSelectionModule,
|
||||
TabsModule, SearchTabModule, ErrorMessagesModule, SafeHtmlPipeModule, ErrorModule,
|
||||
AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging
|
||||
AdvancedSearchInputModule, InputModule, QuickSelectionsModule, IconsModule, NoLoadPaging, NumberRoundModule
|
||||
],
|
||||
declarations: [
|
||||
CommunityComponent
|
||||
],
|
||||
providers:[
|
||||
PreviousRouteRecorder, PiwikService
|
||||
PreviousRouteRecorder, PiwikService, PluginsService
|
||||
],
|
||||
exports: [
|
||||
CommunityComponent
|
||||
]
|
||||
})
|
||||
export class CommunityModule { }
|
||||
export class CommunityModule {
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import {CuratorsComponent} from "./curators.component";
|
||||
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: CuratorsComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class CuratorsRoutingModule {
|
||||
}
|
||||
|
|
@ -1,152 +0,0 @@
|
|||
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
|
||||
<ng-container *ngIf="longView else shortView">
|
||||
<div style="min-height: 650px;">
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small">
|
||||
<div *ngIf="showLoading" class="uk-margin-large uk-padding-large uk-padding-remove-horizontal">
|
||||
<loading></loading>
|
||||
</div>
|
||||
<div *ngIf="!showLoading">
|
||||
<h1 class="uk-margin-top">
|
||||
Curators
|
||||
</h1>
|
||||
<div *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0" class="uk-margin-medium">
|
||||
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
|
||||
[texts]="pageContents['top']">
|
||||
</helper>
|
||||
</div>
|
||||
<div *ngIf="curators" class="uk-margin-large-top">
|
||||
<div *ngFor="let curator of curators let i=index;" class="uk-card uk-card-default uk-padding uk-margin-medium-bottom">
|
||||
<div class="uk-grid" uk-grid>
|
||||
<div class="uk-width-2-3@m uk-flex uk-flex-middle">
|
||||
<div class="uk-width-small">
|
||||
<img *ngIf="curator.photo && curator.photo !== ''" class="uk-border-circle" style="width: 150px; height: 150px;"
|
||||
src="{{downloadUrl + curator.photo}}" alt="Curator Photo">
|
||||
<img *ngIf="!curator.photo || curator.photo == ''" class="uk-border-circle" style="width: 150px; height: 150px;"
|
||||
src="../../assets/common-assets/curator-default.png" alt="Curator Photo">
|
||||
</div>
|
||||
<div class="uk-width-expand">
|
||||
<div class="uk-padding">
|
||||
<h4 class="uk-margin-remove">{{curator.name}}</h4>
|
||||
<div *ngIf="curator.bio" class="uk-margin-top uk-height-max-large uk-overflow-auto">
|
||||
<div class="uk-text-muted uk-margin-small-bottom">
|
||||
Biography
|
||||
</div>
|
||||
<div>
|
||||
<div *ngIf="!viewingMore">{{format(curator.bio)}}</div>
|
||||
<div *ngIf="viewingMore">{{curator.bio}}</div>
|
||||
<div *ngIf="curator.bio.length >= maxCharacters" class="uk-text-right uk-margin-small-top">
|
||||
<a *ngIf="curator.bio.length >= maxCharacters"
|
||||
(click)="openFsModal(curator)">
|
||||
View details
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="curator.affiliations && curator.affiliations.length > 0" class="uk-width-1-3@m uk-padding" style="border-left: 1px solid #eaeaea">
|
||||
<div class="uk-text-muted uk-margin-bottom">
|
||||
Affiliations
|
||||
</div>
|
||||
<div class="uk-grid uk-flex-middle uk-child-width-1-2" uk-grid>
|
||||
<div *ngFor="let affiliation of curator.affiliations">
|
||||
<span *ngIf="!affiliation.website_url">
|
||||
<img [src]="affiliation.logo_url | urlPrefix" [alt]="affiliation.name">
|
||||
</span>
|
||||
<a *ngIf="affiliation.website_url"
|
||||
target="_blank" [href]="affiliation.website_url | urlPrefix">
|
||||
<img [src]="affiliation.logo_url | urlPrefix" [alt]="affiliation.name">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-margin-medium">
|
||||
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
|
||||
[texts]="pageContents['bottom']">
|
||||
</helper>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
||||
<!-- Short view for community's homepage -->
|
||||
<ng-template #shortView>
|
||||
<div *ngIf=" curators && curators.length > 0" class="uk-grid">
|
||||
<span class="uk-text-meta uk-width-auto">
|
||||
Curated by:
|
||||
</span>
|
||||
<div class="uk-width-expand uk-padding-remove uk-overflow-auto">
|
||||
<div class="uk-height-max-medium uk-margin-xsmall-left">
|
||||
<a routerLink="/curators">
|
||||
<span *ngFor="let curator of curators.slice(0,curatorsLimit) let i=index;">
|
||||
{{curator.name}}
|
||||
<span *ngIf="i < curators.length-1 && i < curatorsLimit-1">, </span>
|
||||
</span>
|
||||
<span *ngIf="curators.length > curatorsLimit">
|
||||
+{{curators.length-curatorsLimit}} more
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<fs-modal #fsModal classTitle="">
|
||||
<div *ngIf="curatorInModal" class="uk-width-1-1 uk-height-1-1">
|
||||
<div class="uk-container uk-container-large uk-section">
|
||||
<div class="uk-margin-large-top uk-grid uk-grid-large" uk-grid>
|
||||
<div class="uk-width-1-3@m">
|
||||
<h2>
|
||||
{{curatorInModal.name}}
|
||||
</h2>
|
||||
<img *ngIf="curatorInModal.photo && curatorInModal.photo !== ''" class="uk-width-2-3 uk-border-circle uk-margin-top uk-margin-bottom"
|
||||
src="{{downloadUrl + curatorInModal.photo}}" alt="Curator Photo">
|
||||
<img *ngIf="!curatorInModal.photo || curatorInModal.photo == ''" class="uk-width-2-3 uk-border-circle uk-margin-top uk-margin-bottom"
|
||||
src="../../assets/common-assets/curator-default.png" alt="Curator Photo">
|
||||
</div>
|
||||
<div class="uk-width-2-3@m">
|
||||
<ul class="uk-tab" uk-tab>
|
||||
<li>
|
||||
<a>Biography</a>
|
||||
</li>
|
||||
<li *ngIf="curatorInModal.affiliations && curatorInModal.affiliations.length > 0">
|
||||
<a>Affiliations</a>
|
||||
</li>
|
||||
</ul>
|
||||
<ul class="uk-switcher">
|
||||
<li class="uk-padding uk-padding-remove-left">
|
||||
<h5>
|
||||
Biography
|
||||
</h5>
|
||||
<div>
|
||||
{{curatorInModal.bio}}
|
||||
</div>
|
||||
</li>
|
||||
<li *ngIf="curatorInModal.affiliations && curatorInModal.affiliations.length > 0" class="uk-padding uk-padding-remove-left">
|
||||
<div class="uk-grid uk-flex-middle uk-child-width-1-3" uk-grid>
|
||||
<div *ngFor="let affiliation of curatorInModal.affiliations">
|
||||
<span *ngIf="!affiliation.website_url">
|
||||
<img [src]="affiliation.logo_url | urlPrefix" [alt]="affiliation.name">
|
||||
</span>
|
||||
<a *ngIf="affiliation.website_url"
|
||||
target="_blank" [href]="affiliation.website_url | urlPrefix">
|
||||
<img [src]="affiliation.logo_url | urlPrefix" [alt]="affiliation.name">
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</fs-modal>
|
||||
|
|
@ -1,155 +0,0 @@
|
|||
import {Component, Input, ViewChild} from '@angular/core';
|
||||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import {CuratorService} from "../openaireLibrary/connect/curators/curator.service";
|
||||
import {Curator} from "../openaireLibrary/utils/entities/CuratorInfo";
|
||||
import {ActivatedRoute, Router} from "@angular/router";
|
||||
import {CommunityService} from "../openaireLibrary/connect/community/community.service";
|
||||
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||
import {Meta, Title} from "@angular/platform-browser";
|
||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {Subscription} from "rxjs";
|
||||
import {properties} from "../../environments/environment";
|
||||
import {UserRegistryService} from "../openaireLibrary/services/user-registry.service";
|
||||
import {FullScreenModalComponent} from '../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.component';
|
||||
import {CommunityInfo} from "../openaireLibrary/connect/community/communityInfo";
|
||||
|
||||
@Component({
|
||||
selector: 'curators',
|
||||
templateUrl: './curators.component.html'
|
||||
|
||||
})
|
||||
export class CuratorsComponent {
|
||||
@Input() longView = true;
|
||||
community: CommunityInfo;
|
||||
public downloadUrl = null;
|
||||
public showLoading = true;
|
||||
|
||||
public curators: Curator[] = [];
|
||||
|
||||
public curatorsLimit: number = 5;
|
||||
public numberOfCurators: number = 5;
|
||||
|
||||
public showMore = [];
|
||||
public maxCharacters = 450;
|
||||
public viewingMore: boolean = false;
|
||||
public curatorInModal;
|
||||
|
||||
public properties: EnvProperties;
|
||||
public pageContents = null;
|
||||
public divContents = null;
|
||||
|
||||
public url: string = null;
|
||||
public pageTitle: string = "Curators";
|
||||
|
||||
public breadcrumbs: Breadcrumb[] = [{name: 'Home', route: '/'}, {name: 'About - Curators'}];
|
||||
|
||||
subs: Subscription[] = [];
|
||||
|
||||
@ViewChild('fsModal', { static: true }) fsModal: FullScreenModalComponent;
|
||||
|
||||
constructor(private route: ActivatedRoute,
|
||||
private curatorsService: CuratorService,
|
||||
private communityService: CommunityService,
|
||||
private userRegistryService: UserRegistryService,
|
||||
private _router: Router,
|
||||
private helper: HelperService,
|
||||
private _meta: Meta,
|
||||
private _title: Title,
|
||||
private seoService: SEOService,
|
||||
private _piwikService: PiwikService) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.showLoading = true;
|
||||
this.properties = properties;
|
||||
this.downloadUrl = this.properties.utilsService + '/download/';
|
||||
//if (properties.environment !== 'development') {
|
||||
if (!this.longView) {
|
||||
this.subs.push(this.communityService.getCommunityAsObservable().subscribe(community => {
|
||||
if (community) {
|
||||
this.community = community;
|
||||
this.getCurators();
|
||||
}
|
||||
}));
|
||||
} else {
|
||||
this.subs.push(this.communityService.getCommunityAsObservable().subscribe(community => {
|
||||
if (community) {
|
||||
this.community = community;
|
||||
this.subs.push(this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription("OpenAIRE - Connect, Community Gateway, research community");
|
||||
//this.getDivContents();
|
||||
this.getPageContents();
|
||||
this.getCurators();
|
||||
}
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
for (let sub of this.subs) {
|
||||
sub.unsubscribe();
|
||||
}
|
||||
}
|
||||
|
||||
private getCurators() {
|
||||
this.subs.push(this.curatorsService.getCurators(this.properties, this.community.communityId).subscribe(curators => {
|
||||
this.curators = curators;
|
||||
this.showLoading = false;
|
||||
}, error => {
|
||||
console.error(error);
|
||||
this.curators = [];
|
||||
this.showLoading = false;
|
||||
}));
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
this.subs.push(this.helper.getPageHelpContents(this.properties, this.community.communityId, this._router.url).subscribe(contents => {
|
||||
this.pageContents = contents;
|
||||
}));
|
||||
}
|
||||
|
||||
private getDivContents() {
|
||||
this.subs.push(this.helper.getDivHelpContents(this.properties, this.community.communityId, this._router.url).subscribe(contents => {
|
||||
this.divContents = contents;
|
||||
}));
|
||||
}
|
||||
|
||||
format(name: string) {
|
||||
if (name) {
|
||||
return (((name).length > this.maxCharacters) ? (name.substring(0, (this.maxCharacters - ('...').length)) + '...') : name);
|
||||
} else {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public viewMore() {
|
||||
this.viewingMore = !this.viewingMore;
|
||||
}
|
||||
|
||||
public openFsModal(curator) {
|
||||
this.curatorInModal = curator;
|
||||
this.fsModal.title = this.community.shortTitle + ' Curator';
|
||||
this.fsModal.open();
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
}
|
||||
|
||||
private updateTitle(title: string) {
|
||||
var _title = ((title.length > 50) ? title.substring(0, 50) : title);
|
||||
this._title.setTitle(_title);
|
||||
this._meta.updateTag({content: _title}, "property='og:title'");
|
||||
}
|
||||
|
||||
private updateUrl(url: string) {
|
||||
this._meta.updateTag({content: url}, "property='og:url'");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {CuratorsComponent} from './curators.component';
|
||||
import {CuratorService} from "../openaireLibrary/connect/curators/curator.service";
|
||||
import {CuratorsRoutingModule} from "./curators-routing.module";
|
||||
import {AffiliationsModule} from "../affiliations/affiliations.module";
|
||||
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
|
||||
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
|
||||
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
|
||||
import {PiwikServiceModule} from "../openaireLibrary/utils/piwik/piwikService.module";
|
||||
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
|
||||
import {UrlPrefixModule} from "../openaireLibrary/utils/pipes/url-prefix.module";
|
||||
import {LoadingModule} from '../openaireLibrary/utils/loading/loading.module';
|
||||
import {FullScreenModalModule} from '../openaireLibrary/utils/modal/full-screen-modal/full-screen-modal.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, RouterModule,
|
||||
CuratorsRoutingModule, AffiliationsModule, HelperModule,
|
||||
Schema2jsonldModule, SEOServiceModule, PiwikServiceModule,
|
||||
BreadcrumbsModule, UrlPrefixModule, LoadingModule,
|
||||
FullScreenModalModule
|
||||
],
|
||||
declarations: [
|
||||
CuratorsComponent
|
||||
],
|
||||
providers: [CuratorService],
|
||||
exports: [
|
||||
CuratorsComponent
|
||||
]
|
||||
})
|
||||
export class CuratorsModule {}
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit d0b4fa7750a8dde3cfa6b5b81c18302380e10c35
|
||||
Subproject commit 552edbd0e25e236dc277abcdcc2d953d28bba726
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit ee22e97b114be823b7ab4e6c41a9cbff93b24e3a
|
||||
Subproject commit 6cef9ebed0db7ecbcca023bae824239106907960
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit df6a0527e9bce69f016da8d28b79885c351104c6
|
||||
Subproject commit 52eca9abe84c941a7e78a5690f273d8c8e3194f9
|
||||
Loading…
Reference in New Issue