From c81a120c90cfcfd51ac14f47de6005473e730a3a Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Mon, 8 Nov 2021 17:26:02 +0200 Subject: [PATCH 1/3] Add new styles and update openaireLibrary, assets --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- explore/src/assets/explore-custom.css | 38 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index b2ad62b6..3632510e 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit b2ad62b6ad0e7c36e6be4b7a3de39631a81fd9bc +Subproject commit 3632510e387b3a83f8d8e0f27cd796912a19c741 diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 443ef4d5..318c6560 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 443ef4d544d370c698ed0856481b71e489a044d8 +Subproject commit 318c6560565a7a0da818385de27ebb430b22aea3 diff --git a/explore/src/assets/explore-custom.css b/explore/src/assets/explore-custom.css index 443dc714..c6c30d99 100644 --- a/explore/src/assets/explore-custom.css +++ b/explore/src/assets/explore-custom.css @@ -206,3 +206,41 @@ border-radius: 6px; } +.flex-column { + display: flex; + flex-direction: column; +} + +.min-width-30 { + min-width: 30%; +} + +.verticalLine { + height: 100%; + width: 2px; + background-color: #DEDEDE; + opacity: 0.7; +} + +.flex-gap { + grid-gap: 40px; +} + +.padding-left { + padding-left: 30px; +} + +.gateway-link-logo { + /* max-width: 80px; */ + max-height: 50px; + width: auto; + margin-bottom: 10px; +} + +.relative { + position: relative !important; +} + +.custom-height-130 { + max-height: 130px; +} \ No newline at end of file From ab8654a3f83f3db82c55541fbf3ab685077e85d5 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Mon, 8 Nov 2021 18:43:23 +0200 Subject: [PATCH 2/3] Add new login/logout/userInfo in development properties --- explore/src/environments/environment.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/explore/src/environments/environment.ts b/explore/src/environments/environment.ts index ef17521c..2d20ed9a 100644 --- a/explore/src/environments/environment.ts +++ b/explore/src/environments/environment.ts @@ -55,10 +55,9 @@ export let properties: EnvProperties = { piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "6", - loginUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_connect_login", - userInfoUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", - logoutUrl: "http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/openid_logout", - + loginUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_connect_login", + userInfoUrl: "http://mpagasas.di.uoa.gr:8080/login-service/userInfo", + logoutUrl: "http://mpagasas.di.uoa.gr:8080/login-service/openid_logout", cookieDomain: ".di.uoa.gr", feedbackmail: "kostis30fylloy@gmail.com", From b52637ca3790772138f0a9cb624fd5d1b6b8550d Mon Sep 17 00:00:00 2001 From: argirok Date: Tue, 9 Nov 2021 16:02:32 +0200 Subject: [PATCH 3/3] add links to special subjects in the landing page --- explore/src/app/openaireLibrary | 2 +- explore/src/assets/common-assets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/explore/src/app/openaireLibrary b/explore/src/app/openaireLibrary index 3632510e..3d6b358c 160000 --- a/explore/src/app/openaireLibrary +++ b/explore/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 3632510e387b3a83f8d8e0f27cd796912a19c741 +Subproject commit 3d6b358c9a833b0b8683e4a9e9d6557bf40d3b5f diff --git a/explore/src/assets/common-assets b/explore/src/assets/common-assets index 318c6560..999d3833 160000 --- a/explore/src/assets/common-assets +++ b/explore/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 318c6560565a7a0da818385de27ebb430b22aea3 +Subproject commit 999d3833d3805534677aa741a3759e26e09b50f2