From 9af3095840bf83a24edf391a267a981da983bc5e Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Fri, 26 Jun 2020 10:52:58 +0000 Subject: [PATCH] [Monitor Dashboard|Trunk] Admin: -add monitor logo in left sidebar -add stakeholder name and logo on the blue bar -back button takes you to /admin Monitor.component.html -manage buttons takes you to /admin - private preview to work if admin or curator git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor_dashboard@58998 d315682c-612b-4755-9ff5-7f18f6832af3 --- deploy/prepareDeploy.sh | 5 +++- src/app/app.component.html | 26 +++++++++++++++--- src/app/monitor/monitor.component.html | 26 +++++++----------- src/app/monitor/monitor.component.ts | 12 +++------ .../stakeholder/stakeholder.component.html | 12 ++++----- src/app/stakeholder/stakeholder.component.ts | 27 ------------------- src/app/topic/indicators.component.html | 2 +- src/app/topic/indicators.component.ts | 16 ++++++----- src/app/topic/topic.component.html | 9 ++++--- src/app/utils/adminDashboard.guard.ts | 5 ++++ src/environments/environment.ts | 2 +- 11 files changed, 67 insertions(+), 75 deletions(-) diff --git a/deploy/prepareDeploy.sh b/deploy/prepareDeploy.sh index 351946c..ae77d8d 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; rm -rf ../dist/assets/common-assets/.svn/; cd ../; rm -rf deploy; +#rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh; rm -rf ../dist/assets/common-assets/.svn/; cd ../; rm -rf deploy; # echo 'Now copy to the server!' ##<-- to here @@ -48,3 +48,6 @@ #portal files exist in "/srv/www/portal/connect" #copy deployment files to the portal folder "cp -r /home/argiro.kokogiannaki/connect-portal/connectYYYY-MM-DD/* /srv/www/portal/connect" #restart portal to get the changes "pm2 restart connect" + + + #rm -rf src node_modules .idea/ installOpenaireLib.sh dist/browser/stats.json dist/browser/assets/common-assets/.svn/ deploy; diff --git a/src/app/app.component.html b/src/app/app.component.html index 444e94e..b930146 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -8,13 +8,33 @@ hasMiniMenu && hasSidebar" [class.stakeholderPage]="isFrontPage"> [src]="'assets/common-assets/'+(properties.environment =='beta'?'beta_flag.svg':'prototype_flag.svg')" [alt]="properties.environment">