[Monitor|Trunk]
apply domain and baseLink changes update properties add prod files for index.html, robots.txt git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@59439 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
parent
11826e33fa
commit
c5fe497abf
16
angular.json
16
angular.json
|
|
@ -48,6 +48,14 @@
|
|||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
},
|
||||
{
|
||||
"replace": "src/index.html",
|
||||
"with": "src/index.prod.html"
|
||||
},
|
||||
{
|
||||
"replace": "src/robots.txt",
|
||||
"with": "src/robots.prod.txt"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
@ -139,6 +147,14 @@
|
|||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
},
|
||||
{
|
||||
"replace": "src/index.html",
|
||||
"with": "src/index.prod.html"
|
||||
},
|
||||
{
|
||||
"replace": "src/robots.txt",
|
||||
"with": "src/robots.prod.txt"
|
||||
}
|
||||
]
|
||||
},
|
||||
|
|
|
|||
|
|
@ -61,7 +61,8 @@
|
|||
"pagingLimit": 20,
|
||||
"resultsPerPage": 10,
|
||||
|
||||
"baseLink" : "https://beta.monitor.openaire.eu",
|
||||
"baseLink" : "",
|
||||
"domain" : "https://beta.monitor.openaire.eu",
|
||||
"searchLinkToPublication" : "/search/publication?articleId=",
|
||||
"searchLinkToProject" : "/search/project?projectId=",
|
||||
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
|
||||
|
|
@ -111,5 +112,5 @@
|
|||
|
||||
"admins" : ["argirok@di.uoa.gr"],
|
||||
"lastIndexUpdate": "2019-08-07",
|
||||
"indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
|
||||
"indexInfoAPI": "https://beta.services.openaire.eu/openaire/info/"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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; ../dist/browser/assets/common-assets/.svn/; 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
|
||||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -62,7 +62,8 @@
|
|||
"pagingLimit": 20,
|
||||
"resultsPerPage": 10,
|
||||
|
||||
"baseLink" : "https://monitor.openaire.eu",
|
||||
"baseLink" : "",
|
||||
"domain" : : "https://monitor.openaire.eu",
|
||||
|
||||
"searchLinkToPublication" : "/search/publication?articleId=",
|
||||
"searchLinkToProject" : "/search/project?projectId=",
|
||||
|
|
@ -103,5 +104,5 @@
|
|||
|
||||
"admins" : ["rcd-helpdesk@openaire.eu"],
|
||||
"lastIndexUpdate": "2019-07-24",
|
||||
"indexInfoAPI": "http://services.openaire.eu/openaire/info/"
|
||||
"indexInfoAPI": "https://services.openaire.eu/openaire/info/"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,8 @@
|
|||
"generate:prerender": "cd dist && node prerender",
|
||||
"webpack:server": "webpack --config webpack.server.config.js --progress --colors",
|
||||
"serve:prerender": "cd dist/browser && http-server",
|
||||
"serve:ssr": "node dist/server"
|
||||
"serve:ssr": "node dist/server",
|
||||
"after-build-clean": "rm -rf src node_modules .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; "
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
|
|
|
|||
|
|
@ -115,13 +115,13 @@ export class AppComponent {
|
|||
this.menuItems = [];
|
||||
this.menuItems.push({
|
||||
rootItem: new MenuItem("", "Dashboard",
|
||||
properties.baseLink + "/dashboard/" + this.stakeholder.alias , "", true, [], [], {}),
|
||||
this.properties.domain + properties.baseLink + "/dashboard/" + this.stakeholder.alias , "", true, [], [], {}),
|
||||
items: []
|
||||
});
|
||||
if (Session.isPortalAdministrator(this.user) || Session.isMonitorCurator(this.user) || Session.isCommunityCurator(this.user)) {
|
||||
this.menuItems.push({
|
||||
rootItem: new MenuItem("", "Manage",
|
||||
properties.baseLink + "/dashboard/admin/" + this.stakeholder.alias , "", true, [], [], {}),
|
||||
this.properties.domain + properties.baseLink + "/dashboard/admin/" + this.stakeholder.alias , "", true, [], [], {}),
|
||||
items: []
|
||||
});
|
||||
}
|
||||
|
|
@ -135,7 +135,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",
|
||||
properties.baseLink + "/dashboard/admin", "", true, [], [], {}))
|
||||
this.properties.domain + properties.baseLink + "/dashboard/admin", "", true, [], [], {}))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,6 +10,7 @@ import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
|
|||
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {AbstractControl, FormBuilder, FormGroup, ValidatorFn, Validators} from "@angular/forms";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'contact',
|
||||
|
|
@ -54,7 +55,7 @@ export class ContactComponent implements OnInit {
|
|||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
|
||||
}
|
||||
this.url = this.properties.baseLink + this._router.url;
|
||||
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<schema2jsonld [URL]="properties.baseLink"
|
||||
[logoURL]="properties.baseLink+'/assets/common-assets/logo-small-monitor.png'" type="home"
|
||||
<schema2jsonld [URL]="properties.domain + properties.baseLink"
|
||||
[logoURL]="properties.domain + properties.baseLink+'/assets/common-assets/logo-small-monitor.png'" type="home"
|
||||
name="OpenAIRE Monitor">
|
||||
</schema2jsonld>
|
||||
<div class="uk-section home-background uk-background-top-center">
|
||||
|
|
|
|||
|
|
@ -18,6 +18,7 @@ import {LocalStorageService} from "../openaireLibrary/services/localStorage.serv
|
|||
import {Stakeholder} from "../openaireLibrary/monitor/entities/stakeholder";
|
||||
import {Session, User} from "../openaireLibrary/login/utils/helper.class";
|
||||
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'home',
|
||||
|
|
@ -138,7 +139,7 @@ export class HomeComponent {
|
|||
this.route.data
|
||||
.subscribe((data: { envSpecific: EnvProperties }) => {
|
||||
this.properties = data.envSpecific;
|
||||
var url = data.envSpecific.baseLink + this._router.url;
|
||||
var url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(url, false);
|
||||
this._meta.updateTag({content: url}, "property='og:url'");
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
|
|
@ -324,7 +325,7 @@ export class HomeComponent {
|
|||
}
|
||||
|
||||
public getStakeholderPageUrl(stakeholder: Stakeholder) {
|
||||
return this.properties.baseLink + '/dashboard/' + stakeholder.alias;
|
||||
return this.properties.domain + this.properties.baseLink + '/dashboard/' + stakeholder.alias;
|
||||
}
|
||||
|
||||
public goToPage(data: any) {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
|||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'learn-how',
|
||||
|
|
@ -39,7 +40,7 @@ export class LearnHowComponent {
|
|||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe();
|
||||
}
|
||||
this.url = this.properties.baseLink + this._router.url;
|
||||
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ import {SEOService} from "../../../openaireLibrary/sharedComponents/SEO/SEO.serv
|
|||
import {PiwikService} from "../../../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {PiwikHelper} from "../../piwikHelper";
|
||||
import {UserManagementService} from "../../../openaireLibrary/services/user-management.service";
|
||||
import {properties} from "../../../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'invite',
|
||||
|
|
@ -109,7 +110,7 @@ export class InviteComponent implements OnInit {
|
|||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.piwiksub = this._piwikService.trackView(this.properties, this.pageTitle, PiwikHelper.getSiteId(this.communityId, this.properties.environment)).subscribe();
|
||||
}
|
||||
this.url = this.properties.baseLink + this._router.url;
|
||||
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@
|
|||
"pagingLimit": 20,
|
||||
"resultsPerPage": 10,
|
||||
|
||||
"baseLink" : "http://dl170.madgik.di.uoa.gr/monitor",
|
||||
"baseLink" : "",
|
||||
"domain" : "http://dl170.madgik.di.uoa.gr/monitor",
|
||||
|
||||
"searchLinkToPublication" : "/search/publication?articleId=",
|
||||
"searchLinkToProject" : "/search/project?projectId=",
|
||||
|
|
@ -114,5 +115,5 @@
|
|||
|
||||
"admins" : ["kostis30fylloy@gmail.com","argirok@di.uoa.gr"],
|
||||
"lastIndexUpdate": "2019-05-16",
|
||||
"indexInfoAPI": "http://beta.services.openaire.eu/openaire/info/"
|
||||
"indexInfoAPI": "https://beta.services.openaire.eu/openaire/info/"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -65,8 +65,9 @@ export let properties: EnvProperties = {
|
|||
csvLimit: 2000,
|
||||
pagingLimit: 20,
|
||||
resultsPerPage: 10,
|
||||
|
||||
baseLink: "https://beta.monitor.openaire.eu",
|
||||
|
||||
"baseLink" : "",
|
||||
"domain" : "https://beta.monitor.openaire.eu",
|
||||
searchLinkToResult: "/search/result?id=",
|
||||
searchLinkToPublication: "/search/publication?articleId=",
|
||||
searchLinkToProject: "/search/project?projectId=",
|
||||
|
|
@ -106,7 +107,7 @@ export let properties: EnvProperties = {
|
|||
|
||||
admins: ["argirok@di.uoa.gr","kiatrop@di.uoa.gr"],
|
||||
lastIndexUpdate: "2019-08-07",
|
||||
indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/",
|
||||
indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
|
||||
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
|
||||
b2noteAPIURL: "http://b2note-dev.bsc.es/"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@ export let properties: EnvProperties = {
|
|||
utilsService: "https://explore.openaire.eu/utils-service",
|
||||
vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/",
|
||||
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
|
||||
piwikSiteId: "112",
|
||||
loginUrl: "https://services.openaire.eu/_UPDATE_/openid_connect_login",
|
||||
piwikSiteId: "104",
|
||||
loginUrl: "https://services.openaire.eu/monitor-login/openid_connect_login",
|
||||
logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
cookieDomain: ".openaire.eu",
|
||||
feedbackmail: "feedback@openaire.eu",
|
||||
cacheUrl: "https://explore.openaire.eu/cache/get?url=",
|
||||
datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/",
|
||||
monitorServiceAPIURL: "http://dl170.madgik.di.uoa.gr:8080/uoa-monitor-service",
|
||||
monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
|
||||
adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
|
||||
adminToolsCommunity: "monitor",
|
||||
contextsAPI: "https://services.openaire.eu/openaire/context",
|
||||
|
|
@ -54,7 +54,8 @@ export let properties: EnvProperties = {
|
|||
csvLimit: 2000,
|
||||
pagingLimit: 20,
|
||||
resultsPerPage: 10,
|
||||
baseLink: "https://monitor.openaire.eu",
|
||||
"baseLink" : "",
|
||||
"domain" : "https://monitor.openaire.eu",
|
||||
searchLinkToResult: "/search/result?id=",
|
||||
searchLinkToPublication: "/search/publication?articleId=",
|
||||
searchLinkToProject: "/search/project?projectId=",
|
||||
|
|
@ -86,9 +87,9 @@ export let properties: EnvProperties = {
|
|||
depositSearchPage: "/participate/deposit/search",
|
||||
shareInZenodoPage: "/participate/deposit/zenodo",
|
||||
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
|
||||
admins: ["rcd-helpdesk@openaire.eu"],
|
||||
admins: ["argirok@di.uoa.gr","kiatrop@di.uoa.gr"],
|
||||
lastIndexUpdate: "2019-07-24",
|
||||
indexInfoAPI: "http://services.openaire.eu/openaire/info/",
|
||||
indexInfoAPI: "https://services.openaire.eu/openaire/info/",
|
||||
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
|
||||
b2noteAPIURL: "http://b2note-dev.bsc.es/"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -60,7 +60,8 @@ export let properties: EnvProperties = {
|
|||
csvLimit: 2000,
|
||||
pagingLimit: 20,
|
||||
resultsPerPage: 10,
|
||||
baseLink: "http://dl170.madgik.di.uoa.gr/monitor",
|
||||
"baseLink" : "",
|
||||
"domain" : "http://dl170.madgik.di.uoa.gr/monitor",
|
||||
searchLinkToResult: "/search/result?id=",
|
||||
searchLinkToPublication: "/search/publication?articleId=",
|
||||
searchLinkToProject: "/search/project?projectId=",
|
||||
|
|
@ -93,7 +94,7 @@ export let properties: EnvProperties = {
|
|||
reCaptchaSiteKey: "6LcVtFIUAAAAAB2ac6xYivHxYXKoUvYRPi-6_rLu",
|
||||
admins: ["kostis30fylloy@gmail.com", "argirok@di.uoa.gr"],
|
||||
lastIndexUpdate: "2019-05-16",
|
||||
indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/",
|
||||
indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/",
|
||||
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
|
||||
b2noteAPIURL: "http://b2note-dev.bsc.es/"
|
||||
};
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en-gb" dir="ltr" vocab="http://schema.org/">
|
||||
<head>
|
||||
<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="/"/>
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8"/>
|
||||
<meta name="description" content="OpenAIRE Monitor, funder, funding, research, "/>
|
||||
|
||||
|
||||
<meta property="og:description" content="OpenAIRE Monitor, funder, funding"/>
|
||||
<meta property="og:title" content="OpenAIRE - Monitor "/>
|
||||
|
||||
<meta property="og:type" content="website"/>
|
||||
<meta property="og:url" content="https://monitor.openaire.eu"/>
|
||||
<meta property="og:site_name" content="OpenAIRE - Monitor"/>
|
||||
|
||||
<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:type" content="image/png"/>
|
||||
<meta property="og:image:width" content="360"/>
|
||||
<meta property="og:image:height" content="359"/>
|
||||
<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="60x60" href="assets/common-assets/logo/apple-icon-60x60.png">
|
||||
<link rel="apple-touch-icon" sizes="72x72" href="assets/common-assets/logo/apple-icon-72x72.png">
|
||||
<link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
|
||||
<link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
|
||||
<link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
|
||||
<link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
|
||||
<link rel="icon" type="image/png" sizes="192x192" href="assets/common-assets/logo/android-icon-192x192.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="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 rel="manifest" href="assets/common-assets/logo/manifest.json">
|
||||
<meta name="msapplication-TileColor" content="#ffffff">
|
||||
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
|
||||
<meta name="theme-color" content="#ffffff">
|
||||
</head>
|
||||
<body class="" style="">
|
||||
|
||||
<div class="uk-offcanvas-content uk-height-viewport">
|
||||
<app-root></app-root>
|
||||
</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")
|
||||
};
|
||||
</script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
User-Agent: *
|
||||
Disallow: /
|
||||
Loading…
Reference in New Issue