diff --git a/deploy/prepareBuild.sh b/deploy/prepareBuild.sh deleted file mode 100755 index af20e68..0000000 --- a/deploy/prepareBuild.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 - -## 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 index d469d57..5664784 100755 --- a/deploy/prepareDeploy.sh +++ b/deploy/prepareDeploy.sh @@ -1,9 +1,21 @@ #ATTENTION #DON'T run it in svn folder - it REMOVES files -#First you have to run prepareBuild Script!!!!!!! +#Copy project in another file "deploy-folder" +#cd "deploy-folder/deploy" +#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/; +# cd ..; npm run build:dynamic; cd deploy; # rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh; # echo 'Now copy to the server!' #echo 'remove this deploy folder' diff --git a/src/app/community/community.component.html b/src/app/community/community.component.html index b16775c..7f3eccb 100644 --- a/src/app/community/community.component.html +++ b/src/app/community/community.component.html @@ -51,7 +51,7 @@ Created: {{community.date | date:'dd-MM-yyyy'}} - + Zenodo communities: {{zenodoCommunityIdS.length + ((masterZenodoCommunity)?1:0)}} diff --git a/src/app/utils/manage/manage.component.ts b/src/app/utils/manage/manage.component.ts index 13ad69b..4806397 100644 --- a/src/app/utils/manage/manage.component.ts +++ b/src/app/utils/manage/manage.component.ts @@ -10,7 +10,7 @@ import {Session} from '../../openaireLibrary/login/utils/helper.class'; - + Manage diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts index f397653..01165db 100644 --- a/src/app/utils/subscribe/invite/invite.component.ts +++ b/src/app/utils/subscribe/invite/invite.component.ts @@ -218,6 +218,8 @@ export class InviteComponent implements OnInit { index = this.community.managers.indexOf(email); } - return Session.isPortalAdministrator() || Session.isCommunityCurator() + return Session.isPortalAdministrator() || Session.isCommunityCurator() || index!=-1; + + } } diff --git a/src/app/utils/subscribe/subscribe.component.ts b/src/app/utils/subscribe/subscribe.component.ts index 573aa08..046aa0f 100644 --- a/src/app/utils/subscribe/subscribe.component.ts +++ b/src/app/utils/subscribe/subscribe.component.ts @@ -106,7 +106,7 @@ export class SubscribeComponent { console.log(res); if(res.status && res.status != 200) { UIkit.notification({ - message : 'There was an error in your subscription. Please try again!', + message : 'An error occured. Please try again!', status : 'warning', timeout : 3000, pos : 'top-center' @@ -118,10 +118,23 @@ export class SubscribeComponent { res => { console.log("The email has been sent successfully!") }, - error => console.log(error) + error => { + + console.log(error) + } ); } } + }, + error => { + this.loading = false; + UIkit.notification({ + message : 'An error occured. Please try again!', + status : 'warning', + timeout : 3000, + pos : 'top-center' + }); + console.log(error) }); } } @@ -138,7 +151,7 @@ export class SubscribeComponent { this.loading = false; if(res.status && res.status != 200) { UIkit.notification({ - message : 'There was an error in your unsubscription. Please try again!', + message : 'An error occured. Please try again!', status : 'warning', timeout : 3000, pos : 'top-center' @@ -149,6 +162,16 @@ export class SubscribeComponent { this.subscribed = false; } } + }, + error => { + this.loading = false; + UIkit.notification({ + message : 'An error occured. Please try again!', + status : 'warning', + timeout : 3000, + pos : 'top-center' + }); + console.log(error) }); } }