MaDgIK
/
connect
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

[Connect|Trunk] 

apply changes for domain, baseLink, update property files



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-connect-portal/trunk@59419 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2020-09-18 13:27:26 +00:00
parent bc70a7604b
commit 7aebc3c672
14 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deploy/beta-properties.json
View File

@ -69,7 +69,8 @@
"pagingLimit": 20,
"resultsPerPage": 10,
"baseLink" : "https://beta.connect.openaire.eu",
"baseLink" :"",
"domain":"https://beta.connect.openaire.eu",
"afterLoginRedirectLink": "/myCommunities",

3
deploy/production-properties.json
View File

@ -71,7 +71,8 @@
"pagingLimit": 20,
"resultsPerPage": 10,
"baseLink" : "https://connect.openaire.eu",
"baseLink" :"",
"domain": "https://connect.openaire.eu",
"afterLoginRedirectLink": "/myCommunities",

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

@ -31,13 +31,13 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
[showHomeMenuItem]="false"></navbar>
<customization *ngIf="properties && communityId && communityId.length > 0" [properties]="properties"
[communityId]="communityId"></customization>
<schema2jsonld *ngIf="properties && showMenu && !community" [URL]="properties.baseLink"
[logoURL]="properties.baseLink+'/assets/common-assets/logo-small-connect.png'" type="home"
<schema2jsonld *ngIf="properties && showMenu && !community" [URL]="properties.domain + properties.baseLink"
[logoURL]="properties.domain + properties.baseLink+'/assets/common-assets/logo-small-connect.png'" type="home"
[searchActionRoute]="properties.searchLinkToCommunities" [searchAction]="true"
name="OpenAIRE Connect"
description="Build a Gateway for your Community: Turn Open Science into Practice. It takes your open and linked research outcomes.">
</schema2jsonld>
<schema2jsonld *ngIf="properties && showMenu && communityId && communityId.length > 0" [URL]="properties.domain"
<schema2jsonld *ngIf="properties && showMenu && communityId && communityId.length > 0" [URL]="properties.domain + properties.baseLink"
[logoURL]="community.logoUrl" type="home" [searchActionRoute]="properties.searchLinkToResults"
[name]="community.name" [description]="community.description" >
</schema2jsonld>

3
src/app/communities/communities.component.ts
View File

@ -13,6 +13,7 @@ import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
import {ErrorMessagesComponent} from '../openaireLibrary/utils/errorMessages.component';
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {properties} from "../../environments/environment";
@Component({
selector: 'communities',
@ -66,7 +67,7 @@ export class CommunitiesComponent {
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')) {

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

@ -150,7 +150,7 @@ export class CommunityComponent {
this.searchLinkToDataProviders = this.properties.searchLinkToDataProviders;
this.searchLinkToAdvancedResults = this.properties.searchLinkToAdvancedResults;
this.shareInZenodoPage = this.properties.shareInZenodoPage;
this.url =properties.baseLink + this._router.url;
this.url =properties.domain + properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url, false);
this._meta.updateTag({content: this.url}, "property='og:url'");
this.subs.push(this.userManagementService.getUserInfo().subscribe(user => {

2
src/app/deposit/zenodo/shareInZenodo.component.ts
View File

@ -71,7 +71,7 @@ export class ShareInZenodoComponent {
public ngOnInit() {
this.zenodoSearchUtils.status = this.errorCodes.LOADING;
this.url = properties.baseLink + this._router.url;
this.url = properties.domain + properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url, false);
this.updateUrl(this.url);

4
src/app/my-communities/my-communities.component.html
View File

@ -1,5 +1,5 @@
<schema2jsonld [URL]="properties.baseLink"
[logoURL]="properties.baseLink+'/assets/common-assets/logo-small-connect.png'" type="home"
<schema2jsonld [URL]="properties.domain + properties.baseLink"
[logoURL]="properties.domain + properties.baseLink+'/assets/common-assets/logo-small-connect.png'" type="home"
name="OpenAIRE Connect">
</schema2jsonld>
<div class="banner-background image-front-topbar uk-section uk-background-norepeat uk-background-bottom-center uk-background-cover uk-section-overlap uk-position-relative uk-preserve-color"

3
src/app/my-communities/my-communities.component.ts
View File

@ -16,6 +16,7 @@ import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
import {UserManagementService} from "../openaireLibrary/services/user-management.service";
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
import {properties} from "../../environments/environment";
@Component({
selector: 'my-communities',
@ -72,7 +73,7 @@ export class MyCommunitiesComponent {
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')) {

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

@ -88,7 +88,7 @@ export class StatisticsComponent {
}
this.properties = properties;
var url = properties.baseLink + this._router.url;
var url = properties.domain + properties.baseLink + this._router.url;
this._meta.updateTag({content: url}, "property='og:url'");
this.subs.push(this.route.queryParams.subscribe(

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

@ -69,7 +69,8 @@
"pagingLimit": 20,
"resultsPerPage": 10,
"baseLink" : "https://beta.connect.openaire.eu",
"baseLink" :"",
"domain": "https://beta.connect.openaire.eu",
"afterLoginRedirectLink": "/myCommunities",

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

@ -71,8 +71,9 @@ export let properties: EnvProperties = {
csvLimit: 2000,
pagingLimit: 20,
resultsPerPage: 10,
baseLink: "https://beta.connect.openaire.eu",
baseLink:"",
domain:"https://beta.connect.openaire.eu",
afterLoginRedirectLink: "/myCommunities",

5
src/environments/environment.prod.prod.ts
View File

@ -73,8 +73,9 @@ export let properties: EnvProperties = {
csvLimit: 2000,
pagingLimit: 20,
resultsPerPage: 10,
baseLink: "https://connect.openaire.eu",
baseLink:"",
domain: "https://connect.openaire.eu",
afterLoginRedirectLink: "/myCommunities",

3
src/environments/environment.prod.ts
View File

@ -72,7 +72,8 @@ export let properties: EnvProperties = {
pagingLimit: 20,
resultsPerPage: 10,
baseLink: "https://connect.openaire.eu",
baseLink:"",
domain:"https://connect.openaire.eu",
afterLoginRedirectLink: "/myCommunities",

3
src/environments/environment.ts
View File

@ -67,7 +67,8 @@ export let properties: EnvProperties = {
csvLimit: 2000,
pagingLimit: 20,
resultsPerPage: 10,
baseLink: 'https://beta.connect.openaire.eu',
baseLink:"",
domain: 'https://beta.connect.openaire.eu',
afterLoginRedirectLink: '/myCommunities',
searchLinkToResult: "/search/result?id=",
searchLinkToPublication: '/search/publication?articleId=',