diff --git a/CHANGELOG.md b/CHANGELOG.md index 562e4e3..bd7099f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,3 +9,22 @@ It contists of the search pages and the landing pages for the content of the BET For datasets there is the demo funtionality of Datatransfer service, using zenodo as source and EDI demo dcache as destination. There is link to EOSC market place (beta) for results connected to EOSC services. +## [1.0.1] +* Production search +* Data Transfer: NEW Browse functionality +* EOSC Subjects: NEW field eoscifguidelines +* Filter "Type" in search services: NEW field eoscdatasourcetype + +## [1.0.2] +* Fixes and updates in advanced search form and data transfer functionality. + +## [1.0.3] +* Updated styles according to new view in EOSC Marketplace & new Search + * Blue banner + * White logo + * Search form rounded and aligned to the center + * Fonts adjusted + * Grey background on page & white background on results +* Detailed page: Display of EOSC subjects updated +* [Bug fix] In description of research products' versions +* Strip html tags from titles & descriptions \ No newline at end of file diff --git a/package.json b/package.json index 3b25cb1..42ae7c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "eosc", - "version": "1.0.0", + "version": "1.0.3", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 16fb54c..a8ea711 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -78,7 +78,8 @@ export class AppComponent { logoSmallUrl: this.agg.logoUrl, position: 'center', menuPosition: 'center', - badge: false + badge: false, + darkBg: true }; this.buildMenu(); } diff --git a/src/app/home/home.component.html b/src/app/home/home.component.html index af72fda..7f6c88c 100644 --- a/src/app/home/home.component.html +++ b/src/app/home/home.component.html @@ -1,47 +1,52 @@
-
-
-
-
- -
- - -
- - -
-
- +
+
+
+
+
+
+
+
+
+ + +
+ +
+
+ +
+
+
-
- -
-
-
-
-
-
- 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.
- - -
+
+
+
+ +
+
+
+
+

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.
+
+
+ +
@@ -123,4 +128,4 @@
- +
diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 975454e..37ff331 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -144,7 +144,7 @@ export class HomeComponent { this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.customFilter ? StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId))) : ''); } - this.getFunders(); + } }, error => { @@ -225,62 +225,7 @@ export class HomeComponent { } return params; } - - getFunders() { - let refineParams1 = '&fq=country%20exact%20%22CA%22'; - let refineParams2 = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22&fq=country%20exact%20%22CA%22%20'; - this.subs.push(zip( - this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams1), - this._refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams2) - ).subscribe((data: any[]) => { - let queriedFunders1 = data[0][1][0].values; - queriedFunders1.forEach(queriedFunder => { - if(queriedFunder.id.includes('nserc')) { - this.funders.push({ - "id": queriedFunder.id, - "name": queriedFunder.name, - "publications": queriedFunder.number, - "openAccessPublications": null, - "logo": 'assets/nserc_logo.png', - "params": { - relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"' - } - }); - } else if(queriedFunder.id.includes('cihr')) { - this.funders.push({ - "id": queriedFunder.id, - "name": queriedFunder.name, - "publications": queriedFunder.number, - "openAccessPublications": null, - "logo": 'assets/cihr_logo.png', - "params": { - relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"' - } - }); - } else if(queriedFunder.id.includes('sshrc')) { - this.funders.push({ - "id": queriedFunder.id, - "name": queriedFunder.name, - "publications": queriedFunder.number, - "openAccessPublications": null, - "logo": 'assets/sshrc_logo.png', - "params": { - relfunder: '"'+encodeURIComponent(queriedFunder.id)+'"' - } - }); - } - }); - let queriedFunders2 = data[1][1][0].values; - queriedFunders2.forEach(queriedFunder => { - for(let funder of this.funders) { - if(queriedFunder.id == funder.id) { - funder.openAccessPublications = queriedFunder.number; - } - } - }); - // console.log(this.funders); - })); - } + isRouteAvailable(routeToCheck: string) { for (let i = 0; i < this._router.config.length; i++) { diff --git a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts index c7e044d..0bead0a 100644 --- a/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts +++ b/src/app/searchPages/advanced/advancedSearchDataProviders.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchDataProvidersComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 fdf9016..1bef7d0 100644 --- a/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts +++ b/src/app/searchPages/advanced/advancedSearchOrganizations.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchOrganizationsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 36222ae..b9ba48d 100644 --- a/src/app/searchPages/advanced/advancedSearchProjects.component.ts +++ b/src/app/searchPages/advanced/advancedSearchProjects.component.ts @@ -15,7 +15,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchProjectsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 15e05f6..16a9f7d 100644 --- a/src/app/searchPages/advanced/advancedSearchServices.component.ts +++ b/src/app/searchPages/advanced/advancedSearchServices.component.ts @@ -19,7 +19,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireAdvancedSearchServicesComponent { properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 e83b405..274ef16 100644 --- a/src/app/searchPages/advanced/searchResearchResults.component.ts +++ b/src/app/searchPages/advanced/searchResearchResults.component.ts @@ -14,7 +14,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/advanced/research-results"; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 60fff71..55e4c59 100644 --- a/src/app/searchPages/find/search.component.ts +++ b/src/app/searchPages/find/search.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchComponent{ piwikSiteId = properties.piwikSiteId; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + public searchForm: SearchForm = {class: 'search-form', dark: true}; constructor ( ) {} ngOnInit() {} } diff --git a/src/app/searchPages/simple/searchDataproviders.component.ts b/src/app/searchPages/simple/searchDataproviders.component.ts index 4a8948b..1afff3c 100644 --- a/src/app/searchPages/simple/searchDataproviders.component.ts +++ b/src/app/searchPages/simple/searchDataproviders.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchDataprovidersComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 a5f4f32..b5dab2a 100644 --- a/src/app/searchPages/simple/searchOrganizations.component.ts +++ b/src/app/searchPages/simple/searchOrganizations.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchOrganizationsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 d5a19b6..2942bf2 100644 --- a/src/app/searchPages/simple/searchProjects.component.ts +++ b/src/app/searchPages/simple/searchProjects.component.ts @@ -11,7 +11,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc }) export class OpenaireSearchProjectsComponent { properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 7e6daa7..d581f8f 100644 --- a/src/app/searchPages/simple/searchResearchResults.component.ts +++ b/src/app/searchPages/simple/searchResearchResults.component.ts @@ -13,7 +13,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchResearchResultsComponent { @Input() searchLink: string = "/search/research-results"; properties: EnvProperties; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 8d7f795..22fe433 100644 --- a/src/app/searchPages/simple/searchServices.component.ts +++ b/src/app/searchPages/simple/searchServices.component.ts @@ -16,7 +16,7 @@ import {SearchForm} from "../../openaireLibrary/searchPages/searchUtils/newSearc export class OpenaireSearchServicesComponent { properties: EnvProperties; public openaireEntities = OpenaireEntities; - public searchForm: SearchForm = {class: 'search-form', dark: false}; + 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 ee3ab82..5160784 100644 --- a/src/app/utils/aggregators.ts +++ b/src/app/utils/aggregators.ts @@ -34,115 +34,10 @@ export class AggregatorInfo { export class PortalAggregators { static eoscInfo: AggregatorInfo = - new AggregatorInfo("eosc", "Eosc Explore", "https://providers.eosc-portal.eu/assets/images/EOSC_Portal_Logo.png", + new AggregatorInfo("eosc", "Eosc Explore", "https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.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; - } `); static disabled = { diff --git a/src/assets/arrow.svg b/src/assets/arrow.svg new file mode 100644 index 0000000..903449c --- /dev/null +++ b/src/assets/arrow.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/ask-explore.svg b/src/assets/ask-explore.svg deleted file mode 100644 index c1a0493..0000000 --- a/src/assets/ask-explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/canada-background.svg b/src/assets/canada-background.svg deleted file mode 100644 index e8b4990..0000000 --- a/src/assets/canada-background.svg +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/src/assets/canada-logo.png b/src/assets/canada-logo.png deleted file mode 100644 index d11538b..0000000 Binary files a/src/assets/canada-logo.png and /dev/null differ diff --git a/src/assets/cihr_logo.png b/src/assets/cihr_logo.png deleted file mode 100644 index 74121e6..0000000 Binary files a/src/assets/cihr_logo.png and /dev/null differ diff --git a/src/assets/develop.png b/src/assets/develop.png deleted file mode 100644 index f4d7160..0000000 Binary files a/src/assets/develop.png and /dev/null differ diff --git a/src/assets/eosc-custom.less b/src/assets/eosc-custom.less new file mode 100644 index 0000000..4f1391b --- /dev/null +++ b/src/assets/eosc-custom.less @@ -0,0 +1,132 @@ +/* EOSC */ +//@eosc-color: #3D4DB6; +//@eosc-light-color: #E80000; +//@eosc-dark-color: #AD0000; +//@eosc-secondary-color: #AD0000; +//@eosc-default-background: #F2F2F2; +// +////@global-primary-gradient: linear-gradient(104deg, @eosc-dark-color 0%, @eosc-light-color 100%); +//@global-primary-gradient: @eosc-light-color; +// +///* Button */ +//@button-primary-background: @eosc-color; +//@inverse-button-primary-background: @eosc-color; +//@button-primary-hover-background: @eosc-secondary-color; +//@button-primary-active-background: @eosc-secondary-color; +// +///* Background */ +//@background-primary-background: @eosc-color; +//@background-primary-background-gradient: none; +// +///* Text */ +//@text-primary-color: @eosc-color; +// +///* Label */ +//@label-secondary-color: @eosc-color; +// +///* General */ +//@general-tab-featured-tab: @eosc-color; +// +///* Landing */ +//@landing-portal-color: @eosc-color; +// +//.search-form { +// background-color: rgba(61,77, 182); +//} + + +@eosc-color: #3D4DB6; +@eosc-light-color: #05A6E7; +@eosc-dark-color: #0C2BD5; +//@eosc-secondary-color: #2255A4; +@eosc-secondary-color: #1890FF; +@eosc-default-background: #F2F2F2; + + +@global-primary-background: @eosc-color; +@global-secondary-background: @eosc-secondary-color; + +@general-search-form-background: @eosc-color; +@base-body-background: @eosc-default-background; + +.image-front-topbar, .search-form, #main-menu .uk-navbar-container, #main-menu-small .uk-navbar-container { + background: @global-primary-background; +} + +#searchImage{ + background: url('https://marketplace.eosc-portal.eu/packs/media/images/eosc-logo-mono-65a4962b88cf1caa9e35838e33022ca8.png') no-repeat center left; + width: 203px; + height: 79px; + background-size: 203px 79px; +} + +.search-results-container { + background-color: white; + border-radius: 25px; +} +// +//.contentbox { +// display: block; +// position: relative; +//} +// +//.contentbox > div { +// width: 58%; +// display: flex; +// flex-direction: column; +// justify-content: center; +//} +// +//.contentbox > div > div { +// width: 90%; +//} +// +//aside { +// background: transparent; +// position: absolute; +// top: -25px; +// right: -100px; +// width: 68%; +// +// display: block; +//} +// +//.contentbox img { +// max-width: 100%; +// min-width: 45%; +// height: auto; +//} +// +//@media (max-width: 576px) { +// .contentbox { +// display: flex; +// flex-direction: column-reverse; +// } +//} +// +//@media (max-width: 991px) { +// .contentbox { +// flex-direction: column; +// align-items: normal; +// } +//} +// +//@media (max-width: 1120px) { +// .contentbox > div { +// width: 100%; +// } +//} +// +//@media (max-width: 576px) { +// .contentbox > div > div { +// width: 100%; +// } +//} +// +//@media (max-width: 576px) { +// .contentbox aside { +// position: relative; +// width: 100%; +// right: auto; +// } +//} \ No newline at end of file diff --git a/src/assets/explore.svg b/src/assets/explore.svg deleted file mode 100644 index c41bb4d..0000000 --- a/src/assets/explore.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/src/assets/lock.svg b/src/assets/lock.svg deleted file mode 100644 index 3e7671d..0000000 --- a/src/assets/lock.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/assets/nserc_logo.png b/src/assets/nserc_logo.png deleted file mode 100644 index 0b98955..0000000 Binary files a/src/assets/nserc_logo.png and /dev/null differ diff --git a/src/assets/sky_bw3.png b/src/assets/sky_bw3.png deleted file mode 100644 index efff414..0000000 Binary files a/src/assets/sky_bw3.png and /dev/null differ diff --git a/src/assets/sshrc_logo.png b/src/assets/sshrc_logo.png deleted file mode 100644 index 18fb8f6..0000000 Binary files a/src/assets/sshrc_logo.png and /dev/null differ diff --git a/src/assets/Εxplore-sub.jpg b/src/assets/Εxplore-sub.jpg deleted file mode 100644 index 78d4e8d..0000000 Binary files a/src/assets/Εxplore-sub.jpg and /dev/null differ diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 1e4ae57..43b822e 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -109,5 +109,12 @@ export let properties: EnvProperties = { depositSearchPage: "/participate/deposit/search", altMetricsAPIURL: "https://api.altmetric.com/v1/doi/", reCaptchaSiteKey: null, - footerGrantText : "" + footerGrantText : "", + eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", + eoscDataTransferDestinations : [ + {label: "EGI dCache (dcache-demo.desy.de)", value: + {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache", + webpage : "https://dcache-demo.desy.de", defaultFolder: "/", hasBrowse: true, + loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"} + }] }; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index e9a8c3a..3a6ccce 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -109,5 +109,18 @@ export let properties: EnvProperties = { 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" + 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", + eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", + eoscDataTransferDestinations : [ + {label: "EGI dCache (dcache-demo.desy.de)", value: + {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache", + webpage : "https://dcache-demo.desy.de", defaultFolder: "/", hasBrowse: true, + loginUrl : "http://rudie.di.uoa.gr:8580/openid_connect_login", cookieName: "EGIAccessToken"} + }, + {label: "FTP", value: + {label : "FTP", id: "ftp", + loginUrl : null} + } + ] + }; diff --git a/src/styles.less b/src/styles.less index ebb671c..f476716 100644 --- a/src/styles.less +++ b/src/styles.less @@ -9,4 +9,5 @@ @import "~src/assets/common-assets/less/user"; @import "~src/assets/common-assets/less/linking"; @import "~src/assets/common-assets/less/landing"; -@import "assets/portal-custom.css"; \ No newline at end of file +//@import "assets/portal-custom.css"; +@import "assets/eosc-custom"; \ No newline at end of file