homepage tweaks and new images
This commit is contained in:
parent
620360fa94
commit
20e1e5d735
|
|
@ -1,4 +1,3 @@
|
|||
<!-- Redesign START -->
|
||||
<ng-template #_logos let-logo="logo" let-class="class">
|
||||
<div *ngIf="logo" [class]="'uk-flex uk-flex-middle uk-flex-center uk-padding-remove-horizontal '+class">
|
||||
<div class="">
|
||||
|
|
@ -23,7 +22,7 @@
|
|||
<div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-3-5@m" uk-scrollspy-class>
|
||||
<advanced-search-input (searchEmitter)="goTo(true)">
|
||||
<entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||
(selectionChange)="entityChanged($event)" (disableSelectEmitter)="disableSelect = $event"
|
||||
(selectionChange)="entityChanged($event)" (disableSelectEmitter)="disableSelectChange($event)"
|
||||
[onChangeNavigate]="false"></entities-selection>
|
||||
<div input placeholder="Scholary works" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
|
||||
</advanced-search-input>
|
||||
|
|
@ -47,7 +46,7 @@
|
|||
<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
routerLinkActive="router-link-active" routerLink="/fos">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/explore-assets/fos-hero-img.svg" alt="FOS logo" loading="lazy">
|
||||
<img src="assets/explore-assets/fos-icon.svg" alt="FOS logo" loading="lazy">
|
||||
<span class="uk-margin-small-left">Browse by FOS</span>
|
||||
</span>
|
||||
</a>
|
||||
|
|
@ -66,7 +65,7 @@
|
|||
</div>
|
||||
<div class="uk-section uk-section-large uk-padding-remove-top">
|
||||
<div class="uk-container uk-container-large uk-width-1-2">
|
||||
<div uk-slider="autoplay: true; autoplay-interval: 2500" class="">
|
||||
<div uk-slider="autoplay: false; autoplay-interval: 2500" class="">
|
||||
<div class="uk-position-relative">
|
||||
<div class="uk-slider-container">
|
||||
<ul class="uk-slider-items" uk-height-match="target: > li > div > div > .logo1; row: false;">
|
||||
|
|
@ -77,7 +76,7 @@
|
|||
<span *ngIf="type=='publication' && showPublications && numbers?.publicationsSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}}
|
||||
publications</span><span> deduplicated</span>
|
||||
{{openaireEntities.PUBLICATIONS}}</span><span> deduplicated</span>
|
||||
</span>
|
||||
<span
|
||||
*ngIf="type=='dataset' && showDatasets && (numbers?.datasetsLinkedSize || numbers?.datasetsSize)">
|
||||
|
|
@ -87,18 +86,17 @@
|
|||
datasets</span> interlinked with publications</span>
|
||||
<span *ngIf="numbers?.datasetsSize && !numbers?.datasetsLinkedSize"
|
||||
class="uk-text-bold">{{numbers.datasetsSize.number|number}}{{numbers.datasetsSize.size}}
|
||||
research data</span>
|
||||
{{openaireEntities.DATASETS}}</span>
|
||||
</span>
|
||||
<span
|
||||
*ngIf="type=='software' && showSoftware && (numbers?.softwareSize || numbers?.softwareLinkedSize)">
|
||||
<span *ngIf="numbers?.softwareLinkedSize">
|
||||
<span
|
||||
class="uk-text-bol ">{{numbers.softwareLinkedSize.number|number}}{{numbers.softwareLinkedSize.size}}
|
||||
research
|
||||
software</span> interlinked with publications</span>
|
||||
{{openaireEntities.SOFTWARE}}</span> interlinked with publications</span>
|
||||
<span *ngIf="numbers?.softwareSize && !numbers?.softwareLinkedSize"
|
||||
class="uk-text-bold">{{numbers.softwareSize.number|number}}{{numbers.softwareSize.size}}
|
||||
research software</span>
|
||||
{{openaireEntities.SOFTWARE}}</span>
|
||||
</span>
|
||||
<span *ngIf="type=='persistent'">
|
||||
<span>Persistent identifiers and registries</span>
|
||||
|
|
@ -173,10 +171,9 @@
|
|||
<div class="uk-width-expand uk-first-column">
|
||||
<div class="explore-dark-logo-background">
|
||||
<div uk-parallax="target: #js-sticky-parallax-images-all;">
|
||||
<!-- TODO: change ipad image -->
|
||||
<img class="uk-position-center-left" src="assets/explore-assets/home/ipad.png" alt="ipad" loading="lazy"
|
||||
<img class="uk-position-center-left" src="assets/explore-assets/home/landscape.png" alt="ipad" loading="lazy"
|
||||
uk-parallax="target: #js-sticky-parallax-images-all; start: 100vh; opacity: 1; easing:0"
|
||||
style="height: 70vh">
|
||||
style="height:50vh">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -261,7 +258,7 @@
|
|||
<div class="uk-section uk-section-large">
|
||||
<div class="uk-container uk-container-large">
|
||||
<h2 class="uk-h1 uk-margin-medium-bottom">
|
||||
Lorem ipsum<span class="uk-text-primary">.</span>
|
||||
Lorem ipsum<span class="uk-text-primary">.</span>
|
||||
</h2>
|
||||
<div id="custom-links" class="uk-padding uk-grid uk-child-width-1-2@m uk-text-bold" uk-grid uk-height-match="target: .link-title;">
|
||||
<div>
|
||||
|
|
@ -309,181 +306,4 @@
|
|||
href="https://www.openaire.eu/contact-us" target="_blank">Contact us</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Redesign END -->
|
||||
|
||||
|
||||
|
||||
<!-- <ng-template #_logos let-logo="logo" let-class="class">
|
||||
<div *ngIf="logo" [class]="'uk-flex uk-flex-middle uk-flex-center uk-padding-remove-horizontal '+class">
|
||||
<div class="">
|
||||
<img src="assets/ExploreLogos/{{logo}}" alt="{{logo}} logo" loading="lazy" width="112px" height="44px">
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
<div class="image-front-topbar mainPageSearchForm">
|
||||
<div class="uk-section">
|
||||
<div class="uk-container uk-container-large uk-flex uk-flex-center">
|
||||
<div class="uk-width-xlarge@l uk-width-large uk-child-width-1-1">
|
||||
<advanced-search-input [class.uk-hidden]="entities.disableSelect" (searchEmitter)="goTo(true)">
|
||||
<entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||
(selectionChange)="entityChanged($event)"
|
||||
[onChangeNavigate]="false"></entities-selection>
|
||||
<div input placeholder="Scholary works" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
|
||||
</advanced-search-input>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-margin-medium">
|
||||
<div class="uk-container uk-container-large explore-numbers uk-margin-medium-bottom">
|
||||
<div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
|
||||
<div class="uk-width-1-1@m uk-first-column">
|
||||
<div class="uk-grid uk-margin uk-margin-bottom uk-width-xxlarge uk-margin-auto">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
|
||||
<div uk-slider="autoplay: false; autoplay-interval: 2500" class="uk-margin-top">
|
||||
<div class="uk-position-relative">
|
||||
<div class="uk-slider-container">
|
||||
<ul class="uk-slider-items" uk-height-match="target: > li > div > div > .logo1; row: false;">
|
||||
<ng-container *ngFor="let type of getKeys(logos)">
|
||||
<li *ngFor="let range of createRange(logos[type].length) let j=index"
|
||||
class="uk-width-1-1 home-logo">
|
||||
<h1 class="uk-text-center uk-margin-bottom portal-color uk-h3">
|
||||
<span *ngIf="type=='publication' && showPublications && numbers?.publicationsSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}}
|
||||
publications</span><span> deduplicated</span>
|
||||
</span>
|
||||
<span
|
||||
*ngIf="type=='dataset' && showDatasets && (numbers?.datasetsLinkedSize || numbers?.datasetsSize)">
|
||||
<span *ngIf="numbers?.datasetsLinkedSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.datasetsLinkedSize.number|number}}{{numbers.datasetsLinkedSize.size}}
|
||||
datasets</span> interlinked with publications</span>
|
||||
<span *ngIf="numbers?.datasetsSize && !numbers?.datasetsLinkedSize"
|
||||
class="uk-text-bold">{{numbers.datasetsSize.number|number}}{{numbers.datasetsSize.size}}
|
||||
research data</span>
|
||||
</span>
|
||||
<span
|
||||
*ngIf="type=='software' && showSoftware && (numbers?.softwareSize || numbers?.softwareLinkedSize)">
|
||||
<span *ngIf="numbers?.softwareLinkedSize">
|
||||
<span
|
||||
class="uk-text-bol ">{{numbers.softwareLinkedSize.number|number}}{{numbers.softwareLinkedSize.size}}
|
||||
research
|
||||
software</span> interlinked with publications</span>
|
||||
<span *ngIf="numbers?.softwareSize && !numbers?.softwareLinkedSize"
|
||||
class="uk-text-bold">{{numbers.softwareSize.number|number}}{{numbers.softwareSize.size}}
|
||||
research software</span>
|
||||
</span>
|
||||
<span *ngIf="type=='persistent'">
|
||||
<span>Persistent identifiers and registries</span>
|
||||
</span>
|
||||
<span *ngIf="type=='funder' && showProjects && numbers?.fundersSize && numbers?.projectsSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.fundersSize.number|number}}{{numbers.fundersSize.size}}
|
||||
funders</span><span> and</span>
|
||||
<span
|
||||
class="uk-text-bold"> {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}}
|
||||
funded grants</span>
|
||||
</span>
|
||||
|
||||
</h1>
|
||||
<div
|
||||
class="uk-grid-small uk-child-width-1-6 uk-text-center grid uk-flex uk-flex-center"
|
||||
uk-grid uk-height-match="target: > div > .logo2; row: false;">
|
||||
<div
|
||||
*ngFor="let logo of logos[type][j].slice(0,ceil(logos[type][j].length/2)); let i=index">
|
||||
<ng-container
|
||||
*ngTemplateOutlet="_logos; context: { logo: logo, class: 'logo1 '}"></ng-container>
|
||||
<ng-container
|
||||
*ngTemplateOutlet="_logos; context: { logo: logos[type][j][ceil(logos[type][j].length/2)+i], class: 'uk-margin-top logo2 '}"></ng-container>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ng-container>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<div class="uk-hidden@s">
|
||||
<a class="uk-position-center-left uk-position-small" href="#" uk-slidenav-previous
|
||||
uk-slider-item="previous"><span class="visually-hidden">prev</span></a>
|
||||
<a class="uk-position-center-right uk-position-small" href="#" uk-slidenav-next
|
||||
uk-slider-item="next"><span class="visually-hidden">next</span></a>
|
||||
</div>
|
||||
|
||||
<div class="uk-visible@s">
|
||||
<a class="uk-position-center-left-out uk-position-small" href="#" uk-slidenav-previous
|
||||
uk-slider-item="previous"><span class="visually-hidden">prev</span></a>
|
||||
<a class="uk-position-center-right-out uk-position-small" href="#" uk-slidenav-next
|
||||
uk-slider-item="next"><span class="visually-hidden">next</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
|
||||
[texts]="pageContents['top']"></helper>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
|
||||
class="uk-section graph-background">
|
||||
<div class="uk-container">
|
||||
<div class="uk-flex uk-flex-top uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
|
||||
<div class="uk-flex-last@m">
|
||||
<div [class.lines-10]="!readMore" class="uk-margin-bottom multi-line-ellipsis">
|
||||
<helper [texts]="pageContents['right']"></helper>
|
||||
</div>
|
||||
<div *ngIf="!readMore" class="uk-text-center clickable" (click)="readMore = true">
|
||||
<span>Read more<span class="space" uk-icon="chevron-down"></span></span>
|
||||
</div>
|
||||
<div *ngIf="readMore" class="uk-text-center clickable" (click)="readMore = false">
|
||||
<span>Read less<span class="space" uk-icon="chevron-up"></span></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-bottom">
|
||||
<div class="uk-width-1-3 uk-width-1-2@m">
|
||||
<img src="assets/explore-assets/graph.png" alt="graph image" loading="lazy">
|
||||
</div>
|
||||
<div class="uk-padding uk-width-1-2">
|
||||
<img src="assets/common-assets/logo-large-graph.png" alt="graph image" loading="lazy">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
|
||||
class="graph-background-bottom uk-section uk-padding-remove-vertical uk-background-cover"></div>
|
||||
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
|
||||
[texts]="pageContents['bottom']"></helper>
|
||||
<div class="uk-section uk-padding-remove-bottom">
|
||||
<h3 class="uk-text-center uk-margin-medium-bottom">Our growing <span class="uk-text-bold">Community</span></h3>
|
||||
<numbers #numbersComponent [defaultInit]="false" backgroundClass="numbers-background"
|
||||
(results)="numbers = $event"></numbers>
|
||||
</div>
|
||||
<div class="uk-section uk-padding-large uk-grid uk-child-width-1-2@m uk-child-width-1-1@s uk-margin-large-top uk-margin-large-bottom">
|
||||
<div class="uk-flex uk-flex-middle uk-flex-center">
|
||||
<h3 class="uk-text-center uk-margin-medium-bottom">Start browsing by subject</h3>
|
||||
</div>
|
||||
<div>
|
||||
<div class="uk-text-center uk-padding-large uk-padding-remove-vertical ">
|
||||
<span *ngFor="let subject of specialSubjects " class=" uk-text-capitalize uk-link-reset uk-button uk-button-default uk-button-secondary uk-margin-small-right uk-margin-small-bottom">
|
||||
<a [routerLink]=" properties.searchLinkToAdvancedResults"
|
||||
[queryParams]="getSubjectParameter(subject.value) ">{{subject.label}}</a></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<helper *ngIf="pageContents && pageContents['left'] && pageContents['left'].length > 0"
|
||||
[texts]="pageContents['left']"></helper>
|
||||
<div class="uk-section-muted"
|
||||
uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}">
|
||||
<div class="uk-container uk-container-large">
|
||||
<other-portals portal="explore" [properties]="properties"></other-portals>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
|
|
@ -1,5 +1,6 @@
|
|||
import {
|
||||
AfterViewInit,
|
||||
ChangeDetectorRef,
|
||||
Component,
|
||||
ElementRef,
|
||||
OnDestroy,
|
||||
|
|
@ -8,7 +9,7 @@ import {
|
|||
ViewChild,
|
||||
ViewChildren
|
||||
} from '@angular/core';
|
||||
import {Subscriber, Subscription} from 'rxjs';
|
||||
import {Observable, of, Subscriber, zip} from 'rxjs';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
import {Meta, Title} from '@angular/platform-browser';
|
||||
|
|
@ -17,7 +18,7 @@ import {SearchDataprovidersService} from '../openaireLibrary/services/searchData
|
|||
import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
|
||||
import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
|
||||
import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
|
||||
import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
|
||||
import {OpenaireEntities, SearchFields} from '../openaireLibrary/utils/properties/searchFields';
|
||||
|
||||
import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
|
||||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
|
|
@ -30,6 +31,7 @@ import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperCla
|
|||
import {properties} from "../../environments/environment";
|
||||
import {Numbers, NumbersComponent} from "../openaireLibrary/sharedComponents/numbers/numbers.component";
|
||||
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
||||
import { NumberUtils } from '../openaireLibrary/utils/number-utils.class';
|
||||
|
||||
@Component({
|
||||
selector: 'home',
|
||||
|
|
@ -123,7 +125,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{
|
|||
public searchFields: SearchFields = new SearchFields();
|
||||
public errorCodes: ErrorCodes = new ErrorCodes();
|
||||
public routerHelper: RouterHelper = new RouterHelper();
|
||||
public numbers: Numbers;
|
||||
public numbers: Numbers = {};
|
||||
showPublications: boolean = false;
|
||||
showDatasets: boolean = false;
|
||||
showSoftware: boolean = false;
|
||||
|
|
@ -132,6 +134,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{
|
|||
showDataProviders: boolean = false;
|
||||
showOrganizations: boolean = false;
|
||||
properties: EnvProperties = properties;
|
||||
public openaireEntities = OpenaireEntities;
|
||||
public readMore: boolean = false;
|
||||
|
||||
subscriptions: any[] = [];
|
||||
|
|
@ -182,14 +185,15 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{
|
|||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private _router: Router,
|
||||
private _searchResearchResultsService: SearchResearchResultsService,
|
||||
private _searchDataprovidersService: SearchDataprovidersService,
|
||||
private _searchProjectsService: SearchProjectsService,
|
||||
private _searchOrganizationsService: SearchOrganizationsService,
|
||||
private _refineFieldResultsService: RefineFieldResultsService,
|
||||
private searchResearchResultsService: SearchResearchResultsService,
|
||||
private searchDataprovidersService: SearchDataprovidersService,
|
||||
private searchProjectsService: SearchProjectsService,
|
||||
private searchOrganizationsService: SearchOrganizationsService,
|
||||
private refineFieldResultsService: RefineFieldResultsService,
|
||||
private location: Location, private _piwikService: PiwikService,
|
||||
private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
|
||||
private helper: HelperService
|
||||
private helper: HelperService,
|
||||
private cdr: ChangeDetectorRef
|
||||
) {
|
||||
let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
|
||||
let title = "OpenAIRE | Find and Share research";
|
||||
|
|
@ -266,7 +270,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{
|
|||
if (this.showOrp) {
|
||||
this.resultTypes.values.push({name: "Other research products", id: "other", selected: true, number: 0});
|
||||
}
|
||||
this.numbersComponent.init(this.showDatasets, this.showSoftware, this.showPublications, this.showDatasets, this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders);
|
||||
this.init(this.showDatasets, this.showSoftware, this.showPublications, this.showDatasets, this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders);
|
||||
}
|
||||
},
|
||||
error => {
|
||||
|
|
@ -275,6 +279,8 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{
|
|||
));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public ngOnDestroy() {
|
||||
this.clear();
|
||||
|
|
@ -354,4 +360,53 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit{
|
|||
getSubjectParameter(param){
|
||||
return {'f0':'resultsubject','fv0':'"' +(param)+'"', size:50};
|
||||
}
|
||||
|
||||
init(getDatasetsLinked = false, getSoftwareLinked = false, getPublications = true, getDatasets = true,
|
||||
getSoftware = true, getOther = true, getProjects = true, getDataProviders = true, refineValue: string = null) {
|
||||
this.subscriptions.push(zip(
|
||||
(getPublications) ? this.searchResearchResultsService.numOfSearchResults('publication', '', this.properties, null) : of(0),
|
||||
(getDatasets) ? this.searchResearchResultsService.numOfSearchResults('dataset', '', this.properties, null) : of(0),
|
||||
(getDatasetsLinked) ? this.searchResearchResultsService.numOfSearchResultsLinkedToPub("dataset", this.properties) : of(0),
|
||||
(getSoftware) ? this.searchResearchResultsService.numOfSearchResults('software', '', this.properties, null) : of(0),
|
||||
(getSoftwareLinked) ? this.searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties) : of(0),
|
||||
(getOther) ? this.searchResearchResultsService.numOfSearchResults('other', '', this.properties, null) : of(0),
|
||||
(getProjects) ? this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties, null) : of(0),
|
||||
(getDataProviders) ? this.searchDataprovidersService.numOfSearchDataproviders('', this.properties, null) : of(0)
|
||||
).subscribe((data: any[]) => {
|
||||
if (data[0] && data[0] > 0) {
|
||||
this.numbers.publicationsSize = NumberUtils.roundNumber(data[0]);
|
||||
}
|
||||
if (data[1] && data[1] > 0) {
|
||||
this.numbers.datasetsSize = NumberUtils.roundNumber(data[1]);
|
||||
}
|
||||
if (data[2] && data[2] > 0) {
|
||||
this.numbers.datasetsLinkedSize = NumberUtils.roundNumber(data[2]);
|
||||
}
|
||||
if (data[3] && data[3] > 0) {
|
||||
this.numbers.softwareSize = NumberUtils.roundNumber(data[3]);
|
||||
}
|
||||
if (data[4] && data[4] > 0) {
|
||||
this.numbers.softwareLinkedSize = NumberUtils.roundNumber(data[4]);
|
||||
}
|
||||
if (data[5] && data[5] > 0) {
|
||||
this.numbers.otherSize = NumberUtils.roundNumber(data[5]);
|
||||
}
|
||||
if (data[6][0] && data[6][0] > 0) {
|
||||
this.numbers.projectsSize = NumberUtils.roundNumber(data[6][0]);
|
||||
}
|
||||
if (data[6][1] && data[6][1].length > 0 && data[6][1][0].filterId == 'funder' && data[6][1][0].values) {
|
||||
this.numbers.fundersSize = NumberUtils.roundNumber(data[6][1][0].values.length);
|
||||
}
|
||||
if (data[7] && data[7] > 0) {
|
||||
this.numbers.datasourcesSize = NumberUtils.roundNumber(data[7]);
|
||||
}
|
||||
}, err => {
|
||||
this.handleError('Error getting numbers', err);
|
||||
}));
|
||||
}
|
||||
|
||||
disableSelectChange(event: boolean) {
|
||||
this.disableSelect = event;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit a40dfa0165e87c28083a14faad194dfe259a3674
|
||||
Subproject commit 07d3c0407d5d98b863f76e2a13be0d5a54747d31
|
||||
|
|
@ -16,54 +16,54 @@
|
|||
height: 40px;
|
||||
width: auto;
|
||||
}
|
||||
.sdg-1, .sdg-1.uk-card-hover:hover {
|
||||
background-color: #E6233D;
|
||||
.sdg-1 {
|
||||
background-color: #E6233D !important;
|
||||
}
|
||||
.sdg-2 {
|
||||
background-color: #DF9F00;
|
||||
background-color: #DF9F00 !important;
|
||||
}
|
||||
.sdg-3 {
|
||||
background-color: #19A220;
|
||||
background-color: #19A220 !important;
|
||||
}
|
||||
.sdg-4 {
|
||||
background-color: #D70023;
|
||||
background-color: #D70023 !important;
|
||||
}
|
||||
.sdg-5 {
|
||||
background-color: #FF0B00;
|
||||
background-color: #FF0B00 !important;
|
||||
}
|
||||
.sdg-6 {
|
||||
background-color: #00BFE8;
|
||||
background-color: #00BFE8 !important;
|
||||
}
|
||||
.sdg-7 {
|
||||
background-color: #FFC300;
|
||||
background-color: #FFC300 !important;
|
||||
}
|
||||
.sdg-8 {
|
||||
background-color: #B10240;
|
||||
background-color: #B10240 !important;
|
||||
}
|
||||
.sdg-9 {
|
||||
background-color: #FF5D00;
|
||||
background-color: #FF5D00 !important;
|
||||
}
|
||||
.sdg-10 {
|
||||
background-color: #F50D86;
|
||||
background-color: #F50D86 !important;
|
||||
}
|
||||
.sdg-11 {
|
||||
background-color: #FF8A00;
|
||||
background-color: #FF8A00 !important;
|
||||
}
|
||||
.sdg-12 {
|
||||
background-color: #CA8A03;
|
||||
background-color: #CA8A03 !important;
|
||||
}
|
||||
.sdg-13 {
|
||||
background-color: #2B772B;
|
||||
background-color: #2B772B !important;
|
||||
}
|
||||
.sdg-14 {
|
||||
background-color: #0098DF;
|
||||
background-color: #0098DF !important;
|
||||
}
|
||||
.sdg-15 {
|
||||
background-color: #00B91C;
|
||||
background-color: #00B91C !important;
|
||||
}
|
||||
.sdg-16 {
|
||||
background-color: #0069A2;
|
||||
background-color: #0069A2 !important;
|
||||
}
|
||||
.sdg-17 {
|
||||
background-color: #1C336A;
|
||||
background-color: #1C336A !important;
|
||||
}
|
||||
|
|
@ -0,0 +1,76 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100.046" height="86.564" viewBox="0 0 100.046 86.564">
|
||||
<defs>
|
||||
<filter id="Path_105220" x="12.875" y="2.05" width="85.448" height="79.607" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
<filter id="Path_105221" x="8.27" y="7.657" width="91.776" height="78.907" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur-2"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur-2"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
<filter id="Path_105222" x="0" y="3.944" width="86.648" height="80.263" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur-3"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur-3"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
<filter id="Path_105223" x="1.133" y="0" width="83.361" height="77.989" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur-4"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur-4"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
<filter id="Path_105224" x="3.177" y="10.407" width="78.698" height="75.921" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur-5"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur-5"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
<filter id="Path_105225" x="9.678" y="10.395" width="76.827" height="75.952" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur-6"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur-6"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
<filter id="Path_105226" x="10.559" y="1.347" width="75.828" height="78.213" filterUnits="userSpaceOnUse">
|
||||
<feOffset dx="15" dy="15" input="SourceAlpha"/>
|
||||
<feGaussianBlur stdDeviation="12.5" result="blur-7"/>
|
||||
<feFlood flood-opacity="0.102"/>
|
||||
<feComposite operator="in" in2="blur-7"/>
|
||||
<feComposite in="SourceGraphic"/>
|
||||
</filter>
|
||||
</defs>
|
||||
<g id="Group_13879" data-name="Group 13879" transform="translate(-133.571 -550.987)">
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105220)">
|
||||
<path id="Path_105220-2" data-name="Path 105220" d="M271.669,193.073h-.831c-1.042,0-2.084,0-3.126-.006-.221,0-.279.054-.208.288.22.713.21.7.962.717.639.016,1.276.1,1.915.126.454.02.909,0,1.364-.011a.472.472,0,0,1,.5.539c-.009.058-.14.137-.214.137q-1.547,0-3.093-.029c-.251,0-.328.1-.26.337a4.911,4.911,0,0,0,.175.609.34.34,0,0,0,.252.165c1.143.01,2.286.008,3.429,0,.36,0,.512.126.583.49a4.3,4.3,0,0,0,.145.516c.052.153.009.251-.152.251a6.763,6.763,0,0,1-1.75-.031,8.659,8.659,0,0,0-2.246-.111c-1.942-.034-3.884-.01-5.826,0-.252,0-.377-.081-.366-.347a.636.636,0,0,0-.057-.262c-.065-.157-.029-.263.14-.294.209-.038.229-.163.182-.336-.021-.078-.026-.16-.04-.239-.062-.341-.033-.387.3-.346.258.03.317-.109.285-.3-.078-.478-.181-.949-.265-1.426a3.153,3.153,0,0,1-.064-.629.3.3,0,0,1,.191-.216,6.018,6.018,0,0,1,.963-.009.408.408,0,0,1,.3.206c.092.293.126.6.194.9s.126.591.205.88a.269.269,0,0,0,.2.133q.47.03.939.021c.181,0,.21-.111.152-.273a4.789,4.789,0,0,1-.126-.483c-.087-.361-.165-.723-.251-1.083-.062-.234.021-.308.251-.308,1.6.008,3.194.014,4.791,0C271.508,192.653,271.61,192.775,271.669,193.073Z" transform="translate(-227.46 -168.09)" fill="#061424"/>
|
||||
</g>
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105221)">
|
||||
<path id="Path_105221-2" data-name="Path 105221" d="M239.251,240.2h.9l1.788.025c.243,0,.337-.107.264-.348a3.715,3.715,0,0,0-.306-.819.605.605,0,0,0-.445-.221c-.606-.023-1.214.014-1.82,0s-1.24-.085-1.861-.114a3.779,3.779,0,0,0-.465.069c-.319.025-.64.052-.959.052q-4.172,0-8.346-.01c-.461,0-.47,0-.482-.433,0-.189-.082-.251-.251-.251-.263.013-.526.013-.787.03-.2.014-.285-.052-.258-.259a1.306,1.306,0,0,0-.014-.27c-.014-.185.075-.251.251-.251q1.5.013,3,.016a26.114,26.114,0,0,1,2.7.009c2.157.223,4.316.04,6.472.1.909.025,1.82.009,2.73,0,.251,0,.377.058.443.326.116.436.307.853.453,1.283.126.358.219.726.346,1.083.1.273.226.536.342.8.074.17.059.273-.162.269q-.844-.015-1.688-.018c-.425,0-.85.008-1.274,0a.342.342,0,0,1-.264-.126C239.44,240.855,239.364,240.562,239.251,240.2Z" transform="translate(-195.44 -207.23)" fill="#061424"/>
|
||||
</g>
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105222)">
|
||||
<path id="Path_105222-2" data-name="Path 105222" d="M163.835,210.482c0-.251-.013-.521,0-.785s-.06-.36-.324-.34a6.382,6.382,0,0,1-.728,0c-.191,0-.27.07-.28.265-.053,1.05-.118,2.1-.174,3.144-.013.241-.091.368-.366.353-.4-.021-.809-.013-1.213,0-.235,0-.3-.1-.287-.316.064-.734.132-1.47.184-2.206.016-.223.112-.314.324-.293s.259-.067.272-.262c.039-.629.1-1.247.148-1.872a.28.28,0,0,1,.324-.3q3.871.008,7.742.009c.126,0,.241-.024.362-.016.211.013.3.157.306.348.01.22-.153.23-.312.23h-2.767c-.335,0-.377.05-.329.371.084.6.084.6.7.6h4.25c.241,0,.336.1.377.331.138.755.068.668-.558.665q-3.581-.011-7.168,0A3.2,3.2,0,0,0,163.835,210.482Z" transform="translate(-137.96 -181.41)" fill="#4598e2"/>
|
||||
</g>
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105223)">
|
||||
<path id="Path_105223-2" data-name="Path 105223" d="M173.634,179.219c-1.3,0-2.589-.006-3.884,0-.259,0-.307-.1-.284-.328.078-.795.15-1.588.2-2.389.015-.218.093-.274.3-.272.778.011,1.557,0,2.334.016.26,0,.519.1.777.094,1.391-.019,2.782-.054,4.172-.087.182,0,.357-.015.356.244,0,.172-.068.251-.252.251q-3.276-.016-6.553-.024c-.334,0-.439.157-.411.645.015.284.2.277.433.273,1.051-.019,2.1-.016,3.154-.02,1.153,0,2.3,0,3.458-.014.179,0,.272.063.288.231.036.377.068.765.1,1.147.015.194-.1.23-.268.23h-3.915Z" transform="translate(-145.83 -153.73)" fill="#1f70b5"/>
|
||||
</g>
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105224)">
|
||||
<path id="Path_105224-2" data-name="Path 105224" d="M187.593,260.191h-1.574c-.216,0-.311-.05-.293-.293.043-.61.033-.606.629-.609.929,0,1.857-.011,2.787-.019.184,0,.275.067.278.268.01.629.015.629-.62.629h-1.212Z" transform="translate(-160.05 -226.36)" fill="#4598e2"/>
|
||||
</g>
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105225)">
|
||||
<path id="Path_105225-2" data-name="Path 105225" d="M238.323,260.108h-.206c-.62,0-.612,0-.7-.629-.026-.2.036-.3.228-.3.424-.006.85-.018,1.273.01.092,0,.231.156.252.259.138.685.126.687-.57.672h-.273Z" transform="translate(-205.24 -226.27)" fill="#061424"/>
|
||||
</g>
|
||||
<g transform="matrix(1, 0, 0, 1, 133.57, 550.99)" filter="url(#Path_105226)">
|
||||
<path id="Path_105226-2" data-name="Path 105226" d="M245.241,190.05c-.031.026-.1.126-.194.15-.167.043-.262-.055-.28-.23-.054-.49-.107-.982-.171-1.473-.048-.368-.114-.736-.169-1.1-.025-.165-.044-.352.171-.39s.319.087.343.313C245.028,188.2,245.131,189.08,245.241,190.05Z" transform="translate(-211.35 -163.15)" fill="#1f70b5"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 7.4 KiB |
|
|
@ -55,10 +55,7 @@
|
|||
<g id="Asset_1_8_" data-name="Asset 1 (8)" transform="translate(0 0)" style="isolation: isolate">
|
||||
<g id="Layer_2-3" data-name="Layer 2" transform="translate(0 0)">
|
||||
<g id="Layer_1-2-2" data-name="Layer 1">
|
||||
<path id="Path_105259" data-name="Path 105259" d="M17.568,0a3.1,3.1,0,0,0-3.1,3.1h0L3.041,4.21A1.553,1.553,0,1,0,3.1,4.8L14.532,3.688A3.1,3.1,0,1,0,17.568,0Z" transform="translate(286.207 517.456)" fill="#f9f9f9"/>
|
||||
<path id="Path_105260" data-name="Path 105260" d="M3.1,6.19A3.1,3.1,0,1,0,0,3.1a3.1,3.1,0,0,0,3.1,3.1Z" transform="translate(45.424 275.081)" fill="#f9f9f9"/>
|
||||
<path id="Path_105261" data-name="Path 105261" d="M3.1,6.19A3.083,3.083,0,0,0,5.752,4.666L36.086,18.832A4.186,4.186,0,0,0,35.8,20.35a4.24,4.24,0,1,0,.534-2.058L6,4.127A2.965,2.965,0,0,0,6.19,3.1a3.1,3.1,0,1,0-3.1,3.1Z" transform="translate(325.968 19.354)" fill="#f9f9f9"/>
|
||||
<ellipse id="Ellipse_793" data-name="Ellipse 793" cx="4.245" cy="4.245" rx="4.245" ry="4.245" transform="translate(425.942 524.643)" fill="#f9f9f9"/>
|
||||
<path id="Path_105262" data-name="Path 105262" d="M17.95,311.121a16.848,16.848,0,0,0,2.28-.173l29.342,167c-9.076,2.29-14.945,11.5-13.478,21.159s9.776,16.506,19.083,15.734,16.482-8.908,16.479-18.685a20.093,20.093,0,0,0-.31-3.444l74.761-16.856-32.98,39.261a2.829,2.829,0,0,0-3.344.92,3.164,3.164,0,0,0-.146,3.617,2.845,2.845,0,0,0,3.258,1.211,3.034,3.034,0,0,0,2.065-2.9,3.1,3.1,0,0,0-.388-1.494l34.717-41.323,99.29-22.384c2.137,9.224,10.523,15.317,19.523,14.184s15.768-9.133,15.757-18.624a10.366,10.366,0,0,0-.078-1.544l129.747-18.746c2,11.752,11.761,20.312,23.161,20.323s21.171-8.531,23.2-20.279-4.277-23.328-14.961-27.492-22.682.285-28.484,10.561L383.925,392.05a10.3,10.3,0,0,0-2.487-12.181,9.2,9.2,0,0,0-11.894-.148,10.284,10.284,0,0,0-2.763,12.116L281.569,439.1a17.9,17.9,0,0,0-13.037-9.385,17.373,17.373,0,0,0-15.043,5.128l-83.93-81.061a6.628,6.628,0,0,0,.293-6.539,6.05,6.05,0,0,0-5.367-3.357,5.7,5.7,0,0,0-1.727.264L71.676,96.234A24.95,24.95,0,0,0,85.425,80.993l87.481,29.466a6.552,6.552,0,0,0-.165,1.463A6.338,6.338,0,0,0,177.3,118.1a5.989,5.989,0,0,0,6.859-3.064,6.6,6.6,0,0,0-1.109-7.722L240.39,33.583A17.242,17.242,0,0,0,254.5,37.192a17.854,17.854,0,0,0,12-8.577l141.662,81.173a6.717,6.717,0,0,0-.349,2.134,6.3,6.3,0,0,0,5.091,6.3,6.071,6.071,0,0,0,6.767-4.224,6.513,6.513,0,0,0-2.868-7.684,5.915,5.915,0,0,0-7.709,1.7L267.432,26.837a19.374,19.374,0,0,0-3.93-21.8,17.275,17.275,0,0,0-21.043-2.588A19.075,19.075,0,0,0,233.811,22.7L85.57,65.173A25.06,25.06,0,0,0,72.621,49.809a23.26,23.26,0,0,0-19.566-.355L43.5,28.168a11.133,11.133,0,0,0,3.9-14.415A10.145,10.145,0,0,0,33.83,9a11.064,11.064,0,0,0-5.171,13.97,10.218,10.218,0,0,0,13.083,6.064L51.3,50.369A25.716,25.716,0,0,0,38.473,75.775,25.064,25.064,0,0,0,56.491,97.453L20.667,273.913a17.719,17.719,0,0,0-2.765-.244c-9.887,0-17.9,8.393-17.9,18.746s8.015,18.746,17.9,18.746Zm4.192-.538a18.163,18.163,0,0,0,12.187-10.648l124.2,49.1a6.967,6.967,0,0,0-.116,1.28,6.514,6.514,0,0,0,1.941,4.654L64.5,481.189a17.221,17.221,0,0,0-10.741-3.78,18.7,18.7,0,0,0-2.28.163ZM150.366,473.863l24.616-29.344a4.969,4.969,0,0,0,6.732-1.479,5.535,5.535,0,0,0-.765-7.158,4.945,4.945,0,0,0-6.878.116,5.539,5.539,0,0,0-.545,7.18l-26.343,31.4L71.132,491.746a18.872,18.872,0,0,0-5.822-9.907l95.768-126.246a5.85,5.85,0,0,0,7.161-.285l83.93,81.061a19.22,19.22,0,0,0-4.1,11.939,20.092,20.092,0,0,0,.31,3.444Zm216.86-81.133a9.281,9.281,0,0,0,16.214.2l32.514,19.092a25.414,25.414,0,0,0-2.775,11.644,17.44,17.44,0,0,0,.107,2.367L283.509,444.763a19.508,19.508,0,0,0-1.543-4.755ZM234.3,24.764a18.819,18.819,0,0,0,5.307,8.291L182.26,106.77a5.865,5.865,0,0,0-5.19-.863,6.2,6.2,0,0,0-3.9,3.688L85.7,80.129a26.521,26.521,0,0,0,.97-7.285,26.885,26.885,0,0,0-.621-5.7ZM58.4,97.829a22.553,22.553,0,0,0,4.085.366,23.164,23.164,0,0,0,8.238-1.5l91.13,247.868a6.311,6.311,0,0,0-2.659,2.571L35,298.034a19.528,19.528,0,0,0-1.361-14.626,18.057,18.057,0,0,0-11.02-9.1Z" transform="translate(18.759 22.388)" fill="#f9f9f9"/>
|
||||
<rect id="Rectangle_17567" data-name="Rectangle 17567" width="490.577" height="554.203" transform="translate(6.489 7.416)" fill="url(#pattern)" style="mix-blend-mode: screen;isolation: isolate"/>
|
||||
<rect id="Rectangle_17568" data-name="Rectangle 17568" width="491.504" height="556.057" opacity="0.15" fill="url(#pattern-2)" style="mix-blend-mode: multiply;isolation: isolate"/>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 170 KiB After Width: | Height: | Size: 169 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 553 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 810 KiB |
|
|
@ -1 +1 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 677.14 1140.24"><defs><style>.cls-1{fill:#fff;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><circle class="cls-1" cx="336.13" cy="588.35" r="203.86"/><path class="cls-1" d="M564.45,762.05A286.87,286.87,0,0,0,133.29,385.51,286.89,286.89,0,0,0,505.15,820.18L642.69,951.44l34.45-36.1v224.9H0V0H677.14V869.59Z"/></g></g></svg>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 677.14 1140.24"><defs><style>.cls-1{fill:#f9f9f9;}</style></defs><g id="Layer_2" data-name="Layer 2"><g id="Layer_1-2" data-name="Layer 1"><path class="cls-1" d="M275.51,330.92c-105.95,0-191.84,85.89-191.84,191.83s85.89,191.84,191.84,191.84S467.35,628.7,467.35,522.75,381.46,330.92,275.51,330.92Z"/><path class="cls-1" d="M0,0V1140.24H677.14V0ZM618,917.23,435.6,740.92h0a269.38,269.38,0,0,1-160.09,52.41C126.07,793.34,4.92,672.19,4.92,522.75S126.07,252.16,275.51,252.16,546.1,373.31,546.1,522.75a269.46,269.46,0,0,1-54.9,163.42h0l181,175Z"/></g></g></svg>
|
||||
|
Before Width: | Height: | Size: 419 B After Width: | Height: | Size: 608 B |
Loading…
Reference in New Issue