[Monitor|Trunk]

update property files for beta
Clean up index.html
import css files in styles.css



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@58910 d315682c-612b-4755-9ff5-7f18f6832af3

deploy/beta-properties.json

@@ -7,8 +7,8 @@
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
   "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
-  "statisticsFrameNewAPIURL": "http://marilyn.athenarc.gr:8080/stats-api/",
+  "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/",
-  "useNewStatistisTool":false,
+  "useNewStatistisTool":true,
   "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
   "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",
   "searchResourcesAPIURL"     : "https://beta.services.openaire.eu/search/v2/api/resources",
@@ -35,8 +35,9 @@
   "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
 
   "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
-  "piwikSiteId" : "80",
+  "piwikSiteId" : "298",
-  "loginUrl" :"https://beta.services.openaire.eu/connect-user-management/openid_connect_login",
+  "loginUrl" :"https://beta.services.openaire.eu/monitor-dashboard-login/openid_connect_login",
+  "userInfoUrl" : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
 
   "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
 
@@ -46,7 +47,8 @@
 
   "cacheUrl" :"https://demo.openaire.eu/cache/get?url=",
 
-  "monitorServiceAPIURL" :"http://dl170.madgik.di.uoa.gr:8080/uoa-monitor-service",
+  "monitorServiceAPIURL" :"https://beta.services.openaire.eu/uoa-monitor-service/",
+
   "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools",
 
   "adminToolsCommunity" :"monitor",
@@ -107,7 +109,7 @@
 
   "reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
 
-  "admins" : ["rcd-helpdesk@openaire.eu"],
+  "admins" : ["argirok@di.uoa.gr"],
   "lastIndexUpdate": "2019-08-07",
   "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
 }

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; cd ../; rm -rf deploy;
+ rm -rf ../src ../node_modules  ../.idea/ ../installOpenaireLib.sh; ../dist/browser/assets/common-assets/.svn/; cd ../; rm -rf deploy;
 # echo 'Now copy to the server!'
 
 ##<-- to here

server.ts

@@ -13,7 +13,7 @@ enableProdMode();
 // Express server
 const app = express();
 
-const PORT = process.env.PORT || 4000;
+const PORT = process.env.PORT || 3000;
 const DIST_FOLDER = join(process.cwd(), 'dist');
 
 // Our index.html we'll use as our template

src/app/app.component.ts

@@ -103,7 +103,7 @@ export class AppComponent {
         ((this.properties.environment == "production") ? "https://admin.explore.openaire.eu" : "https://beta.admin.connect.openaire.eu") + "/dashboard?communityId=connect",
         "", false, [], [], {}))*/
       this.userMenuItems.push(new MenuItem("", "Manage Stakeholders",
-        "/admin", "", true, [], [], {}))
+        properties.baseLink + "/dashboard/admin", "", true, [], [], {}))
     }
     this.showMenu = true;
   }

src/assets/env-properties.json

@@ -7,7 +7,7 @@
   "framesAPIURL" : "https://beta.openaire.eu/stats3/",
   "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
   "statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
-  "statisticsFrameNewAPIURL": "http://88.197.53.71:8080/stats-api/",
+  "statisticsFrameNewAPIURL": "https://stats.madgik.di.uoa.gr/stats-api/",
   "useNewStatistisTool":false,
   "claimsAPIURL" : "http://scoobydoo.di.uoa.gr:8080/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
    "searchAPIURLLAst"     : "https://beta.services.openaire.eu/search/v2/api/",
@@ -37,7 +37,7 @@
 
   "piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
   "piwikSiteId" : "80",
-  "loginUrl" :"http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
+  "loginUrl" :"http://scoobydoo.di.uoa.gr:8080/dnet-login/openid_connect_login",
 
   "userInfoUrl" : "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",
 

src/assets/monitor-custom.css

@@ -29,7 +29,7 @@
 .datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,
 .journalsSearchForm, .journalsTableSearchForm,
 .entityRegistriesSearchForm, .entityRegistriesTableSearchForm {
-  background: url('search-background.svg')   #F7FCFF no-repeat center bottom   ;
+  background: /*url('search-background.svg')*/   #F7FCFF no-repeat center bottom   ;
   background-size: cover !important;
   height: inherit;
 

src/environments/environment.beta.ts

@@ -9,8 +9,8 @@ export let properties: EnvProperties = {
   framesAPIURL: "https://beta.openaire.eu/stats3/",
   statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
   statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
-  statisticsFrameNewAPIURL: "http://marilyn.athenarc.gr:8080/stats-api/",
+  statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
-  useNewStatistisTool: false,
+  useNewStatistisTool: true,
   claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
   searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
   searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
@@ -37,8 +37,10 @@ export let properties: EnvProperties = {
   vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
   
   piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
-  piwikSiteId: "80",
+  piwikSiteId: "298",
-  loginUrl: "https://beta.services.openaire.eu/connect-user-management/openid_connect_login",
+  loginUrl :"https://beta.services.openaire.eu/monitor-login/openid_connect_login",
+  userInfoUrl : "https://beta.services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=",
+
 
   logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
   
@@ -48,7 +50,8 @@ export let properties: EnvProperties = {
   
   cacheUrl: "https://demo.openaire.eu/cache/get?url=",
   
-  monitorServiceAPIURL: "http://dl170.madgik.di.uoa.gr:8080/uoa-monitor-service",
+  monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service/",
+
   adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools",
   
   adminToolsCommunity: "monitor",
@@ -104,7 +107,7 @@ export let properties: EnvProperties = {
   
   reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
   
-  admins: ["rcd-helpdesk@openaire.eu"],
+  admins: ["argirok@di.uoa.gr","kiatrop@di.uoa.gr"],
   lastIndexUpdate: "2019-08-07",
   indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/"
 };

src/index.html

@@ -1,11 +1,9 @@
 <!DOCTYPE html>
 <html lang="en-gb" dir="ltr" vocab="http://schema.org/">
 <head>
-      <!--link href="http://demo.openaire.eu" rel="canonical" /-->
   <meta charset="utf-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width, initial-scale=1">
-<!--      <base href="/monitor/" />-->
   <base href="/"/>
   <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
   <meta name="description" content="OpenAIRE Monitor, funder, funding, research,  "/>
@@ -69,15 +67,6 @@ $(document).ready(function(){
 
   </script>
 
-      <link rel="stylesheet" href="assets/common-assets/common/theme.css?v=1">
-      <link rel="stylesheet" href="assets/common-assets/common/custom.css?v=1">
-      <link rel="stylesheet" href="assets/common-assets/library.css?v=4">
-      <link rel="stylesheet" href="assets/monitor-custom.css?v=7">
-
-
-      <script src="assets/common-assets/clipboard.min.js"></script>
-
-
 </head>
 <body class="" style="">
 
@@ -87,29 +76,5 @@ $(document).ready(function(){
 </div>
 
 
-  <script type="text/javascript"  >
-  function loadAltmetrics(e,t,n){
-    var d="createElement",c="getElementsByTagName",m="setAttribute",n=document.getElementById(e);
-    return n&&n.parentNode&&n.parentNode.removeChild(n),n=document[d+"NS"]&&document.documentElement.namespaceURI,n=n?document[d+"NS"](n,"script"):document[d]("script"),n[m]("id",e),n[m]("src",t),(document[c]("head")[0]||document[c]("body")[0]).appendChild(n),n=new Image,void n[m]("src","https://d1uo4w7k31k5mn.cloudfront.net/donut/0.png")
-  };
-  function appendCss(customData) {
-      if (typeof customData != "undefined")
-          $(document).ready(function () {
-              $("style").append(customData);
-          });
-  }
-    /*  console.log("here!");
-      var fileref=document.createElement("link");
-      fileref.setAttribute("rel", "stylesheet");
-      fileref.setAttribute("type", "text/css");
-      fileref.setAttribute("href", "assets/customization.css");
-      if (typeof fileref!="undefined")
-          document.getElementsByTagName("head")[0].appendChild(fileref)
-  }*/
-</script>
-<!-- Go to www.addthis.com/dashboard to customize your tools -->
-<!-- to update addThis: https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-559d24521cd8c080-->
-<!-- <script type="text/javascript" src="https://s7.addthis.com/js/300/addthis_widget.js#pubid=ra-5a12dbd124e4e521"></script> -->
-<script type="text/javascript" src="//s7.addthis.com/js/300/addthis_widget.js#pubid=ra-559d24521cd8c080"></script>
 </body>
 </html>

src/robots.txt

@@ -1,4 +1,2 @@
 User-Agent: *
-Disallow: /cache
-Disallow: /upload
 Disallow: /

src/styles.css

@@ -1,2 +1,6 @@
 /* You can add global styles to this file, and also import other style files */
 @import "~@angular/material/prebuilt-themes/indigo-pink.css";
+@import "assets/common-assets/common/theme.css";
+@import "assets/common-assets/common/custom.css";
+@import "assets/common-assets/library.css";
+@import "assets/monitor-custom.css";