MaDgIK
/
monitor
13
0
Fork 0
Code Issues Pull Requests Projects Releases 15 Wiki Activity

[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
This commit is contained in:
Argiro Kokogiannaki 2020-06-12 17:41:07 +00:00
parent d0e66e2e7e
commit 949d9f0a94
10 changed files with 92 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
deploy/beta-properties.json
View File

@ -7,8 +7,8 @@
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/", "statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/", "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/", "claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
"searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/", "searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/",
"searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources", "searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources",
@ -35,8 +35,9 @@
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/", "vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=", "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=", "logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
@ -46,7 +47,8 @@
"cacheUrl" :"https://demo.openaire.eu/cache/get?url=", "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", "adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools",
"adminToolsCommunity" :"monitor", "adminToolsCommunity" :"monitor",
@ -107,7 +109,7 @@
"reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", "reCaptchaSiteKey": "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
"admins" : ["rcd-helpdesk@openaire.eu"], "admins" : ["argirok@di.uoa.gr"],
"lastIndexUpdate": "2019-08-07", "lastIndexUpdate": "2019-08-07",
"indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/" "indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
} }

2
deploy/prepareDeploy.sh
View File

@ -34,7 +34,7 @@
# rm -rf ../src/assets/common-assets/.svn/; # rm -rf ../src/assets/common-assets/.svn/;
# rm -rf ../src/app/openaireLibrary/.svn/; # rm -rf ../src/app/openaireLibrary/.svn/;
# cd ..; npm run build:ssr; cd deploy; # 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!' # echo 'Now copy to the server!'
##<-- to here ##<-- to here

2
server.ts
View File

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

2
src/app/app.component.ts
View File

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

4
src/assets/env-properties.json
View File

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

2
src/assets/monitor-custom.css
View File

@ -29,7 +29,7 @@
.datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm, .datasourcesSearchForm, .compatibleDatasourcesSearchForm, .compatibleDatasourcesTableSearchForm, .datasourcesTableSearchForm,
.journalsSearchForm, .journalsTableSearchForm, .journalsSearchForm, .journalsTableSearchForm,
.entityRegistriesSearchForm, .entityRegistriesTableSearchForm { .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; background-size: cover !important;
height: inherit; height: inherit;

15
src/environments/environment.beta.ts
View File

@ -9,8 +9,8 @@ export let properties: EnvProperties = {
framesAPIURL: "https://beta.openaire.eu/stats3/", framesAPIURL: "https://beta.openaire.eu/stats3/",
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", 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/", claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", 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/", vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", 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=", 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=", 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", adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools",
adminToolsCommunity: "monitor", adminToolsCommunity: "monitor",
@ -104,7 +107,7 @@ export let properties: EnvProperties = {
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P", reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
admins: ["rcd-helpdesk@openaire.eu"], admins: ["argirok@di.uoa.gr","kiatrop@di.uoa.gr"],
lastIndexUpdate: "2019-08-07", lastIndexUpdate: "2019-08-07",
indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/" indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/"
}; };

77
src/index.html
View File

@ -1,13 +1,11 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en-gb" dir="ltr" vocab="http://schema.org/"> <html lang="en-gb" dir="ltr" vocab="http://schema.org/">
<head> <head>
<!--link href="http://demo.openaire.eu" rel="canonical" /-->
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<!-- <base href="/monitor/" />--> <base href="/"/>
<base href="/" /> <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
<meta name="description" content="OpenAIRE Monitor, funder, funding, research, "/> <meta name="description" content="OpenAIRE Monitor, funder, funding, research, "/>
@ -19,10 +17,10 @@
<meta property="og:site_name" content="OpenAIRE - Monitor"/> <meta property="og:site_name" content="OpenAIRE - Monitor"/>
<meta property="og:image" content="assets/common-assets/common/Symbol.png"/> <meta property="og:image" content="assets/common-assets/common/Symbol.png"/>
<meta property="og:image:secure_url" content="assets/common-assets/common/Symbol.png" /> <meta property="og:image:secure_url" content="assets/common-assets/common/Symbol.png"/>
<meta property="og:image:type" content="image/png" /> <meta property="og:image:type" content="image/png"/>
<meta property="og:image:width" content="360" /> <meta property="og:image:width" content="360"/>
<meta property="og:image:height" content="359" /> <meta property="og:image:height" content="359"/>
<meta name="robots" content="noindex"> <meta name="robots" content="noindex">
<link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png"> <link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png"> <link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png">
@ -37,7 +35,7 @@
<link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png"> <link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png"> <link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
<link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png"> <link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
<link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" /> <link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon"/>
<link rel="manifest" href="assets/common-assets/logo/manifest.json"> <link rel="manifest" href="assets/common-assets/logo/manifest.json">
<meta name="msapplication-TileColor" content="#ffffff"> <meta name="msapplication-TileColor" content="#ffffff">
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png"> <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
@ -45,14 +43,14 @@
<script> <script>
window.onerror = function (errorMsg) { window.onerror = function (errorMsg) {
if(errorMsg !=null && (errorMsg.message && errorMsg.message.indexOf("uikit.js") != -1) || (errorMsg.url && if (errorMsg != null && (errorMsg.message && errorMsg.message.indexOf("uikit.js") != -1) || (errorMsg.url &&
errorMsg.url.indexOf("uikit.js") != -1 )){ errorMsg.url.indexOf("uikit.js") != -1)) {
console.log("********UIKIT Error ***********"); console.log("********UIKIT Error ***********");
$.getScript("assets/common-assets/common/uikit.min.js?v=1"); $.getScript("assets/common-assets/common/uikit.min.js?v=1");
$.getScript("assets/common-assets/common/uikit-icons.min.js?v=1"); $.getScript("assets/common-assets/common/uikit-icons.min.js?v=1");
} }
} }
</script> </script>
<script src="assets/common-assets/common/jquery.js"></script> <script src="assets/common-assets/common/jquery.js"></script>
@ -60,56 +58,23 @@
<script src="assets/common-assets/common/uikit.min.js?v=1"></script> <script src="assets/common-assets/common/uikit.min.js?v=1"></script>
<script src="assets/common-assets/common/uikit-icons.min.js?v=1"></script> <script src="assets/common-assets/common/uikit-icons.min.js?v=1"></script>
<script src="https://cdn.ckeditor.com/4.5.11/full-all/ckeditor.js"></script> <script src="https://cdn.ckeditor.com/4.5.11/full-all/ckeditor.js"></script>
<script> <script>
$(document).ready(function(){ $(document).ready(function () {
console.log("Is ready - load uikit ***") console.log("Is ready - load uikit ***")
$.getScript("assets/common-assets/common/uikit.min.js?v=1"); $.getScript("assets/common-assets/common/uikit.min.js?v=1");
$.getScript("assets/common-assets/common/uikit-icons.min.js?v=1"); $.getScript("assets/common-assets/common/uikit-icons.min.js?v=1");
}); });
</script> </script>
<link rel="stylesheet" href="assets/common-assets/common/theme.css?v=1"> </head>
<link rel="stylesheet" href="assets/common-assets/common/custom.css?v=1"> <body class="" style="">
<link rel="stylesheet" href="assets/common-assets/library.css?v=4">
<link rel="stylesheet" href="assets/monitor-custom.css?v=7">
<div class="uk-offcanvas-content uk-height-viewport">
<script src="assets/common-assets/clipboard.min.js"></script>
</head>
<body class="" style="">
<div class="uk-offcanvas-content uk-height-viewport">
<app-root></app-root> <app-root></app-root>
</div> </div>
<script type="text/javascript" > </body>
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> </html>

2
src/robots.txt
View File

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

4
src/styles.css
View File

@ -1,2 +1,6 @@
/* You can add global styles to this file, and also import other style files */ /* You can add global styles to this file, and also import other style files */
@import "~@angular/material/prebuilt-themes/indigo-pink.css"; @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";