Project

General

Profile

« Previous | Next » 

Revision 56320

Added by Argiro Kokogiannaki almost 5 years ago

[newlinking|Branch]
Merge trunk into branch 56306:56318

View differences:

modules/uoa-admin-portal/branches/newlinking/src/app/pages/curator/curator.component.ts
55 55 
        this.curatorService.getCurator(this.properties,
56 56 
          this.properties.adminToolsAPIURL + 'curator/' + this.curatorId).subscribe(
57 57 
          curator => {
58 
            if (curator) {
58 
            if (curator && Object.keys(curator).length > 0) {
59 59 
              this.curator = curator;
60 60 
              this.curator.email = Session.getUserEmail();
61 61 
              if (this.curator.photo && this.curator.photo !== '') {
modules/uoa-admin-portal/branches/newlinking/src/app/pages/community/community-edit-form/community-edit-form.component.ts
172 172 
                                    }
173 173 
                                );
174 174 
                                this._subscribeService.getCommunitySubscribers
175 
                                (this.communityId, this.properties.adminToolsAPIURL).subscribe(
175 
                                (this.properties, this.communityId).subscribe(
176 176 
                                    res => {
177 177 
                                        // console.log(res);
178 178 
                                    }
modules/uoa-admin-portal/branches/newlinking/src/app/pages/subscribers/manage-subscribers.component.ts
255 255 
        this.subscribersSearchUtils.page=1;
256 256 
        this.subscribersSearchUtils.keyword = "";
257 257 

  		




  258
  
  
    
        this.subResults = this._subscribeService.getCommunitySubscribers(this.communityId, this.properties.adminToolsAPIURL).subscribe(


  		




  
  258
  
    
        this.subResults = this._subscribeService.getCommunitySubscribers(this.properties, this.communityId).subscribe(


  		




  259
  259
  
    

  		




  260
  260
  
    
            res => {


  		




  261
  261
  
    
                //console.info("search Subscribers [total communitySubscribers:"+res.subscribers.length+"]");


  		












  

    
      modules/uoa-admin-portal/branches/newlinking/src/app/app.component.ts
    
  





  125
  125
  
    
              if (this.communityId) {


  		




  126
  126
  
    
                this.userMenuItems.push(new MenuItem('manage-user-notifications', 'Manage notification settings', '', '/manage-user-notifications', false, [], [], {communityId: this.communityId}));


  		




  127
  127
  
    
                this.userMenuItems.push(new MenuItem('personal', 'Manage Personal Info', '', '/personal', false, [], [], {communityId: this.communityId}));


  		




  
  128
  
    
                this.userMenuItems.push(new MenuItem("","Support","https://openaire-connect.d4science.org/group/openaire-connect-gateway/explore?siteId=172366611","",false,[],[],{}))


  		




  128
  129
  
    
              }


  		




  129
  130
  
    
              this.buildSideBar();


  		




  130
  131
  
    
            },


  		












  

    
      modules/uoa-admin-portal/branches/newlinking/src/assets/env-properties.json
    
  





  53
  53
  
    

  		




  54
  54
  
    
  "cacheUrl" :"http://scoobydoo.di.uoa.gr:3000/get?url=",


  		




  55
  55
  
    

  		




  56
  
  
    
  "adminToolsAPIURL" :"http://scoobydoo.di.uoa.gr:8080/uoa-admin-tools/",


  		




  
  56
  
    
  "adminToolsAPIURL" :"http://mpagasas.di.uoa.gr:8080/uoa-admin-tools/",


  		




  57
  57
  
    

  		




  58
  58
  
    
  "adminToolsCommunity" :"openaire",


  		




  59
  59
  
    
  "communityAPI": "https://dev-openaire.d4science.org/openaire/community/",


  		




  ......




  102
  102
  
    
  "showLastIndexInformationLink" : false,


  		




  103
  103
  
    

  		




  104
  104
  
    
  "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",


  		




  105
  
  
    
  "claimsInformationLink": "https://www.openaire.eu/linking-beta"


  		




  
  105
  
    
  "claimsInformationLink": "https://www.openaire.eu/linking-beta",


  		




  
  106
  
    
  "lastIndexUpdate": "2019-05-16",


  		




  
  107
  
    
  "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"


  		




  106
  108
  
    
}


  		












  

    
      modules/uoa-admin-portal/branches/newlinking/src/index.html
    
  





  27
  27
  
    

  		




  28
  28
  
    
        <script  src="assets/common-assets/common/jquery.js"></script>


  		




  29
  29
  
    

  		




  30
  
  
    
        <script  src="assets/common-assets/common/uikit.min.js"></script>


  		




  31
  
  
    
        <script src="assets/common-assets/common/uikit-icons.min.js"></script>


  		




  
  30
  
    
        <script  src="assets/common-assets/common/uikit.min.js?v=1"></script>


  		




  
  31
  
    
        <script src="assets/common-assets/common/uikit-icons.min.js?v=1"></script>


  		




  32
  32
  
    
    <!-- stylesheets -->


  		




  33
  33
  
    
    <link rel="stylesheet" type="text/css" href="assets/common-assets/common/theme.css" />


  		




  34
  34
  
    
    <link rel="stylesheet" type="text/css" href="assets/common-assets/common/custom.css" />


  		




  35
  
  
    
    <link rel="stylesheet" type="text/css" href="assets/common-assets/library.css" />


  		




  36
  
  
    
    <link rel="stylesheet" type="text/css" href="assets/css/connect-custom.css" />


  		




  
  35
  
    
    <link rel="stylesheet" type="text/css" href="assets/common-assets/library.css?v=1" />


  		




  
  36
  
    
    <link rel="stylesheet" type="text/css" href="assets/css/connect-custom.css?v=1" />


  		




  37
  37
  
    

  		




  38
  38
  
    

  		




  39
  39
  
    

  		












  

    
      modules/uoa-admin-portal/branches/newlinking/deploy/prepareBetaDeploy.sh
    
  





  1
  
  
    
##ATTENTION


  		




  2
  
  
    
##DON'T run it in svn folder - it *REMOVES* files


  		




  3
  
  
    
##Copy project in another file "deploy-folder"


  		




  4
  
  
    
##cd "deploy-folder"


  		




  5
  
  
    
##run the script


  		




  6
  
  
    

  		




  7
  
  
    
## uncommect from here-->


  		




  8
  
  
    
# cp beta-properties.json  ../src/assets/env-properties.json;


  		




  9
  
  
    
# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts;


  		




  10
  
  
    
# npm run build;


  		




  11
  
  
    
# rm -rf ../dist/assets/common-assets/.svn/;


  		




  12
  
  
    
# echo 'Ready!';


  		




  13
  
  
    
# echo 'Now copy only "dist" to the server!'


  		




  14
  
  
    
##<-- to here


  		




  15
  
  
    

  		




  16
  
  
    
##copy "deploy-folder/dist" in demo.openaire.eu


  		




  17
  
  
    
##coppies of previous deployments exist in  "/home/argiro.kokogiannaki/uoa-portal/connect-adminYYYY-MM-DD"


  		




  18
  
  
    
##become nodejs user: "sudo su nodejs -s /bin/bash"


  		




  19
  
  
    
##go to "cd /srv/www/portal-www"


  		




  20
  
  
    
##cp files from "cp -r HOME_PATH/deploy-folder/* ."


  		




  21
  0
  
    

  		












  

    
      modules/uoa-admin-portal/branches/newlinking/deploy/prepareProductionDeploy.sh
    
  





  1
  
  
    
##ATTENTION


  		




  2
  
  
    
##DON'T run it in svn folder - it *REMOVES* files


  		




  3
  
  
    
##Copy project in another file "deploy-folder"


  		




  4
  
  
    
##cd "deploy-folder"


  		




  5
  
  
    
##run the script


  		




  6
  
  
    

  		




  7
  
  
    
## uncommect from here-->


  		




  8
  
  
    
# cp production-properties.json  ../src/assets/env-properties.json;


  		




  9
  
  
    
# pico ../src/app/openaireLibrary/utils/properties/environment-specific.service.ts;


  		




  10
  
  
    
# npm run build;


  		




  11
  
  
    
# rm -rf ../dist/assets/common-assets/.svn/;


  		




  12
  
  
    
# echo 'Ready!';


  		




  13
  
  
    
# echo 'Now copy dist to the server!'


  		




  14
  
  
    
##<-- to here


  		




  15
  
  
    

  		




  16
  
  
    
##copy "deploy-folder/dist" in explore.openaire.eu


  		




  17
  
  
    
##coppies of previous deployments exist in  "/home/argiro.kokogiannaki/portals/adminYYYY-MM-DD"


  		




  18
  
  
    
##become nodejs user: "sudo su nodejs -s /bin/bash"


  		




  19
  
  
    
##go to "cd /srv/www/portal-www"


  		




  20
  
  
    
##cp files from "cp -r HOME_PATH/deploy-folder/* ."


  		




  21
  0
  
    

  		












  

    
      modules/uoa-admin-portal/branches/newlinking/deploy/prepareDeploy.sh
    
  





  
  1
  
    
##ATTENTION


  		




  
  2
  
    
##DON'T run it in svn folder - it *REMOVES* files


  		




  
  3
  
    
##Copy project in another file "deploy-folder"


  		




  
  4
  
    
##cd "deploy-folder"


  		




  
  5
  
    
##run the script


  		




  
  6
  
    

  		




  
  7
  
    
## uncommect from here-->


  		




  
  8
  
    
#choose properties based on environment


  		




  
  9
  
    
# cp beta-properties.json  ../src/assets/env-properties.json;


  		




  
  10
  
    
# cp production-properties.json  ../src/assets/env-properties.json;


  		




  
  11
  
    

  		




  
  12
  
    

  		




  
  13
  
    
# echo -n 'Check that you have the correct properties file';


  		




  
  14
  
    
# echo -n "Press key:";


  		




  
  15
  
    
# read -n1 ans


  		




  
  16
  
    
# pico ../src/assets/env-properties.json;


  		




  
  17
  
    
# echo -n 'Check Robots.txt: For test and beta add "Diasallow /", for production remove it!';


  		




  
  18
  
    
# echo -n "Press key:";


  		




  
  19
  
    
# read -n1 ans


  		




  
  20
  
    
# echo -n "Pressed";


  		




  
  21
  
    
# pico ../src/robots.txt;


  		




  
  22
  
    
# rm -rf ../src/assets/common-assets/.svn/;


  		




  
  23
  
    
# rm -rf ../src/app/openaireLibrary/.svn/;


  		




  
  24
  
    
# npm run build;


  		




  
  25
  
    
# echo 'Ready!';


  		




  
  26
  
    
# echo 'Now copy only "dist" to the server!'


  		




  
  27
  
    
##<-- to here


  		




  
  28
  
    

  		




  
  29
  
    
##copy "deploy-folder/dist" in demo.openaire.eu


  		




  
  30
  
    
##coppies of previous deployments exist in  "/home/argiro.kokogiannaki/uoa-portal/connect-adminYYYY-MM-DD"


  		




  
  31
  
    
##become nodejs user: "sudo su nodejs -s /bin/bash"


  		




  
  32
  
    
##go to "cd /srv/www/portal-www"


  		




  
  33
  
    
##cp files from "cp -r HOME_PATH/deploy-folder/* ."


  		




  0
  34
  
    

  		












  

    
      modules/uoa-admin-portal/branches/newlinking/deploy/beta-properties.json
    
  





  8
  8
  
    
  "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",


  		




  9
  9
  
    
  "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",


  		




  10
  10
  
    
  "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",


  		




  
  11
  
    
  "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/",


  		




  
  12
  
    
  "useNewStatistisTool":false,


  		




  11
  13
  
    
  "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",


  		




  12
  14
  
    
  "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",


  		




  13
  15
  
    
  "openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=",


  		




  ......




  99
  101
  
    
  "showLastIndexInformationLink" : true,


  		




  100
  102
  
    

  		




  101
  103
  
    
  "widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",


  		




  102
  
  
    
  "claimsInformationLink": "https://beta.openaire.eu/linking"


  		




  
  104
  
    
  "claimsInformationLink": "https://beta.openaire.eu/linking",


  		




  
  105
  
    
   "lastIndexUpdate": "2019-05-16",


  		




  
  106
  
    
   "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"


  		




  103
  107
  
    
}


  		












Also available in:  Unified diff