Apply initial changes for eosc explore
This commit is contained in:
argirok
parent
aa00582f7e
commit
7476cd68b4
50
angular.json
50
angular.json
|
|
@ -155,6 +155,45 @@
|
|||
"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"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
@ -237,6 +276,17 @@
|
|||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true
|
||||
},
|
||||
"eosc": {
|
||||
"outputHashing": "media",
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.eosc.ts"
|
||||
}
|
||||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true
|
||||
}
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@
|
|||
"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",
|
||||
|
|
@ -16,6 +17,7 @@
|
|||
"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*"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -1,6 +1,10 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {Routes, RouterModule, PreloadAllModules} from '@angular/router';
|
||||
import {Router, RouterModule, Routes} from '@angular/router';
|
||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||
import {ConnectHelper} from "./openaireLibrary/connect/connectHelper";
|
||||
import {PortalAggregators} from "./utils/aggregators";
|
||||
import {properties} from "../environments/environment";
|
||||
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
|
||||
|
||||
const routes: Routes = [
|
||||
{path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)},
|
||||
|
|
@ -76,20 +80,7 @@ const routes: Routes = [
|
|||
path: 'project-report',
|
||||
loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
|
||||
},
|
||||
// Deposit Pages
|
||||
{ path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-subject-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-publications', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-publications-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
|
||||
{ path: 'participate/deposit/learn-how', loadChildren: () => import('./deposit/deposit.module').then(m => m.LibDepositModule)},
|
||||
{ path: 'participate/deposit/search', loadChildren: () => import('./deposit/searchDataprovidersToDeposit.module').then(m => m.LibSearchDataprovidersToDepositModule)},
|
||||
// Linking Pages
|
||||
{ path: 'myclaims', loadChildren: () => import('./claims/myClaims/myClaims.module').then(m => m.LibMyClaimsModule)},
|
||||
{ path: 'participate/claim', loadChildren: () => import('./claims/linking/linkingGeneric.module').then(m => m.LibLinkingGenericModule)},
|
||||
{ path: 'participate/direct-claim', loadChildren: () => import('./claims/directLinking/directLinking.module').then(m => m.LibDirectLinkingModule)},
|
||||
{path: 'develop', loadChildren: () => import('./develop/develop.module').then(m => m.DevelopModule)},
|
||||
|
||||
{path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)},
|
||||
{path: 'error', component: OpenaireErrorPageComponent},
|
||||
{path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
|
||||
|
|
@ -102,4 +93,51 @@ const routes: Routes = [
|
|||
exports: [RouterModule]
|
||||
})
|
||||
export class AppRoutingModule {
|
||||
subs = [];
|
||||
routes =[];
|
||||
ngOnDestroy() {
|
||||
for (let sub of this.subs) {
|
||||
sub.unsubscribe();
|
||||
}
|
||||
}
|
||||
constructor( private config: ConfigurationService, private router: Router){
|
||||
this.subs.push(this.config.communityInformationState.subscribe(data => {
|
||||
if (data) {
|
||||
if (data['pages']) {
|
||||
for (var i = 0; i < data['pages'].length; i++) {
|
||||
this.routes[data['pages'][i]['route']] = data['pages'][i]['isEnabled'];
|
||||
}
|
||||
}
|
||||
this.getRoutes();
|
||||
}
|
||||
},
|
||||
error => {
|
||||
// this.handleError('Error getting community information (e.g. pages,entities) for community with id: ' + this.communityId, error);
|
||||
}));
|
||||
}
|
||||
getRoutes(){
|
||||
let optionalRoutes = [
|
||||
// Deposit Pages
|
||||
{ path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-subject-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-publications', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-publications-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
|
||||
{ path: 'participate/deposit/learn-how', loadChildren: () => import('./deposit/deposit.module').then(m => m.LibDepositModule)},
|
||||
{ path: 'participate/deposit/search', loadChildren: () => import('./deposit/searchDataprovidersToDeposit.module').then(m => m.LibSearchDataprovidersToDepositModule)},
|
||||
// Linking Pages
|
||||
{ path: 'myclaims', loadChildren: () => import('./claims/myClaims/myClaims.module').then(m => m.LibMyClaimsModule)},
|
||||
{ path: 'participate/claim', loadChildren: () => import('./claims/linking/linkingGeneric.module').then(m => m.LibLinkingGenericModule)},
|
||||
{ path: 'participate/direct-claim', loadChildren: () => import('./claims/directLinking/directLinking.module').then(m => m.LibDirectLinkingModule)},
|
||||
{path: 'develop', loadChildren: () => import('./develop/develop.module').then(m => m.DevelopModule)}
|
||||
];
|
||||
|
||||
for (var i = 0; i <optionalRoutes.length; i++) {
|
||||
if(this.routes["/"+optionalRoutes[i].path]){
|
||||
this.router.config.push(optionalRoutes[i]);
|
||||
}
|
||||
}
|
||||
return routes;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,21 +12,22 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
|
|||
import {Subscriber} from "rxjs";
|
||||
import {DOCUMENT} from "@angular/common";
|
||||
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
|
||||
import {Router} from "@angular/router";
|
||||
|
||||
@Component({
|
||||
selector: 'app-root',
|
||||
template: `
|
||||
<div *ngIf="agg">
|
||||
<navbar *ngIf="properties && loginCheck && header" portal="aggregator" [properties]=properties [onlyTop]=false
|
||||
<navbar *ngIf="properties && loginCheck && header " portal="aggregator" [properties]=properties [onlyTop]=false
|
||||
[user]="user" [userMenuItems]="userMenuItems"
|
||||
[communityId]="properties.adminToolsCommunity" [menuItems]=menuItems
|
||||
[userMenu]="true" [header]="header"></navbar>
|
||||
[userMenu]="agg.enableLogin" [header]="header"></navbar>
|
||||
<div class="custom-main-content">
|
||||
<main>
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
</div>
|
||||
<cookie-law *ngIf="isClient" position="bottom">
|
||||
<cookie-law *ngIf="isClient && agg.menuId != 'eosc'" position="bottom">
|
||||
OpenAIRE uses cookies in order to function properly.<br>
|
||||
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing
|
||||
experience possible.
|
||||
|
|
@ -36,7 +37,7 @@ import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
|
|||
ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
|
||||
</span></a>
|
||||
</cookie-law>
|
||||
<bottom *ngIf="isClient && properties" [properties]=properties [centered]="true" [showMenuItems]="true" [menuItems]="[]" [darkBackground]="false" ></bottom>
|
||||
<bottom *ngIf="isClient && properties && agg.menuId != 'eosc'" [properties]=properties [centered]="true" [showMenuItems]="true" [menuItems]="[]" [darkBackground]="false" ></bottom>
|
||||
</div>
|
||||
`
|
||||
})
|
||||
|
|
@ -53,7 +54,7 @@ export class AppComponent {
|
|||
header: Header;
|
||||
agg: AggregatorInfo = null;
|
||||
subscriptions = [];
|
||||
|
||||
|
||||
constructor(private userManagementService: UserManagementService,
|
||||
private configurationService: ConfigurationService, private smoothScroll: SmoothScroll,
|
||||
@Inject(DOCUMENT) private document, private rendererFactory: RendererFactory2) {
|
||||
|
|
@ -62,7 +63,7 @@ export class AppComponent {
|
|||
this.setStyles();
|
||||
this.configurationService.initStaticCommunityInformation(PortalAggregators.getCommunityInfoByMenuId(this.id));
|
||||
}
|
||||
|
||||
|
||||
ngOnInit() {
|
||||
if (typeof document !== 'undefined') {
|
||||
this.isClient = true;
|
||||
|
|
@ -76,8 +77,9 @@ export class AppComponent {
|
|||
title: this.agg.title,
|
||||
logoUrl: this.agg.logoUrl,
|
||||
logoSmallUrl: this.agg.logoUrl,
|
||||
position: 'left',
|
||||
badge: true
|
||||
position: this.agg.menuId == 'eosc'?'center':'left',
|
||||
menuPosition: this.agg.menuId == 'eosc'?'center':'right',
|
||||
badge: this.agg.menuId == 'eosc'?false:true
|
||||
};
|
||||
this.buildMenu();
|
||||
}
|
||||
|
|
@ -91,7 +93,7 @@ export class AppComponent {
|
|||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
|
|
@ -102,7 +104,7 @@ export class AppComponent {
|
|||
this.userManagementService.clearSubscriptions();
|
||||
this.smoothScroll.clearSubscriptions();
|
||||
}
|
||||
|
||||
|
||||
private buildMenu() {
|
||||
this.menuItems = [
|
||||
{rootItem: new MenuItem("home", "Home", "", "/", false, [], null, {}), items: []},
|
||||
|
|
@ -144,7 +146,85 @@ export class AppComponent {
|
|||
css = css.concat("--graph-background: url('" + this.agg.background + "\') no-repeat bottom;\n");
|
||||
}
|
||||
css = css.concat('}');
|
||||
let css2 = `
|
||||
|
||||
.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, .search_box_bg .uk-button:hover, #searchForm .uk-button:hover {
|
||||
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;
|
||||
|
||||
}
|
||||
|
||||
.uk-navbar-nav > li > a, .uk-navbar-dropdown-nav > li > a, .uk-navbar-dropdown-nav > li > a:focus, .uk-navbar-dropdown-nav > li > a:hover {
|
||||
color: #555 !important;
|
||||
}
|
||||
.uk-navbar-nav > li:hover > a, .uk-navbar-nav > li > a.uk-open, .uk-navbar-nav > li > a:focus {
|
||||
color: #555 ;
|
||||
outline: 0;
|
||||
}
|
||||
|
||||
.aggregator-menu .uk-navbar-nav>li {
|
||||
margin-right:20px
|
||||
}
|
||||
.aggregator-menu .uk-navbar-nav>li>a {
|
||||
padding:0
|
||||
}
|
||||
|
||||
.navbar .nav > li > .dropdown-menu, .uk-navbar-dropdown{
|
||||
background-color: white;
|
||||
color: #555;
|
||||
}
|
||||
|
||||
.aggregator-menu .uk-navbar-dropdown li:before {
|
||||
bottom:0
|
||||
}
|
||||
.navbar .nav>li>.dropdown-menu,
|
||||
.uk-navbar-dropdown {
|
||||
padding:20px
|
||||
}
|
||||
|
||||
|
||||
/* .aggregator-menu .uk-navbar-dropdown li:active::before, .aggregator-menu .uk-navbar-dropdown li:focus::before, .aggregator-menu .uk-navbar-dropdown li:hover::before, .aggregator-menu .uk-navbar-nav > li > a:active::before, .aggregator-menu .uk-navbar-nav > li > a:focus::before, .aggregator-menu .uk-navbar-nav > li > a:hover::before {
|
||||
|
||||
transform: scaleX(1);
|
||||
transform-origin: 0 50%;
|
||||
|
||||
}
|
||||
.aggregator-menu .uk-navbar-dropdown li::before, .aggregator-menu .uk-navbar-nav > li > a::before {
|
||||
|
||||
content: "";
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 3px;
|
||||
bottom: 20px;
|
||||
z-index: 300;
|
||||
left: 0;
|
||||
background-color: #dc9d19;
|
||||
transform: scaleX(0);
|
||||
transition: transform .5s cubic-bezier(.7,0,.3,1);
|
||||
transform-origin: 100% 50%;
|
||||
|
||||
}*/
|
||||
|
||||
|
||||
`;
|
||||
css = css.concat(css2);
|
||||
try {
|
||||
if( this.document.getElementById('customStyle')){
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -96,6 +96,7 @@
|
|||
</div>
|
||||
</div>
|
||||
<!-- Funders Cards -->
|
||||
<ng-container *ngIf="this.customFilter && this.customFilter.valueId == 'CA'">
|
||||
<div *ngIf=" funders.length" class="uk-section uk-padding-remove-bottom" style="background: linear-gradient(180deg, #FAFAFA 50%, #FFFFFF 55%);">
|
||||
<h3 class="uk-text-center uk-margin-medium-bottom">Our Canadian <span class="uk-text-bold">Funders</span></h3>
|
||||
<!-- TODO: individual component -->
|
||||
|
|
@ -120,12 +121,12 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</ng-container>
|
||||
<div class="uk-section uk-padding-remove-bottom">
|
||||
<h3 class="uk-text-center uk-margin-medium-bottom">Our growing <span class="uk-text-bold">Community</span></h3>
|
||||
<numbers #numbersComponent [defaultInit]="false" backgroundClass="numbers-background"></numbers>
|
||||
</div>
|
||||
<div class="uk-section" >
|
||||
<div class="uk-section" *ngIf="isRouteAvailable('participate/deposit/learn-how') || isRouteAvailable('participate/claim')">
|
||||
<div class="uk-padding uk-padding-remove-horizontal">
|
||||
<div class="uk-container uk-container-small">
|
||||
<div class="uk-grid-margin uk-grid uk-grid-stack" uk-grid="">
|
||||
|
|
@ -133,7 +134,7 @@
|
|||
<div
|
||||
class="uk-margin uk-text-center uk-child-width-1-1 uk-grid-match uk-child-width-1-1@s uk-child-width-1-2@m uk-child-width-1-2@l uk-grid"
|
||||
id="page#8" uk-grid="" uk-height-match="target: .target">
|
||||
<div class="uk-first-column">
|
||||
<div class="uk-first-column" *ngIf="isRouteAvailable('participate/deposit/learn-how')">
|
||||
<div class="el-item uk-card uk-card-default uk-card-medium uk-card-body">
|
||||
<div class="uk-text-center target"><img alt="Share" class="uk-width-1-3@m uk-width-small"
|
||||
src="assets/share.svg"></div>
|
||||
|
|
@ -153,7 +154,7 @@
|
|||
href="/participate/deposit/learn-how" type="submit">Deposit </a></div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div *ngIf=" isRouteAvailable('participate/claim')">
|
||||
<div class="el-item uk-card uk-card-default uk-card-medium uk-card-body">
|
||||
<div class="uk-text-center target"><img alt="Share" class="uk-width-1-3@m uk-width-small"
|
||||
src="assets/link.svg"></div>
|
||||
|
|
|
|||
|
|
@ -141,8 +141,8 @@ export class HomeComponent {
|
|||
this.resultTypes.values.push({name: "Other research products" , id:"other",selected:true, number:0});
|
||||
}
|
||||
this.numbersComponent.init(false, false, this.showPublications, this.showDatasets,
|
||||
this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders,
|
||||
StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId ))));
|
||||
this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders, this.customFilter?
|
||||
StringUtils.URIEncode(this.customFilter.queryFieldName + " exact " + StringUtils.quote((this.customFilter.valueId ))):'');
|
||||
this.getFunders();
|
||||
}
|
||||
},
|
||||
|
|
@ -280,4 +280,14 @@ export class HomeComponent {
|
|||
// console.log(this.funders);
|
||||
}));
|
||||
}
|
||||
|
||||
isRouteAvailable(routeToCheck: string) {
|
||||
for (let i = 0; i < this._router.config.length; i++) {
|
||||
let routePath: string = this._router.config[i].path;
|
||||
if (routePath == routeToCheck) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit ca430fd89f7654bb71f52383bd52bf58e4c70e5f
|
||||
Subproject commit 66eed055970529c78d98ea3833070d5f45acd139
|
||||
|
|
@ -9,8 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
@Component({
|
||||
selector: 'openaire-advanced-search-dataprovider',
|
||||
template: `
|
||||
<search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders'"
|
||||
[piwikSiteId]="properties.piwikSiteId">
|
||||
<search-dataproviders [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/dataproviders':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
|
||||
</search-dataproviders>
|
||||
|
||||
`
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
@Component({
|
||||
selector: 'openaire-advanced-search-organizations',
|
||||
template: `
|
||||
<search-organizations [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations'"
|
||||
[piwikSiteId]="properties.piwikSiteId">
|
||||
<search-organizations [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/organizations':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
|
||||
</search-organizations>
|
||||
|
||||
`
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
@Component({
|
||||
selector: 'openaire-advanced-search-projects',
|
||||
template: `
|
||||
<search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects'"
|
||||
[piwikSiteId]="properties.piwikSiteId">
|
||||
<search-projects [customFilter]="customFilter" [simpleView]="false" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/projects':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
|
||||
</search-projects>
|
||||
|
||||
`
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
@Component({
|
||||
selector: 'openaire-search-results',
|
||||
template: `
|
||||
<search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes'"
|
||||
[piwikSiteId]="properties.piwikSiteId"></search-research-results>
|
||||
<search-research-results resultType="result" [simpleView]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/advanced/research-outcomes':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"></search-research-results>
|
||||
`
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
selector: 'openaire-search-dataproviders',
|
||||
template: `
|
||||
|
||||
<search-dataproviders [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders'"
|
||||
[piwikSiteId]="properties.piwikSiteId">
|
||||
<search-dataproviders [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/dataproviders':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
|
||||
</search-dataproviders>
|
||||
|
||||
`
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
selector: 'openaire-search-organizations',
|
||||
template: `
|
||||
|
||||
<search-organizations [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations'"
|
||||
[piwikSiteId]="properties.piwikSiteId">
|
||||
<search-organizations [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/organizations':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
|
||||
</search-organizations>
|
||||
|
||||
`
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
selector: 'openaire-search-projects',
|
||||
template: `
|
||||
|
||||
<search-projects [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects'"
|
||||
[piwikSiteId]="properties.piwikSiteId">
|
||||
<search-projects [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/projects':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false">
|
||||
</search-projects>
|
||||
`
|
||||
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@ import {EnvProperties} from "../../openaireLibrary/utils/properties/env-properti
|
|||
@Component({
|
||||
selector: 'openaire-search-results',
|
||||
template: `
|
||||
<search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes'"
|
||||
[piwikSiteId]="properties.piwikSiteId"></search-research-results>
|
||||
<search-research-results resultType="result" [stickyForm]="false" [customFilter]="customFilter" [openaireLink]="customFilter?'https://'+(properties.environment != 'production'?'beta.':'')+'explore.openaire.eu/search/find/research-outcomes':null"
|
||||
[piwikSiteId]="properties.piwikSiteId" [hasPrefix]="false"></search-research-results>
|
||||
`
|
||||
|
||||
})
|
||||
|
|
|
|||
|
|
@ -15,9 +15,10 @@ export class AggregatorInfo {
|
|||
background:string;
|
||||
graphSectionTitle: string;
|
||||
graphSectionText: string;
|
||||
enableLogin: boolean;
|
||||
|
||||
constructor(menuId: string, title: string, logoUrl: string, fieldName: string, queryFieldName: string, valueId: string,
|
||||
valueName: string, mainColor:string=null, darkColor:string=null, background:string=null,graphSectionTitle: string = null, graphSectionText:string = null ) {
|
||||
valueName: string, mainColor:string=null, darkColor:string=null, background:string=null,graphSectionTitle: string = null, graphSectionText:string = null, enableLogin:boolean = true ) {
|
||||
this.menuId = menuId;
|
||||
this.title = title;
|
||||
this.logoUrl = logoUrl;
|
||||
|
|
@ -30,6 +31,7 @@ export class AggregatorInfo {
|
|||
this.background = background;
|
||||
this.graphSectionTitle = graphSectionTitle;
|
||||
this.graphSectionText = graphSectionText;
|
||||
this.enableLogin = enableLogin;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -54,12 +56,15 @@ export class PortalAggregators {
|
|||
</span>`),
|
||||
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, "#3540b6","#233d4c", null,null,null ,false)
|
||||
|
||||
];
|
||||
static disabled = {
|
||||
"canada": {pages: [], entities: ["software"]},
|
||||
"italy": {pages: [], entities: []},
|
||||
"greece": {pages: [], entities: []}
|
||||
"greece": {pages: [], entities: []},
|
||||
"eosc": {pages: ["/participate/deposit/search", "/participate/deposit/learn-how","/participate/claim", "/participate/direct-claim", "/myclaims","/claims", "/develop"]
|
||||
, entities: []}
|
||||
};
|
||||
static defaultAggregator: AggregatorInfo = PortalAggregators.list[0];
|
||||
|
||||
|
|
@ -78,7 +83,7 @@ export class PortalAggregators {
|
|||
|
||||
public static getSearchCustomFilterByAggregator(agg: AggregatorInfo): SearchCustomFilter {
|
||||
let filter:SearchCustomFilter = null;
|
||||
if(agg) {
|
||||
if(agg && agg.fieldName) {
|
||||
filter = new SearchCustomFilter(agg.fieldName, agg.queryFieldName, agg.valueId, agg.valueName);
|
||||
filter.promptToAddFilter = false;
|
||||
filter.isHiddenFilter = true;
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 28db142aa54b8bea87ada52dbae2da7c7da8f458
|
||||
Subproject commit 04d799f089c93ae28c9d2ca8436f283ebc0be3ae
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
environment: "production",
|
||||
adminToolsPortalType: "aggregator",
|
||||
dashboard: "explore",
|
||||
enablePiwikTrack: false,
|
||||
useCache: false,
|
||||
useLongCache: true,
|
||||
showAddThis: true,
|
||||
metricsAPIURL: "https://services.openaire.eu/usagestats/",
|
||||
framesAPIURL: "https://www.openaire.eu/stats3/",
|
||||
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
||||
statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
|
||||
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats/",
|
||||
useNewStatistisTool: false,
|
||||
claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
|
||||
searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
|
||||
searchResourcesAPIURL: "https://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/",
|
||||
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: null,
|
||||
|
||||
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=",
|
||||
searchLinkToDataset: "/search/dataset?datasetId=",
|
||||
searchLinkToSoftwareLanding: "/search/software?softwareId=",
|
||||
searchLinkToOrp: "/search/other?orpId=",
|
||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||
|
||||
searchLinkToPublications: "/search/find/publications",
|
||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||
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",
|
||||
searchLinkToAdvancedOrganizations: "/search/advanced/organizations",
|
||||
searchLinkToAdvancedResults: "/search/advanced/research-outcomes",
|
||||
|
||||
lastIndexInformationLink: "https://www.openaire.eu/aggregation-and-content-provision-workflows",
|
||||
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-06-15",
|
||||
indexInfoAPI: "https://services.openaire.eu/openaire/info/",
|
||||
|
||||
depositLearnHowPage: "/participate/deposit/learn-how",
|
||||
depositSearchPage: "/participate/deposit/search",
|
||||
altMetricsAPIURL: "https://api.altmetric.com/v1/doi/",
|
||||
reCaptchaSiteKey: "6LezhVIUAAAAAOb4nHDd87sckLhMXFDcHuKyS76P",
|
||||
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"
|
||||
|
||||
};
|
||||
|
|
@ -73,7 +73,7 @@ export let properties: EnvProperties = {
|
|||
resultsPerPage: 10,
|
||||
|
||||
"baseLink" : "",
|
||||
"domain": "https://beta.explore.openaire.eu",
|
||||
"domain":"https://explore.eosc-portal.eu",
|
||||
|
||||
searchLinkToResult: "/search/result?id=",
|
||||
searchLinkToPublication: "/search/publication?articleId=",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,62 @@
|
|||
<!DOCTYPE html>
|
||||
<html lang="en" dir="ltr" vocab="http://schema.org/">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<base href="/" />
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8" />
|
||||
<meta name="description"
|
||||
content="Eosc explore, research graph discovery"/>
|
||||
|
||||
<meta property="og:description" content="Eosc explore, research graph discovery"/>
|
||||
<meta property="og:title" content="Eosc Explore"/>
|
||||
<meta property="og:type" content="website"/>
|
||||
<meta property="og:url" content="https://explore.eosc-portal.eu"/>
|
||||
<meta property="og:site_name" content="Eosc Explore"/>
|
||||
|
||||
<meta property="og:image" content="assets/common-assets/common/Symbol.png"/>
|
||||
<meta property="og:image:secure_url" content="assets/common-assets/common/Symbol.png" />
|
||||
<meta property="og:image:type" content="image/png" />
|
||||
<meta property="og:image:width" content="360" />
|
||||
<meta property="og:image:height" content="359" />
|
||||
<link rel="apple-touch-icon" sizes="57x57" href="assets/common-assets/logo/apple-icon-57x57.png">
|
||||
<link rel="apple-touch-icon" sizes="60x60" href="assets/common-assets/logo/apple-icon-60x60.png">
|
||||
<link rel="apple-touch-icon" sizes="72x72" href="assets/common-assets/logo/apple-icon-72x72.png">
|
||||
<link rel="apple-touch-icon" sizes="76x76" href="assets/common-assets/logo/apple-icon-76x76.png">
|
||||
<link rel="apple-touch-icon" sizes="114x114" href="assets/common-assets/logo/apple-icon-114x114.png">
|
||||
<link rel="apple-touch-icon" sizes="120x120" href="assets/common-assets/logo/apple-icon-120x120.png">
|
||||
<link rel="apple-touch-icon" sizes="144x144" href="assets/common-assets/logo/apple-icon-144x144.png">
|
||||
<link rel="apple-touch-icon" sizes="152x152" href="assets/common-assets/logo/apple-icon-152x152.png">
|
||||
<link rel="apple-touch-icon" sizes="180x180" href="assets/common-assets/logo/apple-icon-180x180.png">
|
||||
<link rel="icon" type="image/png" sizes="192x192" href="assets/common-assets/logo/android-icon-192x192.png">
|
||||
<link rel="icon" type="image/png" sizes="32x32" href="assets/common-assets/logo/favicon-32x32.png">
|
||||
<link rel="icon" type="image/png" sizes="96x96" href="assets/common-assets/logo/favicon-96x96.png">
|
||||
<link rel="icon" type="image/png" sizes="16x16" href="assets/common-assets/logo/favicon-16x16.png">
|
||||
<link href="assets/common-assets/logo/favicon.ico" rel="shortcut icon" type="image/vnd.microsoft.icon" />
|
||||
<link rel="manifest" href="assets/common-assets/logo/manifest.json">
|
||||
<meta name="msapplication-TileColor" content="#ffffff">
|
||||
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
|
||||
<meta name="theme-color" content="#ffffff">
|
||||
<link id="customCss" rel="stylesheet" href="">
|
||||
<title>Search OpenAIRE</title>
|
||||
</head>
|
||||
<body>
|
||||
<div class="uk-offcanvas-content uk-height-viewport">
|
||||
<eosc-common-main-header></eosc-common-main-header>
|
||||
|
||||
<app-root></app-root>
|
||||
<EoscCommonMainFooter></EoscCommonMainFooter>
|
||||
<EoscCommonEuInformation></EoscCommonEuInformation>
|
||||
<script src="https://s3.cloud.cyfronet.pl/eosc-portal-common/index.production.min.js"></script>
|
||||
<link rel="stylesheet" href="https://s3.cloud.cyfronet.pl/eosc-portal-common/index.production.min.css" />
|
||||
</div>
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
function loadAltmetrics(e,t,n){
|
||||
var d="createElement",c="getElementsByTagName",m="setAttribute",n=document.getElementById(e);
|
||||
return n&&n.parentNode&&n.parentNode.removeChild(n),n=document[d+"NS"]&&document.documentElement.namespaceURI,n=n?document[d+"NS"](n,"script"):document[d]("script"),n[m]("id",e),n[m]("src",t),(document[c]("head")[0]||document[c]("body")[0]).appendChild(n),n=new Image,void n[m]("src","https://d1uo4w7k31k5mn.cloudfront.net/donut/0.png")
|
||||
}
|
||||
</script>
|
||||
<script src="https://unpkg.com/smoothscroll-polyfill@0.4.3/dist/smoothscroll.min.js"></script>
|
||||
</html>
|
||||
|
|
@ -0,0 +1,2 @@
|
|||
User-Agent: *
|
||||
Disallow: /
|
||||
|
|
@ -44,7 +44,13 @@
|
|||
</head>
|
||||
<body>
|
||||
<div class="uk-offcanvas-content uk-height-viewport">
|
||||
<app-root></app-root>
|
||||
<!-- <eosc-common-main-header></eosc-common-main-header>-->
|
||||
|
||||
<app-root></app-root>
|
||||
<!-- <EoscCommonMainFooter></EoscCommonMainFooter>-->
|
||||
<!-- <EoscCommonEuInformation></EoscCommonEuInformation>-->
|
||||
<!-- <script src="https://s3.cloud.cyfronet.pl/eosc-portal-common/index.production.min.js"></script>-->
|
||||
<!-- <link rel="stylesheet" href="https://s3.cloud.cyfronet.pl/eosc-portal-common/index.production.min.css" />-->
|
||||
</div>
|
||||
</body>
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
Loading…
Reference in New Issue