From 17040a402bd88afbb31a6c75711b7a0bbb03ff65 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 16 Sep 2020 09:33:56 +0000 Subject: [PATCH] [Usage Counts | Trunk]: Fix some backgrounds --- src/app/about/about.component.css | 33 +++++++++---------- src/app/about/about.component.html | 18 +++++----- src/app/about/about.component.ts | 12 +++++-- src/app/app.component.html | 5 ++- src/app/app.routing.ts | 5 +-- src/app/home/home.component.html | 32 ++++++++++-------- src/app/resources/resources.component.css | 2 +- src/app/resources/resources.component.ts | 14 +++++--- src/assets/usage-statistics-assets/home/1.svg | 2 +- src/environments/environment.ts | 2 +- src/styles.css | 2 +- 11 files changed, 72 insertions(+), 55 deletions(-) diff --git a/src/app/about/about.component.css b/src/app/about/about.component.css index 24b821a..49a3151 100644 --- a/src/app/about/about.component.css +++ b/src/app/about/about.component.css @@ -12,23 +12,21 @@ } } -.about-background { - background-image: url("/assets/usage-statistics-assets/about/1.svg"); - background-repeat: no-repeat; - background-position: 0 -30px; - background-size: contain; - position: relative; -} -@media only screen and (max-width: 959px) { + +@media only screen and (min-width: 1200px) { .about-background { - background-size: cover; + background-image: url("/assets/usage-statistics-assets/about/1.svg"); + background-repeat: no-repeat; + background-position: 0 -30px; + background-size: contain; + position: relative; } } .about-background a.next { position: absolute; - bottom: 10%; + bottom: 10vh; right: 10%; color: var(--portal-main-color); line-height: 24px; @@ -54,29 +52,30 @@ background-repeat: no-repeat; background-position: 0 0; background-size: contain; - height: 45vh; + height: 30vh; } @media only screen and (min-width: 1200px) { + .architecture { - position: relative; + background-size: 80% 70%; + height: 450px; } .architecture > div { - top: -30px; - right: -10vw; - width: 400px; background-image: url("/assets/usage-statistics-assets/about/2.2.svg"); background-repeat: no-repeat; background-position: 0 0; - background-size: contain; - position: absolute; + background-size: auto; + margin-top: -50px; + width: 30%; } } @media only screen and (min-width: 1200px) { .workflows img { margin-left: -10%; + align-self: start; } } diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html index 5423cc0..604b93f 100644 --- a/src/app/about/about.component.html +++ b/src/app/about/about.component.html @@ -14,8 +14,9 @@ - + @@ -32,12 +33,10 @@

Architecture

-
-
-
- UsageCounts service collects usage activity from OpenAIRE content providers for usage events related to - research products of the OpenAIRE graph, creates and deploys aggregated statistics for these products. -
+
+
+ UsageCounts service collects usage activity from OpenAIRE content providers for usage events related to + research products of the OpenAIRE graph, creates and deploys aggregated statistics for these products.
@@ -48,7 +47,8 @@

Architecture & Workflows

- +

Architecture functionalities

diff --git a/src/app/about/about.component.ts b/src/app/about/about.component.ts index aad83c1..d8561cd 100644 --- a/src/app/about/about.component.ts +++ b/src/app/about/about.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {AfterViewChecked, Component, OnInit} from '@angular/core'; import {faqs} from './faqs'; import {ActivatedRoute} from '@angular/router'; import {Title} from '@angular/platform-browser'; @@ -8,14 +8,20 @@ import {Title} from '@angular/platform-browser'; templateUrl: 'about.component.html', styleUrls: ['about.component.css'], }) -export class AboutComponent implements OnInit{ +export class AboutComponent implements OnInit { faqs: any[] = faqs; - constructor(private title: Title) { + constructor(private title: Title, + private route: ActivatedRoute) { } ngOnInit() { this.title.setTitle('OpenAIRE - UsageCounts | About'); + this.route.fragment.subscribe(fragment => { + setTimeout(() => { + this.goTo(fragment); + }, 100); + }); } goTo(id: string) { diff --git a/src/app/app.component.html b/src/app/app.component.html index 0abcdce..e234aa5 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -5,7 +5,10 @@
- + diff --git a/src/app/app.routing.ts b/src/app/app.routing.ts index 4d985ef..72d9024 100644 --- a/src/app/app.routing.ts +++ b/src/app/app.routing.ts @@ -34,10 +34,7 @@ const appRoutes: Routes = [ @NgModule({ imports: [RouterModule.forRoot(appRoutes, { preloadingStrategy: PreloadAllModules, - anchorScrolling: 'enabled', - onSameUrlNavigation: 'reload', - scrollPositionRestoration: 'enabled', - scrollOffset: [0, 100] + scrollPositionRestoration: 'top' })], exports: [RouterModule] }) diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 137ccdf..9e45472 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -24,11 +24,8 @@

Why OpenAIRE UsageCounts?

- Register in OpenAIRE (via PROVIDE ), - share usage activity from your repository and receive cleaned and combined - statistics from aggregated usage data from sources around the world. Share - COUNTER - compliant reports via standard SUSHI-Lite APIs. + OpenAIRE UsageCounts is part of an Open Metrics framework which intends to standardize the sharing and exchange + of usage data (views and downloads) and develop trusted metrics to promote open science.
@@ -68,9 +65,13 @@
Repository managers, publishers
- Register in OpenAIRE (via PROVIDE), share usage activity from your repository and receive cleaned and combined - statistics from aggregated usage data from sources around the world. Share COUNTER compliant reports via - standard SUSHI-Lite APIs. + Register in OpenAIRE (via PROVIDE ), + share usage activity from your repository and receive cleaned and combined + statistics from aggregated usage data from sources around the world. Share + COUNTER + compliant reports via standard SUSHI-Lite APIs.
Learn More @@ -79,9 +80,11 @@
-
Research performing & funding organizations, research infrastructures, policy makers
+
Research performing & funding organizations, research infrastructures, policy + makers
- View research uptake, identify science trends based on user activity, examine the engagement and evolution or research popularity. + View research uptake, identify science trends based on user activity, examine the engagement and evolution + or research popularity.
Learn More @@ -99,10 +102,13 @@
    -
  • Provides standards for usage data exchange ( - OpenAIRE Usage Statistics Guidelines ) +
  • Provides standards for usage data exchange ( + OpenAIRE Usage Statistics Guidelines ) +
    • +
  • Complies to COUNTER Code of Practice for reliable and comparable reports
    • -
  • Complies to COUNTER Code of Practice for reliable and comparable reports
  • Follows GDPR for trusted
  • Offers global coverage with partners in
  • Supports analysis via advanced visualizations
    • diff --git a/src/app/resources/resources.component.css b/src/app/resources/resources.component.css index 474c934..af408a0 100644 --- a/src/app/resources/resources.component.css +++ b/src/app/resources/resources.component.css @@ -30,7 +30,7 @@ .provide-background a.next { position: absolute; - bottom: 10%; + bottom: 10vh; right: 10%; color: var(--portal-main-color); line-height: 24px; diff --git a/src/app/resources/resources.component.ts b/src/app/resources/resources.component.ts index d0b3ac0..debd11f 100644 --- a/src/app/resources/resources.component.ts +++ b/src/app/resources/resources.component.ts @@ -1,4 +1,4 @@ -import {Component, OnInit} from '@angular/core'; +import {AfterViewChecked, Component, OnInit} from '@angular/core'; import {Title} from '@angular/platform-browser'; import {ActivatedRoute} from '@angular/router'; @@ -7,13 +7,19 @@ import {ActivatedRoute} from '@angular/router'; templateUrl: 'resources.component.html', styleUrls: ['resources.component.css'], }) -export class ResourcesComponent implements OnInit{ - - constructor(private title: Title) { +export class ResourcesComponent implements OnInit { + + constructor(private title: Title, + private route: ActivatedRoute) { } ngOnInit() { this.title.setTitle('OpenAIRE - UsageCounts | Resources'); + this.route.fragment.subscribe(fragment => { + setTimeout(() => { + this.goTo(fragment); + }, 100); + }); } goTo(id: string) { diff --git a/src/assets/usage-statistics-assets/home/1.svg b/src/assets/usage-statistics-assets/home/1.svg index e175027..f1dfbe5 100644 --- a/src/assets/usage-statistics-assets/home/1.svg +++ b/src/assets/usage-statistics-assets/home/1.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 738f54c..7f8210f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -14,7 +14,7 @@ export let properties: EnvProperties = { userInfoUrl: 'http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=', logoutUrl: 'https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=', cookieDomain: '.di.uoa.gr', - cacheUrl: "http://mpagasas.di.uoa.gr:3200/get?url=", + cacheUrl: "https://demo.openaire.eu/cache/get?url=", adminToolsAPIURL: 'http://duffy.di.uoa.gr:8080/uoa-admin-tools/', reCaptchaSiteKey: '6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu', admins: ['kostis30fylloy@gmail.com'], diff --git a/src/styles.css b/src/styles.css index 02ca03c..f386947 100644 --- a/src/styles.css +++ b/src/styles.css @@ -87,7 +87,7 @@ ul.light-blue-circle li { } ul.light-blue-circle.large li { - margin: 0 0 50px 0; + margin: 0 0 40px 0; } ul.light-blue-circle li:last-child {