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

[Monitor |Trunk] 

SEO changes:
	-update titles and descriptions
	- add more jsonld



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-monitor-portal/trunk/monitor@59889 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
Argiro Kokogiannaki 2020-11-16 16:28:16 +00:00
parent 95ff2e4639
commit 53903cbe18
9 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,12 @@ import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component
<navbar *ngIf="properties && showMenu && header" portal="monitor" [header]="header" [onlyTop]="false"
[userMenuItems]=userMenuItems [menuItems]=menuItems [user]="user"
[showMenu]=showMenu [properties]="properties"></navbar>
<schema2jsonld *ngIf="properties " [URL]="properties.domain + properties.baseLink"
[logoURL]="properties.domain + properties.baseLink+'/assets/common-assets/logo-small-monitor.png'"
type="home"
description="OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies. Work together with us to view, understand and visualize research statistics and indicators. "
name="OpenAIRE Monitor" [searchAction]="true" [searchActionRoute]="properties.domain + properties.baseLink + '/browse'">
</schema2jsonld>
<div class="custom-main-content">
<main>
<router-outlet></router-outlet>

4
src/app/app.module.ts
View File

@ -16,6 +16,7 @@ import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigation
import {EnvironmentSpecificResolver} from './openaireLibrary/utils/properties/environmentSpecificResolver';
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
@ -33,7 +34,8 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi
CookieLawModule,
BrowserTransferStateModule,
BrowserModule.withServerTransition({appId: 'my-app'}),
AppRoutingModule
AppRoutingModule,
Schema2jsonldModule
],
declarations: [ AppComponent, OpenaireErrorPageComponent],
exports: [ AppComponent ],

2
src/app/contact/contact.component.html
View File

@ -1,4 +1,4 @@
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="description"></schema2jsonld>
<div class="uk-section">
<div class="uk-align-center">
<div *ngIf="showLoading" class="uk-margin-large">

36
src/app/contact/contact.component.ts
View File

@ -11,6 +11,7 @@ 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 {Subscriber} from "rxjs";
import {properties} from "../../environments/environment";
@Component({
selector: 'contact',
@ -19,6 +20,7 @@ import {Subscriber} from "rxjs";
export class ContactComponent implements OnInit {
public url: string = null;
public pageTitle: string = "OpenAIRE - Monitor | Contact Us";
public description: string = "OpenAIRE - Monitor . Any Questions? Contact us to learn more";
public piwiksub: any;
public showLoading = true;
public errorMessage = '';
@ -55,24 +57,22 @@ export class ContactComponent implements OnInit {
});
}
ngOnInit() {
this._title.setTitle('OpenAIRE-Monitor | Contact Us');
this.subscriptions.push(this.route.data.subscribe((data: { envSpecific: EnvProperties }) => {
this.properties = data.envSpecific;
this.email = {body: '', subject: '', recipients: []};
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
this.updateTitle(this.pageTitle);
this.updateDescription("OpenAIRE - Monitor, Community Gateway, research community - Contact Us");
this.reset();
//this.getDivContents();
// this.getPageContents();
HelperFunctions.scroll();
this.showLoading = false;
}));
this.properties = properties;
this.email = {body: '', subject: '', recipients: []};
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
this.subscriptions.push(this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
}
this.url = this.properties.domain + this.properties.baseLink + this._router.url;
this.seoService.createLinkForCanonicalURL(this.url);
this.updateUrl(this.url);
this.updateTitle(this.pageTitle);
this.updateDescription(this.description);
this.reset();
//this.getDivContents();
// this.getPageContents();
HelperFunctions.scroll();
this.showLoading = false;
}
private getPageContents() {

5
src/app/home/home.component.html
View File

@ -1,8 +1,3 @@
<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="image-front-topbar"
style="background: transparent linear-gradient(180deg, #F4F4F4 0%, #F5F5F5 83%, #FAFAFA 100%) no-repeat;">
<div

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

@ -101,7 +101,7 @@ export class HomeComponent {
private _refineFieldResultsService: RefineFieldResultsService, private _searchResearchResultsService: SearchResearchResultsService) {
var description = "OpenAIRE - Monitor, Statistics, Search, Funder, EC, European Commision";
var description = "OpenAIRE - Monitor, A new era of monitoring research. Open data. Open methodologies. Work together with us to view, understand and visualize research statistics and indicators. ";
var title = "OpenAIRE - Monitor";
this._meta.updateTag({content: description}, "name='description'");

2
src/app/learn-how/learn-how.component.html
View File

@ -1,4 +1,4 @@
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other"></schema2jsonld>
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="description"></schema2jsonld>
<div class="uk-section uk-container uk-container-large">
<div class="uk-padding-small">
<div class="uk-flex uk-flex-center">

2
src/app/learn-how/learn-how.component.ts
View File

@ -19,7 +19,7 @@ export class LearnHowComponent {
public url: string = null;
public pageTitle: string = "OpenAIRE - Monitor | Learn How";
public description: string = "Learn the process: Use the Monitor Dashboard to view your research results, open science. See how it works. Simplify research tracking & monitoring ";
properties: EnvProperties;
subscriptions = [];
constructor(

2
src/environments/environment.ts
View File

@ -43,7 +43,7 @@ export let properties: EnvProperties = {
utilsService: "http://mpagasas.di.uoa.gr:8000",
vocabulariesAPI: "https://beta.services.openaire.eu/provision/mvc/vocabularies/",
piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=",
piwikSiteId: "80",
piwikSiteId: "298",
registryUrl: 'http://mpagasas.di.uoa.gr:8080/dnet-openaire-users-1.0.0-SNAPSHOT/api/registry/',
loginUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-login/openid_connect_login",
userInfoUrl: "http://dl170.madgik.di.uoa.gr:8180/dnet-openaire-users-1.0.0-SNAPSHOT/api/users/getUserInfo?accessToken=",