From c446566929d70a9076bcee9f2d788416cddcaf59 Mon Sep 17 00:00:00 2001 From: "argiro.kokogiannaki" Date: Mon, 17 Aug 2020 09:12:54 +0000 Subject: [PATCH] [Explore|Trunk] angular:jsom: add replacements files for robots.txt, index.html properly app.routing: table view routes redirect to search pages update robots.txt and properties files git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-portal/trunk@59287 d315682c-612b-4755-9ff5-7f18f6832af3 --- explore/angular.json | 16 ++++++++ explore/package.json | 4 +- explore/src/app/app-routing.module.ts | 6 +-- .../simple/searchResearchResults.component.ts | 2 +- explore/src/assets/explore-custom.css | 6 --- explore/src/environments/environment.beta.ts | 2 +- explore/src/environments/environment.prod.ts | 4 +- explore/src/environments/environment.test.ts | 6 ++- explore/src/robots.prod.txt | 4 ++ explore/src/sitemap.xml | 38 ++----------------- 10 files changed, 38 insertions(+), 50 deletions(-) diff --git a/explore/angular.json b/explore/angular.json index 99a0e19c..e58d4c7a 100644 --- a/explore/angular.json +++ b/explore/angular.json @@ -53,6 +53,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" } ] }, @@ -70,6 +78,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/explore/package.json b/explore/package.json index 39267872..fa9980a7 100644 --- a/explore/package.json +++ b/explore/package.json @@ -33,7 +33,9 @@ "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/explore/src/app/app-routing.module.ts b/explore/src/app/app-routing.module.ts index a38b5b4d..f93eb29a 100644 --- a/explore/src/app/app-routing.module.ts +++ b/explore/src/app/app-routing.module.ts @@ -52,11 +52,11 @@ const routes: Routes = [ // Search Content Providers Pages { path: 'search/content-providers', loadChildren: './searchPages/dataProviders/compatibleDataProviders.module#LibCompatibleDataProvidersModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/content-providers-table', loadChildren: './searchPages/dataProviders/compatibleDataProvidersTable.module#LibCompatibleDataProvidersTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/content-providers-table', redirectTo: 'search/content-providers'}, { path: 'search/entity-registries', loadChildren: './searchPages/dataProviders/entityRegistries.module#LibEntityRegistriesModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/entity-registries-table', loadChildren: './searchPages/dataProviders/entityRegistriesTable.module#LibEntityRegistriesTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/entity-registries-table', redirectTo: 'search/entity-registries'}, { path: 'search/journals', loadChildren: './searchPages/dataProviders/journals.module#LibJournalsModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, - { path: 'search/journals-table', loadChildren: './searchPages/dataProviders/journalsTable.module#LibJournalsTableModule', resolve: { envSpecific: EnvironmentSpecificResolver }}, + { path: 'search/journals-table', redirectTo: 'search/journals'}, // Deposit Pages { path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'}, diff --git a/explore/src/app/searchPages/simple/searchResearchResults.component.ts b/explore/src/app/searchPages/simple/searchResearchResults.component.ts index 917ff644..cb93b40a 100644 --- a/explore/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/explore/src/app/searchPages/simple/searchResearchResults.component.ts @@ -3,7 +3,7 @@ import {Component, Input} from '@angular/core'; @Component({ selector: 'openaire-search-results', template: ` - + ` }) diff --git a/explore/src/assets/explore-custom.css b/explore/src/assets/explore-custom.css index 239bb738..391ba8b2 100644 --- a/explore/src/assets/explore-custom.css +++ b/explore/src/assets/explore-custom.css @@ -216,9 +216,3 @@ border-radius: 6px; } -.exploreZenodoButton { - background: transparent linear-gradient(90deg, #01367D 0%, #009AE1 100%) 0% 0% no-repeat padding-box; - box-shadow: 0px 4px 10px #00000029; - border: none; - color: white; -} diff --git a/explore/src/environments/environment.beta.ts b/explore/src/environments/environment.beta.ts index 97b4b8ea..105f1996 100644 --- a/explore/src/environments/environment.beta.ts +++ b/explore/src/environments/environment.beta.ts @@ -107,7 +107,7 @@ export let properties: EnvProperties = { showLastIndexInformationLink: false, widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", claimsInformationLink: "https://beta.openaire.eu/linking", - lastIndexUpdate: "2020-03-26", + lastIndexUpdate: "2020-05-11", indexInfoAPI: "http://beta.services.openaire.eu/openaire/info/", depositLearnHowPage: "/participate/deposit/learn-how", diff --git a/explore/src/environments/environment.prod.ts b/explore/src/environments/environment.prod.ts index 57ee26eb..297f10a8 100644 --- a/explore/src/environments/environment.prod.ts +++ b/explore/src/environments/environment.prod.ts @@ -6,7 +6,7 @@ export let properties: EnvProperties = { enablePiwikTrack: true, useCache: false, useLongCache: true, - showAddThis: false, + showAddThis: true, metricsAPIURL: "https://services.openaire.eu/usagestats/", framesAPIURL: "https://www.openaire.eu/stats3/", statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", @@ -108,7 +108,7 @@ export let properties: EnvProperties = { showLastIndexInformationLink: true, widgetLink: "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", claimsInformationLink: "https://www.openaire.eu/linking", - lastIndexUpdate: "2020-04-22", + lastIndexUpdate: "2020-06-15", indexInfoAPI: "http://services.openaire.eu/openaire/info/", depositLearnHowPage: "/participate/deposit/learn-how", diff --git a/explore/src/environments/environment.test.ts b/explore/src/environments/environment.test.ts index 1dc20445..e92d1bff 100644 --- a/explore/src/environments/environment.test.ts +++ b/explore/src/environments/environment.test.ts @@ -39,12 +39,14 @@ export let properties: EnvProperties = { ercGuidlines: "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf", helpdesk: "https://www.openaire.eu/support/helpdesk", helpdeskEmail: "helpdesk@openaire.eu", - + utilsService: "https://explore.openaire.eu/utils-service", + vocabulariesAPI: "https://services.openaire.eu/provision/mvc/vocabularies/", piwikBaseUrl: "https://analytics.openaire.eu/piwik.php?idsite=", piwikSiteId: "109", loginUrl: "https://services.openaire.eu/uoa-user-management/openid_connect_login", + userInfoUrl: " https://services.openaire.eu/uoa-user-management/api/users/getUserInfo?accessToken=", logoutUrl: "https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=", @@ -105,7 +107,7 @@ export let properties: EnvProperties = { showLastIndexInformationLink: false, widgetLink: "https://test.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", claimsInformationLink: "https://www.openaire.eu/linking", - lastIndexUpdate: "2019-09-07", + lastIndexUpdate: "2020-07-31", indexInfoAPI: "http://services.openaire.eu/openaire/info/", depositLearnHowPage: "/participate/deposit/learn-how", diff --git a/explore/src/robots.prod.txt b/explore/src/robots.prod.txt index 3477660e..4395fa3c 100644 --- a/explore/src/robots.prod.txt +++ b/explore/src/robots.prod.txt @@ -1,8 +1,12 @@ User-Agent: * Disallow: /upload Disallow: /participate/direct-claim +Disallow: /participate/direct-claim?* +Disallow: /participate/claim Disallow: /myclaims +Disallow: /myclaims?* Disallow: /claims +Disallow: /claims?* Sitemap: https://explore.openaire.eu/sitemap.xml diff --git a/explore/src/sitemap.xml b/explore/src/sitemap.xml index 92553e19..7f079239 100644 --- a/explore/src/sitemap.xml +++ b/explore/src/sitemap.xml @@ -11,22 +11,7 @@ 1 - - daily - 0.9 - - - - daily - 0.9 - - - - daily - 0.9 - - - + daily 0.9 @@ -46,22 +31,7 @@ 0.9 - - daily - 0.8 - - - - daily - 0.8 - - - - daily - 0.8 - - - + daily 0.8 @@ -96,12 +66,12 @@ 0.7 - + weekly 0.8 - + weekly 0.8