Merge branch 'master' of code-repo.d4science.org:MaDgIK/explore-services

 Conflicts:

	explore/src/app/openaireLibrary

explore/src/app/openaireLibrary

@@ -1 +1 @@
-Subproject commit e99a4258135aab1c1147aaaf60e06dbd63d77505
+Subproject commit 9e1c4b6a89999d531e0a2fab8e9227eba95760d3

explore/src/assets/common-assets

@@ -1 +1 @@
-Subproject commit 443ef4d544d370c698ed0856481b71e489a044d8
+Subproject commit 999d3833d3805534677aa741a3759e26e09b50f2

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;
+}

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",