From 949d9f0a9410d5be0c475c5365d2262a2cb66d27 Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Fri, 12 Jun 2020 17:41:07 +0000 Subject: [PATCH] [Monitor|Trunk] update property files for beta Clean up index.html import css files in styles.css git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@58910 d315682c-612b-4755-9ff5-7f18f6832af3 --- deploy/beta-properties.json | 16 +-- deploy/prepareDeploy.sh | 2 +- server.ts | 2 +- src/app/app.component.ts | 2 +- src/assets/env-properties.json | 4 +- src/assets/monitor-custom.css | 2 +- src/environments/environment.beta.ts | 17 +-- src/index.html | 161 +++++++++++---------------- src/robots.txt | 2 - src/styles.css | 4 + 10 files changed, 92 insertions(+), 120 deletions(-) diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json index b90f3ee..4090abd 100644 --- a/deploy/beta-properties.json +++ b/deploy/beta-properties.json @@ -7,8 +7,8 @@ "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/", - "useNewStatistisTool":false, + "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/", + "useNewStatistisTool":true, "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/", "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", @@ -35,8 +35,9 @@ "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", - "piwikSiteId" : "80", - "loginUrl" :"https://beta.services.openaire.eu/connect-user-management/openid_connect_login", + "piwikSiteId" : "298", + "loginUrl" :"https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login", + "userInfoUrl" : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", @@ -46,7 +47,8 @@ "cacheUrl" :"https://demo.openaire.eu/cache/get?url=", - "monitorServiceAPIURL" :"http://dl170.madgik.di.uoa.gr:8080/uoa-monitor-service", + "monitorServiceAPIURL" :"https://beta.services.openaire.eu/uoa-monitor-service/", + "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools", "adminToolsCommunity" :"monitor", @@ -89,7 +91,7 @@ "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - + "sendMailUrl": "https://beta.services.openaire.eu/uoa-admin-tools/sendMail/", "notifyForNewManagers": "https://beta.services.openaire.eu/uoa-admin-tools/notifyForNewManagers/", "notifyForNewSubscribers": "https://beta.services.openaire.eu/uoa-admin-tools/notifyForNewSubscribers/", @@ -107,7 +109,7 @@ "reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - "admins" : ["rcd-helpdesk@openaire.eu"], + "admins" : ["argirok@di.uoa.gr"], "lastIndexUpdate": "2019-08-07", "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/" } diff --git a/deploy/prepareDeploy.sh b/deploy/prepareDeploy.sh index 0963a37..5743e5a 100755 --- a/deploy/prepareDeploy.sh +++ b/deploy/prepareDeploy.sh @@ -34,7 +34,7 @@ # rm -rf ../src/assets/common-assets/.svn/; # rm -rf ../src/app/openaireLibrary/.svn/; # cd ..; npm run build:ssr; cd deploy; -# rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh; cd ../; rm -rf deploy; + rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh; ../dist/browser/assets/common-assets/.svn/; cd ../; rm -rf deploy; # echo 'Now copy to the server!' ##<-- to here diff --git a/server.ts b/server.ts index 852d757..cf64032 100644 --- a/server.ts +++ b/server.ts @@ -13,7 +13,7 @@ enableProdMode(); // Express server const app = express(); -const PORT = process.env.PORT || 4000; +const PORT = process.env.PORT || 3000; const DIST_FOLDER = join(process.cwd(), 'dist'); // Our index.html we'll use as our template diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d6f9115..efa1de8 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -103,7 +103,7 @@ export class AppComponent { ((this.properties.environment == "production") ? "https://admin.explore.openaire.eu" : "https://beta.admin.connect.openaire.eu") + "/dashboard?communityId=connect", "", false, [], [], {}))*/ this.userMenuItems.push(new MenuItem("", "Manage Stakeholders", - "/admin", "", true, [], [], {})) + properties.baseLink + "/dashboard/admin", "", true, [], [], {})) } this.showMenu = true; } diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index 79eddf9..ce33a79 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -7,7 +7,7 @@ "framesAPIURL" : "https://beta.openaire.eu/stats3/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", - "statisticsFrameNewAPIURL": "http://88.197.53.71:8080/stats-api/", + "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/", "useNewStatistisTool":false, "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", @@ -37,7 +37,7 @@ "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "piwikSiteId" : "80", - "loginUrl" :"http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login", + "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-login/openid_connect_login", "userInfoUrl" : "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=", diff --git a/src/assets/monitor-custom.css b/src/assets/monitor-custom.css index 6354f83..a039510 100644 --- a/src/assets/monitor-custom.css +++ b/src/assets/monitor-custom.css @@ -29,7 +29,7 @@ .datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm, .journalsSearchForm, .journalsTableSearchForm, .entityRegistriesSearchForm, .entityRegistriesTableSearchForm { - background: url('search-background.svg') #F7FCFF no-repeat center bottom ; + background: /*url('search-background.svg')*/ #F7FCFF no-repeat center bottom ; background-size: cover !important; height: inherit; diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 3fe0ebd..03f5470 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -9,8 +9,8 @@ export let properties: EnvProperties = { framesAPIURL: "https://beta.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/", - useNewStatistisTool: false, + statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/", + useNewStatistisTool: true, claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", @@ -37,9 +37,11 @@ export let properties: EnvProperties = { vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", - piwikSiteId: "80", - loginUrl: "https://beta.services.openaire.eu/connect-user-management/openid_connect_login", - + piwikSiteId: "298", + loginUrl :"https://beta.services.openaire.eu/monitor-login/openid_connect_login", + userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", + + logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", cookieDomain: ".openaire.eu", @@ -48,7 +50,8 @@ export let properties: EnvProperties = { cacheUrl: "https://demo.openaire.eu/cache/get?url=", - monitorServiceAPIURL: "http://dl170.madgik.di.uoa.gr:8080/uoa-monitor-service", + monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/", + adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools", adminToolsCommunity: "monitor", @@ -104,7 +107,7 @@ export let properties: EnvProperties = { reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", - admins: ["rcd-helpdesk@openaire.eu"], + admins: ["argirok@di.uoa.gr","kiatrop@di.uoa.gr"], lastIndexUpdate: "2019-08-07", indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/" }; diff --git a/src/index.html b/src/index.html index 3a99951..d9be906 100644 --- a/src/index.html +++ b/src/index.html @@ -1,115 +1,80 @@ - - - - - - - - - + + + + + + + - - + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + - - - - - - +
- - - - + +
- - - - - - -
- - -
- - - - - - - - + diff --git a/src/robots.txt b/src/robots.txt index e44c1d4..c6742d8 100644 --- a/src/robots.txt +++ b/src/robots.txt @@ -1,4 +1,2 @@ User-Agent: * -Disallow: /cache -Disallow: /upload Disallow: / diff --git a/src/styles.css b/src/styles.css index 5f69d4f..c73d3af 100644 --- a/src/styles.css +++ b/src/styles.css @@ -1,2 +1,6 @@ /* You can add global styles to this file, and also import other style files */ @import "~@angular/material/prebuilt-themes/indigo-pink.css"; +@import "assets/common-assets/common/theme.css"; +@import "assets/common-assets/common/custom.css"; +@import "assets/common-assets/library.css"; +@import "assets/monitor-custom.css";