MaDgIK
/
explore-services
13
0
Fork 0
Code Issues Pull Requests Projects Releases 22 Wiki Activity

remove old meta service - use angular way | change the base url in sitemap, index, properties 

git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@51840 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
argiro.kokogiannaki 2018-04-17 13:51:47 +00:00
parent e6f0afaf4c
commit 966e47927d
5 changed files with 36 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
portal-4cli-lib/src/app/home/home.component.ts
View File

@ -3,7 +3,7 @@ import {Observable} from 'rxjs/Observable';
import {ActivatedRoute, Router} from '@angular/router'; import {ActivatedRoute, Router} from '@angular/router';
import {Location} from '@angular/common'; import {Location} from '@angular/common';
import "rxjs/add/observable/zip"; import "rxjs/add/observable/zip";
import {Meta} from '../openaireLibrary/sharedComponents/metaService'; import {Title, Meta} from '@angular/platform-browser';
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
import { SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service'; import { SearchPublicationsService} from '../openaireLibrary/services/searchPublications.service';
import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service'; import { SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
@ -56,19 +56,18 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
private _searchDatasetsService: SearchDatasetsService, private _searchDatasetsService: SearchDatasetsService,
private _searchOrganizationsService: SearchOrganizationsService, private _searchOrganizationsService: SearchOrganizationsService,
private _refineFieldResultsService:RefineFieldResultsService, private _refineFieldResultsService:RefineFieldResultsService,
private location: Location, private _meta: Meta,private _piwikService:PiwikService, private location: Location, private _piwikService:PiwikService,
private config: ConfigurationService private config: ConfigurationService, private _meta: Meta, private _title: Title
) { ) {
var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects "; var description = "open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects ";
var title = "OpenAIRE"; var title = "OpenAIRE";
this._meta.setTitle(title); this._title.setTitle(title);
this._meta.updateMeta("description", description); this._meta.updateTag({content:description},"name='description'");
this._meta.updateProperty("og:description", description); this._meta.updateTag({content:description},"property='og:description'");
this._meta.updateProperty("og:title", title); this._meta.updateTag({content:title},"property='og:title'");
} }
@ -78,7 +77,7 @@ public subPub;public subData;public subProjects;public subOrg; public subDataPr;
this.properties = data.envSpecific; this.properties = data.envSpecific;
if(this.properties!=null){ if(this.properties!=null){
var url = this.properties.baseLink+this._router.url; var url = this.properties.baseLink+this._router.url;
this._meta.updateProperty("og:url", url); this._meta.updateTag({content:url},"property='og:url'");
if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){ if(this.properties.enablePiwikTrack && (typeof document !== 'undefined')){
this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe(); this.piwiksub = this._piwikService.trackView(this.properties, "OpenAIRE").subscribe();
} }

3
portal-4cli-lib/src/app/home/home.module.ts
View File

@ -17,7 +17,6 @@ import {PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.mo
import {HelperModule} from '../openaireLibrary/utils/helper/helper.module'; import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module'; import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
import {Meta} from '../openaireLibrary/sharedComponents/metaService';
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service'; import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard'; import {FreeGuard} from '../openaireLibrary/login/freeGuard.guard';
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard'; import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
@ -38,7 +37,7 @@ import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRout
HomeComponent HomeComponent
], ],
providers:[ providers:[
FreeGuard, PreviousRouteRecorder, ConfigurationService, Meta FreeGuard, PreviousRouteRecorder, ConfigurationService
], ],
exports: [ exports: [
HomeComponent HomeComponent

4
portal-4cli-lib/src/assets/env-properties.json
View File

@ -1,7 +1,7 @@
{ {
"enablePiwikTrack" : false, "enablePiwikTrack" : false,
"enableHelper" : true, "enableHelper" : true,
"useCache" : true, "useCache" : false,
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/", "metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
"framesAPIURL" : "https://beta.openaire.eu/stats3/", "framesAPIURL" : "https://beta.openaire.eu/stats3/",
"statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/", "statisticsAPIURL" : "http://vatopedi.di.uoa.gr:8080/stats/",
@ -56,7 +56,7 @@
"pagingLimit": 20, "pagingLimit": 20,
"resultsPerPage": 10, "resultsPerPage": 10,
"baseLink" : "https://demo.openaire.eu", "baseLink" : "https://beta.explore.openaire.eu",
"searchLinkToPublication" : "/search/publication?articleId=", "searchLinkToPublication" : "/search/publication?articleId=",
"searchLinkToProject" : "/search/project?projectId=", "searchLinkToProject" : "/search/project?projectId=",

40
portal-4cli-lib/src/assets/sitemap.xml
View File

@ -1,102 +1,102 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd"> <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9 http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
<url> <url>
<loc><![CDATA[https://demo.openaire.eu]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/participate/deposit-publications-data]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/participate/deposit-publications-data]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/participate/claim]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/participate/claim]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find/publications]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find/publications]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find/datasets]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find/datasets]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find/projects]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find/projects]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find/people]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find/people]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find/organizations]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find/organizations]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/find/dataproviders]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/find/dataproviders]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/advanced/publications]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/publications]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/advanced/datasets]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/datasets]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/advanced/projects]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/projects]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/advanced/people]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/people]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/advanced/organizations]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/organizations]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/advanced/dataproviders]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/advanced/dataproviders]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/content-providers]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/content-providers]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc><![CDATA[https://demo.openaire.eu/search/entity-registries]]></loc> <loc><![CDATA[https://beta.explore.openaire.eu/search/entity-registries]]></loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc>![CDATA[https://demo.openaire.eu/participate/deposit-publications]</loc> <loc>![CDATA[https://beta.explore.openaire.eu/participate/deposit-publications]</loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>
<url> <url>
<loc>![CDATA[https://demo.openaire.eu/participate/deposit-datasets]</loc> <loc>![CDATA[https://beta.explore.openaire.eu/participate/deposit-datasets]</loc>
<changefreq>weekly</changefreq> <changefreq>weekly</changefreq>
<priority>0.5</priority> <priority>0.5</priority>
</url> </url>

10
portal-4cli-lib/src/index.html
View File

@ -1,7 +1,7 @@
<!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" /--> <!--link href="http://beta.explore.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">
@ -12,7 +12,7 @@
<meta property="og:description" content="open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects "/> <meta property="og:description" content="open access, research, scientific publication, European Commission, EC, FP7, ERC, Horizon 2020, H2020, search, projects "/>
<meta property="og:title" content="Search OpenAIRE"/> <meta property="og:title" content="Search OpenAIRE"/>
<meta property="og:type" content="website"/> <meta property="og:type" content="website"/>
<meta property="og:url" content="https://demo.openaire.eu"/> <meta property="og:url" content="https://beta.explore.openaire.eu"/>
<meta property="og:site_name" content="OpenAIRE"/> <meta property="og:site_name" content="OpenAIRE"/>
<meta property="og:image" content="assets/common/Symbol.png"/> <meta property="og:image" content="assets/common/Symbol.png"/>
@ -102,7 +102,7 @@ $(document).ready(function(){
"@context" : "http://schema.org", "@context" : "http://schema.org",
"@type" : "WebSite", "@type" : "WebSite",
"name" : "OpenAIRE", "name" : "OpenAIRE",
"url" : "http://demo.openaire.eu" "url" : "http://beta.explore.openaire.eu"
} }
</script> </script>
<!-- End of Google sitename markup--> <!-- End of Google sitename markup-->
@ -111,10 +111,10 @@ $(document).ready(function(){
{ {
"@context": "http://schema.org", "@context": "http://schema.org",
"@type": "WebSite", "@type": "WebSite",
"url" : "http://demo.openaire.eu", "url" : "http://beta.explore.openaire.eu",
"potentialAction": { "potentialAction": {
"@type": "SearchAction", "@type": "SearchAction",
"target": "http://demo.openaire.eu/search/find/?keyword={search_term_string}", "target": "http://beta.explore.openaire.eu/search/find/?keyword={search_term_string}",
"query-input": "required name=search_term_string" "query-input": "required name=search_term_string"
} }
} }