Merge branch 'master' of code-repo.d4science.org:MaDgIK/explore-services
This commit is contained in:
commit
bd76a05623
|
@ -39,7 +39,7 @@ import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service";
|
|||
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing
|
||||
experience possible.</span>
|
||||
By using the OpenAIRE portal you accept our use of cookies. <a
|
||||
href="//ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span class="uk-icon">
|
||||
href="https://www.openaire.eu/privacy-policy#cookies" target="_blank"> Read more <span class="uk-icon">
|
||||
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right"
|
||||
ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
|
||||
</span></a>
|
||||
|
|
|
@ -115,7 +115,7 @@
|
|||
<span *ngIf="type=='persistent'">
|
||||
<span>Persistent identifiers and registries</span>
|
||||
</span>
|
||||
<span *ngIf="type=='funder' && showProjects && numbers?.fundersSize">
|
||||
<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>
|
||||
|
@ -168,9 +168,6 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!--<schema2jsonld [URL]="properties.baseLink"-->
|
||||
<!-- [logoURL]="properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home"-->
|
||||
<!-- name="OpenAIRE Explore"></schema2jsonld>-->
|
||||
<div *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
|
||||
class="uk-section graph-background">
|
||||
<div class="uk-container">
|
||||
|
@ -206,98 +203,19 @@
|
|||
<numbers #numbersComponent [defaultInit]="false" backgroundClass="numbers-background"
|
||||
(results)="numbers = $event"></numbers>
|
||||
</div>
|
||||
<!--<div class="uk-section uk-padding-remove-bottom">
|
||||
<div class="uk-container uk-text-center uk-margin-medium-bottom">
|
||||
<div class="uk-margin-medium uk-flex-center">
|
||||
<div class="uk-first-column">
|
||||
<div class="uk-panel">
|
||||
<h3 class="uk-margin uk-text-center">
|
||||
Our growing <span class="uk-text-bold">Community</span>
|
||||
</h3>
|
||||
<div class="uk-margin-large-top uk-container uk-margin-bottom uk-text-center">
|
||||
<div class="uk-grid uk-flex uk-flex-center">
|
||||
<div *ngIf="fundersSize" class="uk-width-1-3@m">
|
||||
<h3>
|
||||
<a [routerLink]="properties.searchLinkToProjects" class="uk-text-bold number">
|
||||
{{fundersSize.number|number}}<span class="number-size">{{fundersSize.size}}</span>
|
||||
</a>
|
||||
</h3>
|
||||
<div class="uk-text-uppercase uk-text-large">Funders</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 *ngIf="datasourcesSize" class="uk-width-1-3@m">
|
||||
<h3>
|
||||
<a [routerLink]="properties.searchLinkToDataProviders" class="uk-text-bold number">
|
||||
{{datasourcesSize.number|number}}<span class="number-size">{{datasourcesSize.size}}</span>
|
||||
</a>
|
||||
</h3>
|
||||
<div class="uk-text-uppercase uk-text-large">Content providers</div>
|
||||
</div>
|
||||
<div *ngIf="projectsSize" class="uk-width-1-3@m">
|
||||
<h3>
|
||||
<a [routerLink]="properties.searchLinkToProjects" class="uk-text-bold number">
|
||||
{{projectsSize.number|number}}<span class="number-size">{{projectsSize.size}}</span>
|
||||
</a>
|
||||
</h3>
|
||||
<div class="uk-text-uppercase uk-text-large">Projects</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>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="numbers-background uk-section">
|
||||
<div class="uk-container">
|
||||
<div class="uk-grid uk-margin-auto-left uk-margin-auto-right uk-grid-large" uk-grid>
|
||||
<div *ngIf="publicationsSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom" [routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'publications', qf: false}">
|
||||
{{publicationsSize.count|number}} </a>
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="book" ratio="1.5" [flex]="true" class="uk-margin-right" customClass="portal-color"></icon>
|
||||
<span>publications</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="datasetsSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom"
|
||||
[routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'datasets', qf: false}">{{datasetsSize.count|number}} </a>
|
||||
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="database" ratio="1.5" [flex]="true" class="uk-margin-right"
|
||||
customClass="portal-color"></icon>
|
||||
<span>research data</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="softwareSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom" [routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'software', qf: false}">
|
||||
{{softwareSize.count|number}} </a>
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="cog" ratio="1.5" [flex]="true" class="uk-margin-right" customClass="portal-color"></icon>
|
||||
<span>software</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="otherSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom" [routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'other', qf: false}">{{otherSize.count|number}} </a>
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="earth" ratio="1.5" [flex]="true" class="uk-margin-right" customClass="portal-color"></icon>
|
||||
<span>other research products</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
<helper *ngIf="pageContents && pageContents['left'] && pageContents['left'].length > 0"
|
||||
[texts]="pageContents['left']"></helper>
|
||||
<div class="uk-section-muted"
|
||||
|
|
|
@ -20,6 +20,7 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
|||
import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
||||
import {properties} from "../../environments/environment";
|
||||
import {Numbers, NumbersComponent} from "../openaireLibrary/sharedComponents/numbers/numbers.component";
|
||||
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
||||
|
||||
@Component({
|
||||
selector: 'home',
|
||||
|
@ -146,7 +147,24 @@ export class HomeComponent {
|
|||
};
|
||||
public pageContents = null;
|
||||
@ViewChild("numbersComponent", { static: true }) numbersComponent: NumbersComponent;
|
||||
|
||||
specialSubjects = [
|
||||
{value: "Physics::Atomic Physics", label: "Atomic Physics"},
|
||||
{value: "Mathematics::Combinatorics", label: "Mathematics Combinatorics"},
|
||||
{value: "lcsh:Medicine", label: "Medicine"},
|
||||
{value: "lcsh:Science", label: "Science"},
|
||||
{value: "lcsh:Biology (General)", label: "Biology"},
|
||||
{value: "lcsh:Chemistry", label: "Chemistry"},
|
||||
{value: "lcsh:Engineering (General). Civil engineering (General)", label: "Civil engineering"},
|
||||
{value: "lcsh:Technology", label: "Technology"},
|
||||
/* "Mathematics::Combinatorics",
|
||||
"lcsh:Medicine",
|
||||
"lcsh:Science",
|
||||
"lcsh:Biology (General)",
|
||||
"lcsh:Chemistry",
|
||||
"lcsh:Engineering (General). Civil engineering (General)",
|
||||
"lcsh:Technology"*/
|
||||
];
|
||||
stringUtils = new StringUtils();
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private _router: Router,
|
||||
|
@ -285,4 +303,7 @@ export class HomeComponent {
|
|||
}
|
||||
this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
||||
}
|
||||
getSubjectParameter(param){
|
||||
return {'f0':'resultsubject','fv0':'"' +(param)+'"', size:50};
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit 28db142aa54b8bea87ada52dbae2da7c7da8f458
|
||||
Subproject commit 18d805e05fe839e143f9f1eeb9fd42f4dcea67d0
|
|
@ -49,11 +49,11 @@ export let properties: EnvProperties = {
|
|||
|
||||
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
|
||||
piwikSiteId: "109",
|
||||
loginUrl: " https://services.openaire.eu/explore-login/openid_connect_login",
|
||||
loginUrl: " https://services.openaire.eu/login-service/openid_connect_login",
|
||||
|
||||
userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
|
||||
userInfoUrl: " https://services.openaire.eu/login-service/userInfo",
|
||||
|
||||
logoutUrl: "https://services.openaire.eu/explore-login/openid_logout",
|
||||
logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
|
||||
|
||||
cookieDomain: ".openaire.eu",
|
||||
|
||||
|
|
|
@ -49,11 +49,11 @@ export let properties: EnvProperties = {
|
|||
|
||||
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
|
||||
piwikSiteId: "109",
|
||||
loginUrl: "https://services.openaire.eu/uoa-user-management/openid_connect_login",
|
||||
loginUrl: "https://services.openaire.eu/login-service/openid_connect_login",
|
||||
|
||||
userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
|
||||
userInfoUrl: " https://services.openaire.eu/login-service/userInfo",
|
||||
|
||||
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
logoutUrl: "https://services.openaire.eu/login-service/openid_logout",
|
||||
|
||||
cookieDomain: ".openaire.eu",
|
||||
|
||||
|
|
Loading…
Reference in New Issue