From a8712b591646db257007cccde2d66f50a80ec763 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Tue, 2 Jul 2019 12:18:02 +0000 Subject: [PATCH] [Admin tool|Trunk] App: add support link index.html: set version of files deploy: clean up deploy folder and script git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-admin-portal/trunk@56317 d315682c-612b-4755-9ff5-7f18f6832af3 --- deploy/beta-properties.json | 2 ++ ...{prepareBetaDeploy.sh => prepareDeploy.sh} | 17 ++++++++++++++-- deploy/prepareProductionDeploy.sh | 20 ------------------- src/app/app.component.ts | 1 + src/index.html | 8 ++++---- 5 files changed, 22 insertions(+), 26 deletions(-) rename deploy/{prepareBetaDeploy.sh => prepareDeploy.sh} (54%) delete mode 100755 deploy/prepareProductionDeploy.sh diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json index 27f8ee3..c90e16e 100644 --- a/deploy/beta-properties.json +++ b/deploy/beta-properties.json @@ -8,6 +8,8 @@ "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", + "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/", + "useNewStatistisTool":false, "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", "openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=", diff --git a/deploy/prepareBetaDeploy.sh b/deploy/prepareDeploy.sh similarity index 54% rename from deploy/prepareBetaDeploy.sh rename to deploy/prepareDeploy.sh index 972b111..1a15acc 100755 --- a/deploy/prepareBetaDeploy.sh +++ b/deploy/prepareDeploy.sh @@ -5,10 +5,23 @@ ##run the script ## uncommect from here--> +#choose properties based on environment # cp beta-properties.json ../src/assets/env-properties.json; -# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts; +# cp production-properties.json ../src/assets/env-properties.json; + + +# echo -n 'Check that you have the correct properties file'; +# echo -n "Press key:"; +# read -n1 ans +# pico ../src/assets/env-properties.json; +# echo -n 'Check Robots.txt: For test and beta add "Diasallow /", for production remove it!'; +# echo -n "Press key:"; +# read -n1 ans +# echo -n "Pressed"; +# pico ../src/robots.txt; +# rm -rf ../src/assets/common-assets/.svn/; +# rm -rf ../src/app/openaireLibrary/.svn/; # npm run build; -# rm -rf ../dist/assets/common-assets/.svn/; # echo 'Ready!'; # echo 'Now copy only "dist" to the server!' ##<-- to here diff --git a/deploy/prepareProductionDeploy.sh b/deploy/prepareProductionDeploy.sh deleted file mode 100755 index f0b6b94..0000000 --- a/deploy/prepareProductionDeploy.sh +++ /dev/null @@ -1,20 +0,0 @@ -##ATTENTION -##DON'T run it in svn folder - it *REMOVES* files -##Copy project in another file "deploy-folder" -##cd "deploy-folder" -##run the script - -## uncommect from here--> -# cp production-properties.json ../src/assets/env-properties.json; -# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts; -# npm run build; -# rm -rf ../dist/assets/common-assets/.svn/; -# echo 'Ready!'; -# echo 'Now copy dist to the server!' -##<-- to here - -##copy "deploy-folder/dist" in explore.openaire.eu -##coppies of previous deployments exist in "/home/argiro.kokogiannaki/portals/adminYYYY-MM-DD" -##become nodejs user: "sudo su nodejs -s /bin/bash" -##go to "cd /srv/www/portal-www" -##cp files from "cp -r HOME_PATH/deploy-folder/* ." diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 7c555cd..20d073c 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -125,6 +125,7 @@ export class AppComponent implements OnInit{ if (this.communityId) { this.userMenuItems.push(new MenuItem('manage-user-notifications', 'Manage notification settings', '', '/manage-user-notifications', false, [], [], {communityId: this.communityId})); this.userMenuItems.push(new MenuItem('personal', 'Manage Personal Info', '', '/personal', false, [], [], {communityId: this.communityId})); + this.userMenuItems.push(new MenuItem("","Support","https://openaire-connect.d4science.org/group/openaire-connect-gateway/explore?siteId=172366611","",false,[],[],{})) } this.buildSideBar(); }, diff --git a/src/index.html b/src/index.html index 65920da..291c3d5 100644 --- a/src/index.html +++ b/src/index.html @@ -27,13 +27,13 @@ - - + + - - + +