From fe0704eda95ea49492111185a452c8bb4c471f5e Mon Sep 17 00:00:00 2001 From: "stefania.martziou" Date: Fri, 12 Jun 2020 13:45:47 +0000 Subject: [PATCH] Working on the new version of the oso - almost done with tha mobile version of the pages --- .../continent-overview.component.html | 451 +++++-- .../continent-overview.component.ts | 3 + .../countrypage/country-page.component.html | 1110 +++++++++-------- src/app/pages/home/home.component.html | 654 ++++++---- src/app/pages/home/home.component.ts | 31 +- src/app/services/data-handler.service.ts | 22 + src/app/services/data.service.ts | 7 +- src/app/shared/footer/footer.component.html | 137 +- .../shared/topmenu/top-menu.component.html | 204 ++- src/app/shared/topmenu/top-menu.component.ts | 12 +- src/assets/css/os-observatory-custom.css | 169 ++- src/assets/img/OS_Logo_Vertical.svg | 1 + src/assets/img/OS_Logo_small.svg | 1 + src/assets/img/flags/es-flag.svg | 1 - src/assets/img/flags/gb-flag.svg | 7 +- src/assets/img/icons/other-icon.svg | 1 + src/assets/img/icons/software-icon.svg | 9 + 17 files changed, 1733 insertions(+), 1087 deletions(-) create mode 100644 src/assets/img/OS_Logo_Vertical.svg create mode 100644 src/assets/img/OS_Logo_small.svg create mode 100644 src/assets/img/icons/other-icon.svg create mode 100644 src/assets/img/icons/software-icon.svg diff --git a/src/app/pages/continentoverview/continent-overview.component.html b/src/app/pages/continentoverview/continent-overview.component.html index 0cc1ce196..4306eb0c6 100644 --- a/src/app/pages/continentoverview/continent-overview.component.html +++ b/src/app/pages/continentoverview/continent-overview.component.html @@ -1,142 +1,306 @@
+
-
    -
  • Home
    • -
  • {{continentName | titlecase}}
    • -
+ +
+
    +
  • Home
    • +
  • {{continentName | titlecase}}
    • +
-
- -
-

{{continentName | titlecase}}

- Info Last Updated: 21 May 2020 +
+ +
+

{{continentName | titlecase}}

+ Info Last Updated: 21 May 2020 +
+
+
+ + +
+
+ +
+

{{continentName | titlecase}}

+ Info Last Updated: 21 May 2020 +
-
+ + +
-
-
+ +
+
+
- - -
-
- - + + +
+
+ + {{europeOverviewData.publications.percentage | number :'1.0-1'}}% - Publications + Publications +
-
- - -
+ + +
-
- +
+ - - -
-
- - + + +
+
+ + {{europeOverviewData.datasets.percentage | number :'1.0-1'}}% - Datasets + Datasets +
-
- - -
+ + +
-
- +
+ - - -
-
- - + + +
+
+ + {{europeOverviewData.software.percentage | number :'1.0-1'}}% - Software + Software +
-
- - -
+ + +
-
- +
+ - - -
-
- - + + +
+
+ + {{europeOverviewData.other.percentage | number :'1.0-1'}}% - Other + Other +
+
+ + +
+ +
+ + +
+ +
+ +
+ +
+
+
+ Lorem Ipsum Lorem Ipsum Lorem Ipsum
- - -
- +
+
+
+ Lorem Ipsum Lorem Ipsum Lorem Ipsum +
+
+
+
+
+ Lorem Ipsum Lorem Ipsum Lorem Ipsum +
+
+
+
+
+ Lorem Ipsum Lorem Ipsum Lorem Ipsum +
- +
-
+ +
+
-
+
-
-
-
- Lorem Ipsum Lorem Ipsum Lorem Ipsum -
-
-
-
-
- Lorem Ipsum Lorem Ipsum Lorem Ipsum -
-
-
-
-
- Lorem Ipsum Lorem Ipsum Lorem Ipsum -
-
-
-
-
- Lorem Ipsum Lorem Ipsum Lorem Ipsum -
-
+ + +
+
+ +
+
+ + +
+
+ + + + +
+
+ +
+
+ + +
+ +
+ + + + +
+
+ +
+
+ + +
+ +
+ + + + +
+
+ +
+
+ + +
+ +
+ + +
+
+ +
+ + +
+
+
+
+
+ + Publications +
+
+ {{europeOverviewData.publications.percentage | number : '1.0-1'}}% +
+
+
+
+
+ + + +
+
+
+
+
+ + Datasets +
+
+ {{europeOverviewData.datasets.percentage | number : '1.0-1'}}% +
+
+
+
+
+ + + +
+
+
+
+
+ + Software +
+
+ {{europeOverviewData.software.percentage | number : '1.0-1'}}% +
+
+
+
+
+ + + +
+
+
+
+
+ + Other +
+
+ {{europeOverviewData.other.percentage | number : '1.0-1'}}% +
+
+
+
+
+ + +
+ +
@@ -145,7 +309,9 @@
-
    + + + -
      + + + +
        +
      • - + + + + + + + + + + + + + + + + + + + + + + + + +
        + +
        +
        +
        + +
        +
        +
        + +
        + +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + +
        +
        +
        + + +
        + + +
        • diff --git a/src/app/pages/continentoverview/continent-overview.component.ts b/src/app/pages/continentoverview/continent-overview.component.ts index 138450d4a..a612c6828 100644 --- a/src/app/pages/continentoverview/continent-overview.component.ts +++ b/src/app/pages/continentoverview/continent-overview.component.ts @@ -22,6 +22,9 @@ export class ContinentOverviewComponent implements OnInit { private sanitizer: DomSanitizer) { } ngOnInit(): void { + + window.scroll(0, 0); + this.continentName = this.route.snapshot.paramMap.get('continentName'); this.dataService.getEuropeOAPercentages().subscribe( diff --git a/src/app/pages/countrypage/country-page.component.html b/src/app/pages/countrypage/country-page.component.html index 2e49386d2..0294d6ec3 100644 --- a/src/app/pages/countrypage/country-page.component.html +++ b/src/app/pages/countrypage/country-page.component.html @@ -1,620 +1,658 @@ -
        -
        - +
        +
        +
        + -
        +
        -
        +
        -
        +
        -
          -
        • Home
          • -
        • {{countryName}}
          • -
        + +
        +
          +
        • Home
          • +
        • {{countryPageOverviewData.name}}
          • +
        -
        -
        - -
        -

        {{countryPageOverviewData.name}}

        - Info Last Updated: 21 May 2020 +
        +
        + +
        +

        {{countryPageOverviewData.name}}

        + Info Last Updated: 21 May 2020 +
        +
        + +
        + Embed + + Download PDF +
        -
        - Embed - - Download PDF + +
        +
        + +
        +

        {{countryPageOverviewData.name}}

        + Info Last Updated: 21 May 2020 +
        +
        + + +
        -
        +
        -
        - -
        -
        - + + +
        +
        +
        + -
        -
        -
        +
        +
        +
        - -
        - - - -

        - -- - {{countryPageOverviewData.publicationsAffiliated.oa | number}} -

        + +
        + + + +

        + -- + {{countryPageOverviewData.publicationsAffiliated.oa | number}} +

        +
        +
        + OA publications affiliated to an organization in the country +
        +
        + {{countryPageOverviewData.publicationsAffiliated.percentage | number :'1.0-1'}}% OA +
        +
        +
        +
        + +
        + + +
        +
        + +
        +

        + -- + {{countryPageOverviewData.publicationsDeposited.oa | number}} +

        +
        +
        + OA publications from institutional repositories +
        +
        + {{countryPageOverviewData.publicationsDeposited.percentage | number :'1.0-1'}}% OA +
        +
        +
        +
        + +
        -
        - OA publications affiliated to an organization in the country +
        + +
        +
        +
        + + +
        + + + +

        + -- + {{countryPageOverviewData.datasetsAffiliated.oa | number}} +

        +
        +
        + OA datasets affiliated to an organization in the country +
        +
        + {{countryPageOverviewData.datasetsAffiliated.percentage | number :'1.0-1'}}% OA +
        +
        +
        +
        + +
        + + +
        +
        + +
        +

        + -- + {{countryPageOverviewData.datasetsDeposited.oa | number}} +

        +
        +
        + OA datasets from institutional repositories +
        +
        + {{countryPageOverviewData.datasetsDeposited.percentage | number :'1.0-1'}}% OA +
        +
        +
        +
        +
        -
        - {{countryPageOverviewData.publicationsAffiliated.percentage | number :'1.0-1'}}% OA -
        +
        + +
        + +
        +
        +
        +
        + +
        +

        + -- + {{countryPageOverviewData.repositories.oa | number}} +

        +
        +
        + repositories from openDOAR & re3data +
        +
        + {{countryPageOverviewData.repositories.percentage | number :'1.0-1'}}% Validated +
        +
        +
        +
        +
        +
        + +
        +
        +
        +
        + +
        +

        + -- + {{countryPageOverviewData.journals.oa | number}} + + +

        +
        +
        + OA journals from DOAJ +
        +
        + {{countryPageOverviewData.journals.percentage | number :'1.0-1'}}% Validated +
        +
        +
        +
        +
        +
        + +
        + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
        + +
        +
        +
        +
        + +
        +

        + -- + + +

        +
        +
        + organizations with OA policies +
        +
        +
        + +
        +
        +
        +
        +
        + + +
        +
        +
        + + +
        +
        + +
        +
        +
        {{countryPageOverviewData.publicationsAffiliated.oa | number}}
        +
        --
        +
        OA PUBLICATIONS AFFILIATED TO AN ORGANIZATION IN THE COUNTRY
        +
        +
        +
        -
        - -
        - - -
        -
        - +
        + {{countryPageOverviewData.publicationsAffiliated.percentage | number :'1.0-1'}}% OA
        -

        - -- - {{countryPageOverviewData.publicationsDeposited.oa | number}} -

        -
        - OA publications from institutional repositories +
        +
        +
        -
        - {{countryPageOverviewData.publicationsDeposited.percentage | number :'1.0-1'}}% OA -
        +
        +
        {{countryPageOverviewData.publicationsDeposited.oa | number}}
        +
        --
        +
        OA PUBLICATIONS FROM INSTITUTIONAL REPOSITORIES
        +
        +
        +
        +
        + {{countryPageOverviewData.publicationsDeposited.percentage | number :'1.0-1'}}% OA +
        -
        -
        -
        -
        -
        -
        - - -
        - - - -

        - -- - {{countryPageOverviewData.datasetsAffiliated.oa | number}} -

        +
        +
        +
        -
        - OA datasets affiliated to an organization in the country +
        +
        {{countryPageOverviewData.datasetsAffiliated.oa | number}}
        +
        --
        +
        OA DATASETS AFFILIATED TO AN ORGANIZATION IN THE COUNTRY
        -
        - {{countryPageOverviewData.datasetsAffiliated.percentage | number :'1.0-1'}}% OA -
        +
        +
        -
        - -
        - - -
        -
        - +
        + {{countryPageOverviewData.datasetsAffiliated.percentage | number :'1.0-1'}}% OA
        -

        - -- - {{countryPageOverviewData.datasetsDeposited.oa | number}} -

        -
        - OA datasets from institutional repositories +
        +
        +
        -
        - {{countryPageOverviewData.datasetsDeposited.percentage | number :'1.0-1'}}% OA -
        +
        +
        {{countryPageOverviewData.datasetsDeposited.oa | number}}
        +
        --
        +
        OA DATASETS FROM INSTITUTIONAL REPOSITORIES
        +
        +
        +
        +
        + {{countryPageOverviewData.datasetsDeposited.percentage | number :'1.0-1'}}% OA +
        -
        -
        -
        - -
        -
        -
        -
        - -
        -

        - -- - {{countryPageOverviewData.repositories.oa | number}} -

        +
        +
        +
        -
        - repositories from openDOAR & re3data +
        +
        {{countryPageOverviewData.repositories.oa | number}}
        +
        --
        +
        VALIDATED REPOSITORIES
        -
        - {{countryPageOverviewData.repositories.percentage | number :'1.0-1'}}% Validated -
        +
        +
        +
        + {{countryPageOverviewData.repositories.percentage | number :'1.0-1'}}% VALIDATED +
        -
        -
        -
        -
        -
        - -
        -

        - -- - {{countryPageOverviewData.journals.oa | number}} - - -

        +
        +
        +
        -
        - OA journals from DOAJ +
        +
        {{countryPageOverviewData.journals.oa | number}}
        +
        --
        +
        VALIDATED JOURNALS
        -
        - {{countryPageOverviewData.journals.percentage | number :'1.0-1'}}% Validated -
        +
        +
        -
        -
        -
        - -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        - -
        -
        -
        -
        - +
        + {{countryPageOverviewData.journals.percentage | number : '1.0-1'}}% Validated
        -

        - -- - - -

        -
        -
        - organizations with OA policies
        -
        -
        +
        +
        + +
        +
        +
        {{countryPageOverviewData.policies.oa | number}}
        +
        --
        +
        OA POLICIES
        +
        +
        + +
        +
        + +
        + +
        +
        - -
        -

        - Green vs. Gold - -

        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - - -
        -
        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        - - -
        -

        - EU funded Open Science - -

        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        -
        -
        -
        -
        - - - -
        -

        - Organisations -

        -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        -
        -
        -
        -
        -
        -
        - - - -
        -

        - Repositories -

        -
        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        -
        -
        -
        -
        - - -
        -

        - Funding sources - -

        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        - - -
        -

        - Project performance - -

        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        -
        -
        - - - -
        -

        - -

        -
        -
        - -
        -
        -
        -
        -
        -
        - - -
        -
        - -
        -

        - Research overview -

        -
        - -
        -
        - -
        - -- - R&D expenditure -
        - -
        - -
        - {{countryPageOverviewData.funders}} - -- - funding sources -
        - -
        - -
        - {{countryPageOverviewData.fundingOrganizations}} - -- - funding organizations -
        - -
        - -
        - {{countryPageOverviewData.ec_fundedOrganizations}} - -- - organizations funded by the European commission since 2013 -
        + + +
        +
        +
        +

        + Research overview +

        +
        +
        -
        +
        + -- + R&D expenditure +
        -
        +
        + +
        + {{countryPageOverviewData.funders}} + -- + funding sources +
        + +
        + +
        + {{countryPageOverviewData.fundingOrganizations}} + -- + funding organizations +
        + +
        + +
        + {{countryPageOverviewData.ec_fundedOrganizations}} + -- + organizations funded by the European commission since 2013 +
        + +
        + + +
        + +
        +
        + Country page in OpenAIRE
        - Country page in OpenAIRE -
        +
        + + + +
        +
        +
        +
        +
        + +
        +
        --
        +
        R&D EXPENDITURE
        +
        + +
        +
        {{countryPageOverviewData.funders}}
        +
        --
        +
        FUNDING SOURCES
        +
        + +
        +
        {{countryPageOverviewData.fundingOrganizations}}
        +
        --
        +
        FUNDING ORGANIZATIONS
        +
        + +
        +
        {{countryPageOverviewData.ec_fundedOrganizations}}
        +
        --
        +
        ORGANIZATIONS FUNDED BY THE EUROPEAN COMMISSION SINCE 2013
        +
        + +
        +
        +
        +
        +
        + +
        - - - - +
        +
        - - - + +
        +
        - - - - - - - - - - - - - - - - - - - - - +
        - + + - + + - - - - +
          + + +
        • +
          + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
          +
          • + + + + + +
        +
        +
        + + + +
        +
        + +
        + + + +
        + Country page in OpenAIRE +
        -
        + +
+ diff --git a/src/app/pages/home/home.component.html b/src/app/pages/home/home.component.html index bd2894047..87a0e7bbc 100644 --- a/src/app/pages/home/home.component.html +++ b/src/app/pages/home/home.component.html @@ -1,331 +1,473 @@ - -
-
+ +
+ +
+
-
+
-
+
- - - + + + -
+
-
-
- -
-

OPENAIRE MONITOR OBSERVATORY

-
-
-
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 -
    • -
  • - View open collaboration patterns -
    • -
-
- +
+
+ +
+

OPENAIRE MONITOR OBSERVATORY

+
+
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 +
    • +
  • + View open collaboration patterns +
    • +
+
+ +
-
-
- +
+
+ - -
-

- - - {{selectedCountry.name | uppercase}} -

-
-
- + +
+

+ + + {{selectedCountry.name | uppercase}} +

+
+
+ - + - -
-
-
+ +
+
+
-
- {{selectedCountryData.publicationsAffiliated | number}} - -- - OA publications affiliated to an organization in the country -
+
+ {{selectedCountryData.publicationsAffiliated | number}} + -- + OA publications affiliated to an organization in the country +
-
- {{selectedCountryData.publicationsDeposited | number}} - -- - OA publications from institutional repositories -
+
+ {{selectedCountryData.publicationsDeposited | number}} + -- + OA publications from institutional repositories +
-
+
-
- {{selectedCountryData.datasetsAffiliated | number}} - -- - OA datasets affiliated to an organization in the country -
+
+ {{selectedCountryData.datasetsAffiliated | number}} + -- + OA datasets affiliated to an organization in the country +
-
- {{selectedCountryData.datasetsDeposited | number}} - -- - OA datasets from institutional repositories -
+
+ {{selectedCountryData.datasetsDeposited | number}} + -- + OA datasets from institutional repositories +
-
+
-
- {{selectedCountryData.repositories | number}} - -- - repositories from openDOAR & re3data -
+
+ {{selectedCountryData.repositories | number}} + -- + repositories from openDOAR & re3data +
-
+
-
- {{selectedCountryData.journals | number}} - -- - journals from DOAJ -
+
+ {{selectedCountryData.journals | number}} + -- + journals from DOAJ +
-
+
+ +
+ {{selectedCountryData.policies | number}} + -- + organisations with OA policies +
-
- {{selectedCountryData.policies | number}} - -- - organisations with OA policies
-
+
+ + + +
-
- - -
- -
-
- +
+ +
-
- + - - + + - + +
+
+
-
-
- -
- -
-
-
-
-
-
-
- +
+ +
+
+
+
+
+
+
+ +
+

+ {{europeOverviewData.publications.oa | number}} + -- +

-

- {{europeOverviewData.publications.oa | number}} - -- -

-
-
- - OA publications -
-
- {{europeOverviewData.publications.percentage | number :'1.0-1'}}% OA -
-
+
+ + OA publications +
+
+ {{europeOverviewData.publications.percentage | number :'1.0-1'}}% OA +
+
+
-
-
-
-
-
-
- +
+
+
+
+
+ +
+

+ {{europeOverviewData.datasets.oa | number}} + -- +

-

- {{europeOverviewData.datasets.oa | number}} - -- -

-
-
- - OA datasets -
-
- {{europeOverviewData.datasets.percentage | number :'1.0-1'}}% OA -
-
+
+ + OA datasets +
+
+ {{europeOverviewData.datasets.percentage | number :'1.0-1'}}% OA +
+
+
-
-
-
-
-
-
- +
+
+
+
+
+ +
+

+ {{europeOverviewData.repositories.oa | number}} + -- +

-

- {{europeOverviewData.repositories.oa | number}} - -- -

-
-
- validated repositories -
-
- {{europeOverviewData.repositories.percentage | number : '1.0-1'}}% Validated -
-
+
+ validated repositories +
+
+ {{europeOverviewData.repositories.percentage | number : '1.0-1'}}% Validated +
+
+
-
-
-
-
-
-
- +
+
+
+
+
+ +
+

+ {{europeOverviewData.journals.oa | number}} + -- +

-

- {{europeOverviewData.journals.oa | number}} - -- -

-
-
- validated OA journals -
-
- {{europeOverviewData.journals.percentage | number : '1.0-1'}}% Validated -
-
+
+ validated OA journals +
+
+ {{europeOverviewData.journals.percentage | number : '1.0-1'}}% Validated +
+
+
-
-
-
-
-
-
- +
+
+
+
+
+ +
+

+ {{europeOverviewData.policies.oa | number}} + -- +

-

- {{europeOverviewData.policies.oa | number}} - -- -

-
-
- - organizations with OA policies -
- +
+ + organizations with OA policies +
+ - + +
+
- -
-
+
- -
-
+ +
+
-

OA in Europe

+

OA in Europe

-
-
- - +
+
+ + +
+
+ +
+
+
+ + + +
+ +
+
+ + + + + + + + +
+
+ + + +
+
+ + +
+
+ +
+
+ +

OA in Europe

+ +
+
+ + +
+
+ +
+
+
{{europeOverviewData.publications.oa | number}}
+
--
+
OA PUBLICATIONS
+
+
+
+
+
+
+ {{europeOverviewData.publications.percentage | number :'1.0-1'}}% OA +
+
+
+ +
+
+ +
+
+
{{europeOverviewData.datasets.oa | number}}
+
--
+
OA DATASETS
+
+
+
+
+
+
+ {{europeOverviewData.datasets.percentage | number :'1.0-1'}}% OA +
+
+
+ +
+
+ +
+
+
{{europeOverviewData.repositories.oa | number}}
+
--
+
VALIDATED REPOSITORIES
+
+
+
+
+
+
+ {{europeOverviewData.repositories.percentage | number :'1.0-1'}}% VALIDATED +
+
+
+ +
+
+ +
+
+
{{europeOverviewData.journals.oa | number}}
+
--
+
VALIDATED JOURNALS
+
+
+
+
+
+
+ {{europeOverviewData.journals.percentage | number : '1.0-1'}}% Validated +
+
+
+ +
+
+ +
+
+
{{europeOverviewData.policies.oa | number}}
+
--
+
OA POLICIES
+
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +

Leading Open Science

+ +
+ +
+
+ +
+
+ + {{data.name}} +
+
+ + {{data.publicationsAffiliated | number}} + -- + OA publications affiliated to an organization in the country +
+
+ + {{data.publicationsDeposited | number}} + -- + OA publications from institutional repositories +
+
+
+
+ +
+ +
+
+ +
+
+
+ Detailed View of OA in Europe
+
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts index 30685e9df..51a5a953f 100644 --- a/src/app/pages/home/home.component.ts +++ b/src/app/pages/home/home.component.ts @@ -1,6 +1,5 @@ -import { Component, DoCheck, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { DataService } from '../../services/data.service'; -import { CountryOverview, OverviewData } from '../../domain/overview-data'; import {CountryOverviewData, EuropeData, SelectedCountry} from '../../domain/overview-map-data'; import {DataHandlerService} from '../../services/data-handler.service'; @@ -11,15 +10,12 @@ import {DataHandlerService} from '../../services/data-handler.service'; export class HomeComponent implements OnInit { - // overviewData: OverviewData; - europeOverviewData: EuropeData; selectedCountry: SelectedCountry = null; selectedCountryData: CountryOverviewData = null; - // countrySelectedName: string = null; - // countrySelectedOverview: CountryOverview = null; + leadingOpenScienceData: CountryOverviewData[]; constructor(private dataService: DataService, private dataHandlerService: DataHandlerService) { } @@ -36,14 +32,13 @@ export class HomeComponent implements OnInit { } ); - // this.dataService.getOverviewData().subscribe( - // overviewData => { - // this.overviewData = overviewData; - // }, - // error => { - // console.log(error); - // } - // ); + this.dataService.getLeadingOpenScienceMobileData().subscribe( + rawData => { + this.leadingOpenScienceData = this.dataHandlerService.convertRawDataToLeadingOpenScienceData(rawData); + }, error => { + console.log(error); + } + ); } countrySelected(selectedCountry: SelectedCountry) { @@ -57,18 +52,10 @@ export class HomeComponent implements OnInit { console.log(error); } ); - - - // this.countrySelectedOverview = this.overviewData.countries.filter(x => x.country === this.selectedCountry.name)[0]; - // console.log('Country selected overview: ', this.countrySelectedOverview); } deselectCountry() { - this.selectedCountry = null; this.selectedCountryData = null; - - // this.countrySelectedName = null; - // this.countrySelectedOverview = null; } } diff --git a/src/app/services/data-handler.service.ts b/src/app/services/data-handler.service.ts index 768373bfe..ed8e206c2 100644 --- a/src/app/services/data-handler.service.ts +++ b/src/app/services/data-handler.service.ts @@ -580,6 +580,28 @@ export class DataHandlerService { return tableData; } + public convertRawDataToLeadingOpenScienceData(rawData: RawData) { + + const leadingOpenScienceData: CountryOverviewData[] = []; + + for (const series of rawData.datasets) { + if (series.series.query.name === 'new.oso.mobile.overview') { + for (const rowResult of series.series.result) { + + const countryOverviewData: CountryOverviewData = new CountryOverviewData(); + countryOverviewData.name = rowResult.row[1]; + countryOverviewData.code = rowResult.row[0]; + countryOverviewData.publicationsAffiliated = Number(rowResult.row[2]); + countryOverviewData.publicationsDeposited = Number(rowResult.row[3]); + + leadingOpenScienceData.push(countryOverviewData); + } + } + } + + return leadingOpenScienceData; + } + public convertRawDataToCountryPageOverviewData(rawData: RawData) { const countryPageOverviewData: CountryPageOverviewData = new CountryPageOverviewData(); diff --git a/src/app/services/data.service.ts b/src/app/services/data.service.ts index b74558344..74c79b88c 100644 --- a/src/app/services/data.service.ts +++ b/src/app/services/data.service.ts @@ -63,13 +63,18 @@ export class DataService { return this.httpClient.get(this.apiURL + overviewTablePercentageDataQuery, headerOptions); } + public getLeadingOpenScienceMobileData(): Observable { + const leadingOpenScienceMobileDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.mobile.overview%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; + return this.httpClient.get(this.apiURL + leadingOpenScienceMobileDataQuery, headerOptions); + } + public getEuropeOAPercentages(): Observable { const europeOAPercentagesQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.publications.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.datasets.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.software.oa_percentage%22%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.other.oa_percentage%22%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; return this.httpClient.get(this.apiURL + europeOAPercentagesQuery, headerOptions); } public getCountryPageOverviewData(countryCode: string): Observable { - const countryPageOverviewDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.country%22%2C%20%22parameters%22%3A%5B%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.country%22%2C%20%22parameters%22%3A%5B%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies.country%22%2C%20%22parameters%22%3A%5B%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funder.country%22%2C%20%22parameters%22%3A%5B%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funding_organizations.country%22%2C%20%22parameters%22%3A%5B%22DE%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.ec_funded_organizations.country%22%2C%20%22parameters%22%3A%5B%22DE%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; + const countryPageOverviewDataQuery = '%7B%22series%22%3A%5B%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22publication%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.results.oa_percentage.deposited.country%22%2C%20%22parameters%22%3A%5B%22dataset%22%2C%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.repositories.doar_re3data.validated.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.journals.doaj.validated.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.oa_policies.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funder.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.funding_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%2C%7B%22query%22%3A%7B%22name%22%3A%22new.oso.ec_funded_organizations.country%22%2C%20%22parameters%22%3A%5B%22' + countryCode + '%22%5D%7D%7D%5D%2C%22verbose%22%3Atrue%7D'; return this.httpClient.get(this.apiURL + countryPageOverviewDataQuery, headerOptions); } diff --git a/src/app/shared/footer/footer.component.html b/src/app/shared/footer/footer.component.html index 80772e5b4..b72ba321e 100644 --- a/src/app/shared/footer/footer.component.html +++ b/src/app/shared/footer/footer.component.html @@ -1,68 +1,70 @@ -
+
-
+
- + Powered by OpenAIRE Open Research Graph
-
+
- + OpenAIRE-Advance receives funding from the European Union’s Horizon 2020 Research and Innovation programme under Grant Agreement No. 777541.
-
- Terms of use & privacy policy - Sources and methodology -
+ +
+
+ Terms of use & privacy policy + Sources and methodology +
+
+
+
+ + + + + +
+ + + -
-
-
- - - - -
- - - - -
+
Newsletter
@@ -70,7 +72,58 @@
+
+
+ +
+
+ Terms of use & privacy policy + Sources and methodology +
+ +
+
+
+ + + + + +
+ + + + +
+
Newsletter
+ + + + + +
+ +
@@ -80,7 +133,7 @@
-
+
diff --git a/src/app/shared/topmenu/top-menu.component.html b/src/app/shared/topmenu/top-menu.component.html index b8c2bbe5f..0bd2755bc 100644 --- a/src/app/shared/topmenu/top-menu.component.html +++ b/src/app/shared/topmenu/top-menu.component.html @@ -1,134 +1,91 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- +
- -
-
- -
-
-
- Sign in| Register - - -
+ + + + + + + + +
-
+
+ + +
+ + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
  • - About + Home + +
    • +
  • + + OA in Europe
  • diff --git a/src/app/shared/topmenu/top-menu.component.ts b/src/app/shared/topmenu/top-menu.component.ts index 12ec53ea3..ea86184f2 100644 --- a/src/app/shared/topmenu/top-menu.component.ts +++ b/src/app/shared/topmenu/top-menu.component.ts @@ -1,11 +1,17 @@ -import { Component, DoCheck, OnInit, ViewEncapsulation } from '@angular/core'; +import { Component } from '@angular/core'; +import {Router} from '@angular/router'; @Component({ selector: 'app-top-menu', templateUrl: './top-menu.component.html', - // styleUrls: ['./top-menu.component.css'], - encapsulation: ViewEncapsulation.None }) export class TopmenuComponent { + + constructor(private router: Router) { + } + + isHomeRoute() { + return (this.router.url === '/home'); + } } diff --git a/src/assets/css/os-observatory-custom.css b/src/assets/css/os-observatory-custom.css index 5442e7757..438d855f8 100644 --- a/src/assets/css/os-observatory-custom.css +++ b/src/assets/css/os-observatory-custom.css @@ -17,6 +17,10 @@ h3 { font-size: 24px; } +.uk-flex-space-between { + justify-content: space-between; +} + .uk-container-large { max-width: 1600px; } @@ -205,6 +209,14 @@ div.indicator span { color: #A98BD4; } +.software { + color: #C2155A; +} + +.other { + color: #00CCCC; +} + .repositories { color: #708AA5; } @@ -316,6 +328,10 @@ div.indicator span { border-bottom-color: #CA4D9A; } +.uk-tab::before { + border-bottom: none; +} + .dataContainer { background: #F9fbfc 0% 0% no-repeat padding-box; border: 1px solid #E0E0E0; @@ -447,6 +463,12 @@ div.indicator span { text-decoration: underline; } +.footerImage { + opacity: 0.8; + float: left; + margin-top: 7px; +} + /********************************************/ @@ -698,7 +720,8 @@ div.indicator span { .demo-chart { - height: 600px; + /*max-height: 600px;*/ + height: 65vh; } /********* LOADERS *********/ @@ -835,3 +858,147 @@ hr.entitiesDivider { display: flex; justify-content: space-between; } + + +.chartCard.md-card { + box-shadow: 1px 10px 12 px #00000026; + border: 1px solid #E0E0E0; + border-radius: 5px; +} + + + + + +/********* MOBILE ********/ +@media only screen and (max-width: 960px) { + + body { + background: #F9FBFC; + } + + ::-webkit-scrollbar { + width: 0px; + background: transparent; /* make scrollbar transparent */ + } + + .uk-navbar-container:not(.uk-navbar-transparent) { + background: #F9FBFC; + } + + .uk-navbar-item, .uk-navbar-nav>li>a, .uk-navbar-toggle { + min-height: 60px; + } + + .uk-logo > img { + max-height: 125px; + } + + .uk-navbar-toggle-icon { + color: #EC4386; + } + + .searchForCountry.uk-search.uk-search-default { + width: 100%; + background: #FFFFFF 0% 0% no-repeat padding-box; + border: 1px solid #C7C7C7; + border-radius: 4px; + } + + .searchForCountry.uk-search .uk-search-icon { + color: #4687f4; + } + + .progress { + width: 100%; + } + + .overviewMobile .number.big { + font-size: 24px; + } + + .overviewMobile { + font-size: 12px; + } + + .goToDetailedViewLink { + text-align: center; + margin-top: 0px; + } + + .leadingOpenScienceCard { + font-size: 10px; + } + + .leadingOpenScienceCard .number { + font-size: 14px; + } + + .leadingOpenScienceCard .countryName { + font-size: 16px; + font-weight: bold; + } + + .footerSection { + text-align: center; + background-color: #fff; + } + + .footerImage { + opacity: 0.8; + float: none; + margin-top: 0px; + } + + [class*="uk-navbar-dropdown-bottom"] { + margin-top: -5px; + left: 200px !important; + } + + .tm-header-mobile .uk-nav-divider { + margin: 15px 0; + } + + .tm-header-mobile .smallHeader { + background: #FFFFFF 0% 0% no-repeat padding-box; + box-shadow: 0px 3px 6px #00000029; + opacity: 1; + } + + .continentPageEntitiesOverview .number.big { + font-size: 24px; + } + + .continentPageEntitiesOverview .entityName { + font-size: 16px; + font-weight: 600; + } + + .uk-tab { + flex-wrap: nowrap; + overflow-x: auto; + background: #fff; + padding-bottom: 15px; + padding-top: 10px; + margin-right: -20px; + } + + .entitiesContainer { + margin-left: 0px; + height: 200px; + } + + hr.entitiesDivider { + margin-left: -15px; + margin-right: -15px; + } + + .dataContainer { + border: none; + } + + .tabContent { + padding: 30px 0px; + } +} + diff --git a/src/assets/img/OS_Logo_Vertical.svg b/src/assets/img/OS_Logo_Vertical.svg new file mode 100644 index 000000000..1b2ae2ebc --- /dev/null +++ b/src/assets/img/OS_Logo_Vertical.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/OS_Logo_small.svg b/src/assets/img/OS_Logo_small.svg new file mode 100644 index 000000000..efc3a0fa9 --- /dev/null +++ b/src/assets/img/OS_Logo_small.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/flags/es-flag.svg b/src/assets/img/flags/es-flag.svg index 946417643..0a0b319e9 100644 --- a/src/assets/img/flags/es-flag.svg +++ b/src/assets/img/flags/es-flag.svg @@ -3941,4 +3941,3 @@ cOHixj4v1i/L4qes5nO4MLsrVuVDVby9l9V0stoWX2VWrNebXbErP6EpW1Xldrepymz7uvnGK3jT ]]> -353369 \ No newline at end of file diff --git a/src/assets/img/flags/gb-flag.svg b/src/assets/img/flags/gb-flag.svg index 7f6377a85..81360d306 100644 --- a/src/assets/img/flags/gb-flag.svg +++ b/src/assets/img/flags/gb-flag.svg @@ -21,8 +21,8 @@ - @@ -33,7 +33,7 @@ - @@ -514,4 +514,3 @@ dOUChsEzSAEiFYQD15yKE8IpxP9yS1bpr74X8xyvr/loYzM6+bi+1t0rt3MP8n7YzN2mM5BH75JB ]]> -38722 \ No newline at end of file diff --git a/src/assets/img/icons/other-icon.svg b/src/assets/img/icons/other-icon.svg new file mode 100644 index 000000000..5f679f0e7 --- /dev/null +++ b/src/assets/img/icons/other-icon.svg @@ -0,0 +1 @@ + diff --git a/src/assets/img/icons/software-icon.svg b/src/assets/img/icons/software-icon.svg new file mode 100644 index 000000000..8db94f1fd --- /dev/null +++ b/src/assets/img/icons/software-icon.svg @@ -0,0 +1,9 @@ + + + + + + + + +