From 5cb2c9f1ba862d640ad4ff436feaef8686ac4a81 Mon Sep 17 00:00:00 2001 From: argirok Date: Thu, 25 Nov 2021 16:10:20 +0200 Subject: [PATCH] Update graphSectionText, update footer view, add grant aggeement text, update login with new single login service --- src/app/app.component.ts | 2 +- src/app/utils/aggregators.ts | 7 ++++--- src/environments/environment.beta.ts | 12 ++++++------ src/environments/environment.prod.ts | 4 +++- src/environments/environment.ts | 3 ++- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index e8d42d7..469ebe3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -36,7 +36,7 @@ import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll"; ratio="1"> - + ` }) diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index dd1372a..87f64cf 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -1,5 +1,6 @@ import {SearchCustomFilter} from "../openaireLibrary/searchPages/searchUtils/searchUtils.class"; import {Portal} from "../openaireLibrary/utils/entities/adminTool/portal"; +import {properties} from "../../environments/environment"; export class AggregatorInfo { menuId: string; @@ -36,8 +37,8 @@ export class PortalAggregators { static list: AggregatorInfo[] = [ new AggregatorInfo("canada", "Canadian Aggregator", "assets/canada-logo.png", "Country", "country", "CA", "Canada","#E80000","#ad0000", "/assets/canada-background.svg", "Portal to Canadian Research Outputs", ` - Welcome to the beta Portal to Canadian Research Outputs, which has been developed as part of a - collaboration between CARL and OpenAIRE as part of the OpenAIRE Advance Project. The portal enables users + Welcome to the Canadian Research Outputs`+ (properties.environment != 'production'?' beta':'') + ` Portal, which has been developed as part of a + collaboration between CARL and OpenAIRE in the context of the OpenAIRE Advance Project. The portal enables users to search and browse Canadian content that is included in the OpenAIRE aggregation. The number of research products is expected to grow in 2021 as more Canadian repositories become compliant with OpenAIRE guidelines and Canadian affiliation information is enhanced. For more information, visit the @@ -46,7 +47,7 @@ export class PortalAggregators {
- Bienvenue sur la version bêta du portail des résultats de la recherche canadienne, qui a été développé dans le cadre d'une collaboration entre l'ABRC et OpenAIRE dans le contexte du projet OpenAIRE Advance. Le portail permet aux utilisateurs de repérer et de parcourir le contenu canadien inclus sur la plateforme OpenAIRE. La quantité des résultats de la recherche canadienne disponible sur la plateforme augmentera tout au long de l'année 2021 au fur et à mesure que les dépôts canadiens se conformeront aux directives d'OpenAIRE et que les détails relatifs aux affiliations canadiennes seront améliorés. Pour plus d'informations, + Bienvenue sur ` + (properties.environment != 'production'?'la version bêta du portail':'le portal') + ` des résultats de la recherche canadienne, qui a été développé dans le cadre d'une collaboration entre l'ABRC et OpenAIRE dans le contexte du projet OpenAIRE Advance. Le portail permet aux utilisateurs de repérer et de parcourir le contenu canadien inclus sur la plateforme OpenAIRE. La quantité des résultats de la recherche canadienne disponible sur la plateforme augmentera tout au long de l'année 2021 au fur et à mesure que les dépôts canadiens se conformeront aux directives d'OpenAIRE et que les détails relatifs aux affiliations canadiennes seront améliorés. Pour plus d'informations, veuillez visiter le site Web de l’ABRC. `), diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 79604c6..455eb39 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -46,11 +46,9 @@ export let properties: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "553", - loginUrl: "https://beta.services.openaire.eu/explore-login/openid_connect_login", - - userInfoUrl: "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", - - logoutUrl: "https://beta.services.openaire.eu/explore-login/openid_logout", + loginUrl: "https://beta.services.openaire.eu/login-service/openid_connect_login", + userInfoUrl: "https://beta.services.openaire.eu/login-service/userInfo", + logoutUrl: "https://beta.services.openaire.eu/login-service/openid_logout", cookieDomain: ".openaire.eu", @@ -115,5 +113,7 @@ export let properties: EnvProperties = { depositLearnHowPage: "/participate/deposit/learn-how", depositSearchPage: "/participate/deposit/search", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P" + reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", + footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" + }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index e145686..39e2827 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -117,5 +117,7 @@ export let properties: EnvProperties = { depositLearnHowPage: "/participate/deposit/learn-how", depositSearchPage: "/participate/deposit/search", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P" + reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", + footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" + }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index f21e510..426ee7d 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -117,5 +117,6 @@ export let properties: EnvProperties = { depositLearnHowPage: "/participate/deposit/learn-how", depositSearchPage: "/participate/deposit/search", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu" + reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu", + footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" };