From c5fe497abfea324d0867d6d1af1dcf086f067d3e Mon Sep 17 00:00:00 2001 From: Argiro Kokogiannaki Date: Mon, 21 Sep 2020 07:28:46 +0000 Subject: [PATCH] [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 --- angular.json | 16 ++++++ deploy/beta-properties.json | 5 +- deploy/prepareDeploy.sh | 5 +- deploy/production-properties.json | 5 +- package.json | 3 +- src/app/app.component.ts | 6 +- src/app/contact/contact.component.ts | 3 +- src/app/home/home.component.html | 4 +- src/app/home/home.component.ts | 5 +- src/app/learn-how/learn-how.component.ts | 3 +- .../subscribe/invite/invite.component.ts | 3 +- src/assets/env-properties.json | 5 +- src/environments/environment.beta.ts | 7 ++- src/environments/environment.prod.ts | 13 +++-- src/environments/environment.ts | 5 +- src/index.prod.html | 57 +++++++++++++++++++ src/robots.prod.txt | 2 + 17 files changed, 118 insertions(+), 29 deletions(-) create mode 100644 src/index.prod.html create mode 100644 src/robots.prod.txt diff --git a/angular.json b/angular.json index 2fdad94..eeeca6c 100644 --- a/angular.json +++ b/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" } ] }, diff --git a/deploy/beta-properties.json b/deploy/beta-properties.json index 4090abd..43b25a4 100644 --- a/deploy/beta-properties.json +++ b/deploy/beta-properties.json @@ -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/" } diff --git a/deploy/prepareDeploy.sh b/deploy/prepareDeploy.sh index 5743e5a..4238ff8 100755 --- a/deploy/prepareDeploy.sh +++ b/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; ../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; diff --git a/deploy/production-properties.json b/deploy/production-properties.json index fd33414..515bfbd 100644 --- a/deploy/production-properties.json +++ b/deploy/production-properties.json @@ -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/" } diff --git a/package.json b/package.json index 7195e8d..fbc796e 100644 --- a/package.json +++ b/package.json @@ -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": { diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a338c4c..958aa0b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -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, [], [], {})) } } } diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index 42e8223..51197a6 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -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); diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 2a1f9a6..decbe16 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,5 +1,5 @@ -
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index cad2b68..d4a55a1 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -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) { diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index 6b61ce7..a5d925a 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -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); diff --git a/src/app/utils/subscribe/invite/invite.component.ts b/src/app/utils/subscribe/invite/invite.component.ts index 239acac..e09c2dc 100644 --- a/src/app/utils/subscribe/invite/invite.component.ts +++ b/src/app/utils/subscribe/invite/invite.component.ts @@ -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); diff --git a/src/assets/env-properties.json b/src/assets/env-properties.json index ce33a79..3fa8d31 100644 --- a/src/assets/env-properties.json +++ b/src/assets/env-properties.json @@ -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/" } diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 847a961..e8b5da4 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -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/" }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index af26929..beeda2f 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -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/" }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 956a9ae..00d2a9f 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -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/" }; diff --git a/src/index.prod.html b/src/index.prod.html new file mode 100644 index 0000000..198d9d4 --- /dev/null +++ b/src/index.prod.html @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+ + + + diff --git a/src/robots.prod.txt b/src/robots.prod.txt new file mode 100644 index 0000000..c6742d8 --- /dev/null +++ b/src/robots.prod.txt @@ -0,0 +1,2 @@ +User-Agent: * +Disallow: /