MaDgIK
/
eosc-explore
13
0
Fork 0
Code Issues Pull Requests Projects Releases 12 Wiki Activity

[Library | EOSC Explore]: Updated styles | Updated link to Marketplace for EOSC::RO-crate | Bug fix in description of results versions | Removed timeout from reports.service.ts. 

1. home.component.html: Added blue banner, white logo, aligned search form to the center and updated fonts according the new EOSC Marketplace.
2. parsingFunctions.class.ts: Updated link to Marketplace for eosc subject EOSC::RO-crate.
3. resultLanding.component.html: Updated how links to Compatible EOSC Services are displayed.
4. searchAll.component.html: Updated paddings and margins in search form of Search all page.
5. navigationBar.component.html: Set burger menu icon to light color if dark background.
6. advancedSearchDataProviders.component.ts & advancedSearchOrganizations.component.ts & advancedSearchProjects.component.ts & advancedSearchServices.component.ts & searchResearchResults.component.ts & searchDataproviders.component.ts & searchOrganizations.component.ts & searchProjects.component.ts & searchResearchResults.component.ts & searchServices.component.ts & search.component.ts: Set in searchForm, dark=true.
7. aggregators.ts: In eoscInfo, updated logoUrl and removed customCss of AggregatorInfo.
8. app.component.ts: Set header.darkBg: true.
9. Added eosc-custom.less file.
10. styles.less: import eosc-custom less file, instead of portal-custom.css.
11. deletedByInference.service.ts & result-preview.ts: [Bug fix] Parse description of versions properly.
12. reports.service.ts: Copy fix from angular-14 branch - do not timeout to 10000.
This commit is contained in:
Konstantina Galouni 2022-11-28 14:37:37 +02:00
parent b8d14cbfe5
commit 587c7f2331
19 changed files with 192 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/app.component.ts
View File

@ -78,7 +78,8 @@ export class AppComponent {
logoSmallUrl: this.agg.logoUrl,
position: 'center',
menuPosition: 'center',
badge: false
badge: false,
darkBg: true
};
this.buildMenu();
}

78
src/app/home/home.component.html
View File

@ -1,48 +1,52 @@
<div class="image-front-topbar">
<div class="uk-section uk-margin-large-left uk-padding-remove-bottom uk-grd uk-flex uk-overflow-hidden home-background">
<div class="uk-grid uk-width-1-1 uk-margin-bottom uk-height-medium">
<div class="uk-width-1-1 uk-width-auto@m uk-margin-medium-top"><div id="searchImage"></div></div>
<div class="uk-width-expand search_box_bg" uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
<div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-3-5@m" uk-scrollspy-class>
<advanced-search-input (searchEmitter)="goTo(true)">
<entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
(selectionChange)="entityChanged($event)" (disableSelectEmitter)="disableSelect = $event"
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>
<div class="uk-width-expand" input placeholder="Scholary works" [hint]="'Search in OpenAIRE'"
[(value)]="keyword" tooltip="true"></div>
</advanced-search-input>
<div *ngIf="selectedEntity === 'result' && !entities.input.focused" class="uk-dropdown uk-display-block uk-margin-top uk-width-auto">
<div class="uk-padding-small">
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
<div class="uk-section uk-section-small home-background">
<div id="searchForm" class="uk-container uk-container-large uk-section uk-section-xsmall uk-padding-remove-bottom">
<div class="uk-grid uk-flex uk-flex-center uk-margin-small-top">
<div class="uk-width-1-1 uk-width-auto@m uk-first-column"><div id="searchImage"></div></div>
<div class="uk-width-expand uk-padding-remove-vertical search_box_bg" uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
<div class="uk-flex uk-flex-center uk-flex-wrap">
<div class="uk-width-xlarge@l uk-width-large">
<div class="uk-flex uk-flex-center uk-child-width-1-1">
<div [class.uk-invisible]="disableSelect" uk-scrollspy-class>
<advanced-search-input (searchEmitter)="goTo(true)">
<entities-selection #entities [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
(selectionChange)="entityChanged($event)" (disableSelectEmitter)="disableSelect = $event"
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>
<div class="uk-width-expand" input placeholder="Scholary works" [hint]="'Search in OpenAIRE'"
[(value)]="keyword" tooltip="true"></div>
</advanced-search-input>
<div *ngIf="selectedEntity === 'result' && !entities.input.focused" class="uk-dropdown uk-display-block uk-margin-top uk-width-auto">
<div class="uk-padding-small">
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="uk-grid uk-child-width-1-1@s">
<div class="uk-width-expand">
<div class="uk-margin-large-left">
<div class=" ">
<span class=" uk-h1">Welcome to EOSC Explore
</span>
<i class=" uk-h5 uk-text-italics"><br>
The in-context research discovery portal over the EOSC Exchange and the global map of science.
</i>
</div>
<div class="uk-margin-large-top uk-text-large">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. </div>
</div>
</div>
<img
class="uk-width-large@m uk-width-1-1@s"
src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png">
</div>
<div class="uk-section uk-container uk-container-large">
<div class="contentbox uk-grid uk-child-width-1-1@s uk-flex-row-reverse">
<div class="uk-width-medium@m uk-width-large@l uk-width-xlarge@xl uk-width-1-1 uk-flex uk-flex-middle uk-padding-remove-horizontal">
<img src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png">
</div>
<div class="uk-width-expand">
<div class="">
<div class=" ">
<h1 class=" uk-h2 uk-text-normal">Welcome to EOSC Explore</h1>
<h2 class="uk-h5 uk-text-normal uk-text-italics"><br>
<i>The in-context research discovery portal over the EOSC Exchange and the global map of science.</i>
</h2>
</div>
<div class="uk-margin-large-top uk-text-large uk-text-light">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. </div>
</div>
</div>
<!-- <aside><img src="https://marketplace.eosc-portal.eu/packs/media/images/gfx_whole_illustation_desktop-fc94d4f7e15455d1785ef4793e1573fb.png"></aside>-->
</div>
<div class="uk-section graph-background" *ngIf="aggregator.graphSectionText && aggregator.graphSectionTitle">
<div class="uk-container">
<div class="uk-flex uk-flex-top uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
@ -124,4 +128,4 @@
</div>
</div>
</div>
</div>

2
src/app/openaireLibrary

@ -1 +1 @@
Subproject commit 65cc8504eaa645b32af7ea4238445d9cc47c2556
Subproject commit f935e81959f8f71b0057ecd6c116db444cd97846

2
src/app/searchPages/advanced/advancedSearchDataProviders.component.ts
View File

@ -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;

2
src/app/searchPages/advanced/advancedSearchOrganizations.component.ts
View File

@ -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;

2
src/app/searchPages/advanced/advancedSearchProjects.component.ts
View File

@ -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;

2
src/app/searchPages/advanced/advancedSearchServices.component.ts
View File

@ -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;

2
src/app/searchPages/advanced/searchResearchResults.component.ts
View File

@ -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;

2
src/app/searchPages/find/search.component.ts
View File

@ -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() {}
}

2
src/app/searchPages/simple/searchDataproviders.component.ts
View File

@ -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;

2
src/app/searchPages/simple/searchOrganizations.component.ts
View File

@ -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;

2
src/app/searchPages/simple/searchProjects.component.ts
View File

@ -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;

2
src/app/searchPages/simple/searchResearchResults.component.ts
View File

@ -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;

2
src/app/searchPages/simple/searchServices.component.ts
View File

@ -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;

107
src/app/utils/aggregators.ts
View File

@ -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 = {

2
src/assets/common-assets

@ -1 +1 @@
Subproject commit 2de3f625b772a264acb0579126b2bfce42778d0c
Subproject commit 99fab0671bee8251230599ef9bc3034aff39c141

132
src/assets/eosc-custom.less Normal file
View File

@ -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;
// }
//}

2
src/assets/openaire-theme

@ -1 +1 @@
Subproject commit f902074e00e01165f489e2fef12aad6551c03ccd
Subproject commit a9acdff7b3249794e002bffff52c07babc3d9d06

3
src/styles.less
View File

@ -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";
//@import "assets/portal-custom.css";
@import "assets/eosc-custom";