Merge remote-tracking branch 'origin/develop'
This commit is contained in:
commit
4aa01517f2
|
|
@ -45,7 +45,7 @@
|
|||
"rxjs": "^6.5.1",
|
||||
"ts-md5": "^1.2.0",
|
||||
"tslib": "^2.0.0",
|
||||
"uikit": "3.12.0",
|
||||
"uikit": "3.13.10",
|
||||
"zone.js": "~0.11.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
|
@ -71,4 +71,4 @@
|
|||
"ts-node": "~7.0.0",
|
||||
"typescript": "~4.6.4"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,30 @@ export function app() {
|
|||
res.set('Content-Type', register.contentType);
|
||||
res.end(register.metrics());
|
||||
});
|
||||
|
||||
|
||||
server.get('/health-check', async (_req, res, _next) => {
|
||||
var uptime = process.uptime();
|
||||
const date = new Date(uptime*1000);
|
||||
const days = date.getUTCDate() - 1,
|
||||
hours = date.getUTCHours(),
|
||||
minutes = date.getUTCMinutes(),
|
||||
seconds = date.getUTCSeconds(),
|
||||
milliseconds = date.getUTCMilliseconds();
|
||||
|
||||
|
||||
const healthcheck = {
|
||||
uptime: days + " days, " + hours + " hours, " + minutes + " minutes, " + seconds + " seconds, " + milliseconds + " milliseconds",
|
||||
message: 'OK',
|
||||
timestamp: new Date()
|
||||
};
|
||||
try {
|
||||
res.send(healthcheck);
|
||||
} catch (error) {
|
||||
healthcheck.message = error;
|
||||
res.status(503).send();
|
||||
}
|
||||
});
|
||||
|
||||
// All regular routes use the Universal engine
|
||||
server.get('*', (req, res) => {
|
||||
if (routes.indexOf(req.path) !== -1) {
|
||||
|
|
|
|||
|
|
@ -10,50 +10,45 @@ const routes: Routes = [
|
|||
{path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)},
|
||||
{path: 'sdgs', loadChildren: () => import('./sdg/sdg.module').then(m => m.LibSdgModule)},
|
||||
{path: 'fields-of-science', loadChildren: () => import('./fos/fos.module').then(m => m.LibFosModule), data: {extraOffset: 100}},
|
||||
{path: 'funders', loadChildren: () => import('./funders/funders.module').then(m => m.FundersModule)},
|
||||
{path: 'contact-us', loadChildren: () => import('./contact/contact.module').then(m => m.ContactModule), data: {hasQuickContact: false}},
|
||||
// ORCID Pages
|
||||
{path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)},
|
||||
{path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)},
|
||||
// Landing Pages
|
||||
{path: 'search/result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: {hasQuickContact: false}},
|
||||
{path: 'search/publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasQuickContact: false}},
|
||||
{path: 'search/dataset', loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: {hasQuickContact: false}},
|
||||
{path: 'search/software', loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: {hasQuickContact: false}},
|
||||
{path: 'search/other', loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: {hasQuickContact: false}},
|
||||
{path: 'search/project', loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: {hasQuickContact: false}},
|
||||
{path: 'search/result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
||||
{path: 'search/publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
||||
{path: 'search/dataset', loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
||||
{path: 'search/software', loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
||||
{path: 'search/other', loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
||||
{path: 'search/project', loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true}},
|
||||
{
|
||||
path: 'search/dataprovider',
|
||||
loadChildren: () => import('././landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule),
|
||||
data: {hasQuickContact: false}
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true}
|
||||
},
|
||||
{
|
||||
path: 'search/organization',
|
||||
loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule),
|
||||
data: {hasQuickContact: false}
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true}
|
||||
},
|
||||
{
|
||||
path: 'project-report',
|
||||
loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
|
||||
},
|
||||
|
||||
// Search Pages
|
||||
{path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)},
|
||||
{
|
||||
path: 'search/find/research-outcomes',
|
||||
loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
|
||||
path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
|
||||
},
|
||||
{path: 'search/find/publications', component: PageURLResolverComponent},
|
||||
{path: 'search/find/datasets', component: PageURLResolverComponent},
|
||||
{path: 'search/find/software', component: PageURLResolverComponent},
|
||||
{path: 'search/find/other', component: PageURLResolverComponent},
|
||||
{path: 'search/find/projects', loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)},
|
||||
{
|
||||
path: 'search/find/dataproviders',
|
||||
loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find/organizations',
|
||||
loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
|
||||
path: 'search/find/:entity', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
|
||||
},
|
||||
|
||||
// Advanced Search Pages
|
||||
{
|
||||
path: 'search/advanced/research-outcomes',
|
||||
|
|
|
|||
|
|
@ -52,8 +52,8 @@ import {LayoutService} from './openaireLibrary/dashboard/sharedComponents/sideba
|
|||
</span></a>
|
||||
</cookie-law>
|
||||
<bottom id="bottom" #bottom *ngIf="isClient && properties" [properties]="properties"></bottom>
|
||||
<quick-contact #quickContact *ngIf="showQuickContact && contactForm" (sendEmitter)="send($event)"
|
||||
[contactForm]="contactForm" [sending]="sending" [contact]="'Help'"></quick-contact>
|
||||
<quick-contact #quickContact *ngIf="bottomNotIntersecting && displayQuickContact && showQuickContact && contactForm" (sendEmitter)="send($event)"
|
||||
[contactForm]="contactForm" [sending]="sending" [contact]="'Help'" class="uk-visible@m"></quick-contact>
|
||||
<modal-alert #modal [overflowBody]="false"></modal-alert>
|
||||
`
|
||||
})
|
||||
|
|
@ -65,7 +65,10 @@ export class AppComponent {
|
|||
properties: EnvProperties = properties;
|
||||
user: User;
|
||||
header: Header;
|
||||
public showQuickContact: boolean;
|
||||
/* Contact */
|
||||
public showQuickContact: boolean;
|
||||
public bottomNotIntersecting: boolean;
|
||||
public displayQuickContact: boolean; // intersecting with specific section in home page
|
||||
public contactForm: FormGroup;
|
||||
public sending: boolean = false;
|
||||
@ViewChild('quickContact') quickContact: QuickContactComponent;
|
||||
|
|
@ -85,11 +88,7 @@ export class AppComponent {
|
|||
if (typeof document !== 'undefined') {
|
||||
this.isClient = true;
|
||||
}
|
||||
this.subscriptions.push(this.layoutService.hasQuickContact.subscribe(hasQuickContact => {
|
||||
this.showQuickContact = hasQuickContact;
|
||||
this.cdr.detectChanges();
|
||||
}));
|
||||
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
|
||||
this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
|
||||
this.feedbackmail = this.properties.feedbackmail;
|
||||
if (this.properties.environment == "production" || this.properties.environment == "development") {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(data => {
|
||||
|
|
@ -111,9 +110,18 @@ export class AppComponent {
|
|||
badge: true
|
||||
};
|
||||
this.reset();
|
||||
}));
|
||||
this.subscriptions.push(this.layoutService.hasQuickContact.subscribe(hasQuickContact => {
|
||||
if(this.showQuickContact !== hasQuickContact) {
|
||||
this.showQuickContact = hasQuickContact;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
}));
|
||||
this.subscriptions.push(this.quickContactService.isDisplayed.subscribe(display => {
|
||||
this.showQuickContact = display;
|
||||
if(this.displayQuickContact !== display) {
|
||||
this.displayQuickContact = display;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
|
@ -121,6 +129,8 @@ export class AppComponent {
|
|||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
} else if (typeof IntersectionObserver !== "undefined" && subscription instanceof IntersectionObserver) {
|
||||
subscription.disconnect();
|
||||
}
|
||||
});
|
||||
this.configurationService.clearSubscriptions();
|
||||
|
|
@ -142,12 +152,9 @@ export class AppComponent {
|
|||
};
|
||||
let intersectionObserver = new IntersectionObserver(entries => {
|
||||
entries.forEach(entry => {
|
||||
if (entry.isIntersecting && this.showQuickContact) {
|
||||
this.showQuickContact = false;
|
||||
this.quickContactService.setDisplay(this.showQuickContact);
|
||||
} else if (!entry.isIntersecting && !this.showQuickContact) {
|
||||
this.showQuickContact = true;
|
||||
this.quickContactService.setDisplay(this.showQuickContact);
|
||||
if(this.bottomNotIntersecting !== (!entry.isIntersecting)) {
|
||||
this.bottomNotIntersecting = !entry.isIntersecting;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
});
|
||||
}, options);
|
||||
|
|
@ -162,13 +169,13 @@ export class AppComponent {
|
|||
this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {}));
|
||||
let researchOutcomesMenu = new MenuItem("", OpenaireEntities.RESULTS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'});
|
||||
researchOutcomesMenu.items = [
|
||||
new MenuItem("", OpenaireEntities.PUBLICATIONS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("publications") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.DATASETS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("datasets") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.SOFTWARE, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("software") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.OTHER, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"'})];
|
||||
new MenuItem("", OpenaireEntities.PUBLICATIONS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("publications") + '"', resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.DATASETS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("datasets") + '"', resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.SOFTWARE, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("software") + '"', resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.OTHER, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"', resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'})];
|
||||
//TODO add check for research results route
|
||||
this.menuItems = [
|
||||
new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {qf: true},
|
||||
new MenuItem("search", "Search", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'},
|
||||
null, null, null, null, "_blank", "internal", false,
|
||||
[
|
||||
researchOutcomesMenu,
|
||||
|
|
@ -191,6 +198,7 @@ export class AppComponent {
|
|||
new MenuItem("", "Registries", "", "/search/entity-registries", false, ["datasource"], ["/search/entity-registries"], {}),
|
||||
new MenuItem("", "Browse all", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {})]
|
||||
),
|
||||
new MenuItem("funders", "Funders", "", "/funders", false, [], ["/funders"], {}),
|
||||
];
|
||||
if (Session.isPortalAdministrator(this.user)) {
|
||||
this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
|
||||
|
|
|
|||
|
|
@ -60,10 +60,7 @@ export class ContactComponent implements OnInit {
|
|||
|
||||
this.properties = properties;
|
||||
this.email = {body: '', subject: '', recipients: []};
|
||||
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle, this.properties.piwikSiteId).subscribe());
|
||||
}
|
||||
this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPag
|
|||
|
||||
import {ZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service";
|
||||
import {CommunityService} from "../openaireLibrary/connect/community/community.service";
|
||||
import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -26,6 +25,6 @@ import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoC
|
|||
OpenaireDepositComponent,
|
||||
],
|
||||
providers: [PreviousRouteRecorder, IsRouteEnabled,
|
||||
ZenodoCommunitiesService, CommunityService, SearchZenodoCommunitiesService]
|
||||
ZenodoCommunitiesService, CommunityService]
|
||||
})
|
||||
export class LibDepositModule { }
|
||||
|
|
|
|||
|
|
@ -9,8 +9,6 @@ import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/sea
|
|||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {ZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/zenodo-communitiesService.module';
|
||||
import {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';
|
||||
|
||||
import {CommunityService} from '../openaireLibrary/connect/community/community.service';
|
||||
|
||||
@NgModule({
|
||||
|
|
@ -18,7 +16,7 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
|
|||
CommonModule, FormsModule,
|
||||
SearchDataprovidersToDepositModule,
|
||||
SearchDataprovidersToDepositRoutingModule,
|
||||
ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule
|
||||
ZenodoCommunitiesServiceModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireSearchDataprovidersToDepositComponent
|
||||
|
|
|
|||
|
|
@ -4,12 +4,8 @@ import {properties} from "../../environments/environment";
|
|||
@Component({
|
||||
selector: 'explore-fos',
|
||||
template: `
|
||||
<fos [piwikSiteId]="piwikSiteId"></fos>
|
||||
<fos></fos>
|
||||
`
|
||||
})
|
||||
|
||||
export class ExploreFosComponent {
|
||||
piwikSiteId = properties.piwikSiteId;
|
||||
|
||||
constructor() {}
|
||||
}
|
||||
export class ExploreFosComponent {}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {FundersComponent} from './funders.component';
|
||||
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{
|
||||
path: '', component: FundersComponent,
|
||||
canActivate: [IsRouteEnabled],
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class FundersRoutingModule { }
|
||||
|
|
@ -0,0 +1,295 @@
|
|||
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="pageDescription"></schema2jsonld>
|
||||
<div class="funders">
|
||||
<div class="uk-background-muted">
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-container uk-container-large uk-section" uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
|
||||
<div class="uk-grid uk-grid-large uk-grid-stack uk-flex-middle uk-padding-small" uk-grid>
|
||||
<div class="uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-align-left uk-margin-remove-bottom uk-flex uk-flex-middle">
|
||||
<span class="custom-coins-dot"></span>
|
||||
<span uk-scrollspy-class class="uk-text-large funders-title">Funders</span>
|
||||
</span>
|
||||
<div style="max-width: 600px;">
|
||||
<h1 uk-scrollspy-class class="uk-h1 uk-margin-remove-top">
|
||||
<span>Be an integral part of the open R&I ecosystem<span class="custom-handshake-dot"></span></span>
|
||||
</h1>
|
||||
<div uk-scrollspy-class>
|
||||
Welcome to the Funders’ page on OpenAIRE Explore. Discover key details about each funder, their commitment to open access, and the impactful research they enable. Our aim? To foster transparency, inspire collaboration.
|
||||
<!-- Welcome to the Funders' page on OpenAIRE Explore. This dedicated hub spotlights our ever-growing extensive network of funding partners:
|
||||
{{formatNumber(projectsNumber)}} grants from
|
||||
{{formatNumber(fundersNumber)}} funders currently linked to
|
||||
{{formatNumber(researchProductsNumber)}} funded research outputs.
|
||||
Discover key details about each funder, their commitment to open access, and the impactful research they enable.
|
||||
Our aim? To foster transparency, inspire collaboration. -->
|
||||
</div>
|
||||
<div class="uk-margin-medium-top" uk-scrollspy-class>
|
||||
<a class="uk-button uk-button-primary uk-text-uppercase" target="_blank" href="https://www.openaire.eu/funders-how-to-join-guide">
|
||||
Join Us
|
||||
</a>
|
||||
</div>
|
||||
<div *ngIf="showContentWithNumbers" class="uk-margin-medium-top" uk-scrollspy-class>
|
||||
<div class="uk-grid uk-grid-divider" uk-grid>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-h4 uk-text-primary uk-margin-xsmall-bottom">
|
||||
{{formatNumber(projectsNumber)}}+
|
||||
</span>
|
||||
<span class="uk-text-uppercase">
|
||||
grants
|
||||
</span>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-h4 uk-text-primary uk-margin-xsmall-bottom">
|
||||
{{formatNumber(fundersNumber)}}
|
||||
</span>
|
||||
<span class="uk-text-uppercase">
|
||||
funders
|
||||
</span>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-h4 uk-text-primary uk-margin-xsmall-bottom">
|
||||
{{formatNumber(researchProductsNumber)}}+
|
||||
</span>
|
||||
<span class="uk-text-uppercase">
|
||||
funded research outputs
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-1-2@m uk-width-1-1 uk-text-center" uk-scrollspy-class>
|
||||
<img src="assets/explore-assets/funders/funders.png" loading="lazy">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="showLoading">
|
||||
<div class="uk-container uk-container-large uk-section">
|
||||
<loading></loading>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!showLoading && funders?.length">
|
||||
<div class="uk-container uk-container-large">
|
||||
<div id="target" class="uk-section uk-padding-remove-top uk-margin-top" uk-height-match="target: .alias;">
|
||||
<div>
|
||||
<div *ngIf="funders" class="uk-padding-small uk-padding-remove-vertical uk-margin-medium-bottom uk-flex uk-flex-wrap uk-flex-middle uk-flex-between">
|
||||
<div class="uk-flex uk-flex-wrap uk-flex-middle uk-flex-between uk-width-auto@m uk-width-1-1 uk-margin-top">
|
||||
<div class="uk-width-small uk-margin-medium-right">
|
||||
<div input
|
||||
type="select" placeholder="Show" inputClass="border-bottom"
|
||||
[options]="showOptions" [(value)]="show" (valueChange)="filtering()">
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-small uk-margin-medium-right">
|
||||
<div input
|
||||
type="select" placeholder="Sort by" inputClass="border-bottom"
|
||||
[options]="sortOptions" [(value)]="sortBy" (valueChange)="sortByChanged()">
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-xsmall">
|
||||
<div input
|
||||
type="select" placeholder="Results per page" inputClass="border-bottom"
|
||||
[options]="pageOptions" [(value)]="pageSize" (valueChange)="sizeChanged($event)">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-middle uk-width-auto@m uk-width-1-1 uk-margin-top">
|
||||
<div search-input [searchControl]="keywordControl" searchInputClass="border-bottom" iconPosition="right"
|
||||
placeholder="Search funder" [disabled]="showLoading" class="uk-width-auto@m uk-width-medium@s uk-width-1-1">
|
||||
</div>
|
||||
<div class="uk-visible@m uk-flex uk-flex-middle uk-margin-medium-left">
|
||||
<a (click)="gridView = true"
|
||||
class="uk-link-reset custom-view-button" [ngClass]="gridView ? 'active' : ''">
|
||||
<icon [name]="'apps'" [ratio]="1.5" [type]="'round'" [flex]="true"></icon>
|
||||
</a>
|
||||
<a (click)="gridView = false"
|
||||
class="uk-link-reset custom-view-button uk-margin-xsmall-left" [ngClass]="gridView ? '' : 'active'">
|
||||
<icon [name]="'view_list'" [ratio]="1.5" [type]="'round'" [flex]="true"></icon>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="uk-margin-large-bottom" uk-height-match="target: .name;">
|
||||
<div *ngIf="!displayedFunders || displayedFunders?.length == 0" class="uk-text-center uk-margin-large-top">
|
||||
No funders available
|
||||
</div>
|
||||
<div class="uk-grid uk-grid-match uk-padding-small" [ngClass]="gridView ? 'uk-child-width-1-2@m uk-child-width-1-3@l' : 'uk-child-width-1-1'"
|
||||
uk-grid uk-height-match="target: .info;">
|
||||
<div *ngFor="let funder of displayedFunders.slice((currentPage-1)*pageSize, currentPage*pageSize)">
|
||||
<!-- funder's card for GRID view -->
|
||||
<ng-container *ngIf="gridView || isMobile; else elseBlock">
|
||||
<div class="uk-card uk-card-default uk-card-hover funder-grid">
|
||||
<!-- OA % -->
|
||||
<!-- <div class="percentage uk-flex uk-flex-right uk-margin-bottom">-->
|
||||
<div class="uk-position-top-right uk-padding-small">
|
||||
<div *ngIf="funder.openAccessResearchProducts && funder.researchProducts" class="uk-text-center">
|
||||
<div class="uk-flex uk-flex-middle uk-flex-center">
|
||||
<span class="uk-margin-xsmall-right open-access">
|
||||
<icon name="open_access" [flex]="true" [ratio]="1"></icon>
|
||||
</span>
|
||||
<h6 class="uk-margin-remove">{{funder.openAccessPercentage}}%</h6>
|
||||
</div>
|
||||
<span class="uk-h6 uk-text-small">Open Access</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-card-body">
|
||||
<!-- funder logo -->
|
||||
<div class="uk-card-media-top uk-margin-medium-top uk-padding-large uk-padding-remove-vertical uk-flex uk-flex-center uk-flex-middle uk-height-xsmall">
|
||||
<img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
|
||||
<ng-template #elseBlock>
|
||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
|
||||
</ng-template>
|
||||
</div>
|
||||
<!-- funder alias -->
|
||||
<div class="alias uk-text-uppercase uk-text-small uk-margin-top type">
|
||||
<ng-container *ngIf="funder.alias">
|
||||
{{funder.alias}}
|
||||
</ng-container>
|
||||
</div>
|
||||
<!-- funder name -->
|
||||
<div class="name uk-h6 uk-margin-remove multi-line-ellipsis lines-2">
|
||||
<ng-container *ngIf="funder.name" >
|
||||
{{funder.name}}
|
||||
</ng-container>
|
||||
</div>
|
||||
<div class="info uk-margin-medium-top">
|
||||
<!-- Monitor dashboard -->
|
||||
<div class="monitor-dashboard">
|
||||
<!-- PUBLIC status -->
|
||||
<a *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus != 'PRIVATE' && funder.monitorDashboardStatus != 'RESTRICTED'"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
|
||||
<span class="monitor-dashboard-link uk-text-uppercase">Monitor Dashboard</span>
|
||||
</span>
|
||||
</a>
|
||||
<!-- RESTRICTED status -->
|
||||
<span *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus == 'RESTRICTED'"
|
||||
class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
|
||||
<span class="monitor-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">Monitor Dashboard</span>
|
||||
<icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
|
||||
</span>
|
||||
</div>
|
||||
<!-- Projects -->
|
||||
<div>
|
||||
<a *ngIf="funder.projects"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
[routerLink]="properties.searchLinkToProjects" [queryParams]="{'funder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Projects ({{funder.projects | number}})</span>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
<!-- Research products -->
|
||||
<div>
|
||||
<a *ngIf="funder.researchProducts"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
[routerLink]="properties.searchLinkToResults" [queryParams]="{'relfunder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Research Products ({{funder.researchProducts | number}})</span>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
<!-- funder's card for LIST view -->
|
||||
<ng-template #elseBlock>
|
||||
<div class="uk-card uk-card-default uk-card-hover uk-padding-small funder-list">
|
||||
<div class="uk-grid uk-grid-divider uk-grid-small" uk-grid>
|
||||
<div class="uk-width-expand uk-flex uk-flex-middle">
|
||||
<div class="uk-width-1-6 uk-flex uk-flex-middle uk-flex-center">
|
||||
<img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply">
|
||||
<ng-template #elseBlock>
|
||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
|
||||
</ng-template>
|
||||
</div>
|
||||
<div class="uk-width-expand uk-margin-medium-left">
|
||||
<div class="name uk-h6 uk-text-truncate">
|
||||
<ng-container *ngIf="funder.name">
|
||||
{{funder.name}}
|
||||
</ng-container>
|
||||
<ng-container *ngIf="funder.alias" >
|
||||
<span class="uk-text-uppercase">
|
||||
({{funder.alias}})
|
||||
</span>
|
||||
</ng-container>
|
||||
</div>
|
||||
<div class="uk-grid uk-grid-divider uk-flex-nowrap" uk-grid>
|
||||
<div *ngIf="funder.monitorDashboard">
|
||||
<a *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus != 'PRIVATE' && funder.monitorDashboardStatus != 'RESTRICTED'"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.alias">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
|
||||
<span class="monitor-dashboard-link uk-text-uppercase">Monitor Dashboard</span>
|
||||
</span>
|
||||
</a>
|
||||
<span *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus == 'RESTRICTED'"
|
||||
class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/Symbol.png" alt="OpenAIRE logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;">
|
||||
<span class="monitor-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">Monitor Dashboard</span>
|
||||
<icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
|
||||
</span>
|
||||
</div>
|
||||
<div>
|
||||
<a *ngIf="funder.projects"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
[routerLink]="properties.searchLinkToProjects" [queryParams]="{'funder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Projects ({{funder.projects | number}})</span>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
<div>
|
||||
<a *ngIf="funder.researchProducts"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
[routerLink]="properties.searchLinkToResults" [queryParams]="{'relfunder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Research Products ({{funder.researchProducts | number}})</span>
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-auto uk-flex uk-flex-middle uk-flex-center">
|
||||
<div *ngIf="funder.openAccessResearchProducts && funder.researchProducts" class="uk-text-center">
|
||||
<div class="uk-flex uk-flex-middle uk-flex-center">
|
||||
<span class="uk-margin-xsmall-right open-access">
|
||||
<icon name="open_access" [flex]="true" [ratio]="1"></icon>
|
||||
</span>
|
||||
<h6 class="uk-margin-remove">{{funder.openAccessPercentage}}%</h6>
|
||||
</div>
|
||||
<span class="uk-h6 uk-text-small">Open Access</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<paging-no-load *ngIf="displayedFunders.length > pageSize"
|
||||
(pageChange)="updateCurrentPage($event)"
|
||||
[currentPage]="currentPage" [size]="pageSize"
|
||||
[totalResults]="displayedFunders.length">
|
||||
</paging-no-load>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,48 @@
|
|||
@import (reference) "~src/assets/openaire-theme/less/color.less";
|
||||
|
||||
|
||||
.custom-coins-dot:after {
|
||||
content: "";
|
||||
background-image: url("~src/assets/explore-assets/funders/coins.svg");
|
||||
display: inline-block;
|
||||
background-size: 100% 100%;
|
||||
height: 35px;
|
||||
width: 35px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.custom-handshake-dot:after {
|
||||
content: "";
|
||||
background-image: url("~src/assets/explore-assets/funders/handshake.svg");
|
||||
display: inline-block;
|
||||
background-size: 100% 100%;
|
||||
height: 30px;
|
||||
width: 30px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.custom-view-button {
|
||||
padding: 4px;
|
||||
background: @light-color;
|
||||
border: 1px solid @disable-color;
|
||||
border-radius: 4px;
|
||||
icon {
|
||||
color: @disable-color;
|
||||
}
|
||||
|
||||
&.active {
|
||||
background: transparent linear-gradient(315deg, @primary-light-color 0%, @primary-dark-color 100%) 0% 0% no-repeat padding-box;
|
||||
icon {
|
||||
color: @light-color;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.uk-card {
|
||||
&.funder-grid {
|
||||
border-bottom: 4px solid fade(@funder-color, 30%);
|
||||
}
|
||||
&.funder-list {
|
||||
border-left: 4px solid fade(@funder-color, 30%);
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,283 @@
|
|||
import {ChangeDetectorRef, Component, OnInit} from '@angular/core';
|
||||
import {Router} from '@angular/router';
|
||||
import {Subscriber, Subscription, zip} from "rxjs";
|
||||
import {Meta, Title} from "@angular/platform-browser";
|
||||
|
||||
import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {properties} from "../../environments/environment";
|
||||
import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
|
||||
import {StakeholderService} from '../openaireLibrary/monitor/services/stakeholder.service';
|
||||
import {Option} from '../openaireLibrary/sharedComponents/input/input.component';
|
||||
import {StringUtils} from '../openaireLibrary/utils/string-utils.class';
|
||||
import {HelperFunctions} from '../openaireLibrary/utils/HelperFunctions.class';
|
||||
import {NumberUtils} from '../openaireLibrary/utils/number-utils.class';
|
||||
import {LayoutService} from '../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service';
|
||||
import {FormBuilder, FormControl} from '@angular/forms';
|
||||
import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
|
||||
|
||||
@Component({
|
||||
selector: 'funders',
|
||||
templateUrl: './funders.component.html',
|
||||
styleUrls: ['funders.component.less']
|
||||
})
|
||||
|
||||
export class FundersComponent implements OnInit {
|
||||
private subscriptions: Subscription[] = [];
|
||||
url: string = null;
|
||||
pageTitle: string = "OpenAIRE - Explore | Funders";
|
||||
pageDescription: string = "Funders | Be an integral part of the open R&I ecosystem";
|
||||
properties: EnvProperties = properties;
|
||||
breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'funders'}];
|
||||
showLoading: boolean = true;
|
||||
isMobile: boolean = false;
|
||||
funders: any[] = [];
|
||||
displayedFunders: any[] = [];
|
||||
showOptions: Option[];
|
||||
sortOptions: Option[];
|
||||
pageOptions: number[] = [10, 20, 30, 40];
|
||||
show: string = 'all';
|
||||
sortBy: string = 'alphAsc';
|
||||
gridView: boolean = true;
|
||||
currentPage: number = 1;
|
||||
pageSize: number = 10;
|
||||
keywordControl: FormControl;
|
||||
keyword: string;
|
||||
fundersNumber: number = 0;
|
||||
researchProductsNumber: number = 0;
|
||||
projectsNumber: number = 0;
|
||||
fundersMap = new Map<string, {
|
||||
"id": string,
|
||||
"name": string,
|
||||
"alias": string,
|
||||
"researchProducts": number,
|
||||
"openAccessResearchProducts": number,
|
||||
"openAccessPercentage": number,
|
||||
"projects": number,
|
||||
"monitorDashboard": string,
|
||||
"monitorDashboardStatus": string,
|
||||
"logoUrl": string
|
||||
}>();
|
||||
|
||||
constructor(private router: Router,
|
||||
private meta: Meta,
|
||||
private title: Title,
|
||||
private seoService: SEOService,
|
||||
private piwikService: PiwikService,
|
||||
private refineFieldResultsService: RefineFieldResultsService,
|
||||
private stakeholderService: StakeholderService,
|
||||
private layoutService: LayoutService,
|
||||
private cdr: ChangeDetectorRef,
|
||||
private fb: FormBuilder,) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.title.setTitle('OpenAIRE - Explore | Funders');
|
||||
this.properties = properties;
|
||||
this.subscriptions.push( this.piwikService.trackView(this.properties, this.pageTitle).subscribe());
|
||||
this.url = this.properties.domain + this.router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription(this.pageDescription);
|
||||
this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
|
||||
this.isMobile = isMobile;
|
||||
this.cdr.detectChanges();
|
||||
}));
|
||||
this.showOptions = [
|
||||
{value: 'all', label: 'All funders'},
|
||||
{value: 'dashboard', label: 'Funders with dashboard'}
|
||||
];
|
||||
this.sortOptions = [
|
||||
{value: 'alphAsc', label: 'Alphabetically Asc. (A-Z)'},
|
||||
{value: 'alphDsc', label: 'Alphabetically Dsc. (Z-A)'},
|
||||
{value: 'oaDsc', label: '"Open Access %" Dsc.'}
|
||||
];
|
||||
this.getFunders();
|
||||
this.keywordControl = this.fb.control('');
|
||||
this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
|
||||
this.keyword = value;
|
||||
this.filtering();
|
||||
}));
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
this.meta.updateTag({content: description}, "name='description'");
|
||||
this.meta.updateTag({content: description}, "property='og:description'");
|
||||
}
|
||||
|
||||
private updateTitle(title: string) {
|
||||
var title = ((title.length > 50) ? title.substring(0, 50) : title);
|
||||
this.title.setTitle(title);
|
||||
this.meta.updateTag({content: title}, "property='og:title'");
|
||||
}
|
||||
|
||||
private updateUrl(url: string) {
|
||||
this.meta.updateTag({content: url}, "property='og:url'");
|
||||
}
|
||||
|
||||
private getFunders() {
|
||||
let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22';
|
||||
this.subscriptions.push(
|
||||
zip(
|
||||
this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties),
|
||||
this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['relfunder'], 'result', this.properties, refineParams),
|
||||
this.refineFieldResultsService.getRefineFieldsResultsByEntityName(['funder'], 'project', this.properties),
|
||||
this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder')
|
||||
).subscribe((data: any[]) => {
|
||||
// storing all needed data to a map
|
||||
// 1st call
|
||||
let queriedFunders1 = data[0][1][0].values;
|
||||
queriedFunders1.forEach(queriedFunder => {
|
||||
this.fundersMap.set(queriedFunder.id, {
|
||||
"id": queriedFunder.id,
|
||||
"name": queriedFunder.name,
|
||||
"alias": '',
|
||||
"researchProducts": +queriedFunder.number,
|
||||
"openAccessResearchProducts": 0,
|
||||
"openAccessPercentage": 0,
|
||||
"projects": 0,
|
||||
"monitorDashboard": '',
|
||||
"monitorDashboardStatus": '',
|
||||
"logoUrl": ''
|
||||
});
|
||||
});
|
||||
|
||||
// 2nd call
|
||||
let queriedFunders2 = data[1][1][0].values;
|
||||
queriedFunders2.forEach(queriedFunder => {
|
||||
if(this.fundersMap.has(queriedFunder.id)) {
|
||||
this.fundersMap.get(queriedFunder.id).openAccessResearchProducts = +queriedFunder.number;
|
||||
}
|
||||
});
|
||||
|
||||
// 3rd call
|
||||
let queriedFunders3 = data[2][1][0].values;
|
||||
queriedFunders3.forEach(queriedFunder => {
|
||||
if(+queriedFunder.number > 1) {
|
||||
if (this.fundersMap.has(queriedFunder.id)) {
|
||||
this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number;
|
||||
} else {
|
||||
this.fundersMap.set(queriedFunder.id, {
|
||||
"id": queriedFunder.id,
|
||||
"name": queriedFunder.name,
|
||||
"alias": '',
|
||||
"researchProducts": 0,
|
||||
"openAccessResearchProducts": 0,
|
||||
"openAccessPercentage": 0,
|
||||
"projects": +queriedFunder.number,
|
||||
"monitorDashboard": '',
|
||||
"monitorDashboardStatus": '',
|
||||
"logoUrl": ''
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 4th call
|
||||
let queriedFunders4 = data[3];
|
||||
queriedFunders4.forEach(queriedFunder => {
|
||||
let id = queriedFunder.index_id + '||' + queriedFunder.index_name + '||' + queriedFunder.index_shortName;
|
||||
if(this.fundersMap.has(id)) {
|
||||
this.fundersMap.get(id).alias = queriedFunder.alias;
|
||||
this.fundersMap.get(id).monitorDashboard = queriedFunder.alias;
|
||||
this.fundersMap.get(id).monitorDashboardStatus = queriedFunder.visibility;
|
||||
this.fundersMap.get(id).logoUrl = (queriedFunder.isUpload ? properties.utilsService + "/download/" : "")+ (queriedFunder.logoUrl);
|
||||
}
|
||||
});
|
||||
this.fundersMap.forEach((value) => {
|
||||
if(value.openAccessResearchProducts > 0) {
|
||||
value.openAccessPercentage = Math.round((value.openAccessResearchProducts / value.researchProducts) * 100);
|
||||
}
|
||||
});
|
||||
// convert funders map into an array
|
||||
this.funders = Array.from(this.fundersMap.values());
|
||||
// calculate total numbers for intro content
|
||||
this.calculateNumbers();
|
||||
// sort funders
|
||||
this.funders.sort((a, b) => a['name'].localeCompare(b['name']));
|
||||
// initialize displayedFunders
|
||||
this.displayedFunders = this.funders;
|
||||
this.showLoading = false;
|
||||
})
|
||||
);
|
||||
}
|
||||
|
||||
private calculateSum(array, property) {
|
||||
let sum = 0;
|
||||
array.forEach(element => {
|
||||
sum += element[property];
|
||||
});
|
||||
return sum;
|
||||
}
|
||||
|
||||
private calculateNumbers() {
|
||||
this.fundersNumber = this.funders.length;
|
||||
this.researchProductsNumber = this.calculateSum(this.funders, 'researchProducts');
|
||||
this.projectsNumber = this.calculateSum(this.funders, 'projects');
|
||||
}
|
||||
|
||||
get showContentWithNumbers() {
|
||||
return this.fundersNumber && this.researchProductsNumber && this.projectsNumber;
|
||||
}
|
||||
|
||||
formatNumber(num: number | string) {
|
||||
let formatted = NumberUtils.roundNumber(+num);
|
||||
return formatted.number + formatted.size;
|
||||
}
|
||||
|
||||
urlEncodeAndQuote(str: string): string {
|
||||
return StringUtils.quote(StringUtils.URIEncode(str));
|
||||
}
|
||||
|
||||
sortByChanged() {
|
||||
switch(this.sortBy) {
|
||||
case 'alphAsc':
|
||||
this.funders = this.funders.sort((a, b) => a['name'].localeCompare(b['name']));
|
||||
break;
|
||||
case 'alphDsc':
|
||||
this.funders = this.funders.sort((a, b) => b['name'].localeCompare(a['name']));
|
||||
break;
|
||||
case 'oaDsc':
|
||||
this.funders = this.funders.sort((a, b) => b['openAccessPercentage'] - a['openAccessPercentage']);
|
||||
break;
|
||||
}
|
||||
this.filtering();
|
||||
}
|
||||
|
||||
sizeChanged($event) {
|
||||
this.pageSize = $event;
|
||||
this.currentPage = 1;
|
||||
}
|
||||
|
||||
filtering() {
|
||||
let displayedFunders = this.funders;
|
||||
if(!this.keyword){
|
||||
this.keyword = '';
|
||||
}
|
||||
if(this.funders.length) {
|
||||
displayedFunders = displayedFunders.filter(item => (item['name'] && item['name'].toLowerCase().includes(this.keyword.toLowerCase())) || (item['alias'] && item['alias'].toLowerCase().includes(this.keyword.toLowerCase())));
|
||||
}
|
||||
if(this.show == 'dashboard') {
|
||||
displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && funder.monitorDashboardStatus != 'PRIVATE');
|
||||
}
|
||||
|
||||
this.displayedFunders = displayedFunders;
|
||||
this.currentPage = 1;
|
||||
}
|
||||
|
||||
public updateCurrentPage($event) {
|
||||
this.currentPage = $event.value;
|
||||
HelperFunctions.scrollToId('target');
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,47 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {FundersComponent} from './funders.component';
|
||||
import {FundersRoutingModule} from "./funders-routing.module";
|
||||
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
|
||||
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
|
||||
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
|
||||
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
|
||||
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
|
||||
import {LogoUrlPipeModule} from '../openaireLibrary/utils/pipes/logoUrlPipe.module';
|
||||
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
|
||||
import {IconsService} from '../openaireLibrary/utils/icons/icons.service';
|
||||
import {open_access} from '../openaireLibrary/utils/icons/icons';
|
||||
import {closed_access} from '../openaireLibrary/utils/icons/icons';
|
||||
import {InputModule} from '../openaireLibrary/sharedComponents/input/input.module';
|
||||
import {PagingModule} from '../openaireLibrary/utils/paging.module';
|
||||
import {SearchInputModule} from '../openaireLibrary/sharedComponents/search-input/search-input.module';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
FundersRoutingModule, CommonModule, RouterModule, AlertModalModule,
|
||||
Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, LoadingModule,
|
||||
RefineFieldResultsServiceModule, LogoUrlPipeModule, IconsModule, InputModule,
|
||||
PagingModule, SearchInputModule
|
||||
],
|
||||
declarations: [
|
||||
FundersComponent
|
||||
],
|
||||
providers: [
|
||||
PiwikService, IsRouteEnabled
|
||||
],
|
||||
exports: [
|
||||
FundersComponent
|
||||
]
|
||||
})
|
||||
|
||||
export class FundersModule {
|
||||
constructor(private iconsService: IconsService) {
|
||||
this.iconsService.registerIcons([open_access, closed_access]);
|
||||
}
|
||||
}
|
||||
|
|
@ -15,18 +15,27 @@
|
|||
Discover open linked research<span class="uk-text-primary">.</span>
|
||||
</h1>
|
||||
<numbers #numbersComponent [defaultInit]="false" (results)="numbers = $event"></numbers>
|
||||
<div [class.uk-invisible]="disableSelect" class="uk-margin-medium-top uk-width-3-4@xl">
|
||||
<advanced-search-input #advanced (searchEmitter)="goTo(true)">
|
||||
<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||
<!-- [class.uk-invisible]="disableSelect" -->
|
||||
<div class="uk-margin-medium-top" style="max-width: 600px;" uk-scrollspy-class>
|
||||
<div class="uk-flex uk-flex-right uk-text-small">
|
||||
<a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
|
||||
Advanced search
|
||||
</a>
|
||||
</div>
|
||||
<!-- <advanced-search-input #advanced (searchEmitter)="goTo()">-->
|
||||
<!-- <entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||
(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
|
||||
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection>
|
||||
<div class="uk-width-expand" input #input placeholder="Scholary works" [searchable]="true" [hint]="'Search in OpenAIRE'" [(value)]="keyword"></div>
|
||||
</advanced-search-input>
|
||||
<div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
|
||||
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection> -->
|
||||
<!-- <div class="uk-width-expand" input #input placeholder="Search in Explore" [searchable]="true" [hint]="'What are you looking for?'" [(value)]="keyword"></div>-->
|
||||
<!-- </advanced-search-input>-->
|
||||
<div search-input [(value)]="keyword" [placeholder]="'Search'+(portalName ? (' in '+portalName) : '')" (searchEmitter)="goTo()"
|
||||
[searchInputClass]="'inner background'"></div>
|
||||
|
||||
<!-- <div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
|
||||
<div class="uk-padding-small">
|
||||
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
|
||||
</div>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="uk-padding-small uk-margin-small-top">
|
||||
<div class="uk-text-meta">
|
||||
|
|
@ -251,16 +260,16 @@
|
|||
<div style="max-width: 550px;">
|
||||
<h2>Linked Open Research.</h2>
|
||||
<div class="">
|
||||
EXPLORE is built on the <a href="https://graph.openaire.eu/" target="_blank" class="graph">OpenAIRE Research Graph</a>, one of the largest
|
||||
EXPLORE is built on the <a href="https://graph.openaire.eu/" target="_blank" class="graph">OpenAIRE Graph</a>, one of the largest
|
||||
open scholarly record collections worldwide. Conceived as a public and
|
||||
transparent good, populated out of data sources trusted by scientists, the
|
||||
OpenAIRE Research Graph brings discovery, monitoring, and assessment of science
|
||||
OpenAIRE Graph brings discovery, monitoring, and assessment of science
|
||||
back in the hands of the scientific community.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div></div>
|
||||
<img class="uk-visible@m uk-height-1-1 uk-position-top-right" src="assets/explore-assets/home/graph.svg" alt="ipad" loading="lazy">
|
||||
<img class="uk-visible@m uk-height-1-1 uk-position-top-right" src="assets/common-assets/common/graph-nodes.svg" alt="ipad" loading="lazy">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -269,10 +278,10 @@
|
|||
<div class="uk-container">
|
||||
<div class="uk-width-1-2@m uk-margin-auto uk-margin-small-top uk-text-center" style="max-width: 600px;">
|
||||
<div>
|
||||
Within a constantly emerging scholarly communication environment, the OpenAIRE Research Graph is a moving target, continuously integrating new sources, new types or research objects, and embedding access measures. We therefore welcome the community to work with us to improve all its aspects: its <span class="uk-text-bold">coverage</span> (geographic and thematic), <span class="uk-text-bold">quality</span> (disambiguation and semantics) and <span class="uk-text-bold">access</span> (APIs).
|
||||
Within a constantly emerging scholarly communication environment, the OpenAIRE Graph is a moving target, continuously integrating new sources, new types or research objects, and embedding access measures. We therefore welcome the community to work with us to improve all its aspects: its <span class="uk-text-bold">coverage</span> (geographic and thematic), <span class="uk-text-bold">quality</span> (disambiguation and semantics) and <span class="uk-text-bold">access</span> (APIs).
|
||||
</div>
|
||||
<div class="uk-margin-top">
|
||||
Find information about the OpenAIRE Research Graph, how to test it and contribute to improving it.
|
||||
Find information about the OpenAIRE Graph, how to test it and contribute to improving it.
|
||||
</div>
|
||||
<div class="uk-margin-top">
|
||||
<a href="https://www.openaire.eu/blogs/the-openaire-research-graph" target="_blank" class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text">
|
||||
|
|
|
|||
|
|
@ -112,6 +112,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
]
|
||||
]
|
||||
};
|
||||
public portalName: string = "";
|
||||
public pageTitle = "OpenAIRE";
|
||||
public keyword: string = "";
|
||||
public searchFields: SearchFields = new SearchFields();
|
||||
|
|
@ -121,7 +122,6 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
public properties: EnvProperties = properties;
|
||||
public openaireEntities = OpenaireEntities;
|
||||
public readMore: boolean = false;
|
||||
public showQuickContact: boolean;
|
||||
@ViewChild('contact') contact: ElementRef;
|
||||
subscriptions: any[] = [];
|
||||
@ViewChildren('scrolling_element') elements: QueryList<ElementRef>;
|
||||
|
|
@ -157,7 +157,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
{value: "lcsh:Technology", label: "Technology"},
|
||||
];
|
||||
stringUtils = new StringUtils();
|
||||
disableSelect: boolean = true;
|
||||
// disableSelect: boolean = true;
|
||||
|
||||
constructor(
|
||||
private _router: Router,
|
||||
|
|
@ -173,6 +173,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
this._meta.updateTag({content: title}, "property='og:title'");
|
||||
this.quickContactService.setDisplay(false);
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
|
|
@ -213,9 +214,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
if (this.properties != null) {
|
||||
var url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||
this._meta.updateTag({content: url}, "property='og:url'");
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
|
||||
}
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
|
||||
if(this.numbersComponent) {
|
||||
this.numbersComponent.showPublications = false;
|
||||
this.numbersComponent.showDatasets = false;
|
||||
|
|
@ -225,8 +224,11 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
this.numbersComponent.showDataProviders = false;
|
||||
this.numbersComponent.showOrganizations = false;
|
||||
}
|
||||
this.subscriptions.push(this.config.communityInformationState.subscribe(data => {
|
||||
this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
|
||||
if(data) {
|
||||
if(data.name) {
|
||||
this.portalName = data.name;
|
||||
}
|
||||
var showEntity = {};
|
||||
for (var i = 0; i < data['entities'].length; i++) {
|
||||
showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
|
||||
|
|
@ -281,6 +283,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
|
||||
|
||||
public ngOnDestroy() {
|
||||
this.quickContactService.setDisplay(true);
|
||||
this.clear();
|
||||
}
|
||||
|
||||
|
|
@ -298,13 +301,7 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
};
|
||||
let intersectionObserver = new IntersectionObserver(entries => {
|
||||
entries.forEach(entry => {
|
||||
if (entry.isIntersecting && this.showQuickContact) {
|
||||
this.showQuickContact = false;
|
||||
this.quickContactService.setDisplay(this.showQuickContact);
|
||||
} else if (!entry.isIntersecting && !this.showQuickContact) {
|
||||
this.showQuickContact = true;
|
||||
this.quickContactService.setDisplay(this.showQuickContact);
|
||||
}
|
||||
this.quickContactService.setDisplay(!entry.isIntersecting);
|
||||
});
|
||||
}, options);
|
||||
intersectionObserver.observe(this.contact.nativeElement);
|
||||
|
|
@ -340,48 +337,47 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
this.selectedEntityAdvancedUrl = $event.advancedUrl;
|
||||
}
|
||||
|
||||
goTo(simple: boolean) {
|
||||
let url = (simple) ? this.selectedEntitySimpleUrl : this.selectedEntityAdvancedUrl;
|
||||
goTo() {
|
||||
let parameterNames = [];
|
||||
let parameterValues = [];
|
||||
if (this.selectedEntity == "result") {
|
||||
if (this.resultTypes) {
|
||||
let values = [];
|
||||
for (let value of this.resultTypes.values) {
|
||||
if (value.selected) {
|
||||
values.push(value.id);
|
||||
}
|
||||
}
|
||||
if (values.length > 0 && values.length != 4) {
|
||||
parameterNames.push("type");
|
||||
parameterValues.push(values.join(","));
|
||||
}
|
||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||
}
|
||||
}
|
||||
} else if (this.selectedEntity == "all") {
|
||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||
}
|
||||
// if (this.selectedEntity == "result") {
|
||||
// if (this.resultTypes) {
|
||||
// let values = [];
|
||||
// for (let value of this.resultTypes.values) {
|
||||
// if (value.selected) {
|
||||
// values.push(value.id);
|
||||
// }
|
||||
// }
|
||||
// if (values.length > 0 && values.length != 4) {
|
||||
// parameterNames.push("type");
|
||||
// parameterValues.push(values.join(","));
|
||||
// }
|
||||
// if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
// parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
// parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||
// }
|
||||
// }
|
||||
// } else if (this.selectedEntity == "all") {
|
||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||
}
|
||||
// }
|
||||
if (this.keyword.length > 0) {
|
||||
parameterNames.push("fv0");
|
||||
parameterValues.push(this.keyword);
|
||||
parameterNames.push("f0");
|
||||
parameterValues.push("q");
|
||||
}
|
||||
this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
||||
this._router.navigate([this.properties.searchLinkToAll], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
||||
}
|
||||
|
||||
getSubjectParameter(param) {
|
||||
return {'f0': 'resultsubject', 'fv0': '"' + (param) + '"', size: 50};
|
||||
}
|
||||
|
||||
disableSelectChange(event: boolean) {
|
||||
this.disableSelect = event;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
// disableSelectChange(event: boolean) {
|
||||
// this.disableSelect = event;
|
||||
// this.cdr.detectChanges();
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import {book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
|
|||
import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers.module";
|
||||
import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module";
|
||||
import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
|
||||
import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -37,7 +38,7 @@ import {InputModule} from "../openaireLibrary/sharedComponents/input/input.modul
|
|||
PiwikServiceModule,
|
||||
HomeRoutingModule,
|
||||
HelperModule,
|
||||
SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule
|
||||
SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule
|
||||
],
|
||||
declarations: [
|
||||
HomeComponent
|
||||
|
|
|
|||
|
|
@ -4,12 +4,7 @@ import {properties} from "../../environments/environment";
|
|||
@Component({
|
||||
selector: 'explore-sdg',
|
||||
template: `
|
||||
<sdg [piwikSiteId]="piwikSiteId"></sdg>
|
||||
<sdg></sdg>
|
||||
`
|
||||
})
|
||||
export class ExploreSdgComponent {
|
||||
piwikSiteId = properties.piwikSiteId;
|
||||
|
||||
constructor() {
|
||||
}
|
||||
}
|
||||
export class ExploreSdgComponent {}
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 315.47 315.47"><defs><style>.cls-1{fill:#241983;}.cls-2,.cls-3{fill:#00d8c4;}.cls-3{fill-rule:evenodd;}</style></defs><g id="Layer_1-2"><g><circle class="cls-1" cx="157.73" cy="157.73" r="157.73"/><g><ellipse class="cls-2" cx="116.85" cy="98.6" rx="63.94" ry="37.92"/><ellipse class="cls-2" cx="199.59" cy="167.66" rx="63.94" ry="37.92"/><path class="cls-3" d="M260.39,185.84c1.25-1.88,2.51-3.76,3.13-5.95-.31,13.48,1.25,14.42-.94,21.63-5.01,17.24-38.86,29.77-64.25,29.15-21.63-.31-39.18-2.82-54.85-15.98-4.39-3.76-9.4-7.52-9.72-12.85,0-10.03,0-11.6,.31-23.82,10.34,38.86,102.8,41.37,126.31,7.84Z"/><path class="cls-3" d="M262.58,209.66c.94,8.78-1.57,13.79-1.88,20.06-.94,14.73-35.1,24.76-61.43,25.07-31.34,.31-63.62-12.22-64.25-24.76-.63-11.28,0-5.33-.94-20.06,21.31,32.28,105.31,31.97,128.5-.31Z"/><path class="cls-3" d="M116.85,140.71c38.55,.31,57.67-17.86,61.74-25.07,1.88-3.45-.31,12.85-.94,13.16-14.1,4.07-31.03,10.03-40.43,21.94-2.82,3.45-3.76,7.52-5.01,12.54,0,.31-13.48-.31-14.42-.31-28.21,0-61.12-13.48-65.82-35.73-.63-4.39,0-8.15,0-17.55,10.03,19.75,36.67,30.71,64.88,31.03Z"/><path class="cls-3" d="M116.85,166.72c5.01,.31,15.04,0,15.04,0-.94,8.78-.63,12.85-1.25,23.19,0,.31-71.15,3.76-78.67-33.85-.63-4.07,0-7.84,0-17.55,15.67,21.31,42.94,27.27,64.88,28.21Z"/><path class="cls-3" d="M130.01,194.3s.94,12.54,.63,21.94c0,.31-68.95,1.88-78.04-27.58l-.63-21.31c16.92,23.51,52.65,27.58,78.04,26.95Z"/></g></g></g></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 1.2 MiB |
|
|
@ -0,0 +1 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 349.02 349.02"><defs><style>.cls-1{fill:#241983;}.cls-2{fill:#00d8c4;}</style></defs><g id="Layer_1-2"><g><circle class="cls-1" cx="157.73" cy="191.29" r="157.73"/><circle class="cls-2" cx="191.29" cy="157.73" r="157.73"/><g><path class="cls-1" d="M256.1,204.17c-2.11,2.33-6.37,2.17-9.98,1.47-.48-.08-.92-.31-1.28-.63l-32.35-27.83c-1.19-1.02-2.98-.89-4,.3l-.09,.12c-1.03,1.19-.89,2.97,.3,3.99l30.02,25.77c2.65,2.28,4.22,5.62,4.02,9.11-.07,1.13-.33,2.12-.88,2.75-1.59,1.81-5.94,1.91-11.98,.31-.39-.11-.76-.3-1.06-.55l-29.86-24.26c-1.21-.98-2.99-.8-3.98,.41l-.1,.14c-.99,1.21-.81,3,.4,3.98l27.98,22.8c1.06,.86,1.35,2.35,.71,3.55-1.73,3.19-4.15,6.39-6.5,7.07-1.26,.32-2.6-.04-3.53-.95-7.32-5.58-19.43-16.03-24.3-20.25-1.18-1.03-2.96-.9-3.99,.27l-.11,.14c-1.03,1.18-.91,2.98,.27,4l.62,.53,1.89,1.65c3.54,3.05,8.35,7.14,12.98,10.95,1.86,1.53,1.08,4.59-1.3,4.98-4.14,.67-8.61,.56-11.87-1.65-7.97-5.42-54.63-39.44-68.11-49.28-1.09-.63-2.87-1.45-5.62-2.17-.23-.06-.49-.12-.74-.18-1.61-.38-3.55-.72-5.83-.98l-40.65-6.77c-2.22-.37-3.6-2.63-2.9-4.77l20.33-62.82c.49-1.52,2.14-2.34,3.65-1.81l32.32,11.51s7.68,1.65,18.24,1.56l13.52-.1c2.18-.01,3.57,2.35,2.48,4.25l-7.31,12.76,.04,.79c.01,1.83,.34,18.11,7.32,23.57,7.63,5.9,16.14,3.97,25.24-5.76l1.57-1.66c6.95-7.4,14.03-13.31,26.54-4.4,1.64,1.17,3.21,2.44,4.71,3.79l6.97,6.65,.68,.63,3.07,2.75,1.05,.99,2.48,2.4,1.35,1.27,2.45,2.18,1.3,1.24,2.4,2.29,1.05,1.05,2.32,2.23,1.18,1.14,2.28,2.27,.87,.82,2.5,2.43,.56,.55,2.59,2.48,.24,.26,8.24,7.98c.4,.39,.67,.86,.79,1.4,.69,3.06,1.31,8.49-1.18,11.29Z"/><path class="cls-1" d="M317.97,154.23c1.2,2.26,.16,5.06-2.22,5.99l-42.33,16.43h-.04c-.37,.04-3.24,.46-8.83,4.49l-5.07,5.23-.92-.92-.72-.69-1.02-.99-1.42-1.37-.58-.59-1.99-1.92-.31-.25-1.18-.82-.29-.24-1.87-1.79-1.08-1.05-1.91-1.82-1.17-1.14-1.98-1.9-1.3-1.24-2.19-2.1-1.13-1.11-7-6.64-.9-.83-2.65-2.48-1.11-1.05-2.58-2.42-.93-.86-3.08-2.74-.52-.5-3.45-3.16c-.89-.83-1.78-1.56-2.66-2.28l-.59-.5c-.85-.68-1.71-1.31-2.53-1.87l-.45-.3c-.75-.5-1.5-.97-2.24-1.4l-.39-.21c-.79-.45-1.57-.84-2.35-1.18l-.5-.2c-.78-.34-1.56-.64-2.3-.87-.71-.22-1.44-.4-2.18-.55l-.41,.02c-.69-.12-1.39-.21-2.09-.26l-.29,.02c-.64,0-1.29,.04-1.93,.11h-.17c-1.04,.07-2.06,.21-3.07,.45-.98,.22-1.94,.54-2.87,.91-1.85,.78-3.6,1.78-5.2,2.98-1.6,1.18-3.11,2.48-4.52,3.87l-1.96,1.98-1.71,1.82c-8.92,9.55-13.96,7.76-17.4,5.12-3.3-2.52-4.79-11.54-5.05-17.43-.03-.53,.11-1.05,.37-1.5l8.85-15.47c1.69-2.93,4.63-4.93,7.98-5.4l18.75-2.64c3.84-.53,7.74-.37,11.53,.5l32.18,7.43s.06,.02,.09,.02c.84,.24,7.71,1.93,16.41-3.05l34.34-19.52c1.39-.8,3.16-.29,3.91,1.12l30.21,56.76Z"/></g></g></g></svg>
|
||||
|
After Width: | Height: | Size: 2.6 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 169 KiB |
|
|
@ -23,12 +23,33 @@
|
|||
/* Label */
|
||||
@label-secondary-color: @explore-color;
|
||||
|
||||
/* Subnav */
|
||||
@subnav-pill-alt-item-active-background: @explore-color;
|
||||
@subnav-pill-alt-item-active-background-gradient: none;
|
||||
|
||||
/* General */
|
||||
@general-tab-featured-tab: @explore-color;
|
||||
|
||||
/* Landing */
|
||||
@landing-portal-color: @explore-color;
|
||||
|
||||
.deposit {
|
||||
.deposit, .funders {
|
||||
@import (multiple) "~src/assets/openaire-theme/less/_import";
|
||||
}
|
||||
|
||||
.monitor-dashboard-link {
|
||||
color: @monitor-color;
|
||||
}
|
||||
|
||||
.funders-title {
|
||||
color: @primary-color;
|
||||
}
|
||||
|
||||
.custom-extra-entities {
|
||||
padding: 2px 5px;
|
||||
border-radius: 4px;
|
||||
&:hover {
|
||||
text-decoration: none;
|
||||
color: @secondary-color;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,6 +1,8 @@
|
|||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||
import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all";
|
||||
import {commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment.beta";
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
let props: EnvProperties = {
|
||||
environment: "beta",
|
||||
adminToolsPortalType: "explore",
|
||||
dashboard: "explore",
|
||||
|
|
@ -12,6 +14,7 @@ export let properties: EnvProperties = {
|
|||
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
||||
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
||||
statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/",
|
||||
bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
|
||||
useNewStatistisTool: true,
|
||||
claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/",
|
||||
searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/",
|
||||
|
|
@ -32,6 +35,7 @@ export let properties: EnvProperties = {
|
|||
cordisURL: "http://cordis.europa.eu/projects/",
|
||||
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
|
||||
r3DataURL: "http://service.re3data.org/repository/",
|
||||
// swhURL: "https://archive.softwareheritage.org/",
|
||||
fairSharingURL: "https://fairsharing.org/",
|
||||
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
|
||||
sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
|
||||
|
|
@ -60,6 +64,7 @@ export let properties: EnvProperties = {
|
|||
|
||||
datasourcesAPI: "https://beta.services.openaire.eu/openaire/ds/api/",
|
||||
|
||||
monitorServiceAPIURL: "https://beta.services.openaire.eu/uoa-monitor-service",
|
||||
adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
|
||||
|
||||
adminToolsCommunity: "openaire",
|
||||
|
|
@ -82,6 +87,7 @@ export let properties: EnvProperties = {
|
|||
searchLinkToOrp: "/search/other?orpId=",
|
||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||
|
||||
searchLinkToAll: "/search/find/",
|
||||
searchLinkToPublications: "/search/find/publications",
|
||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||
searchLinkToProjects: "/search/find/projects",
|
||||
|
|
@ -124,3 +130,7 @@ export let properties: EnvProperties = {
|
|||
|
||||
egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook"
|
||||
};
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
...props, ...common, ...commonBeta
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,8 @@
|
|||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||
import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all";
|
||||
import {commonProd} from "../app/openaireLibrary/utils/properties/environments/environment.prod";
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
let props: EnvProperties = {
|
||||
environment: "production",
|
||||
adminToolsPortalType: "explore",
|
||||
dashboard: "explore",
|
||||
|
|
@ -12,6 +14,7 @@ export let properties: EnvProperties = {
|
|||
statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/",
|
||||
statisticsFrameAPIURL: "https://www.openaire.eu/stats/",
|
||||
statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/",
|
||||
bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
|
||||
useNewStatistisTool: true,
|
||||
claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/",
|
||||
searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/",
|
||||
|
|
@ -32,6 +35,7 @@ export let properties: EnvProperties = {
|
|||
cordisURL: "http://cordis.europa.eu/projects/",
|
||||
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
|
||||
r3DataURL: "http://service.re3data.org/repository/",
|
||||
// swhURL: "https://archive.softwareheritage.org/",
|
||||
fairSharingURL: "https://fairsharing.org/",
|
||||
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
|
||||
sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
|
||||
|
|
@ -64,6 +68,7 @@ export let properties: EnvProperties = {
|
|||
|
||||
datasourcesAPI: "https://services.openaire.eu/openaire/ds/api/",
|
||||
|
||||
monitorServiceAPIURL: "https://services.openaire.eu/uoa-monitor-service",
|
||||
adminToolsAPIURL: "https://services.openaire.eu/uoa-admin-tools/",
|
||||
|
||||
adminToolsCommunity: "openaire",
|
||||
|
|
@ -87,6 +92,7 @@ export let properties: EnvProperties = {
|
|||
searchLinkToOrp: "/search/other?orpId=",
|
||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||
|
||||
searchLinkToAll: "/search/find/",
|
||||
searchLinkToPublications: "/search/find/publications",
|
||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||
searchLinkToProjects: "/search/find/projects",
|
||||
|
|
@ -127,3 +133,7 @@ export let properties: EnvProperties = {
|
|||
myOrcidLinksPage: "/my-orcid-links",
|
||||
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
|
||||
};
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
...props, ...common, ...commonProd
|
||||
}
|
||||
|
|
@ -1,6 +1,9 @@
|
|||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||
import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all";
|
||||
import {commonTest} from "../app/openaireLibrary/utils/properties/environments/environment.test";
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
let props: EnvProperties = {
|
||||
// export let properties: EnvProperties = {
|
||||
environment: "test",
|
||||
dashboard: "explore",
|
||||
adminToolsPortalType: "explore",
|
||||
|
|
@ -32,6 +35,7 @@ export let properties: EnvProperties = {
|
|||
cordisURL: "http://cordis.europa.eu/projects/",
|
||||
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
|
||||
r3DataURL: "http://service.re3data.org/repository/",
|
||||
// swhURL: "https://archive.softwareheritage.org/",
|
||||
fairSharingURL: "https://fairsharing.org/",
|
||||
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
|
||||
sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
|
||||
|
|
@ -86,6 +90,7 @@ export let properties: EnvProperties = {
|
|||
searchLinkToOrp: "/search/other?orpId=",
|
||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||
|
||||
searchLinkToAll: "/search/find/",
|
||||
searchLinkToPublications: "/search/find/publications",
|
||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||
searchLinkToProjects: "/search/find/projects",
|
||||
|
|
@ -126,3 +131,7 @@ export let properties: EnvProperties = {
|
|||
myOrcidLinksPage: "/my-orcid-links",
|
||||
footerGrantText: "OpenAIRE has received funding from the European Union's Horizon 2020 research and innovation programme under grant agreements No. 777541 and 101017452"
|
||||
};
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
...props, ...common, ...commonTest
|
||||
}
|
||||
|
|
@ -4,8 +4,10 @@
|
|||
// The list of which env maps to which file can be found in `.angular-cli.json`.
|
||||
|
||||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||
import {common} from "../app/openaireLibrary/utils/properties/environments/environment.all";
|
||||
import {commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
let props: EnvProperties = {
|
||||
environment: "development",
|
||||
adminToolsPortalType: "explore",
|
||||
dashboard: "explore",
|
||||
|
|
@ -17,20 +19,26 @@ export let properties: EnvProperties = {
|
|||
statisticsAPIURL: "http://vatopedi.di.uoa.gr:8080/stats/",
|
||||
statisticsFrameAPIURL: "https://beta.openaire.eu/stats/",
|
||||
statisticsFrameNewAPIURL: "https://stats.madgik.di.uoa.gr/stats-api/",
|
||||
bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=",
|
||||
useNewStatistisTool: true,
|
||||
claimsAPIURL: "http://rudie.di.uoa.gr:8980/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
|
||||
// claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/",
|
||||
// From here
|
||||
searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/",
|
||||
searchResourcesAPIURL: "https://beta.services.openaire.eu/search/v2/api/resources",
|
||||
// to here
|
||||
openCitationsAPIURL: "https://services.openaire.eu/opencitations/getCitations?id=",
|
||||
csvAPIURL: "https://beta.services.openaire.eu/search/v2/api/reports",
|
||||
// From here
|
||||
searchCrossrefAPIURL: "https://api.crossref.org/works",
|
||||
searchDataciteAPIURL: "https://api.datacite.org/works",
|
||||
searchOrcidURL: "https://pub.orcid.org/v2.1/",
|
||||
orcidURL: "https://orcid.org/",
|
||||
// to here
|
||||
orcidAPIURL: "http://duffy.di.uoa.gr:19480/uoa-orcid-service/",
|
||||
orcidTokenURL : "https://sandbox.orcid.org/oauth/authorize?",
|
||||
orcidClientId: "APP-A5M3KTX6NCN67L91",
|
||||
// From here
|
||||
doiURL: "https://doi.org/",
|
||||
pmcURL: "http://europepmc.org/articles/",
|
||||
pmidURL: "https://www.ncbi.nlm.nih.gov/pubmed/",
|
||||
|
|
@ -38,8 +46,11 @@ export let properties: EnvProperties = {
|
|||
cordisURL: "http://cordis.europa.eu/projects/",
|
||||
openDoarURL: "http://v2.sherpa.ac.uk/id/repository/",
|
||||
r3DataURL: "http://service.re3data.org/repository/",
|
||||
// swhURL: "https://archive.softwareheritage.org/",
|
||||
fairSharingURL: "https://fairsharing.org/",
|
||||
// to here
|
||||
eoscMarketplaceURL: "https://marketplace.eosc-portal.eu/services/",
|
||||
// From here
|
||||
sherpaURL: "http://sherpa.ac.uk/romeo/issn/",
|
||||
sherpaURLSuffix: "/",
|
||||
zenodo: "https://zenodo.org/",
|
||||
|
|
@ -48,6 +59,7 @@ export let properties: EnvProperties = {
|
|||
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",
|
||||
// to here
|
||||
helpdesk: "https://www.openaire.eu/support/helpdesk",
|
||||
helpdeskEmail: "helpdesk@openaire.eu",
|
||||
utilsService: "http://dl170.madgik.di.uoa.gr:8000",
|
||||
|
|
@ -65,6 +77,7 @@ export let properties: EnvProperties = {
|
|||
|
||||
cacheUrl: "http://dl170.madgik.di.uoa.gr:3000/get?url=",
|
||||
|
||||
monitorServiceAPIURL: "http://duffy.di.uoa.gr:19380/uoa-monitor-service",
|
||||
adminToolsAPIURL: "http://duffy.di.uoa.gr:19280/uoa-admin-tools/",
|
||||
|
||||
adminToolsCommunity: "openaire",
|
||||
|
|
@ -88,6 +101,7 @@ export let properties: EnvProperties = {
|
|||
searchLinkToOrp: "/search/other?orpId=",
|
||||
searchLinkToOrganization: "/search/organization?organizationId=",
|
||||
|
||||
searchLinkToAll: "/search/find/",
|
||||
searchLinkToPublications: "/search/find/publications",
|
||||
searchLinkToDataProviders: "/search/find/dataproviders",
|
||||
searchLinkToProjects: "/search/find/projects",
|
||||
|
|
@ -130,3 +144,7 @@ export let properties: EnvProperties = {
|
|||
|
||||
egiNotebookLink: "https://marketplace.eosc-portal.eu/services/egi-notebooks?q=EGI+Notebook"
|
||||
};
|
||||
|
||||
export let properties: EnvProperties = {
|
||||
...props, ...common, ...commonDev
|
||||
}
|
||||
|
|
@ -18,5 +18,8 @@
|
|||
"es2018",
|
||||
"dom"
|
||||
]
|
||||
}
|
||||
},
|
||||
// "angularCompilerOptions": {
|
||||
// "strictTemplates": true
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
userInfoUrl = http://mpagasas.di.uoa.gr:8080/login-service/userInfo
|
||||
userInfoUrl = http://mpagasas.di.uoa.gr:19080/login-service/userInfo
|
||||
ssl = false
|
||||
localPath = true
|
||||
# photo size in KB
|
||||
|
|
|
|||
Loading…
Reference in New Issue