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
This commit is contained in:
parent
ce8aab7d4f
commit
3583782988
|
@ -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/",
|
|
@ -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
|
|
@ -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"
|
|
@ -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"
|
|
@ -17,9 +17,9 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper';
|
|||
`],
|
||||
template: `
|
||||
|
||||
<navbar *ngIf= "properties && showMenu && !community" portal="connect" [onlyTop]=false [userMenuItems]=userMenuItems [menuItems]=menuItems
|
||||
<navbar *ngIf= "properties && showMenu && !community" [environment]=properties.environment portal="connect" [onlyTop]=false [userMenuItems]=userMenuItems [menuItems]=menuItems
|
||||
[(APIUrl)]="properties.adminToolsAPIURL" [(logInUrl)]="properties.loginUrl" [(logOutUrl)]="properties.logoutUrl" [(cookieDomain)]="properties.cookieDomain" [showMenu]=showMenu></navbar>
|
||||
<navbar *ngIf= "properties && showMenu && community" portal="connect" [onlyTop]=false [(communityId)]="community.id" [userMenuItems]=userMenuItems [menuItems]=menuItems
|
||||
<navbar *ngIf= "properties && showMenu && community" [environment]=properties.environment portal="connect" [onlyTop]=false [(communityId)]="community.id" [userMenuItems]=userMenuItems [menuItems]=menuItems
|
||||
[(APIUrl)]="properties.adminToolsAPIURL" [(logInUrl)]="properties.loginUrl" [(logOutUrl)]="properties.logoutUrl" [(cookieDomain)]="properties.cookieDomain" [(community)]=community [showMenu]=showMenu></navbar>
|
||||
|
||||
<div class="custom-main-content" >
|
||||
|
@ -35,8 +35,8 @@ import {ConnectHelper} from './openaireLibrary/connect/connectHelper';
|
|||
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right" ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
|
||||
</span></a>
|
||||
</cookie-law>
|
||||
<bottom *ngIf= "isClient && showMenu && !community" [menuItems]=bottomMenuItems></bottom>
|
||||
<bottom *ngIf= "isClient && showMenu && community" [showSocialButton] = "false" [showMenu]=false [showDnet]=false [showOpenaire]=true [(communityId)]="community.id" [(APIUrl)]="properties.adminToolsAPIURL" [menuItems]=bottomMenuItems ></bottom>
|
||||
<bottom *ngIf= "properties && isClient && showMenu && !community" [menuItems]=bottomMenuItems [environment]=properties.environment></bottom>
|
||||
<bottom *ngIf= "properties && isClient && showMenu && community" [environment]=properties.environment [showSocialButton] = "false" [showMenu]=false [showDnet]=false [showOpenaire]=true [(communityId)]="community.id" [(APIUrl)]="properties.adminToolsAPIURL" [menuItems]=bottomMenuItems ></bottom>
|
||||
|
||||
`
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"productionMode" : false,
|
||||
"environment" : "beta",
|
||||
"enablePiwikTrack" : false,
|
||||
"enableHelper" : true,
|
||||
"useCache" : false,
|
||||
|
|
Loading…
Reference in New Issue