-
-
-
{{datasetsSize.count|number}}
-
-
-
-
-
-
-
- research data
-
+
+
+
+
+
{{softwareSize.count|number}}
+
-
-
{{otherSize.count|number}}
-
-
-
-
-
-
-
-
- other research products
-
+
+
+
{{datasetsSize.count|number}}
+
+
+
+
+
+
+
research data
+
+
+
+
{{otherSize.count|number}}
+
+
+
+
+
+
+
other research products
@@ -158,3 +399,25 @@
+
+
+
Synergies
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts
index 0c245e9..0df05f5 100644
--- a/src/app/home/home.component.ts
+++ b/src/app/home/home.component.ts
@@ -3,21 +3,22 @@ import {Subscription} from 'rxjs';
import {ActivatedRoute, Router} from '@angular/router';
import {Location} from '@angular/common';
import "rxjs/add/observable/zip";
-import {Title, Meta} from '@angular/platform-browser';
+import {Title, Meta} from '@angular/platform-browser';
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
-import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
-import { SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
-import { SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
-import { RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
-import { NumberUtils} from '../openaireLibrary/utils/number-utils.class';
+import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
+import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
+import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
+import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
+import {NumberUtils} from '../openaireLibrary/utils/number-utils.class';
-import { RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
-import { EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
-import { ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
+import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
+import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
+import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
-import { SEOService } from '../openaireLibrary/sharedComponents/SEO/SEO.service';
+import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
import {properties} from "../../environments/environment";
+import {portals} from "./portals";
@Component({
selector: 'home',
@@ -26,71 +27,97 @@ import {properties} from "../../environments/environment";
})
export class HomeComponent {
public pageTitle = "OpenAIRE Research Graph";
-
- public errorCodes:ErrorCodes = new ErrorCodes();
- public routerHelper:RouterHelper = new RouterHelper();
-
- public publicationsSize:any = null;
- public datasetsSize:any = null;
- public datasetsLinkedSize:any = null;
- public softwareLinkedSize:any = null;
+
+ public errorCodes: ErrorCodes = new ErrorCodes();
+ public routerHelper: RouterHelper = new RouterHelper();
+
+ public publicationsSize: any = null;
+ public datasetsSize: any = null;
+ public datasetsLinkedSize: any = null;
+ public softwareLinkedSize: any = null;
public softwareSize: any = null;
public otherSize: any = null;
- public fundersSize:any = null;
- public projectsSize:any = null;
- public datasourcesSize:any = null;
-
+ public fundersSize: any = null;
+ public projectsSize: any = null;
+ public datasourcesSize: any = null;
+ public portals: any[] = portals;
+ public state: number = 0;
+ private timeouts: any[] = [];
+
properties: EnvProperties = properties;
-
+
subs: Subscription[] = [];
-
- constructor (
+
+ constructor(
private route: ActivatedRoute,
private _router: Router,
private _searchResearchResultsService: SearchResearchResultsService,
private _searchDataprovidersService: SearchDataprovidersService,
private _searchProjectsService: SearchProjectsService,
private _searchOrganizationsService: SearchOrganizationsService,
- private _refineFieldResultsService:RefineFieldResultsService,
- private location: Location, private _piwikService:PiwikService,
+ private _refineFieldResultsService: RefineFieldResultsService,
+ private location: Location, private _piwikService: PiwikService,
private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService
) {
-
- let description = "OpenAIRE Research Graph: 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";
-
- this._title.setTitle(title);
- this._meta.updateTag({content:description},"name='description'");
- this._meta.updateTag({content:description},"property='og:description'");
- this._meta.updateTag({content:title},"property='og:title'");
+
+ let description = "OpenAIRE Research Graph";
+
+ this._title.setTitle(this.pageTitle);
+ /*this._meta.updateTag({content: description}, "name='description'");
+ this._meta.updateTag({content: description}, "property='og:description'");
+ this._meta.updateTag({content: this.pageTitle}, "property='og:title'");*/
}
-
+
public ngOnInit() {
- this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink+this._router.url, false);
-
- if(this.properties){
- var url = this.properties.domain + this.properties.baseLink+this._router.url;
- this._meta.updateTag({content:url},"property='og:url'");
- if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
- this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
- }
-
-
- this.getNumbers();
- }
+ /*this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this._router.url, false);*/
+ if (this.properties) {
+ /*var url = this.properties.domain + this.properties.baseLink + this._router.url;
+ this._meta.updateTag({content: url}, "property='og:url'");
+ if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
+ this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
+ }*/
+ this.getNumbers();
+ this.animation();
+ }
}
+
public ngOnDestroy() {
for (let sub of this.subs) {
sub.unsubscribe();
}
+ this.clearTimeouts();
}
-
+
+ private animation() {
+ this.timeouts.push(setTimeout(() => {
+ this.animation();
+ if (this.state === (this.portals.length -1)) {
+ this.state = 0
+ } else {
+ this.state++;
+ }
+ }, 4000));
+ }
+
+ private changeSlide(slide: number) {
+ this.clearTimeouts();
+ this.state = slide;
+ this.animation();
+ }
+
+ private clearTimeouts() {
+ this.timeouts.forEach(timeout => {
+ clearTimeout(timeout);
+ });
+ this.state = 0;
+ }
+
private getNumbers() {
this.subs.push(this._searchResearchResultsService.numOfSearchResults("publication", "", this.properties).subscribe(
data => {
- if(data && data > 0 ){
+ if (data && data > 0) {
this.publicationsSize = NumberUtils.roundNumber(data);
-
+
}
},
err => {
@@ -99,7 +126,7 @@ export class HomeComponent {
));
this.subs.push(this._searchResearchResultsService.numOfSearchResults("dataset", "", this.properties).subscribe(
data => {
- if(data && data > 0 ){
+ if (data && data > 0) {
this.datasetsSize = NumberUtils.roundNumber(data);
}
},
@@ -110,7 +137,7 @@ export class HomeComponent {
));
this.subs.push(this._searchResearchResultsService.numOfSearchResultsLinkedToPub("dataset", this.properties).subscribe(
data => {
- if(data && data > 0 ){
+ if (data && data > 0) {
this.datasetsLinkedSize = NumberUtils.roundNumber(data);
}
},
@@ -130,7 +157,7 @@ export class HomeComponent {
));
this.subs.push(this._searchResearchResultsService.numOfSearchResultsLinkedToPub("software", this.properties).subscribe(
data => {
- if(data && data > 0 ){
+ if (data && data > 0) {
this.softwareLinkedSize = NumberUtils.roundNumber(data);
}
},
@@ -148,37 +175,37 @@ export class HomeComponent {
this.handleError("Error getting number of software data", err);
}
));
- this.subs.push(this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"],"project", this.properties).subscribe(
+ this.subs.push(this._refineFieldResultsService.getRefineFieldsResultsByEntityName(["funder"], "project", this.properties).subscribe(
data => {
-
-
- if(data[0] && data[0] > 0 ){
+
+
+ if (data[0] && data[0] > 0) {
this.projectsSize = NumberUtils.roundNumber(data[0]);
}
- if(data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values ){
+ if (data[1].length > 0 && data[1][0].filterId == "funder" && data[1][0].values) {
this.fundersSize = NumberUtils.roundNumber(data[1][0].values.length);
}
-
+
},
err => {
this.handleError("Error getting 'funder' field results of projects", err);
})
);
-
+
this.subs.push(this._searchDataprovidersService.numOfSearchDataproviders("", this.properties).subscribe(
data => {
- if(data && data > 0 ){
+ if (data && data > 0) {
this.datasourcesSize = NumberUtils.roundNumber(data);
}
-
+
},
err => {
this.handleError("Error getting number of content providers", err);
}
));
}
-
+
private handleError(message: string, error) {
- console.error("Home Page: "+message, error);
+ console.error("Home Page: " + message, error);
}
}
diff --git a/src/app/home/portals.ts b/src/app/home/portals.ts
new file mode 100644
index 0000000..53aea70
--- /dev/null
+++ b/src/app/home/portals.ts
@@ -0,0 +1,22 @@
+export const portals: any[] = [
+ {
+ name: 'connect',
+ text: 'Use a trusted partner to share, link, disseminate and monitor your research.'
+ },
+ {
+ name: 'monitor',
+ text: 'Use our monitoring services and easily track all relevant research outcomes.'
+ },
+ {
+ name: 'explore',
+ text: 'Explore all OA research outcomes. Link your research. Build your profile.'
+ },
+ {
+ name: 'provide',
+ text: 'Join OpenAIRE, user our tools and make your content more visible around the world.'
+ },
+ {
+ name: 'osmonitor',
+ text: 'An OpenAIRE service to better understand the European open research landscape, track trends for open access to publications, data, software, reveal hidden potential on existing resources and view open collaboration patterns.'
+ },
+]
diff --git a/src/app/resources/resources.component.css b/src/app/resources/resources.component.css
index e69de29..3e86f27 100644
--- a/src/app/resources/resources.component.css
+++ b/src/app/resources/resources.component.css
@@ -0,0 +1,11 @@
+.uk-card {
+ border-radius: 36px;
+ color: #1a1a1a;
+}
+.panel {
+ border-radius: 15px;
+ background-color: #FDE8EA;
+ color: #292929;
+ font-size: 14px;
+ padding: 20px;
+}
diff --git a/src/app/resources/resources.component.html b/src/app/resources/resources.component.html
index e69de29..7433411 100644
--- a/src/app/resources/resources.component.html
+++ b/src/app/resources/resources.component.html
@@ -0,0 +1,75 @@
+
+
+
+
+
+
Resources
+
+
Start building with OpenAIRE APIs
+
+
+
Not sure where to start? Let us give you some guides and reference documentation.
+
+
+
+
+
+
+
+
+
Quality of Service: all API services are
+ running in production 24/7 within the OpenAIRE infrastructure
+ premises deployed at the data center facilities of the Interdisciplinary Centre for Mathematical and
+ Computational Modelling (ICM).
+
+ OpenAIRE Research Graphlicense is CC-BY:
+ the records returned by the service can be freely re-used by commercial and
+ non-commercial partners under CC-BY license, hence as long as OpenAIRE is acknowledged as a content
+ provider.
+
+
+
+
+
OpenAIRE HTTP API: the APIs are
+ free-to-use
+ (no sign-up needed) by any third-party service.
+
+
Note that: The HTTP API limits each query to 10,000 paged results;
+ for unlimited access to the APIs please
contact us .
+
+
+
+
+
+
+
+
+
+
Metadata Schema
+
+
+
+
+
+
+ The latest versions of the XML schema and documentation are also available at the following permanent links:
+
+
+
+
+
+
diff --git a/src/app/resources/resources.component.ts b/src/app/resources/resources.component.ts
index 2168ca0..9183343 100644
--- a/src/app/resources/resources.component.ts
+++ b/src/app/resources/resources.component.ts
@@ -1,6 +1,6 @@
-import {AfterViewChecked, Component, OnInit} from '@angular/core';
+import {Component, OnInit} from '@angular/core';
import {Title} from '@angular/platform-browser';
-import {ActivatedRoute} from '@angular/router';
+import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
@Component({
selector: 'resources',
@@ -9,25 +9,20 @@ import {ActivatedRoute} from '@angular/router';
})
export class ResourcesComponent implements OnInit {
- constructor(private title: Title,
- private route: ActivatedRoute) {
+ public breadcrumbs: Breadcrumb[] = [
+ {
+ name: 'home',
+ route: '/'
+ },
+ {
+ name: 'resources'
+ }
+ ];
+
+ constructor(private title: Title) {
}
ngOnInit() {
this.title.setTitle('OpenAIRE - Research Graph | Resources');
- // this.route.fragment.subscribe(fragment => {
- // setTimeout(() => {
- // this.goTo(fragment);
- // }, 100);
- // });
}
-
- // goTo(id: string) {
- // const yOffset = -100;
- // const element = document.getElementById(id);
- // if(element) {
- // const y = element.getBoundingClientRect().top + window.pageYOffset + yOffset;
- // window.scrollTo({top: y, behavior: 'smooth'});
- // }
- // }
}
diff --git a/src/app/resources/resources.module.ts b/src/app/resources/resources.module.ts
index ef24f8b..7779620 100644
--- a/src/app/resources/resources.module.ts
+++ b/src/app/resources/resources.module.ts
@@ -3,13 +3,15 @@ import {CommonModule} from "@angular/common";
import {RouterModule} from "@angular/router";
import {ResourcesComponent} from "./resources.component";
+import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
@NgModule({
imports: [
CommonModule,
RouterModule.forChild([{
path: '', component: ResourcesComponent
- }])
+ }]),
+ BreadcrumbsModule
],
declarations: [ResourcesComponent],
exports: [ResourcesComponent]
diff --git a/src/assets/graph-assets/home/10.svg b/src/assets/graph-assets/home/10.svg
deleted file mode 100644
index 115b87c..0000000
--- a/src/assets/graph-assets/home/10.svg
+++ /dev/null
@@ -1 +0,0 @@
-
Asset 1
\ No newline at end of file
diff --git a/src/assets/graph-assets/home/4.svg b/src/assets/graph-assets/home/4.svg
new file mode 100644
index 0000000..d94ad1a
--- /dev/null
+++ b/src/assets/graph-assets/home/4.svg
@@ -0,0 +1 @@
+
graph
\ No newline at end of file
diff --git a/src/assets/graph-assets/home/5.svg b/src/assets/graph-assets/home/5.svg
new file mode 100644
index 0000000..aa99eb9
--- /dev/null
+++ b/src/assets/graph-assets/home/5.svg
@@ -0,0 +1,306 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/assets/graph-assets/home/services/connect.jpg b/src/assets/graph-assets/home/services/connect.jpg
new file mode 100644
index 0000000..8054161
Binary files /dev/null and b/src/assets/graph-assets/home/services/connect.jpg differ
diff --git a/src/assets/graph-assets/home/services/explore.jpg b/src/assets/graph-assets/home/services/explore.jpg
new file mode 100644
index 0000000..f7bbcf8
Binary files /dev/null and b/src/assets/graph-assets/home/services/explore.jpg differ
diff --git a/src/assets/graph-assets/home/services/monitor.jpg b/src/assets/graph-assets/home/services/monitor.jpg
new file mode 100644
index 0000000..16fec74
Binary files /dev/null and b/src/assets/graph-assets/home/services/monitor.jpg differ
diff --git a/src/assets/graph-assets/home/services/osmonitor.jpg b/src/assets/graph-assets/home/services/osmonitor.jpg
new file mode 100644
index 0000000..586b489
Binary files /dev/null and b/src/assets/graph-assets/home/services/osmonitor.jpg differ
diff --git a/src/assets/graph-assets/home/services/provide.jpg b/src/assets/graph-assets/home/services/provide.jpg
new file mode 100644
index 0000000..8f263d7
Binary files /dev/null and b/src/assets/graph-assets/home/services/provide.jpg differ
diff --git a/src/assets/graph-assets/home/synergies/microsoft.png b/src/assets/graph-assets/home/synergies/microsoft.png
new file mode 100644
index 0000000..731f082
Binary files /dev/null and b/src/assets/graph-assets/home/synergies/microsoft.png differ
diff --git a/src/assets/graph-assets/home/synergies/orcid.png b/src/assets/graph-assets/home/synergies/orcid.png
new file mode 100644
index 0000000..9d1dbbb
Binary files /dev/null and b/src/assets/graph-assets/home/synergies/orcid.png differ
diff --git a/src/assets/graph-assets/home/synergies/rda.png b/src/assets/graph-assets/home/synergies/rda.png
new file mode 100644
index 0000000..fff7205
Binary files /dev/null and b/src/assets/graph-assets/home/synergies/rda.png differ
diff --git a/src/assets/graph-assets/home/synergies/unpaywall.png b/src/assets/graph-assets/home/synergies/unpaywall.png
new file mode 100644
index 0000000..15cd2e3
Binary files /dev/null and b/src/assets/graph-assets/home/synergies/unpaywall.png differ
diff --git a/src/assets/graph-assets/resources/1.svg b/src/assets/graph-assets/resources/1.svg
new file mode 100644
index 0000000..60db35f
--- /dev/null
+++ b/src/assets/graph-assets/resources/1.svg
@@ -0,0 +1 @@
+
laptop
\ No newline at end of file
diff --git a/src/assets/graph-assets/resources/2.svg b/src/assets/graph-assets/resources/2.svg
new file mode 100644
index 0000000..6d06800
--- /dev/null
+++ b/src/assets/graph-assets/resources/2.svg
@@ -0,0 +1,65 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <xs:schema xmlns:xs=“ http://www.w3.org/2001/XMLSchema ” xmlns:dri=“ http:// www.driver-repository.eu/namespace/dri ” xmlns=“ http://namespace.openaire.eu/oaf ” elementFormDefault=“ qualified ” targetNamespace=“ http://namespace.openaire.eu/oaf ”> <xs:annotation> <xs:documentation> This schema describes the XML serialization of the OpenAIRE Research Graph. For an overview of the model, please check the OpenAIRE Research Graph Data Model at https://doi.org/10.5281/zenodo.2643199 </xs:documentation> </xs:annotation> <xs:include schemaLocation =“oaf-result-1.0.xsd ”/> <xs:include schemaLocation =“oaf-org-1.0.xsd ”/> <xs:include schemaLocation =“oaf-datasource-1.0.xsd ”/>
+ oaf.xsd
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ openaire.eu/oaf.html
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index 75af5ba..2c6032d 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -2,7 +2,7 @@ import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-propert
export let properties: EnvProperties = {
environment: "beta",
- searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
+ searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
helpdesk: "https://www.openaire.eu/support/helpdesk",
helpdeskEmail: "helpdesk@openaire.eu",
cookieDomain: ".openaire.eu",
diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
index adf83e0..06518ad 100644
--- a/src/environments/environment.prod.ts
+++ b/src/environments/environment.prod.ts
@@ -2,7 +2,7 @@ import {EnvProperties} from '../app/openaireLibrary/utils/properties/env-propert
export let properties: EnvProperties = {
environment: "production",
- searchAPIURLLAst: "http://services.openaire.eu/search/v2/api/",
+ searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
helpdesk: "https://www.openaire.eu/support/helpdesk",
helpdeskEmail: "helpdesk@openaire.eu",
cookieDomain: ".openaire.eu",
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 528b6b8..fe5d2c2 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -7,7 +7,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert
export let properties: EnvProperties = {
environment: "development",
- searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
+ searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
helpdesk: "https://www.openaire.eu/support/helpdesk",
helpdeskEmail: "helpdesk@openaire.eu",
cookieDomain: ".di.uoa.gr",
diff --git a/src/styles.css b/src/styles.css
index 0b288c0..428a137 100644
--- a/src/styles.css
+++ b/src/styles.css
@@ -38,11 +38,16 @@ navbar > * {
/* Unordered list*/
ul.portal-circle {
list-style: none;
- padding-left: 40px;
+ padding-left: 20px;
}
ul.portal-circle li {
- margin: 0 0 20px 0;
+ margin: 0 0 15px 0;
+ position: relative;
+}
+
+ul.portal-circle.small li {
+ margin: 0 0 5px 0;
position: relative;
}