From 358378298894b8e250620f5f41ebde1fefe32b67 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Thu, 13 Dec 2018 14:25:05 +0000 Subject: [PATCH] Update svn externals in home directory Property environment set and used in navbar & footer Create deploy folder git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@54367 d315682c-612b-4755-9ff5-7f18f6832af3 --- .../beta-properties.json | 7 +----- deploy/prepareBuild.sh | 20 ++++++++++++++++ deploy/prepareDeploy.sh | 20 ++++++++++++++++ prepareDeploy.sh | 24 ------------------- src/app/app.component.ts | 8 +++---- src/assets/env-properties.json | 2 +- 6 files changed, 46 insertions(+), 35 deletions(-) rename connect-production-properties.json => deploy/beta-properties.json (96%) create mode 100755 deploy/prepareBuild.sh create mode 100755 deploy/prepareDeploy.sh delete mode 100755 prepareDeploy.sh diff --git a/connect-production-properties.json b/deploy/beta-properties.json similarity index 96% rename from connect-production-properties.json rename to deploy/beta-properties.json index 12cb602..dd75510 100644 --- a/connect-production-properties.json +++ b/deploy/beta-properties.json @@ -1,5 +1,5 @@ { - "productionMode" : false, + "environment" : "beta", "enablePiwikTrack" : true, "enableHelper" : true, "useCache" : true, @@ -40,8 +40,6 @@ "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", - "logoutOpenaireUrl" :"http://dl067.madgik.di.uoa.gr/idp/profile/Logout", - "cookieDomain" :".openaire.eu", "feedbackmail" :"openaire.test@gmail.com", @@ -93,9 +91,6 @@ "searchLinkToAdvancedOrps" : "/search/advanced/other", "searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders", "searchLinkToAdvancedOrganizations" : "/search/advanced/organizations", - "searchLinkToAdvancedPeople" : "/search/advanced/people", - - "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/", diff --git a/deploy/prepareBuild.sh b/deploy/prepareBuild.sh new file mode 100755 index 0000000..af20e68 --- /dev/null +++ b/deploy/prepareBuild.sh @@ -0,0 +1,20 @@ +#ATTENTION +#DON'T run it in svn folder - it REMOVES files +#Copy project in another file "deploy-folder" +#cd "deploy-folder" +#run the script + +## cp the file according to the deploy environment +# cp beta-properties.json ../src/assets/env-properties.json; + +## uncommect from here--> +# echo -n 'Check properties service to have the url for the deployment environment!!'; +# echo -n "Press key:"; +# read -n1 ans +# echo -n "Pressed"; +# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts; +# rm -rf ../src/assets/common-assets/.svn/; +# rm -rf ../src/app/openaireLibrary/.svn/; +# echo 'Run "cd ..; npm run build:dynamic; cd deploy;" '; +# echo 'Then run prepary deploy script'; +##<-- to here diff --git a/deploy/prepareDeploy.sh b/deploy/prepareDeploy.sh new file mode 100755 index 0000000..d469d57 --- /dev/null +++ b/deploy/prepareDeploy.sh @@ -0,0 +1,20 @@ +#ATTENTION +#DON'T run it in svn folder - it REMOVES files +#First you have to run prepareBuild Script!!!!!!! + +## uncommect from here--> + +# rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh; +# echo 'Now copy to the server!' +#echo 'remove this deploy folder' + +##<-- to here + +#Deploy instructions! +##copy "deploy-folder" in beta.connect.openaire.eu +##coppies of previous deployments exist in "/home/argiro.kokogiannaki/connect-portal/connectYYYY-MM-DD" +##run "npm i" +##become nodejs user: "sudo su nodejs -s /bin/bash" +##go to "cd /srv/www/portal" +##cp files from "cp -r HOME_PATH/deploy-folder/* ." +##restart portal "pm2 restart connect" diff --git a/prepareDeploy.sh b/prepareDeploy.sh deleted file mode 100755 index d52d0f3..0000000 --- a/prepareDeploy.sh +++ /dev/null @@ -1,24 +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 connect-production-properties.json src/assets/env-properties.json; -# rm -rf src/assets/common-assets/.svn/; -# rm -rf src/app/openaireLibrary/.svn/; -# pico src/app/openaireLibrary/utils/properties/environment-specific.service.ts; -# npm run build:dynamic; -# rm -rf src node_modules .idea/ connect-production-properties.json installOpenaireLib.sh; -# echo 'Ready!'; -# echo 'Now copy to the server!' -##<-- to here - -##copy "deploy-folder" in beta.connect.openaire.eu -##coppies of previous deployments exist in "/home/argiro.kokogiannaki/connect-portal/connectYYYY-MM-DD" -##run "npm i" -##become nodejs user: "sudo su nodejs -s /bin/bash" -##go to "cd /srv/www/portal" -##cp files from "cp -r HOME_PATH/deploy-folder/* ." -##restart portal "pm2 restart connect" diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 6b7255c..30861d3 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -17,9 +17,9 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper'; `], template: ` - -
@@ -35,8 +35,8 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper'; - - + + ` diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index 46acf07..1759f36 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -1,5 +1,5 @@ { - "productionMode" : false, + "environment" : "beta", "enablePiwikTrack" : false, "enableHelper" : true, "useCache" : false,