From f5968ca7b5d530919d67ac08e216b3bd3ae545a4 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Mon, 8 Aug 2022 17:20:28 +0300 Subject: [PATCH] [Aggregator | new-theme]: environments/: Removed old properties "searchLinkToEntityRegistriesDataProvidersTable" and "searchLinkToJournalsTable" | Removed checks and configurations for eosc (created dedicated project for eosc). --- angular.json | 50 ------- package.json | 2 - src/app/app.component.ts | 10 +- src/app/home/home.component.html | 19 --- .../advancedSearchDataProviders.component.ts | 2 +- .../advancedSearchOrganizations.component.ts | 2 +- .../advancedSearchProjects.component.ts | 2 +- .../advancedSearchServices.component.ts | 2 +- .../searchResearchResults.component.ts | 2 +- src/app/searchPages/find/search.component.ts | 2 +- .../simple/searchDataproviders.component.ts | 2 +- .../simple/searchOrganizations.component.ts | 2 +- .../simple/searchProjects.component.ts | 2 +- .../simple/searchResearchResults.component.ts | 2 +- .../simple/searchServices.component.ts | 2 +- src/app/utils/aggregators.ts | 119 +--------------- src/environments/environment.beta.ts | 2 - src/environments/environment.eosc.ts | 128 ------------------ src/environments/environment.prod.ts | 2 - src/environments/environment.ts | 6 +- src/eosc/index.html | 65 --------- src/eosc/robots.txt | 2 - src/index.html | 10 -- 23 files changed, 20 insertions(+), 417 deletions(-) delete mode 100644 src/environments/environment.eosc.ts delete mode 100644 src/eosc/index.html delete mode 100644 src/eosc/robots.txt diff --git a/angular.json b/angular.json index e7899f5..071c1a5 100644 --- a/angular.json +++ b/angular.json @@ -154,45 +154,6 @@ "maximumWarning": "6kb" } ] - }, - "eosc": { - "assets": [ - "src/assets", - { - "input": "src/eosc/", - "output": "/", - "glob": "*.txt" - } - ], - "index": { - "input": "src/eosc/index.html", - "output": "index.html" - }, - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.eosc.ts" - } - ], - "optimization": true, - "outputHashing": "all", - "sourceMap": false, - "namedChunks": false, - "aot": true, - "extractLicenses": true, - "vendorChunk": false, - "buildOptimizer": true, - "budgets": [ - { - "type": "initial", - "maximumWarning": "2mb", - "maximumError": "5mb" - }, - { - "type": "anyComponentStyle", - "maximumWarning": "6kb" - } - ] } } }, @@ -275,17 +236,6 @@ ], "sourceMap": false, "optimization": true - }, - "eosc": { - "outputHashing": "media", - "fileReplacements": [ - { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.eosc.ts" - } - ], - "sourceMap": false, - "optimization": true } } }, diff --git a/package.json b/package.json index abd5b68..6b29064 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "build": "ng build", "build-dev": "ng build --configuration=development", "build-beta": "ng build --configuration=beta", - "build-eosc": "ng build --configuration=eosc", "build-prod": "ng build --prod", "webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/aggregator/browser/stats-es2015.json --host 0.0.0.0", "test": "ng test", @@ -17,7 +16,6 @@ "build:ssr-dev": "npm run build-dev && ng run aggregator:server:development", "build:ssr-beta": "npm run build-beta && ng run aggregator:server:beta", "build:ssr-prod": "npm run build-prod && ng run aggregator:server:production", - "build:ssr-eosc": "npm run build-eosc && ng run aggregator:server:eosc", "prerender": "ng run aggregator:prerender", "after-build-clean": "rm -rf dist/aggregator/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .git*" }, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index fc0ef2c..68a15bc 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -29,7 +29,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields" - + OpenAIRE uses cookies in order to function properly.
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing experience possible. @@ -39,7 +39,7 @@ import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields" ratio="1"> - + ` }) @@ -90,9 +90,9 @@ export class AppComponent { title: this.agg.title, logoUrl: this.agg.logoUrl, logoSmallUrl: this.agg.logoUrl, - position: this.agg.menuId == 'eosc'?'center':'left', - menuPosition: this.agg.menuId == 'eosc'?'center':'right', - badge: this.agg.menuId == 'eosc'?false:true + position: 'left', + menuPosition: 'right', + badge: true }; this.buildMenu(); } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index 7996ea6..92f350f 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -90,25 +90,6 @@ - -
-
-
-
- Welcome to EOSC Explore - -
- The in-context research discovery portal over the EOSC Exchange and the global map of science. - -
-
The EOSC Explore supports discovery of research products and services onboarded in the EOSC Exchange in the wider context of scientific research outcomes, research funding, and research organization. The EOSC Research Graph, powered by the OpenAIRE Research Graph, provides links from products and services to funders, projects, organizations, and authors, collects and infers SDGs subjects, communities, many more. The portal exploits the EOSC Interoperability Framework to identify relationships between research products in the graph and EOSC Services in the EOSC Marketplace, to facilitate and enable composability of resources.
-
-
- - -
diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index c04de0d..22d6ce8 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -20,7 +20,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchDataProvidersComponent { customFilter: SearchCustomFilter = null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts index a0e4df6..0ac4d02 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -21,7 +21,7 @@ export class OpenaireAdvancedSearchOrganizationsComponent { customFilter:SearchCustomFilter= null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchProjects.component.ts b/src/app/searchPages/advanced/advancedSearchProjects.component.ts index 294a0d3..29420bd 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts @@ -20,7 +20,7 @@ export class OpenaireAdvancedSearchProjectsComponent { customFilter:SearchCustomFilter= null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/advancedSearchServices.component.ts b/src/app/searchPages/advanced/advancedSearchServices.component.ts index 741f750..c7b9921 100644 --- a/src/app/searchPages/advanced/advancedSearchServices.component.ts +++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts @@ -24,7 +24,7 @@ export class OpenaireAdvancedSearchServicesComponent { customFilter: SearchCustomFilter = null; properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/advanced/searchResearchResults.component.ts b/src/app/searchPages/advanced/searchResearchResults.component.ts index 3a73f55..e62d5a2 100644 --- a/src/app/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/searchPages/advanced/searchResearchResults.component.ts @@ -18,7 +18,7 @@ export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/advanced/research-results"; customFilter:SearchCustomFilter= null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/find/search.component.ts b/src/app/searchPages/find/search.component.ts index ac91871..7193296 100644 --- a/src/app/searchPages/find/search.component.ts +++ b/src/app/searchPages/find/search.component.ts @@ -15,7 +15,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchComponent{ customFilter:SearchCustomFilter= null; piwikSiteId = properties.piwikSiteId; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { let id = ConnectHelper.getCommunityFromDomain(properties.domain); diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index bd86223..1353927 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -19,7 +19,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchDataprovidersComponent { customFilter: SearchCustomFilter = null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchOrganizations.component.ts b/src/app/searchPages/simple/searchOrganizations.component.ts index 7c67cc7..ef04d3e 100644 --- a/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/searchPages/simple/searchOrganizations.component.ts @@ -20,7 +20,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchOrganizationsComponent { customFilter:SearchCustomFilter= null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchProjects.component.ts b/src/app/searchPages/simple/searchProjects.component.ts index ba910da..d29ac06 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -19,7 +19,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchProjectsComponent { customFilter: SearchCustomFilter = null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchResearchResults.component.ts b/src/app/searchPages/simple/searchResearchResults.component.ts index c996142..f56103c 100644 --- a/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/searchPages/simple/searchResearchResults.component.ts @@ -18,7 +18,7 @@ export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/research-results"; customFilter:SearchCustomFilter= null; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/searchPages/simple/searchServices.component.ts b/src/app/searchPages/simple/searchServices.component.ts index f1348b0..ec2f679 100644 --- a/src/app/searchPages/simple/searchServices.component.ts +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -23,7 +23,7 @@ export class OpenaireSearchServicesComponent { customFilter: SearchCustomFilter = null; properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: properties.adminToolsPortalType == "eosc" ? false : true}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() { this.properties = properties; diff --git a/src/app/utils/aggregators.ts b/src/app/utils/aggregators.ts index 7ff1450..a335202 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -70,127 +70,12 @@ export class PortalAggregators { } `), new AggregatorInfo("italy", "Italian Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "IT", "Italy"), - new AggregatorInfo("greece", "Greek Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece"), - new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png", - null, null, null, null,null,null ,false,false, - ` - :root { - --primary-color: #3540b6; - --primary-dark-color: #233d4c; - --search-form-background: transparent; - - } - .search-input { - --search-input-border-radius: 0px; - } - .input-wrapper.advanced-search { - --input-border-radius: 0px; - } - .input-wrapper { - --input-border-radius: 0px; - } - a, .uk-link, a.uk-link-heading{ - color: #3540b6; - } - a:hover, .uk-link:hover, a.uk-link-heading:hover{ - color: #233d4c; - text-decoration: none; - } - .uk-link-text a:hover, .uk-link-toggle:hover .uk-link-text, a.uk-link-text:hover{ - color:#0c2bd5; - } -.search_box_bg { - /*background: url(//marketplace.eosc-portal.eu/packs/media/images/home-bg-89b63b3d579f3530ec6283f51e1648bc.png) no-repeat;*/ - /* background-position-x: 0%;*/ - /* background-position-y: 0%;*/ - /* background-position: 50% -120px;*/ - z-index: 3; -} -#searchImage{ -background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-color-883f208671ef77b15b9cd067ecdc369b.png') no-repeat center left; -width: 250px; -height: 80px; -background-size: 250px 80px; -/*margin-left: 80px;*/ -} -#searchForm advanced-search-form{ -float:right; -} -#searchForm{ -/*padding:0;*/ - /*width:100%;*/ - /*max-width:100%;*/ -} -search-filter h6::after{ -border-bottom: 1px solid gray; -} -search-filter h6{ -text-transform: uppercase !important; -font-size: 12px; -} - -search-filter .tm-child-list-divider > ul > li:nth-child(n+2), .uk-list-divider > li:nth-child(n+2){ -border: none; -} - -.filterHeader{ -border-bottom:1px solid #ced4da; -} -.matSelection.mat-select { - - padding: 4px; - border: 1px solid #ced4da; - -} - -.search-results .uk-card-default.uk-card-hover:hover{ - box-shadow: none; -} -.search-results .uk-card-default { - border: 1px solid #ced4da; - box-shadow:none; -} - - -.uk-pagination > .uk-active > *, .uk-pagination > .uk-active > :hover { - - border-radius: 0px; - - -} - .uk-button-primary:not(.uk-icon-button), .portal-button:not(.uk-icon-button) { - color: #fff !important; - background-color: #0c2bd5 !important; - background-image: linear-gradient(135deg,#05cae7,#0c2bd5) !important; - border:none !important; - } - - .uk-button-primary:hover, .portal-button:hover:not(.uk-icon-button) { - background: #0c2bd5 !important; - border:none !important; - } - - .search_box_bg .uk-button, #searchForm .uk-button:not(.uk-button-text):not(.uk-button-link), .search_box_bg .uk-button:hover, #searchForm .uk-button:hover:not(.uk-button-text):not(.uk-button-link) { - border-radius: 0px; - margin-left: 0px !important; - color: rgb(102, 102, 102) !important; - background-color: #0c2bd5 !important; - background-color: rgba(255, 255, 255, 1.0) !important; - border: 1px solid rgba(0, 0, 0, 0.40) !important; - background-image: none !important; - padding: 10px; - } - - `) - + new AggregatorInfo("greece", "Greek Aggregator", "assets/common-assets/logo-small-aggregator.png", "Country", "country", "GR", "Greece") ]; static disabled = { "canada": {pages: ["/search/find/services"], entities: ["software", "service"]}, "italy": {pages: ["/search/find/services"], entities: ["service"]}, - "greece": {pages: ["/search/find/services"], entities: ["service"]}, - "eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop", - "/search/find/datasources"] - , entities: ["datasource"]} + "greece": {pages: ["/search/find/services"], entities: ["service"]} }; static defaultAggregator: AggregatorInfo = PortalAggregators.list[0]; diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 16d9627..6aa3ef0 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -92,9 +92,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications", diff --git a/src/environments/environment.eosc.ts b/src/environments/environment.eosc.ts deleted file mode 100644 index ba71854..0000000 --- a/src/environments/environment.eosc.ts +++ /dev/null @@ -1,128 +0,0 @@ -import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties"; - -export let properties: EnvProperties = { - environment: "beta", - adminToolsPortalType: "eosc", - dashboard: "aggregator", - enablePiwikTrack: true, - useCache: false, - useLongCache: true, - showAddThis: true, - enableEoscDataTransfer: true, - framesAPIURL: "https://beta.openaire.eu/stats3/", - statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", - statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", - statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - useNewStatistisTool: true, - claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", - searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", - searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources", - openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=", - csvAPIURL: "https://services.openaire.eu/search/v2/api/reports", - searchCrossrefAPIURL: "https://api.crossref.org/works", - searchDataciteAPIURL: "https://api.datacite.org/works", - searchOrcidURL: "https://pub.orcid.org/v2.1/", - orcidURL: "https://orcid.org/", - doiURL: "https://dx.doi.org/", - pmcURL: "http://europepmc.org/articles/", - pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/", - handleURL: "http://hdl.handle.net/", - cordisURL: "http://cordis.europa.eu/projects/", - openDoarURL: "http://v2.sherpa.ac.uk/id/repository/", - r3DataURL: "http://service.re3data.org/repository/", - fairSharingURL: "https://fairsharing.org/", - eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/", - sherpaURL: "http://sherpa.ac.uk/romeo/issn/", - sherpaURLSuffix: "/", - zenodo: "https://zenodo.org/", - openAccess: "https://www.openaire.eu/support/faq#article-id-234", - openAccessRepo: "https://www.openaire.eu/support/faq#article-id-310", - fp7Guidlines: "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme", - h2020Guidlines: "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020", - 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: "594", - - loginUrl: "https://services.openaire.eu/login-service/openid_connect_login", - userInfoUrl: "https://services.openaire.eu/login-service/userInfo", - logoutUrl: "https://services.openaire.eu/login-service/openid_logout", - cookieDomain: ".openaire.eu", - - feedbackmail: "feedback@openaire.eu", - - cacheUrl: "https://explore.openaire.eu/cache/get?url=", - - datasourcesAPI: "https://services.openaire.eu/openaire/ds/search/", - - adminToolsCommunity: "aggregator", - adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/", - useHelpTexts:false, - - contextsAPI: "https://services.openaire.eu/openaire/context", - - communityAPI: "https://services.openaire.eu/openaire/community/", - - csvLimit: 2000, - pagingLimit: 20, - resultsPerPage: 10, - - "baseLink" : "/", - "domain": "https://explore.eosc-portal.eu", - - searchLinkToResult: "/search/result?id=", - searchLinkToPublication: "/search/publication?articleId=", - searchLinkToProject: "/search/project?projectId=", - searchLinkToDataProvider: "/search/dataprovider?datasourceId=", - searchLinkToService: "/search/service?serviceId=", - searchLinkToDataset: "/search/dataset?datasetId=", - searchLinkToSoftwareLanding: "/search/software?softwareId=", - searchLinkToOrp: "/search/other?orpId=", - searchLinkToOrganization: "/search/organization?organizationId=", - - searchLinkToPublications: "/search/find/publications", - searchLinkToDataProviders: "/search/find/dataproviders", - searchLinkToServices: "/search/find/services", - searchLinkToProjects: "/search/find/projects", - searchLinkToDatasets: "/search/find/datasets", - searchLinkToSoftware: "/search/find/software", - searchLinkToOrps: "/search/find/other", - searchLinkToOrganizations: "/search/find/organizations", - searchLinkToCompatibleDataProviders: "/search/content-providers", - searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", - searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", - searchLinkToResults: "/search/find/research-outcomes", - - searchLinkToAdvancedPublications: "/search/advanced/publications", - searchLinkToAdvancedProjects: "/search/advanced/projects", - searchLinkToAdvancedDatasets: "/search/advanced/datasets", - searchLinkToAdvancedSoftware: "/search/advanced/software", - searchLinkToAdvancedOrps: "/search/advanced/other", - searchLinkToAdvancedDataProviders: "/search/advanced/dataproviders", - searchLinkToAdvancedServices: "/search/advanced/services", - searchLinkToAdvancedOrganizations: "/search/advanced/organizations", - searchLinkToAdvancedResults: "/search/advanced/research-outcomes", - - errorLink: "/error", - - lastIndexInformationLink: "https://beta.openaire.eu/aggregation-and-content-provision-workflows", - showLastIndexInformationLink: true, - widgetLink: "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=", - claimsInformationLink: "https://www.openaire.eu/linking", - lastIndexUpdate: "2020-06-15", - indexInfoAPI: "https://beta.services.openaire.eu/openaire/info/", - - depositLearnHowPage: "/participate/deposit/learn-how", - depositSearchPage: "/participate/deposit/search", - altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", - reCaptchaSiteKey: null, - footerGrantText : "This OpenAIRE gateway is part of a project that has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452" - -}; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index a4c02f8..edc5294 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -94,9 +94,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index c41cff6..cd0dcf1 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -7,7 +7,7 @@ import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-propert export let properties: EnvProperties = { environment: "development", - adminToolsPortalType: "eosc", + adminToolsPortalType: "aggregator", dashboard: "aggregator", enablePiwikTrack: false, useCache: true, @@ -75,7 +75,7 @@ export let properties: EnvProperties = { resultsPerPage: 10, "baseLink" : "", - "domain":"https://explore.eosc-portal.eu", + "domain": "https://canada.explore.openaire.eu", searchLinkToResult: "/search/result?id=", searchLinkToPublication: "/search/publication?articleId=", @@ -97,9 +97,7 @@ export let properties: EnvProperties = { searchLinkToOrganizations: "/search/find/organizations", searchLinkToCompatibleDataProviders: "/search/content-providers", searchLinkToEntityRegistriesDataProviders: "/search/entity-registries", - searchLinkToEntityRegistriesDataProvidersTable: "/search/entity-registries-table", searchLinkToJournals: "/search/journals", - searchLinkToJournalsTable: "/search/journals-table", searchLinkToResults: "/search/find/research-outcomes", searchLinkToAdvancedPublications: "/search/advanced/publications", diff --git a/src/eosc/index.html b/src/eosc/index.html deleted file mode 100644 index b835948..0000000 --- a/src/eosc/index.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Search OpenAIRE - - -
Beta instance
-
- - - -
- - -
- - -
- - - - diff --git a/src/eosc/robots.txt b/src/eosc/robots.txt deleted file mode 100644 index c6742d8..0000000 --- a/src/eosc/robots.txt +++ /dev/null @@ -1,2 +0,0 @@ -User-Agent: * -Disallow: / diff --git a/src/index.html b/src/index.html index cb3c6e4..800d21c 100644 --- a/src/index.html +++ b/src/index.html @@ -44,16 +44,6 @@
Beta instance
-
- - -
- - -
- - -