diff --git a/angular.json b/angular.json index e4a40fd..d187fff 100644 --- a/angular.json +++ b/angular.json @@ -18,8 +18,7 @@ "polyfills": "src/polyfills.ts", "assets": [ "src/assets", - "src/robots.txt", - "src/sitemap.xml" + "src/robots.txt" ], "styles": [ "src/styles.css", @@ -136,8 +135,7 @@ ], "assets": [ "src/assets", - "src/robots.txt", - "src/sitemap.xml" + "src/robots.txt" ] } }, @@ -166,6 +164,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" } ] }, @@ -174,6 +180,14 @@ { "replace": "src/environments/environment.ts", "with": "src/environments/environment.beta.ts" + }, + { + "replace": "src/index.html", + "with": "src/index.beta.html" + }, + { + "replace": "src/robots.txt", + "with": "src/robots.beta.txt" } ] }, diff --git a/server.ts b/server.ts index e80e171..5e5e2f3 100644 --- a/server.ts +++ b/server.ts @@ -79,6 +79,26 @@ app.use(function (req, res, next) { } next(); }); + // - Serve sitemap based on the host - + app.get('/sitemap.xml', (req, res) => { + console.log(req.get("host")); + let host = req.get("host").split(":")[0]; + let connectLinks= ["/","/about/learn-how","/about/learn-in-depth", "/about/faq","/search/find/communities"]; + let communityLinks= ["/","/search/find/research-outcomes","/search/advanced/research-outcomes","/participate/deposit/learn-how","/organizations", "/content"]; + let sitemap = "\n" + + ""; + let urlPre = "\n" + + " \n" + + " "; + for(let link of (host.indexOf("connect.openaire.eu") == -1 ?communityLinks:connectLinks)){ + sitemap += urlPre + "https://" + host + link + urlSuf; + } + sitemap += "\n"; + console.log(req.secure); + res.setHeader('content-type', 'application/xml'); + res.send( sitemap); + }); /* - Example Express Rest API endpoints - app.get('/api/**', (req, res) => { }); diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 766b976..b162ffd 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -31,6 +31,16 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config [showHomeMenuItem]="false"> + + + +
@@ -167,7 +177,8 @@ export class AppComponent { this.community = { id: community.communityId, name: (community.shortTitle) ? community.shortTitle : community.title, - logoUrl: community.logoUrl + logoUrl: community.logoUrl, + description:community.description }; this.menuItems = []; diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 9bbab72..2516134 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -27,6 +27,7 @@ import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver. import {InviteBasicModule} from "./utils/subscribe/invite/inviteBasic.module"; import {SubscribeService} from "./openaireLibrary/utils/subscribe/subscribe.service"; import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module"; +import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; @NgModule({ @@ -45,7 +46,7 @@ import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.mod AppRoutingModule, BrowserTransferStateModule, BrowserAnimationsModule, - PageURLResolverModule + PageURLResolverModule, Schema2jsonldModule ], declarations: [ AppComponent, OpenaireErrorPageComponent], exports: [ AppComponent ], diff --git a/src/app/communities/communities.component.html b/src/app/communities/communities.component.html index 4faea90..6b00ef2 100644 --- a/src/app/communities/communities.component.html +++ b/src/app/communities/communities.component.html @@ -1,7 +1,3 @@ - -
- -
diff --git a/src/app/community/community.module.ts b/src/app/community/community.module.ts index a411b5b..4cef217 100644 --- a/src/app/community/community.module.ts +++ b/src/app/community/community.module.ts @@ -22,7 +22,6 @@ import {SearchResearchResultsServiceModule} from "../openaireLibrary/services/se import {SearchResultsModule} from "../openaireLibrary/searchPages/searchUtils/searchResults.module"; import {CuratorsModule} from "../curators/curators.module"; import {AffiliationsModule} from "../affiliations/affiliations.module"; -import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module"; import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module"; import {MatSelectModule} from "@angular/material"; import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtils/entitiesSelection.module"; @@ -36,7 +35,7 @@ import {ErrorMessagesModule} from "../openaireLibrary/utils/errorMessages.module SubscribeModule, StatisticsModule, ManageModule, InviteModule, SearchZenodoCommunitiesServiceModule, ZenodoCommunitiesServiceModule, SearchFormModule, SearchDataprovidersServiceModule, SearchProjectsServiceModule, SearchResearchResultsServiceModule, SearchResultsModule, CuratorsModule, AffiliationsModule, - Schema2jsonldModule, SEOServiceModule, MatSelectModule, EntitiesSelectionModule, + SEOServiceModule, MatSelectModule, EntitiesSelectionModule, TabsModule, SearchTabModule, ErrorMessagesModule ], declarations: [ diff --git a/src/app/contact/contact.component.html b/src/app/contact/contact.component.html index 6b5d79e..33cdc54 100644 --- a/src/app/contact/contact.component.html +++ b/src/app/contact/contact.component.html @@ -1,4 +1,5 @@ - + diff --git a/src/app/contact/contact.component.ts b/src/app/contact/contact.component.ts index ad17763..c4fca2a 100644 --- a/src/app/contact/contact.component.ts +++ b/src/app/contact/contact.component.ts @@ -57,7 +57,7 @@ export class ContactComponent implements OnInit { this.seoService.createLinkForCanonicalURL(this.url); this.updateUrl(this.url); this.updateTitle(this.pageTitle); - this.updateDescription("OpenAIRE - Connect, Community Gateway, research community"); + this.updateDescription("Contact us to learn more about OpenAIRE Connect Research Gateways"); this.reset(); //this.getDivContents(); this.getPageContents(); diff --git a/src/app/htmlPages/htmlPage.component.ts b/src/app/htmlPages/htmlPage.component.ts index da8e35d..e1599bc 100644 --- a/src/app/htmlPages/htmlPage.component.ts +++ b/src/app/htmlPages/htmlPage.component.ts @@ -11,7 +11,7 @@ import {ConnectHelper} from "../openaireLibrary/connect/connectHelper"; @Component({ selector: 'html-page', template: ` - + ` }) diff --git a/src/app/learn-how/faqs/faqs.component.ts b/src/app/learn-how/faqs/faqs.component.ts index e5935f3..210ae62 100644 --- a/src/app/learn-how/faqs/faqs.component.ts +++ b/src/app/learn-how/faqs/faqs.component.ts @@ -18,6 +18,6 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co }) export class FaqsComponent { public pageTitle: string = "OpenAIRE - Connect | FAQs"; - public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community"; + public pageDescription: string = "Frequently asked questions about OpenAIRE Connect research gateway"; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'FAQs'}]; } diff --git a/src/app/learn-how/learn-how.component.ts b/src/app/learn-how/learn-how.component.ts index 59251e0..ef66dc8 100644 --- a/src/app/learn-how/learn-how.component.ts +++ b/src/app/learn-how/learn-how.component.ts @@ -1,10 +1,4 @@ import {Component} from '@angular/core'; -import {ActivatedRoute, Router} from '@angular/router'; -import {Meta, Title} from '@angular/platform-browser'; -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 {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component"; @Component({ @@ -24,6 +18,6 @@ import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.compo }) export class LearnHowComponent { public pageTitle: string = "OpenAIRE - Connect | Learn How"; - public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community"; + public pageDescription: string = "Learn the process: Build a Gateway to your community's open and linked research outcomes. Customized to your needs."; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about'}]; } diff --git a/src/app/learn-how/learnInDepth/learn-in-depth.component.ts b/src/app/learn-how/learnInDepth/learn-in-depth.component.ts index cf4efe4..0a52797 100644 --- a/src/app/learn-how/learnInDepth/learn-in-depth.component.ts +++ b/src/app/learn-how/learnInDepth/learn-in-depth.component.ts @@ -18,6 +18,6 @@ import {Breadcrumb} from "../../openaireLibrary/utils/breadcrumbs/breadcrumbs.co }) export class LearnInDepthComponent { public pageTitle: string = "OpenAIRE - Connect | Learn In Depth"; - public pageDescription: string = "OpenAIRE - Connect, Community Gateway, research community"; + public pageDescription: string = "Work in 4 collaborative steps to identify your needs, putting in practice our expertise on open science so you get the most out of OpenAIRE’s operational services."; public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'about', route: '/about'}, {name: 'learn in-depth'}]; } diff --git a/src/assets/sitemap.xml b/src/assets/sitemap.xml deleted file mode 100644 index 35438b8..0000000 --- a/src/assets/sitemap.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - - weekly - 0.5 - - - ![CDATA[https://demo.openaire.eu/participate/deposit-publications] - weekly - 0.5 - - - ![CDATA[https://demo.openaire.eu/participate/deposit-datasets] - weekly - 0.5 - - diff --git a/src/robots.prod.txt b/src/robots.prod.txt index 5919c0a..9bc97c3 100644 --- a/src/robots.prod.txt +++ b/src/robots.prod.txt @@ -1,3 +1,10 @@ User-Agent: * +Disallow: /participate/direct-claim +Disallow: /participate/direct-claim?* +Disallow: /participate/claim +Disallow: /myclaims +Disallow: /myclaims?* +Disallow: /claims +Disallow: /claims?* -Sitemap: https://connect.openaire.eu/sitemap.xml +Sitemap: /sitemap.xml diff --git a/src/sitemap.xml b/src/sitemap.xml deleted file mode 100644 index 9baa05c..0000000 --- a/src/sitemap.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - -