Compare commits
95 Commits
production
...
master
Author | SHA1 | Date |
---|---|---|
Konstantina Galouni | 5f4e40a834 | |
Konstantina Galouni | 7abfb0bb49 | |
Konstantina Galouni | e356b58380 | |
Konstantina Galouni | 7ab767aec8 | |
argirok | 4ca47d7f36 | |
Konstantina Galouni | 974c43b00d | |
Konstantina Galouni | 8c3f17cc20 | |
Konstantina Galouni | 0879a339ff | |
Konstantina Galouni | 623eb2fad0 | |
Konstantina Galouni | cf998dcd2e | |
Konstantina Galouni | 5d0c69e410 | |
Konstantina Galouni | 7d986a7028 | |
Konstantina Galouni | 24895a85a2 | |
Konstantina Galouni | 7ca0d9e8b8 | |
Konstantina Galouni | 68ecec3210 | |
Konstantina Galouni | 6881ae35b2 | |
Konstantina Galouni | a1ec284c63 | |
Konstantina Galouni | 3acffc3d79 | |
Konstantina Galouni | c1bac808f9 | |
argirok | 7ec3df2dc3 | |
argirok | 40830c48df | |
argirok | 1e06fb0404 | |
Konstantina Galouni | 0de2ac90d7 | |
Konstantina Galouni | d172ef8991 | |
Konstantina Galouni | 8bed072023 | |
Konstantina Galouni | 16838a3d51 | |
argirok | 706fe7cd07 | |
Konstantina Galouni | 4fc4182696 | |
Konstantina Galouni | 2754736693 | |
Konstantina Galouni | d484f4afda | |
Konstantina Galouni | 45f93d79ef | |
Konstantina Galouni | c4e8a2b390 | |
Konstantina Galouni | ff3e56465e | |
Konstantina Galouni | 0181035409 | |
Konstantina Galouni | 7a863e3d4b | |
Konstantina Galouni | faad25e780 | |
Konstantina Galouni | 1494f44362 | |
Konstantina Galouni | b059b300ba | |
Konstantina Galouni | d05209a54c | |
Konstantina Galouni | 24696d7991 | |
Konstantina Galouni | b72a7f03b1 | |
Konstantina Galouni | e4d230369e | |
Konstantina Galouni | ba83087b59 | |
Konstantina Galouni | 55469cc2bc | |
Konstantina Galouni | dbdb929a8f | |
Konstantina Galouni | 58770771ca | |
Konstantina Galouni | 0c82b325cf | |
Konstantina Galouni | e518a80ba4 | |
Konstantina Galouni | 234b12be9d | |
Konstantina Galouni | 5789293ffe | |
Konstantina Galouni | 83f01d8aa1 | |
Konstantina Galouni | 0a20d80c4c | |
Konstantina Galouni | 8a3e859132 | |
Konstantina Galouni | ca41e89465 | |
Konstantina Galouni | e563886f8a | |
Konstantina Galouni | d1b482c189 | |
Konstantina Galouni | 443f90d2e9 | |
Konstantina Galouni | 8d0f711064 | |
Konstantina Galouni | 0f639ec210 | |
Konstantina Galouni | d9647d2a46 | |
Konstantina Galouni | b79dbd20ec | |
Konstantina Galouni | ccae7b03a5 | |
Alex Martzios | 59f3e8dae9 | |
Alex Martzios | 09b7435243 | |
argirok | 260b263e6f | |
Alex Martzios | d42a3973bd | |
Konstantina Galouni | 37358b14db | |
Konstantina Galouni | 2a4b92ba00 | |
Konstantina Galouni | 4ad1f4e51c | |
Konstantina Galouni | 3d2ad5336b | |
Konstantina Galouni | 60de7eb2a0 | |
Konstantina Galouni | 45561bddb2 | |
Konstantina Galouni | 215c3fbc83 | |
Konstantina Galouni | a79b936629 | |
Alex Martzios | b7a05316c0 | |
Konstantina Galouni | a99e6378fc | |
Konstantina Galouni | 8949088e0e | |
Konstantina Galouni | 463410a135 | |
Konstantina Galouni | 17165e83ae | |
Alex Martzios | f3115b9f98 | |
Alex Martzios | f226482ba3 | |
Konstantina Galouni | 38337e296f | |
argirok | c81c6196c0 | |
Konstantina Galouni | 178846353c | |
Konstantina Galouni | 49dce466ce | |
argirok | 68662693a4 | |
Konstantina Galouni | e8e4c410dd | |
Konstantina Galouni | c51b2b58f4 | |
Konstantinos Triantafyllou | 85320e8653 | |
Konstantina Galouni | 9f53423ae3 | |
Konstantina Galouni | 15499aa4ca | |
Konstantina Galouni | a762efab08 | |
Konstantina Galouni | 8cdc423f02 | |
Konstantinos Triantafyllou | 3797ddcc3a | |
Konstantinos Triantafyllou | e57f1b02ed |
|
@ -14,6 +14,91 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|||
- *Fixed (for any bug fixes)*
|
||||
- *Security (in case of vulnerabilities)*
|
||||
|
||||
## [production-release-august-2024] - 2024/08/01
|
||||
### Changed
|
||||
* Hide L3 & L4 from FoS (Fields of Science page, Detailed page, Advanced search page)
|
||||
* Search page: Reordered buttons - moved compact results button before download button
|
||||
|
||||
## [production-release-july-2024] - 2024/07/11
|
||||
### Changed
|
||||
* Parse instances new info (to delete deletedbyinference records)
|
||||
* Detailed page: Remove subjects by vocabulary section and show all subjects under keywords
|
||||
|
||||
### Fixed
|
||||
* Updated vocabulary for Fields of Science level 4
|
||||
* Linking: Do not add unidentified code in queries - missing irish funders
|
||||
|
||||
### Added
|
||||
* Funders page: More information in cards (i.e. country, registered)
|
||||
* Funders page: New sorting options by research products & projects
|
||||
* Links between Research products and Data sources
|
||||
* Design of compact search results
|
||||
|
||||
## [production-release-june-2024] - 2024/06/04
|
||||
### Changed
|
||||
* Filter out unidentified projects from the search page and related tabs in detailed pages
|
||||
* Updated link functionality for funding: search either by selecting funder or directly for projects
|
||||
|
||||
### Fixed
|
||||
* Search results: adjust message when >= 1000 relations in the metadata line
|
||||
* Fixed message on "Related Data Sources" tab of Data source detailed page
|
||||
* Query 100 top values when a value of the filter is selected (bug when selected not in top 7 values)
|
||||
|
||||
## [production-release-may-2024] - 2024/05/23
|
||||
### Changed
|
||||
* Restored in search pages: number of results & selected keyword
|
||||
* Performance improvements: onPush Strategy for checking when there are content changes in search results
|
||||
* Updated color of filter labels & set color of "x" on filter labels same as the text
|
||||
* Updated cards in funders page
|
||||
|
||||
### Fixed
|
||||
* Filters in claims (projects) always loading
|
||||
* z-index issue in dropdown (ORCID) inside modal (authors)
|
||||
* Close dropdown of ORCID author when clicking on the search button
|
||||
* Replaced /projects search endpoint with /resources2?type=projects in project claims
|
||||
|
||||
### Added
|
||||
* Link directly with funding (unidentified projects)
|
||||
* Display organization persistent identifiers (search results & detailed page)
|
||||
* Search & Advanced search organizations by pid
|
||||
* Display full organization names in search organizations page
|
||||
* Added level4 FoS in fos.json vocabulary
|
||||
|
||||
## [production-release-march-2024] - 2024/03/04
|
||||
### Changed
|
||||
* Performance improvements
|
||||
* Search pages: Access Routes, impact-based indicators, usage counts: Open drops on click, instead of hover
|
||||
* Linking: change Datacite api from /works to /dois
|
||||
* Updated funding text in footer
|
||||
* Removed tooltips from search results
|
||||
* UI updates on search pages
|
||||
* Paging only at the bottom under the search results
|
||||
* Removed number of results
|
||||
* Removed results per page option
|
||||
|
||||
### Fixed
|
||||
* z-index issue in dropdowns inside modals
|
||||
* Change search tab from menu
|
||||
* Requests in bulk DOIs upload in linking
|
||||
* View all for search filters
|
||||
* Research products detailed page: Provenance label in funded by
|
||||
|
||||
### Added
|
||||
* Full-Text link in Research products
|
||||
|
||||
## [production-release-february-2024] - 2024/02/12
|
||||
### Changed
|
||||
* Remove "open access" as preselected filter
|
||||
* Rounded numbers in search tabs
|
||||
* Home page: Performance improvements on images loading
|
||||
* Home page, Search page, Funders page: Performance improvements on services requests
|
||||
|
||||
### Fixed
|
||||
* Filtering out in funding levels according to selected funder when querying 100 values
|
||||
* Filters in claims & in organization landing > projects tab were always loading
|
||||
* Research products landing page: Added providers in versions
|
||||
* SEO fixes in landing pages
|
||||
|
||||
## [production-release-january-2024] - 2024/02/01
|
||||
### Changed
|
||||
* Updated FoS search filter - do not display code
|
||||
|
|
|
@ -52,6 +52,8 @@
|
|||
],
|
||||
"styles": [
|
||||
"src/styles.less",
|
||||
{"input": "src/assets/deposit.less", "inject": false },
|
||||
{"input": "src/assets/funders.less", "inject": false },
|
||||
"src/assets/common-assets/library-css/material.scss"
|
||||
],
|
||||
"scripts": [
|
||||
|
|
|
@ -39,6 +39,7 @@
|
|||
"clipboard": "^1.5.16",
|
||||
"core-js": "^2.5.4",
|
||||
"express": "^4.15.2",
|
||||
"flag-icons": "^7.2.1",
|
||||
"jquery": "^3.4.1",
|
||||
"ng-recaptcha": "^12.0.2",
|
||||
"prom-client": "^11.3.0",
|
||||
|
|
|
@ -1,35 +1,36 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule, Routes} from '@angular/router';
|
||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||
import {PageURLResolverComponent} from "./openaireLibrary/utils/pageURLResolver.component";
|
||||
import {SdgModule} from "./openaireLibrary/sdg/sdg.module";
|
||||
import {ErrorPageComponent} from "./openaireLibrary/error/errorPage.component";
|
||||
|
||||
const routes: Routes = [
|
||||
// Other Pages
|
||||
{path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule), data: {hasStickyHeaderOnMobile: true}},
|
||||
{path: 'home', redirectTo: '', pathMatch: 'full'},
|
||||
{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: 'sdgs', loadChildren: () => import('./openaireLibrary/sdg/sdg.module').then(m => m.SdgModule)},
|
||||
{path: 'fields-of-science', loadChildren: () => import('./openaireLibrary/fos/fos.module').then(m => m.FosModule), 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)},
|
||||
{path: 'orcid', loadChildren: () => import('./openaireLibrary/orcid/orcid.module').then(m => m.OrcidModule)},
|
||||
{path: 'my-orcid-links', loadChildren: () => import('./openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module').then(m => m.MyOrcidLinksModule)},
|
||||
// Landing Pages
|
||||
{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/result', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'result', community: 'openaire'}},
|
||||
{path: 'search/publication', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'publication', community: 'openaire'}},
|
||||
{path: 'search/dataset', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'dataset', community: 'openaire'}},
|
||||
{path: 'search/software', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'software', community: 'openaire'}},
|
||||
{path: 'search/other', loadChildren: () => import('./openaireLibrary/landingPages/result/resultLanding.module').then(m => m.ResultLandingModule), data: {hasQuickContact: false, hasMenuSearchBar: true, type: 'orp', community: 'openaire'}},
|
||||
{path: 'search/project', loadChildren: () => import('./openaireLibrary/landingPages/project/project.module').then(m => m.ProjectModule), data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}},
|
||||
{
|
||||
path: 'search/dataprovider',
|
||||
loadChildren: () => import('././landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule),
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true}
|
||||
loadChildren: () => import('./openaireLibrary/landingPages/dataProvider/dataProvider.module').then(m => m.DataProviderModule),
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
|
||||
},
|
||||
{
|
||||
path: 'search/organization',
|
||||
loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule),
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true}
|
||||
loadChildren: () => import('./openaireLibrary/landingPages/organization/organization.module').then(m => m.OrganizationModule),
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
|
||||
},
|
||||
|
||||
// Search Pages
|
||||
|
@ -99,10 +100,10 @@ const routes: Routes = [
|
|||
},
|
||||
// { path: 'claims-project-manager', loadChildren: './claims/claimsByToken/claimsByToken.module#LibClaimsByTokenModule'},
|
||||
// help pages - do not exist in Admin portal/api/db
|
||||
{path: 'reload', loadChildren: () => import('./reload/libReload.module').then(m => m.LibReloadModule)},
|
||||
{path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)},
|
||||
{path: 'error', component: OpenaireErrorPageComponent},
|
||||
{path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
|
||||
{path: 'reload', loadChildren: () => import('./openaireLibrary/reload/reload.module').then(m => m.ReloadModule)},
|
||||
{path: 'user-info', loadChildren: () => import('./openaireLibrary/login/user.module').then(m => m.UserModule)},
|
||||
{path: 'error', component: ErrorPageComponent},
|
||||
{path: '**', pathMatch: 'full', component: ErrorPageComponent}
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import {ChangeDetectorRef, Component, ElementRef, ViewChild} from '@angular/core';
|
||||
import {AfterViewInit, ChangeDetectorRef, Component, ElementRef, ViewChild} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
|
||||
import {MenuItem} from './openaireLibrary/sharedComponents/menu';
|
||||
|
@ -21,22 +21,30 @@ import {AlertModal} from './openaireLibrary/utils/modal/alert';
|
|||
import {NotificationHandler} from "./openaireLibrary/utils/notification-handler";
|
||||
import {QuickContactService} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.service';
|
||||
import {LayoutService} from './openaireLibrary/dashboard/sharedComponents/sidebar/layout.service';
|
||||
import {ISVocabulariesService} from "./openaireLibrary/utils/staticAutoComplete/ISVocabularies.service";
|
||||
|
||||
@Component({
|
||||
//changeDetection: ChangeDetectionStrategy.Default,
|
||||
//encapsulation: ViewEncapsulation.Emulated,
|
||||
selector: 'app-root',
|
||||
template: `
|
||||
<div id="modal-container"></div>
|
||||
<navbar *ngIf="properties && header" [header]="header" [portal]="properties.dashboard" [properties]=properties
|
||||
[onlyTop]=false [user]="user"
|
||||
[communityId]="properties.adminToolsCommunity" [userMenuItems]=userMenuItems [menuItems]=menuItems></navbar>
|
||||
<div *ngIf="loading">
|
||||
<loading [full]="true"></loading>
|
||||
</div>
|
||||
<schema2jsonld *ngIf="properties" [URL]="properties.domain+properties.baseLink"
|
||||
[logoURL]="properties.domain+properties.baseLink+'/assets/common-assets/logo-services/explore/main.svg'"
|
||||
type="home"
|
||||
name="OpenAIRE | Find and Share research"
|
||||
description="OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide."></schema2jsonld>
|
||||
<div class="custom-main-content">
|
||||
<div [class.uk-hidden]="loading" [ngClass]="rootClass">
|
||||
<div id="modal-container"></div>
|
||||
<!-- <span class="js-upload" uk-form-custom>-->
|
||||
<!-- <input id="exampleInputFile" class="uk-width-medium" type="file" (change)="fileChangeEvent($event)"/>-->
|
||||
<!-- <span class="uk-link " style="text-decoration: underline;">Parse NEW FOS</span>-->
|
||||
<!-- </span>-->
|
||||
|
||||
<!-- <a (click)="checkDifferences()" class="uk-margin-left uk-link ">Check if different FOS codes/labels</a>-->
|
||||
<main>
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
|
@ -57,7 +65,9 @@ import {LayoutService} from './openaireLibrary/dashboard/sharedComponents/sideba
|
|||
<modal-alert #modal [overflowBody]="false"></modal-alert>
|
||||
`
|
||||
})
|
||||
export class AppComponent {
|
||||
export class AppComponent implements AfterViewInit {
|
||||
loading: boolean = false;
|
||||
rootClass: string;
|
||||
isClient: boolean = false;
|
||||
userMenuItems: MenuItem[] = [];
|
||||
menuItems: MenuItem [] = [];
|
||||
|
@ -81,9 +91,224 @@ export class AppComponent {
|
|||
private router: Router, private userManagementService: UserManagementService, private smoothScroll: SmoothScroll,
|
||||
private configurationService: ConfigurationService, private _meta: Meta, private seoService: SEOService,
|
||||
private emailService: EmailService, private fb: FormBuilder, private quickContactService: QuickContactService,
|
||||
private layoutService: LayoutService, private cdr: ChangeDetectorRef) {
|
||||
private layoutService: LayoutService, private cdr: ChangeDetectorRef,
|
||||
private ISVocabulariesService: ISVocabulariesService) {
|
||||
}
|
||||
|
||||
// fileChangeEvent(fileInput: any) {
|
||||
// let file = <Array<File>>fileInput.target.files;
|
||||
// this.parseNewFos(file);
|
||||
// }
|
||||
//
|
||||
// makeFileRequest(url: string, params: Array<string>, files: Array<File>) {
|
||||
// return new Promise<void>((resolve, reject) => {
|
||||
// const formData: any = new FormData();
|
||||
// const xhr = new XMLHttpRequest();
|
||||
// for (let i = 0; i < files.length; i++) {
|
||||
// formData.append("uploads[]", files[i], files[i].name);
|
||||
// }
|
||||
// xhr.onreadystatechange = function () {
|
||||
// if (xhr.readyState == 4) {
|
||||
// if (xhr.status == 200) {
|
||||
// resolve(xhr.response);
|
||||
// } else {
|
||||
// reject(xhr.response);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// xhr.open("POST", url, true);
|
||||
// xhr.send(formData);
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// parseNewFos(file: Array<File>) {
|
||||
// let fos = null;
|
||||
// this.makeFileRequest(this.properties.utilsService + '/upload', [], file).then((result) => {
|
||||
// this.ISVocabulariesService.getFos(properties).subscribe(fosRes => {
|
||||
// fos = fosRes['fos'];
|
||||
// for(let fieldL1 of fos) {
|
||||
// if(fieldL1.children != null) {
|
||||
// for (let fieldL2 of fieldL1.children) {
|
||||
// if(fieldL2.children != null) {
|
||||
// for (let fieldL3 of fieldL2.children) {
|
||||
// if(fieldL3.children != null)
|
||||
// fieldL3.children = [];
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// // console.log(fos);
|
||||
// let setOfCodes: Set<string> = new Set<string>();
|
||||
// let duplicates = new Map<string, string[]>;
|
||||
// const rows = (result as any).split('\n'); // I have used space, you can use any thing.
|
||||
// let added = false;
|
||||
// for (let i = 0; i < (rows.length); i++) {
|
||||
// if (rows[i] && rows[i] != null && rows[i] != "") {
|
||||
// added = false;
|
||||
// let code = rows[i].split(' ')[0];
|
||||
// if(setOfCodes.has(code)) {
|
||||
// console.log("SAME CODE!!!!!!!!");
|
||||
// } else {
|
||||
// setOfCodes.add(code);
|
||||
// }
|
||||
// let label = rows[i].substring(code.length+1, rows[i].length);
|
||||
// // console.log(rows[i]);
|
||||
// let firstLevel = rows[i].substring(0, 2);
|
||||
// let secondLevel = rows[i].substring(0, 4);
|
||||
// let thirdLevel = rows[i].substring(0, 6);
|
||||
// for(let fieldL1 of fos) {
|
||||
// if(fieldL1.code == firstLevel) {
|
||||
// for(let fieldL2 of fieldL1.children) {
|
||||
// if(fieldL2.code == secondLevel) {
|
||||
// for(let fieldL3 of fieldL2.children) {
|
||||
// if(fieldL3.code == thirdLevel) {
|
||||
// if(fieldL3.children == null) {
|
||||
// fieldL3.children = [];
|
||||
// }
|
||||
// fieldL3.children.push({
|
||||
// "code": code,
|
||||
// "id": rows[i],
|
||||
// "label": label,
|
||||
// "level": 4
|
||||
// })
|
||||
// added = true;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if(!added && (!fieldL2.children || fieldL2.children.filter(field => field.code == thirdLevel).length == 0)) {
|
||||
// console.log("Level 3 not found for "+rows[i]);
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if(!added && (!fieldL1.children || fieldL1.children.filter(field => field.code == secondLevel).length == 0)) {
|
||||
// console.log("Level 2 not found for "+rows[i]);
|
||||
// }
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if(!added && fos.filter(field => field.code == firstLevel).length == 0) {
|
||||
// console.log("Level 1 not found for |"+rows[i]+"|");
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// for(let l1 of fos) {
|
||||
// if(duplicates.has(l1.label)) {
|
||||
// duplicates.get(l1.label).push(l1.id);
|
||||
// } else {
|
||||
// duplicates.set(l1.label, [l1.id]);
|
||||
// }
|
||||
// if(l1.children) {
|
||||
// for (let l2 of l1.children) {
|
||||
// if(duplicates.has(l2.label)) {
|
||||
// duplicates.get(l2.label).push(l2.id);
|
||||
// } else {
|
||||
// duplicates.set(l2.label, [l2.id]);
|
||||
// }
|
||||
//
|
||||
// if(l2.children) {
|
||||
// for(let l3 of l2.children) {
|
||||
// if(duplicates.has(l3.label)) {
|
||||
// duplicates.get(l3.label).push(l3.id);
|
||||
// } else {
|
||||
// duplicates.set(l3.label, [l3.id]);
|
||||
// }
|
||||
//
|
||||
// if(l3.children) {
|
||||
// for(let l4 of l3.children) {
|
||||
// if(duplicates.has(l4.label)) {
|
||||
// duplicates.get(l4.label).push(l4.id);
|
||||
// } else {
|
||||
// duplicates.set(l4.label, [l4.id]);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// for(let label of duplicates.keys()) {
|
||||
// if(duplicates.get(label).length > 1) {
|
||||
// console.log(label, duplicates.get(label));
|
||||
// }
|
||||
// }
|
||||
// var url = window.URL.createObjectURL(new Blob([JSON.stringify(fos)]));
|
||||
// var a = window.document.createElement('a');
|
||||
// window.document.body.appendChild(a);
|
||||
// a.setAttribute('style', 'display: none');
|
||||
// a.href = url;
|
||||
// a.download = "fosNewL4.json";
|
||||
// a.click();
|
||||
// window.URL.revokeObjectURL(url);
|
||||
// a.remove(); // remove the element
|
||||
//
|
||||
// // var theJSON = JSON.stringify(fos);
|
||||
// // var uri = this.sanitizer.bypassSecurityTrustUrl("data:text/json;charset=UTF-8," + encodeURIComponent(theJSON));
|
||||
// // this.downloadJsonHref = uri;
|
||||
// // console.log(fos);
|
||||
// });
|
||||
// });
|
||||
// }
|
||||
//
|
||||
// checkDifferences() {
|
||||
// this.ISVocabulariesService.getIndexedFosL4(properties).subscribe(fosRes => {
|
||||
// console.log(fosRes);
|
||||
// this.ISVocabulariesService.getFos(properties).subscribe(currentFos => {
|
||||
// console.log(currentFos);
|
||||
// let currentSet: Map<string, string> = new Map<string, string>();
|
||||
// for(let currentL1 of currentFos['fos']) {
|
||||
// if(currentL1.children?.length > 0) {
|
||||
// for(let currentL2 of currentL1.children) {
|
||||
// if(currentL2.children?.length > 0) {
|
||||
// for(let currentL3 of currentL2.children) {
|
||||
// if(currentL3.children?.length > 0) {
|
||||
// for(let currentL4 of currentL3.children) {
|
||||
// if(currentSet.has(currentL4.code)) {
|
||||
// console.log("ALREADY HERE ",currentL4.code);
|
||||
// }
|
||||
// currentSet.set(currentL4.code, currentL4.label);
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// console.log(currentSet);
|
||||
// for (let fos of fosRes) {
|
||||
// if(!currentSet.has(fos.l4code)) {
|
||||
// console.log(fos.l4code + " does not exist in current voc");
|
||||
// } else {
|
||||
// if(currentSet.get(fos.l4code) != fos.l4label) {
|
||||
// console.log(fos.l4code + " different label");
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// for(let code of currentSet.keys()) {
|
||||
// let found = false;
|
||||
// for(let fos of fosRes) {
|
||||
// if(fos.l4code == code) {
|
||||
// found = true;
|
||||
// break;
|
||||
// }
|
||||
// }
|
||||
// if(!found) {
|
||||
// console.log("current code "+code+" not indexed");
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
// });
|
||||
// }
|
||||
|
||||
|
||||
ngOnInit() {
|
||||
if (typeof document !== 'undefined') {
|
||||
this.isClient = true;
|
||||
|
@ -141,6 +366,31 @@ export class AppComponent {
|
|||
ngAfterViewInit() {
|
||||
if (typeof window !== "undefined") {
|
||||
this.createObservers();
|
||||
this.subscriptions.push(this.layoutService.rootClass.subscribe(rootClass => {
|
||||
this.loading = true;
|
||||
this.cdr.detectChanges();
|
||||
if (rootClass && this.isClient) {
|
||||
let link = <HTMLLinkElement>document.getElementById('theme');
|
||||
let append = false;
|
||||
if (!link) {
|
||||
link = document.createElement('link');
|
||||
link.rel = 'stylesheet';
|
||||
link.id = 'theme';
|
||||
append = true;
|
||||
}
|
||||
link.href = rootClass + '.css';
|
||||
link.onerror = (error) => console.log(error);
|
||||
if (append) {
|
||||
document.head.appendChild(link);
|
||||
}
|
||||
}
|
||||
this.rootClass = rootClass;
|
||||
this.cdr.detectChanges();
|
||||
setTimeout(() => {
|
||||
this.loading = false;
|
||||
this.cdr.detectChanges();
|
||||
}, 500)
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -165,7 +415,9 @@ export class AppComponent {
|
|||
buildMenu() {
|
||||
this.userMenuItems = [];
|
||||
this.userMenuItems.push(new MenuItem("", "My profile", "", "", false, [], [], {}));
|
||||
if(this.properties.environment != "beta") {
|
||||
this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {}));
|
||||
}
|
||||
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"], {});
|
||||
researchOutcomesMenu.items = [
|
||||
|
|
|
@ -9,7 +9,6 @@ import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigation
|
|||
import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module';
|
||||
import {BottomModule} from './openaireLibrary/sharedComponents/bottom.module';
|
||||
import {ErrorModule} from './openaireLibrary/error/error.module';
|
||||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||
import {AppRoutingModule} from './app-routing.module';
|
||||
import {HttpInterceptorService} from "./openaireLibrary/http-interceptor.service";
|
||||
import {PageURLResolverModule} from "./openaireLibrary/utils/pageURLResolver.module";
|
||||
|
@ -19,6 +18,7 @@ import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-int
|
|||
import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.service";
|
||||
import {QuickContactModule} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.module';
|
||||
import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module';
|
||||
import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -33,9 +33,9 @@ import {AlertModalModule} from './openaireLibrary/utils/modal/alertModal.module'
|
|||
BrowserAnimationsModule, PageURLResolverModule,
|
||||
Schema2jsonldModule,
|
||||
QuickContactModule,
|
||||
AlertModalModule
|
||||
AlertModalModule, LoadingModule
|
||||
],
|
||||
declarations: [AppComponent, OpenaireErrorPageComponent],
|
||||
declarations: [AppComponent],
|
||||
exports: [AppComponent],
|
||||
providers: [
|
||||
{provide: APP_ID, useValue: 'explore'},
|
||||
|
|
|
@ -4,19 +4,17 @@ import {properties} from "../../../environments/environment";
|
|||
@Component({
|
||||
selector: 'openaire-claims-admin',
|
||||
template: `
|
||||
<claims-admin *ngIf="claimsInfoURL && userInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
|
||||
<claims-admin *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
|
||||
</claims-admin>
|
||||
`,
|
||||
})
|
||||
export class OpenaireClaimsAdminComponent implements OnInit {
|
||||
claimsInfoURL: string;
|
||||
userInfoURL: string;
|
||||
|
||||
constructor() {
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.claimsInfoURL = properties.claimsInformationLink;
|
||||
this.userInfoURL = properties.userInfoUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -5,9 +5,6 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
|
|||
import { ClaimsAdminRoutingModule } from './claimsAdmin-routing.module';
|
||||
import{ClaimsAdminModule } from '../../openaireLibrary/claims/claimsAdmin/claimsAdmin.module';
|
||||
import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -15,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|||
ClaimsAdminRoutingModule,
|
||||
ClaimsAdminModule
|
||||
],
|
||||
providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled],
|
||||
providers:[ClaimsCuratorGuard],
|
||||
declarations: [
|
||||
OpenaireClaimsAdminComponent
|
||||
]
|
||||
|
|
|
@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
|||
import { OpenaireDirectLinkingComponent } from './directLinking.component';
|
||||
import{ DirectLinkingModule} from '../../openaireLibrary/claims/directLinking/directLinking.module';
|
||||
import {DirectLinkingRoutingModule} from './directLinking-routing.module';
|
||||
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
SharedModule, DirectLinkingModule, DirectLinkingRoutingModule
|
||||
],
|
||||
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
|
||||
providers:[],
|
||||
declarations: [
|
||||
OpenaireDirectLinkingComponent
|
||||
], exports:[OpenaireDirectLinkingComponent]
|
||||
|
|
|
@ -4,15 +4,12 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
|||
import {OpenaireLinkingComponent} from './linkingGeneric.component';
|
||||
import {LinkingRoutingModule} from './linking-routing.module';
|
||||
import{ LinkingGenericModule} from '../../openaireLibrary/claims/linking/linkingGeneric.module';
|
||||
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
SharedModule, LinkingRoutingModule, LinkingGenericModule
|
||||
],
|
||||
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
|
||||
providers:[],
|
||||
declarations: [
|
||||
OpenaireLinkingComponent
|
||||
], exports:[
|
||||
|
|
|
@ -5,20 +5,18 @@ import {properties} from "../../../environments/environment";
|
|||
@Component({
|
||||
selector: 'openaire-my-claims',
|
||||
template: `
|
||||
<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
|
||||
<my-claims *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
|
||||
</my-claims>
|
||||
`
|
||||
|
||||
})
|
||||
export class OpenaireMyClaimsComponent implements OnInit {
|
||||
claimsInfoURL: string;
|
||||
userInfoURL: string;
|
||||
|
||||
constructor() {
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.claimsInfoURL = properties.claimsInformationLink;
|
||||
this.userInfoURL = properties.userInfoUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,10 +4,6 @@ import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
|||
import { OpenaireMyClaimsComponent } from './myClaims.component';
|
||||
import { MyClaimsRoutingModule } from './myClaims-routing.module';
|
||||
import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.module';
|
||||
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -16,7 +12,7 @@ import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
|||
MyClaimsModule
|
||||
|
||||
],
|
||||
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
|
||||
providers:[],
|
||||
declarations: [
|
||||
OpenaireMyClaimsComponent
|
||||
]
|
||||
|
|
|
@ -58,7 +58,6 @@ export class ContactComponent implements OnInit {
|
|||
ngOnInit() {
|
||||
this._title.setTitle('OpenAIRE - Explore | Contact Us');
|
||||
|
||||
this.properties = properties;
|
||||
this.email = {body: '', subject: '', recipients: []};
|
||||
this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
|
|
|
@ -4,11 +4,8 @@ import {RouterModule} from '@angular/router';
|
|||
|
||||
import {ContactComponent} from './contact.component';
|
||||
import {ContactRoutingModule} from "./contact-routing.module";
|
||||
import {EmailService} from "../openaireLibrary/utils/email/email.service";
|
||||
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
|
||||
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
|
||||
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
|
||||
import {ContactUsModule} from "../openaireLibrary/contact-us/contact-us.module";
|
||||
|
@ -25,9 +22,7 @@ import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
|
|||
declarations: [
|
||||
ContactComponent
|
||||
],
|
||||
providers: [
|
||||
EmailService, PiwikService, IsRouteEnabled
|
||||
],
|
||||
providers: [],
|
||||
exports: [
|
||||
ContactComponent
|
||||
]
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
import {Component} from '@angular/core';
|
||||
import {Component, OnDestroy, OnInit} from '@angular/core';
|
||||
import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-deposit',
|
||||
|
@ -7,11 +8,17 @@ import {Component} from '@angular/core';
|
|||
`
|
||||
})
|
||||
|
||||
export class OpenaireDepositComponent {
|
||||
export class OpenaireDepositComponent implements OnInit, OnDestroy {
|
||||
|
||||
constructor() {
|
||||
constructor(private layoutService: LayoutService) {
|
||||
}
|
||||
|
||||
public ngOnInit() {}
|
||||
public ngOnInit() {
|
||||
this.layoutService.setRootClass('deposit');
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.layoutService.setRootClass(null);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2,10 +2,6 @@ import { NgModule } from '@angular/core';
|
|||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard';
|
||||
|
||||
import {OpenaireDepositComponent} from "./deposit.component";
|
||||
import {DepositRoutingModule} from "./deposit-routing.module";
|
||||
import {DepositFirstPageModule} from "../openaireLibrary/deposit/depositFirstPage.module";
|
||||
|
@ -24,7 +20,8 @@ import {CommunityService} from "../openaireLibrary/connect/community/community.s
|
|||
exports: [
|
||||
OpenaireDepositComponent,
|
||||
],
|
||||
providers: [PreviousRouteRecorder, IsRouteEnabled,
|
||||
ZenodoCommunitiesService, CommunityService]
|
||||
providers: [
|
||||
ZenodoCommunitiesService, CommunityService
|
||||
]
|
||||
})
|
||||
export class LibDepositModule { }
|
||||
|
|
|
@ -6,16 +6,14 @@ import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovi
|
|||
|
||||
import {SearchDataprovidersToDepositRoutingModule} from './searchDataprovidersToDeposit-routing.module';
|
||||
import {SearchDataprovidersToDepositModule} from '../openaireLibrary/deposit/searchDataprovidersToDeposit.module';
|
||||
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 {CommunityService} from '../openaireLibrary/connect/community/community.service';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
SearchDataprovidersToDepositModule,
|
||||
SearchDataprovidersToDepositRoutingModule,
|
||||
SearchDataprovidersToDepositModule,
|
||||
ZenodoCommunitiesServiceModule
|
||||
],
|
||||
declarations: [
|
||||
|
@ -24,6 +22,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
|
|||
exports: [
|
||||
OpenaireSearchDataprovidersToDepositComponent,
|
||||
],
|
||||
providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService]
|
||||
providers: [CommunityService]
|
||||
})
|
||||
export class LibSearchDataprovidersToDepositModule { }
|
||||
|
|
|
@ -1,12 +0,0 @@
|
|||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-error',
|
||||
template: `
|
||||
<error></error>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireErrorPageComponent {
|
||||
|
||||
}
|
|
@ -1,17 +0,0 @@
|
|||
import {NgModule} from "@angular/core";
|
||||
import {RouterModule} from "@angular/router";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {ExploreFosComponent} from "./fos.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{
|
||||
path: '',
|
||||
component: ExploreFosComponent,
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class LibFosRoutingModule { }
|
|
@ -1,11 +0,0 @@
|
|||
import {Component} from "@angular/core";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'explore-fos',
|
||||
template: `
|
||||
<fos></fos>
|
||||
`
|
||||
})
|
||||
|
||||
export class ExploreFosComponent {}
|
|
@ -1,26 +0,0 @@
|
|||
import {CommonModule} from "@angular/common";
|
||||
import {NgModule} from "@angular/core";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {LibFosRoutingModule} from "./fos-routing.module";
|
||||
import {FosRoutingModule} from "../openaireLibrary/fos/fos-routing.module";
|
||||
import {FosModule} from "../openaireLibrary/fos/fos.module";
|
||||
import {ExploreFosComponent} from "./fos.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
LibFosRoutingModule,
|
||||
FosRoutingModule,
|
||||
FosModule
|
||||
],
|
||||
declarations: [
|
||||
ExploreFosComponent
|
||||
],
|
||||
exports: [
|
||||
ExploreFosComponent
|
||||
],
|
||||
providers: [
|
||||
PreviousRouteRecorder
|
||||
]
|
||||
})
|
||||
export class LibFosModule { }
|
|
@ -62,7 +62,7 @@
|
|||
</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">
|
||||
<img src="assets/explore-assets/funders/funders.png" alt="Funders advertisement image">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -75,7 +75,7 @@
|
|||
</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 id="target" class="uk-section uk-padding-remove-top uk-margin-top" uk-height-match="target: .shortName;">
|
||||
<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">
|
||||
|
@ -121,87 +121,122 @@
|
|||
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;">
|
||||
uk-grid uk-height-match="target: .data;">
|
||||
<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 class="uk-position-top-left uk-padding-small">
|
||||
<!-- <span class="uk-text-xsmall">flag</span>-->
|
||||
<span class="fi" [ngClass]="'fi-'+funder.country | lowercase"></span>
|
||||
</div>
|
||||
<span class="uk-h6 uk-text-small">Open Access</span>
|
||||
<div *ngIf="funder.registered" class="uk-position-top-right uk-padding-small">
|
||||
<div class="uk-flex uk-flex-middle uk-text-xsmall uk-text-meta">
|
||||
<div class="uk-icon-bg uk-icon-bg-small">
|
||||
<icon name="done" [flex]="true"></icon>
|
||||
</div>
|
||||
<span class="uk-margin-xsmall-left">Registered</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">
|
||||
<img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
|
||||
<ng-template #elseBlock>
|
||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
|
||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
|
||||
</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}}
|
||||
<div class="uk-padding-small uk-padding-remove-vertical uk-padding-remove-left uk-margin-medium-left">
|
||||
<!-- shortName -->
|
||||
<div class="shortName uk-text-uppercase uk-text-small uk-margin-top type">
|
||||
<ng-container *ngIf="funder.shortName">
|
||||
{{funder.shortName}}
|
||||
</ng-container>
|
||||
</div>
|
||||
<!-- funder name -->
|
||||
<div class="name uk-h6 uk-margin-remove multi-line-ellipsis lines-2">
|
||||
<div class="uk-flex">
|
||||
<div class="uk-width-expand name uk-h6 uk-margin-remove multi-line-ellipsis lines-2">
|
||||
<ng-container *ngIf="funder.name" >
|
||||
{{funder.name}}
|
||||
<span>{{funder.name}}</span>
|
||||
</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>
|
||||
<div *ngIf="funder.websiteUrl" class="uk-width-auto uk-margin-left">
|
||||
<a [href]="funder.websiteUrl" target="_blank" class="uk-flex-inline uk-flex-middle uk-text-uppercase uk-button uk-button-text custom-external">
|
||||
<icon name="payment" [flex]="true"></icon>
|
||||
</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>
|
||||
</div>
|
||||
<div class="data uk-background-muted uk-flex uk-flex-middle uk-padding-small uk-padding-remove-left uk-margin-top">
|
||||
<div class="uk-flex uk-flex-middle uk-width-1-1 uk-child-width-1-2 uk-margin-medium-left">
|
||||
<div>
|
||||
<a *ngIf="funder.projects"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
<!-- Projects -->
|
||||
<div *ngIf="funder.projects" class="uk-flex uk-flex-column" [class.uk-margin-small-bottom]="funder.researchProducts">
|
||||
<span class="uk-text-meta uk-text-xsmall">
|
||||
Projects
|
||||
</span>
|
||||
<a
|
||||
class="uk-link-text uk-text-large uk-text-bold"
|
||||
[routerLink]="properties.searchLinkToProjects" [queryParams]="{'funder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Projects ({{funder.projects | number}})</span>
|
||||
<span>
|
||||
{{funder.projects | number}}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
<!-- Research products -->
|
||||
<div>
|
||||
<a *ngIf="funder.researchProducts"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
<div *ngIf="funder.researchProducts" class="uk-flex uk-flex-column">
|
||||
<span class="uk-text-meta uk-text-xsmall">
|
||||
Research Products
|
||||
</span>
|
||||
<a
|
||||
class="uk-link-text uk-text-large uk-text-bold"
|
||||
[routerLink]="properties.searchLinkToResults" [queryParams]="{'relfunder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Research Products ({{funder.researchProducts | number}})</span>
|
||||
<span>
|
||||
{{funder.researchProducts | number}}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-column uk-flex-middle uk-flex-center">
|
||||
<div class="uk-progress-semicircle uk-progress-semicircle-small" [attr.percentage]="funder.openAccessPercentage" [style]="'--percentage:' + funder.openAccessPercentage"></div>
|
||||
<div class="uk-flex uk-flex-middle uk-margin-top">
|
||||
<icon class="open-access" [name]="'open_access'" [flex]="true" [ratio]="0.8"></icon>
|
||||
<span class="uk-text-xsmall uk-margin-xsmall-left">Open Access</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="monitor-dashboard uk-padding-small uk-padding-remove-left uk-margin-medium-left">
|
||||
<a *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus && 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.monitorDashboard">
|
||||
<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;" loading="lazy">
|
||||
<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;" loading="lazy">
|
||||
<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>
|
||||
|
||||
<a *ngIf="funder.irishDashboard && funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE' && funder.irishDashboardStatus != 'RESTRICTED' && properties.environment != 'beta'"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'oamonitor.ireland.openaire.eu/rfo/'+funder.irishDashboard">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/small_irish.svg" alt="Irish logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
|
||||
<span class="irish-dashboard-link uk-text-uppercase">RFO Dashboard</span>
|
||||
</span>
|
||||
</a>
|
||||
<span *ngIf="funder.irishDashboard && funder.irishDashboardStatus && (funder.irishDashboardStatus == 'RESTRICTED' || properties.environment =='beta')"
|
||||
class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/small_irish.svg" alt="Irish logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
|
||||
<span class="irish-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">RFO Dashboard</span>
|
||||
<icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
|
@ -211,71 +246,117 @@
|
|||
<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">
|
||||
<img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
|
||||
<ng-template #elseBlock>
|
||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply">
|
||||
<img src="assets/common-assets/placeholder.png" alt="OpenAIRE placeholder logo" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
|
||||
</ng-template>
|
||||
</div>
|
||||
<div class="uk-width-expand uk-margin-medium-left">
|
||||
<div class="name uk-h6 uk-text-truncate">
|
||||
<div class="uk-width-expand uk-grid uk-grid-divider uk-child-width-1-2 uk-margin-left" uk-grid>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<div class="uk-flex uk-flex-middle">
|
||||
<!-- <span class="uk-text-xsmall uk-margin-small-right">flag</span> -->
|
||||
<span *ngIf="funder.country" class="fi uk-text-xsmall uk-margin-small-right" [ngClass]="'fi-'+funder.country | lowercase"></span>
|
||||
<div class="uk-h6 uk-margin-remove uk-text-truncate">
|
||||
<ng-container *ngIf="funder.name">
|
||||
{{funder.name}}
|
||||
<span>{{funder.name}}</span>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="funder.alias" >
|
||||
<ng-container *ngIf="funder.shortName" >
|
||||
<span class="uk-text-uppercase">
|
||||
({{funder.alias}})
|
||||
({{funder.shortName}})
|
||||
</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'"
|
||||
</div>
|
||||
<div *ngIf="funder.monitorDashboard || funder.irishDashboard" class="uk-margin-top">
|
||||
<a *ngIf="funder.monitorDashboard && funder.monitorDashboardStatus && 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">
|
||||
target="_blank" [href]="'https://'+(properties.environment =='beta' || properties.environment =='development'?'beta.':'')+'monitor.openaire.eu/dashboard/'+funder.monitorDashboard">
|
||||
<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;">
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
|
||||
<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;">
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
|
||||
<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"
|
||||
|
||||
<a *ngIf="funder.irishDashboard && funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE' && funder.irishDashboardStatus != 'RESTRICTED' && properties.environment != 'beta'"
|
||||
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.irishDashboard">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/small_irish.svg" alt="Irish logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
|
||||
<span class="irish-dashboard-link uk-text-uppercase">RFO Dashboard</span>
|
||||
</span>
|
||||
</a>
|
||||
<span *ngIf="funder.irishDashboard && funder.irishDashboardStatus && (funder.irishDashboardStatus == 'RESTRICTED' || properties.environment == 'beta')"
|
||||
class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/common/small_irish.svg" alt="Irish logo"
|
||||
class="uk-margin-xsmall-right" style="width: 17px; height: 17px;" loading="lazy">
|
||||
<span class="irish-dashboard-link uk-text-uppercase uk-text-bold uk-text-small">RFO Dashboard</span>
|
||||
<icon class="uk-margin-xsmall-left" name="closed_access" [flex]="true" [ratio]="1"></icon>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-middle uk-child-width-1-3">
|
||||
<div>
|
||||
<div *ngIf="funder.projects" class="uk-flex uk-flex-column">
|
||||
<span class="uk-text-meta uk-text-xsmall">
|
||||
Projects
|
||||
</span>
|
||||
<a
|
||||
class="uk-link-text uk-text-large uk-text-bold"
|
||||
[routerLink]="properties.searchLinkToProjects" [queryParams]="{'funder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Projects ({{funder.projects | number}})</span>
|
||||
<span>
|
||||
{{funder.projects | number}}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<a *ngIf="funder.researchProducts"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
<div *ngIf="funder.researchProducts" class="uk-flex uk-flex-column">
|
||||
<span class="uk-text-meta uk-text-xsmall">
|
||||
Research Products
|
||||
</span>
|
||||
<a
|
||||
class="uk-link-text uk-text-large uk-text-bold"
|
||||
[routerLink]="properties.searchLinkToResults" [queryParams]="{'relfunder': urlEncodeAndQuote(funder.id)}">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<span>Research Products ({{funder.researchProducts | number}})</span>
|
||||
<span>
|
||||
{{funder.researchProducts | number}}
|
||||
</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">
|
||||
<div>
|
||||
<div *ngIf="funder.openAccessResearchProducts && funder.researchProducts" class="uk-flex uk-flex-column">
|
||||
<span class="uk-text-meta uk-text-xsmall">Open Access</span>
|
||||
<div class="uk-flex uk-flex-middle">
|
||||
<span class="uk-margin-xsmall-right open-access">
|
||||
<icon name="open_access" [flex]="true" [ratio]="1"></icon>
|
||||
<icon name="open_access" [flex]="true" [ratio]="0.8"></icon>
|
||||
</span>
|
||||
<h6 class="uk-margin-remove">{{funder.openAccessPercentage}}%</h6>
|
||||
<span class="uk-text-large uk-text-bold">{{funder.openAccessPercentage}}%</span>
|
||||
</div>
|
||||
<span class="uk-h6 uk-text-small">Open Access</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="funder.registered || funder.websiteUrl" class="uk-width-auto uk-flex uk-flex-column uk-flex-center uk-margin-right">
|
||||
<div *ngIf="funder.registered" class="uk-flex uk-flex-middle uk-text-xsmall uk-text-meta uk-margin-bottom">
|
||||
<div class="uk-icon-bg uk-icon-bg-small">
|
||||
<icon name="done" [flex]="true"></icon>
|
||||
</div>
|
||||
<span class="uk-margin-xsmall-left">Registered</span>
|
||||
</div>
|
||||
<div *ngIf="funder.websiteUrl">
|
||||
<a [href]="funder.websiteUrl" target="_blank" class="uk-flex-inline uk-flex-middle uk-text-uppercase uk-button uk-button-text custom-external">
|
||||
<icon name="payment" [flex]="true"></icon>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
@ -284,6 +365,7 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<paging-no-load *ngIf="displayedFunders.length > pageSize"
|
||||
(pageChange)="updateCurrentPage($event)"
|
||||
[currentPage]="currentPage" [size]="pageSize"
|
||||
|
|
|
@ -1,5 +1,11 @@
|
|||
@import (reference) "~src/assets/openaire-theme/less/color.less";
|
||||
@import "flag-icons/css/flag-icons.min.css";
|
||||
|
||||
@irish-color: #FF7901;
|
||||
|
||||
.irish-dashboard-link {
|
||||
color: @irish-color;
|
||||
}
|
||||
|
||||
.custom-coins-dot:after {
|
||||
content: "";
|
||||
|
@ -21,28 +27,28 @@
|
|||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.custom-view-button {
|
||||
padding: 4px;
|
||||
background: @light-color;
|
||||
border: 1px solid @disable-color;
|
||||
border-radius: 4px;
|
||||
icon {
|
||||
color: @disable-color;
|
||||
}
|
||||
//.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;
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
&.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%);
|
||||
}
|
||||
}
|
||||
// .uk-card {
|
||||
// &.funder-grid {
|
||||
// border-bottom: 4px solid fade(@funder-color, 30%);
|
||||
// }
|
||||
// &.funder-list {
|
||||
// border-left: 4px solid fade(@funder-color, 30%);
|
||||
// }
|
||||
// }
|
|
@ -18,6 +18,7 @@ import {LayoutService} from '../openaireLibrary/dashboard/sharedComponents/sideb
|
|||
import {FormBuilder, FormControl} from '@angular/forms';
|
||||
import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
|
||||
import {GroupedRequestsService} from "../openaireLibrary/services/groupedRequests.service";
|
||||
import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
|
||||
|
||||
@Component({
|
||||
selector: 'funders',
|
||||
|
@ -31,6 +32,7 @@ export class FundersComponent implements OnInit {
|
|||
pageTitle: string = "OpenAIRE - Explore | Funders";
|
||||
pageDescription: string = "Funders | Be an integral part of the open R&I ecosystem";
|
||||
properties: EnvProperties = properties;
|
||||
public openaireEntities = OpenaireEntities;
|
||||
breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'funders'}];
|
||||
showLoading: boolean = true;
|
||||
isMobile: boolean = false;
|
||||
|
@ -52,29 +54,36 @@ export class FundersComponent implements OnInit {
|
|||
fundersMap = new Map<string, {
|
||||
"id": string,
|
||||
"name": string,
|
||||
"alias": string,
|
||||
"shortName": string,
|
||||
// "alias": string,
|
||||
// "irishAlias": string,
|
||||
"researchProducts": number,
|
||||
"openAccessResearchProducts": number,
|
||||
"openAccessPercentage": number,
|
||||
"projects": number,
|
||||
"monitorDashboard": string,
|
||||
"monitorDashboardStatus": string,
|
||||
"logoUrl": string
|
||||
"irishDashboard": string,
|
||||
"irishDashboardStatus": string,
|
||||
"logoUrl": string,
|
||||
"websiteUrl": string,
|
||||
"country": string,
|
||||
"registered": boolean
|
||||
}>();
|
||||
staticLogos: Set<string> = new Set<string>([
|
||||
"arc_________::ARC||Australian Research Council (ARC)||ARC",
|
||||
"asap________::ASAP||Aligning Science Across Parkinson's||ASAP",
|
||||
"cihr________::CIHR||Canadian Institutes of Health Research||CIHR",
|
||||
"euenvagency_::EEA||European Environment Agency||EEA",
|
||||
"inca________::INCA||Institut National du Cancer||INCa",
|
||||
"nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC",
|
||||
"nih_________::NIH||National Institutes of Health||NIH",
|
||||
"nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC",
|
||||
"nsf_________::NSF||National Science Foundation||NSF",
|
||||
"sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC",
|
||||
"taraexp_____::tara||Tara Expeditions Foundation||TARA",
|
||||
"ukri________::UKRI||UK Research and Innovation||UKRI",
|
||||
"wt__________::WT||Wellcome Trust||WT"
|
||||
staticLogos: Map<string, string> = new Map<string, string>([
|
||||
["arc_________::ARC||Australian Research Council (ARC)||ARC", "ARC"],
|
||||
["asap________::ASAP||Aligning Science Across Parkinson's||ASAP", "ASAP"],
|
||||
["cihr________::CIHR||Canadian Institutes of Health Research||CIHR", "CIHR"],
|
||||
["euenvagency_::EEA||European Environment Agency||EEA", "EEA"],
|
||||
["inca________::INCA||Institut National du Cancer||INCa", "INCa"],
|
||||
["nhmrc_______::NHMRC||National Health and Medical Research Council (NHMRC)||NHMRC", "NHMRC"],
|
||||
["nih_________::NIH||National Institutes of Health||NIH", "NIH"],
|
||||
["nserc_______::NSERC||Natural Sciences and Engineering Research Council of Canada||NSERC", "NSERC"],
|
||||
["nsf_________::NSF||National Science Foundation||NSF", "NSF"],
|
||||
["sshrc_______::SSHRC||Social Sciences and Humanities Research Council||SSHRC", "SSHRC"],
|
||||
["taraexp_____::tara||Tara Expeditions Foundation||TARA", "TARA"],
|
||||
["ukri________::UKRI||UK Research and Innovation||UKRI", "UKRI"],
|
||||
["wt__________::WT||Wellcome Trust||WT", "WT"]
|
||||
]);
|
||||
|
||||
constructor(private router: Router,
|
||||
|
@ -91,8 +100,8 @@ export class FundersComponent implements OnInit {
|
|||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.layoutService.setRootClass('funders');
|
||||
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);
|
||||
|
@ -105,12 +114,16 @@ export class FundersComponent implements OnInit {
|
|||
}));
|
||||
this.showOptions = [
|
||||
{value: 'all', label: 'All funders'},
|
||||
{value: 'dashboard', label: 'Funders with dashboard'}
|
||||
{value: 'monitor', label: 'Funders with Monitor dashboard'},
|
||||
{value: 'rfo', label: 'Funders with RFO dashboard'}
|
||||
];
|
||||
this.sortOptions = [
|
||||
{value: 'alphAsc', label: 'Alphabetically Asc. (A-Z)'},
|
||||
{value: 'alphDsc', label: 'Alphabetically Dsc. (Z-A)'},
|
||||
{value: 'oaDsc', label: '"Open Access %" Dsc.'}
|
||||
{value: 'alphAsc', label: 'Alphabetically asc. (A-Z)'},
|
||||
{value: 'alphDsc', label: 'Alphabetically desc. (Z-A)'},
|
||||
{value: 'oaDsc', label: 'Open Access % desc.'},
|
||||
{value: 'countryAsc', label: 'Country desc. (A-Z)'},
|
||||
{value: 'researcProductsDsc', label: this.openaireEntities.RESULTS+' desc.'},
|
||||
{value: 'projectsDsc', label: this.openaireEntities.PROJECTS+' desc.'}
|
||||
];
|
||||
this.getFunders();
|
||||
this.keywordControl = this.fb.control('');
|
||||
|
@ -126,6 +139,7 @@ export class FundersComponent implements OnInit {
|
|||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
this.layoutService.setRootClass(null);
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
|
@ -151,14 +165,21 @@ export class FundersComponent implements OnInit {
|
|||
let funder = {
|
||||
"id": id,
|
||||
"name": this.removePartAfterCharacters(queriedFunder.name, "||"),
|
||||
"alias": '',
|
||||
"shortName": queriedFunder.shortName,
|
||||
// "alias": '',
|
||||
// "irishAlias": '',
|
||||
"researchProducts": +queriedFunder.results,
|
||||
"openAccessResearchProducts": +queriedFunder.openResults,
|
||||
"openAccessPercentage": 0,
|
||||
"projects": +queriedFunder.projects,
|
||||
"monitorDashboard": '',
|
||||
"monitorDashboardStatus": '',
|
||||
"logoUrl": ''
|
||||
"irishDashboard": '',
|
||||
"irishDashboardStatus": '',
|
||||
"logoUrl": '',
|
||||
"websiteUrl": '',
|
||||
"country": queriedFunder.country,
|
||||
"registered": queriedFunder.registered
|
||||
};
|
||||
|
||||
if((!funder.researchProducts || funder.researchProducts == 0) && (!funder.projects || funder.projects == 0)) {
|
||||
|
@ -167,10 +188,19 @@ export class FundersComponent implements OnInit {
|
|||
|
||||
if(queriedFunder.stakeholder) {
|
||||
let stakeholder = queriedFunder.stakeholder;
|
||||
funder.alias = stakeholder.alias;
|
||||
// funder.alias = stakeholder.alias;
|
||||
// funder.irishAlias = stakeholder.irishAlias;
|
||||
// if(!funder.shortName) {
|
||||
// funder.shortName = stakeholder.alias;
|
||||
// }
|
||||
funder.monitorDashboard = stakeholder.alias;
|
||||
funder.monitorDashboardStatus = stakeholder.visibility;
|
||||
funder.logoUrl = (stakeholder.isUpload ? properties.utilsService + "/download/" : "")+ (stakeholder.logoUrl);
|
||||
funder.irishDashboard = stakeholder.irishAlias;
|
||||
funder.irishDashboardStatus = stakeholder.irishVisibility;
|
||||
if(stakeholder.logoUrl) {
|
||||
funder.logoUrl = (stakeholder.isUpload ? properties.utilsService + "/download/" : "") + (stakeholder.logoUrl);
|
||||
}
|
||||
funder.websiteUrl = stakeholder.websiteUrl;
|
||||
}
|
||||
|
||||
if(funder.openAccessResearchProducts && funder.researchProducts) {
|
||||
|
@ -178,9 +208,7 @@ export class FundersComponent implements OnInit {
|
|||
}
|
||||
|
||||
if(!funder.logoUrl && this.staticLogos.has(funder.id)) {
|
||||
let split = funder.id.split("||");
|
||||
let shortname = (split && split.length==3) ? funder.id.split("||")[2] : funder.id;
|
||||
funder.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".png";
|
||||
funder.logoUrl = "assets/explore-assets/funders/logos/"+this.staticLogos.get(funder.id)+".png";
|
||||
}
|
||||
|
||||
this.fundersMap.set(queriedFunder.id, funder);
|
||||
|
@ -333,6 +361,25 @@ export class FundersComponent implements OnInit {
|
|||
case 'oaDsc':
|
||||
this.funders = this.funders.sort((a, b) => b['openAccessPercentage'] - a['openAccessPercentage']);
|
||||
break;
|
||||
case 'countryAsc':
|
||||
this.funders = this.funders.sort((a, b) => {
|
||||
if(a['country'] && b['country']) {
|
||||
return a['country'].localeCompare(b['country'])
|
||||
} else if(!a['country'] && !b['country']) {
|
||||
return 0;
|
||||
} else if(!a['country']) {
|
||||
return 1;
|
||||
} else {
|
||||
return -1;
|
||||
}
|
||||
});
|
||||
break;
|
||||
case "researcProductsDsc":
|
||||
this.funders = this.funders.sort((a, b) => b['researchProducts'] - a['researchProducts']);
|
||||
break;
|
||||
case "projectsDsc":
|
||||
this.funders = this.funders.sort((a, b) => b['projects'] - a['projects']);
|
||||
break;
|
||||
}
|
||||
this.filtering();
|
||||
}
|
||||
|
@ -348,10 +395,16 @@ export class FundersComponent implements OnInit {
|
|||
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())));
|
||||
displayedFunders = displayedFunders.filter(item => (item['name'] && item['name'].toLowerCase().includes(this.keyword.toLowerCase()))
|
||||
|| (item['monitorDashboard'] && item['monitorDashboard'].toLowerCase().includes(this.keyword.toLowerCase())
|
||||
|| (item['irishDashboard'] && item['irishDashboard'].toLowerCase().includes(this.keyword.toLowerCase()))));
|
||||
}
|
||||
if(this.show == 'dashboard') {
|
||||
displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && funder.monitorDashboardStatus != 'PRIVATE');
|
||||
if(this.show == 'monitor') {
|
||||
displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.monitorDashboardStatus && funder.monitorDashboardStatus != 'PRIVATE')));
|
||||
}
|
||||
|
||||
if(this.show == 'rfo') {
|
||||
displayedFunders = displayedFunders.filter(funder => funder.monitorDashboard && funder.monitorDashboard?.length > 0 && ((funder.irishDashboardStatus && funder.irishDashboardStatus != 'PRIVATE')));
|
||||
}
|
||||
|
||||
this.displayedFunders = displayedFunders;
|
||||
|
|
|
@ -5,8 +5,6 @@ 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";
|
||||
|
@ -33,9 +31,7 @@ import {GroupedRequestsServiceModule} from "../openaireLibrary/services/groupedR
|
|||
declarations: [
|
||||
FundersComponent
|
||||
],
|
||||
providers: [
|
||||
PiwikService, IsRouteEnabled
|
||||
],
|
||||
providers: [],
|
||||
exports: [
|
||||
FundersComponent
|
||||
]
|
||||
|
|
|
@ -81,7 +81,7 @@
|
|||
<ng-container *ngFor="let type of getKeys(logos)">
|
||||
<li *ngFor="let range of createRange(logos[type].length) let j=index"
|
||||
class="uk-width-1-1 home-logo">
|
||||
<h1 class="uk-text-center uk-margin-bottom uk-text-primary uk-h4">
|
||||
<h2 class="uk-text-center uk-margin-bottom uk-text-primary uk-h4">
|
||||
<span *ngIf="type=='publication' && numbersComponent.showPublications && numbers?.publicationsSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}}
|
||||
|
@ -119,7 +119,7 @@
|
|||
funded grants</span>
|
||||
</span>
|
||||
|
||||
</h1>
|
||||
</h2>
|
||||
<div class="uk-text-center uk-flex uk-flex-center uk-margin-medium-left uk-margin-medium-right">
|
||||
<ng-container *ngTemplateOutlet="_logos; context: { logo: logos[type][j], class: ' '}"></ng-container>
|
||||
<!-- <div-->
|
||||
|
@ -173,9 +173,9 @@
|
|||
</slider-column>
|
||||
<slider-column type="nav" class="slider-nav">
|
||||
<slider-nav-item [start]="0">
|
||||
<h6>
|
||||
<h3 class="uk-h6">
|
||||
<i class="uk-text-primary">Deposit</i> your research<span class="uk-text-primary">.</span>
|
||||
</h6>
|
||||
</h3>
|
||||
<div class="uk-margin-bottom">
|
||||
Whether it’s publications, data or software,
|
||||
select an OpenAIRE compatible repository and
|
||||
|
@ -190,9 +190,9 @@
|
|||
</div>
|
||||
</slider-nav-item>
|
||||
<slider-nav-item [start]="1">
|
||||
<h6>
|
||||
<h3 class="uk-h6">
|
||||
<i class="uk-text-primary">Link</i> your work<span class="uk-text-primary">.</span>
|
||||
</h6>
|
||||
</h3>
|
||||
<div class="uk-margin-bottom">
|
||||
Connect all your research. If you can't find your research
|
||||
results in OpenAIRE, don't worry! Use our Link service,
|
||||
|
|
|
@ -36,84 +36,29 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
public logos = {
|
||||
"publication": [
|
||||
[
|
||||
// "logo-pubmed.png",
|
||||
// "logo-arxiv.png",
|
||||
// "logo-base.png",
|
||||
// "logo-scielo.png",
|
||||
// "logo-la-referencia.png",
|
||||
// "logo-soar.png",
|
||||
// "logo-repec.png",
|
||||
// "logo-core.png",
|
||||
// "logo-zenodo.png",
|
||||
// "logo-narcis.png"
|
||||
"publications.png"
|
||||
],
|
||||
[
|
||||
// "logo-unpaywall.png",
|
||||
// "logo-elsevier.png",
|
||||
// "logo-spring-nature.png",
|
||||
// "logo-frontiers.png",
|
||||
// "logo-opencitations.png",
|
||||
// "logo-doaj.png",
|
||||
// "logo-microsoft.png",
|
||||
// "logo-plos.png",
|
||||
// "logo-f1000.png",
|
||||
// "logo-copernicus.png"
|
||||
"publications2.png"
|
||||
]
|
||||
],
|
||||
"software": [
|
||||
[
|
||||
// "logo-software-heritage.png",
|
||||
// "logo-github.png",
|
||||
// "logo-doecode.png",
|
||||
// "logo-bitbucket.png",
|
||||
// "logo-elixir-bio-tools.png",
|
||||
// "logo-google-code.png",
|
||||
// "logo-sourceforge.png",
|
||||
// "logo-zenodo.png"
|
||||
"software.png"
|
||||
]
|
||||
],
|
||||
"dataset": [
|
||||
[
|
||||
// "logo-scholexplorer.png",
|
||||
// "logo-zenodo.png",
|
||||
// "logo-pangea.png",
|
||||
// "logo-figshare.png",
|
||||
// "logo-protocols.png",
|
||||
// "logo-opentrials.png",
|
||||
// "logo-kaggle.png",
|
||||
// "logo-reactome.png",
|
||||
// "logo-easy.png",
|
||||
// "logo-dryad.png"
|
||||
"datasets.png"
|
||||
]
|
||||
],
|
||||
"persistent": [
|
||||
[
|
||||
// "logo-re3data.png",
|
||||
// "logo-orcid.png",
|
||||
// "logo-opendoar.png",
|
||||
// "logo-grid.png",
|
||||
// "logo-fairsharing.png",
|
||||
// "logo-ror.png",
|
||||
// "logo-datacite.png",
|
||||
// "logo-crossref.png"
|
||||
"pids.png"
|
||||
]
|
||||
],
|
||||
"funder": [
|
||||
[
|
||||
// "logo-european-commision.png",
|
||||
// "logo-nsf.png",
|
||||
// "logo-nhmrc.png",
|
||||
// "logo-sfi.png",
|
||||
// "logo-nwo.png",
|
||||
// "logo-welcome-trust.png",
|
||||
// "logo-fct.png",
|
||||
// "logo-gsrt.png",
|
||||
// "logo-fnsnf.png"
|
||||
"funders.png"
|
||||
]
|
||||
]
|
||||
|
|
|
@ -10,12 +10,10 @@ import { DataProvidersServiceModule} from '../openaireLibrary/services/dataProvi
|
|||
import { SearchResearchResultsServiceModule} from '../openaireLibrary/services/searchResearchResultsService.module';
|
||||
import { ProjectsServiceModule} from '../openaireLibrary/services/projectsService.module';
|
||||
import { OrganizationsServiceModule} from '../openaireLibrary/services/organizationsService.module';
|
||||
import { PiwikServiceModule} from '../openaireLibrary/utils/piwik/piwikService.module';
|
||||
|
||||
import {HelperModule} from '../openaireLibrary/utils/helper/helper.module';
|
||||
|
||||
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { SEOServiceModule } from '../openaireLibrary/sharedComponents/SEO/SEOService.module';
|
||||
|
||||
import {OtherPortalsModule} from "../openaireLibrary/sharedComponents/other-portals/other-portals.module";
|
||||
|
@ -32,21 +30,18 @@ import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-util
|
|||
|
||||
@NgModule({
|
||||
imports: [
|
||||
HomeRoutingModule,
|
||||
CommonModule, FormsModule, RouterModule,
|
||||
RefineFieldResultsServiceModule,
|
||||
DataProvidersServiceModule, SearchResearchResultsServiceModule,
|
||||
ProjectsServiceModule, OrganizationsServiceModule,
|
||||
PiwikServiceModule,
|
||||
HomeRoutingModule,
|
||||
HelperModule,
|
||||
SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule
|
||||
],
|
||||
declarations: [
|
||||
HomeComponent
|
||||
],
|
||||
providers:[
|
||||
PreviousRouteRecorder
|
||||
],
|
||||
providers:[],
|
||||
exports: [
|
||||
HomeComponent
|
||||
]
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireDataProviderComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class DataProviderRoutingModule { }
|
|
@ -1,17 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-dataprovider',
|
||||
template: `<dataprovider></dataprovider>`,
|
||||
})
|
||||
export class OpenaireDataProviderComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { DataProviderModule } from '../../openaireLibrary/landingPages/dataProvider/dataProvider.module';
|
||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
||||
import {DataProviderRoutingModule} from './dataProvider-routing.module';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [DataProviderModule, DataProviderRoutingModule],
|
||||
declarations:[OpenaireDataProviderComponent],
|
||||
providers:[ PreviousRouteRecorder],
|
||||
exports:[OpenaireDataProviderComponent]
|
||||
})
|
||||
export class LibDataProviderModule { }
|
|
@ -1,17 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { OpenaireDatasetComponent } from './dataset.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireDatasetComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class DatasetRoutingModule { }
|
|
@ -1,7 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-dataset',
|
||||
template: `<result-landing type="dataset"></result-landing>`,
|
||||
})
|
||||
export class OpenaireDatasetComponent{}
|
|
@ -1,12 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { OpenaireDatasetComponent } from './dataset.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {DatasetRoutingModule} from './dataset-routing.module';
|
||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||
@NgModule({
|
||||
imports: [DatasetRoutingModule, ResultLandingModule],
|
||||
declarations:[OpenaireDatasetComponent],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports:[OpenaireDatasetComponent]
|
||||
})
|
||||
export class LibDatasetModule { }
|
|
@ -1,13 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { OrganizationModule } from '../../openaireLibrary/landingPages/organization/organization.module';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { OpenaireOrganizationComponent } from './organization.component';
|
||||
import {OrganizationRoutingModule} from './organization-routing.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [OrganizationModule, OrganizationRoutingModule],
|
||||
declarations:[OpenaireOrganizationComponent],
|
||||
providers:[ PreviousRouteRecorder],
|
||||
exports:[OpenaireOrganizationComponent]
|
||||
})
|
||||
export class LibOrganizationModule { }
|
|
@ -1,19 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireOrganizationComponent } from './organization.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireOrganizationComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class OrganizationRoutingModule { }
|
|
@ -1,17 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-organization',
|
||||
template: `<organization></organization>`,
|
||||
})
|
||||
export class OpenaireOrganizationComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { OpenaireOrpComponent } from './orp.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {OrpRoutingModule} from './orp-routing.module';
|
||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||
@NgModule({
|
||||
imports: [OrpRoutingModule, ResultLandingModule],
|
||||
declarations:[OpenaireOrpComponent],
|
||||
providers:[ PreviousRouteRecorder],
|
||||
exports:[OpenaireOrpComponent]
|
||||
})
|
||||
export class LibOrpModule { }
|
|
@ -1,18 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireOrpComponent } from './orp.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireOrpComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class OrpRoutingModule { }
|
|
@ -1,7 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-orp',
|
||||
template: `<result-landing type="orp"></result-landing>`,
|
||||
})
|
||||
export class OpenaireOrpComponent{}
|
|
@ -1,13 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { ProjectModule } from '../../openaireLibrary/landingPages/project/project.module';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { OpenaireProjectComponent } from './project.component';
|
||||
import {ProjectRoutingModule} from './project-routing.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [ProjectModule, ProjectRoutingModule],
|
||||
declarations:[OpenaireProjectComponent],
|
||||
providers:[ PreviousRouteRecorder],
|
||||
exports:[OpenaireProjectComponent]
|
||||
})
|
||||
export class LibProjectModule { }
|
|
@ -1,17 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireProjectComponent } from './project.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireProjectComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class ProjectRoutingModule { }
|
|
@ -1,17 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-project',
|
||||
template: `<project></project>`,
|
||||
})
|
||||
export class OpenaireProjectComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
|
@ -1,13 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { OpenairePublicationComponent } from './publication.component';
|
||||
import {PublicationRoutingModule} from './publication-routing.module';
|
||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [PublicationRoutingModule, ResultLandingModule],
|
||||
declarations:[OpenairePublicationComponent],
|
||||
providers:[ PreviousRouteRecorder],
|
||||
exports:[OpenairePublicationComponent]
|
||||
})
|
||||
export class LibPublicationModule { }
|
|
@ -1,17 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenairePublicationComponent } from './publication.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenairePublicationComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class PublicationRoutingModule { }
|
|
@ -1,8 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
template: `
|
||||
<result-landing type="publication"></result-landing>`,
|
||||
})
|
||||
export class OpenairePublicationComponent {}
|
|
@ -1,13 +0,0 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {OpenaireResultComponent} from './result.component';
|
||||
import {ResultRoutingModule} from './result-routing.module';
|
||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [ResultRoutingModule, ResultLandingModule],
|
||||
declarations:[OpenaireResultComponent],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports:[OpenaireResultComponent]
|
||||
})
|
||||
export class LibResultModule { }
|
|
@ -1,18 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenaireResultComponent } from './result.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireResultComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class ResultRoutingModule { }
|
|
@ -1,7 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
template: `<result-landing type="result"></result-landing>`,
|
||||
})
|
||||
export class OpenaireResultComponent{}
|
|
@ -1,13 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { OpenaireSoftwareComponent } from './software.component';
|
||||
import {SoftwareRoutingModule} from './software-routing.module';
|
||||
import {ResultLandingModule} from "../../openaireLibrary/landingPages/result/resultLanding.module";
|
||||
@NgModule({
|
||||
imports: [SoftwareRoutingModule, ResultLandingModule],
|
||||
declarations:[OpenaireSoftwareComponent],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports:[OpenaireSoftwareComponent]
|
||||
})
|
||||
export class LibSoftwareModule { }
|
|
@ -1,14 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenaireSoftwareComponent } from './software.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSoftwareComponent, canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class SoftwareRoutingModule { }
|
|
@ -1,7 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-software',
|
||||
template: `<result-landing type="software"></result-landing>`,
|
||||
})
|
||||
export class OpenaireSoftwareComponent{}
|
|
@ -1,23 +0,0 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
|
||||
import {OpenaireUserComponent } from './user.component';
|
||||
import { UserRoutingModule } from './user-routing.module';
|
||||
import { UserModule} from '../openaireLibrary/login/user.module';
|
||||
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
UserRoutingModule, UserModule
|
||||
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
declarations: [
|
||||
OpenaireUserComponent
|
||||
|
||||
]
|
||||
})
|
||||
export class LibUserModule { }
|
|
@ -1,15 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenaireUserComponent } from './user.component';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireUserComponent, canDeactivate: [PreviousRouteRecorder]},
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class UserRoutingModule { }
|
|
@ -1,10 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-user',
|
||||
template: `<user></user>`
|
||||
})
|
||||
|
||||
export class OpenaireUserComponent {
|
||||
|
||||
}
|
|
@ -1 +1 @@
|
|||
Subproject commit c3cb2d56ca2670dc7d937b293290bf3ac419f3f6
|
||||
Subproject commit f1fd1ef60c5a964e283ced7840876dc5896af9be
|
|
@ -1,21 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {OpenaireMyOrcidLinksComponent} from "./myOrcidLinks.component";
|
||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireMyOrcidLinksComponent,
|
||||
canActivate: [LoginGuard], data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class MyOrcidLinksRoutingModule { }
|
|
@ -1,16 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-my-orcid-links',
|
||||
template: `
|
||||
<my-orcid-links></my-orcid-links>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireMyOrcidLinksComponent {
|
||||
|
||||
constructor() {}
|
||||
|
||||
public ngOnInit() {}
|
||||
}
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {OpenaireMyOrcidLinksComponent} from './myOrcidLinks.component';
|
||||
import {MyOrcidLinksModule} from "../../openaireLibrary/orcid/my-orcid-links/myOrcidLinks.module";
|
||||
import {MyOrcidLinksRoutingModule} from "./myOrcidLinks-routing.module";
|
||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
MyOrcidLinksModule,
|
||||
MyOrcidLinksRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireMyOrcidLinksComponent
|
||||
],
|
||||
exports: [
|
||||
OpenaireMyOrcidLinksComponent
|
||||
],
|
||||
providers: [PreviousRouteRecorder, LoginGuard]
|
||||
})
|
||||
export class LibMyOrcidLinksModule { }
|
|
@ -1,21 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenaireOrcidComponent} from './orcid.component';
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireOrcidComponent,
|
||||
canActivate: [LoginGuard], data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},
|
||||
canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class OrcidRoutingModule { }
|
|
@ -1,10 +0,0 @@
|
|||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-orcid',
|
||||
template: `
|
||||
<orcid></orcid>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireOrcidComponent {}
|
|
@ -1,24 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
|
||||
import {OpenaireOrcidComponent} from './orcid.component';
|
||||
import {OrcidRoutingModule} from './orcid-routing.module';
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {FormsModule} from "@angular/forms";
|
||||
import {OrcidModule} from "../openaireLibrary/orcid/orcid.module";
|
||||
import {LoginGuard} from "../openaireLibrary/login/loginGuard.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
OrcidModule, OrcidRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireOrcidComponent
|
||||
],
|
||||
providers: [PreviousRouteRecorder, LoginGuard],
|
||||
exports: [
|
||||
OpenaireOrcidComponent
|
||||
]
|
||||
})
|
||||
export class LibOrcidModule { }
|
|
@ -1,24 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
|
||||
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
|
||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
// { path: '', component: OpenaireSearchMyResultsInOrcidComponent, canActivate: [IsRouteEnabled], data: {
|
||||
{ path: '', component: OpenaireSearchRecommendedResultsForOrcidComponent,
|
||||
canActivate: [LoginGuard], data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
},
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class SearchRecommendedResultsForOrcidRoutingModule { }
|
|
@ -1,16 +0,0 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-search-recommended-results-for-orcid',
|
||||
template: `
|
||||
<search-recommended-results-for-orcid></search-recommended-results-for-orcid>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireSearchRecommendedResultsForOrcidComponent {
|
||||
|
||||
constructor() {}
|
||||
|
||||
public ngOnInit() {}
|
||||
}
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { CommonModule } from '@angular/common';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import {OpenaireSearchRecommendedResultsForOrcidComponent} from "./searchRecommendedResultsForOrcid.component";
|
||||
import {PreviousRouteRecorder} from "../../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {IsRouteEnabled} from "../../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {SearchRecommendedResultsForOrcidModule} from "../../openaireLibrary/orcid/recommend-orcid-links/searchRecommendedResultsForOrcid.module";
|
||||
import {SearchRecommendedResultsForOrcidRoutingModule} from "./searchRecommendedResultsForOrcid-routing.module";
|
||||
import {FreeGuard} from "../../openaireLibrary/login/freeGuard.guard";
|
||||
import {LoginGuard} from "../../openaireLibrary/login/loginGuard.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
SearchRecommendedResultsForOrcidModule,
|
||||
SearchRecommendedResultsForOrcidRoutingModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireSearchRecommendedResultsForOrcidComponent
|
||||
],
|
||||
exports: [
|
||||
OpenaireSearchRecommendedResultsForOrcidComponent
|
||||
],
|
||||
// providers: [PreviousRouteRecorder, IsRouteEnabled]
|
||||
providers: [PreviousRouteRecorder, LoginGuard]
|
||||
})
|
||||
export class LibSearchRecommendedResultsForOrcidModule { }
|
|
@ -1,18 +0,0 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {FormsModule} from '@angular/forms';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {ReloadModule} from '../openaireLibrary/reload/reload.module';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule, RouterModule, ReloadModule
|
||||
],
|
||||
declarations: [],
|
||||
providers: [],
|
||||
exports: []
|
||||
})
|
||||
export class LibReloadModule {
|
||||
}
|
|
@ -1,17 +0,0 @@
|
|||
import {NgModule} from "@angular/core";
|
||||
import {RouterModule} from "@angular/router";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {ExploreSdgComponent} from "./sdg.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{
|
||||
path: '',
|
||||
component: ExploreSdgComponent,
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class LibSdgRoutingModule { }
|
|
@ -1,10 +0,0 @@
|
|||
import {Component} from "@angular/core";
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@Component({
|
||||
selector: 'explore-sdg',
|
||||
template: `
|
||||
<sdg></sdg>
|
||||
`
|
||||
})
|
||||
export class ExploreSdgComponent {}
|
|
@ -1,26 +0,0 @@
|
|||
import {CommonModule} from "@angular/common";
|
||||
import {NgModule} from "@angular/core";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
import {LibSdgRoutingModule} from "./sdg-routing.module";
|
||||
import {SdgRoutingModule} from "../openaireLibrary/sdg/sdg-routing.module";
|
||||
import {SdgModule} from "../openaireLibrary/sdg/sdg.module";
|
||||
import {ExploreSdgComponent} from "./sdg.component";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule,
|
||||
LibSdgRoutingModule,
|
||||
SdgRoutingModule,
|
||||
SdgModule
|
||||
],
|
||||
declarations: [
|
||||
ExploreSdgComponent
|
||||
],
|
||||
exports: [
|
||||
ExploreSdgComponent
|
||||
],
|
||||
providers: [
|
||||
PreviousRouteRecorder
|
||||
]
|
||||
})
|
||||
export class LibSdgModule { }
|
|
@ -9,10 +9,9 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
|
|||
|
||||
@NgModule({
|
||||
imports: [
|
||||
AdvancedSearchOrganizationsRoutingModule,
|
||||
CommonModule, FormsModule,
|
||||
SearchOrganizationsModule,
|
||||
AdvancedSearchOrganizationsRoutingModule
|
||||
|
||||
SearchOrganizationsModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireAdvancedSearchOrganizationsComponent
|
||||
|
|
|
@ -8,10 +8,9 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj
|
|||
|
||||
@NgModule({
|
||||
imports: [
|
||||
AdvancedSearchProjectsRoutingModule,
|
||||
CommonModule, FormsModule,
|
||||
SearchProjectsModule,
|
||||
AdvancedSearchProjectsRoutingModule
|
||||
|
||||
SearchProjectsModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireAdvancedSearchProjectsComponent
|
||||
|
|
|
@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
|
|||
import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
|
||||
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
|
||||
|
||||
@NgModule({
|
||||
|
@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
|
|||
declarations: [
|
||||
OpenaireSearchResearchResultsComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchResearchResultsComponent
|
||||
]
|
||||
|
|
|
@ -5,8 +5,6 @@ import { FormsModule } from '@angular/forms';
|
|||
import{ CompatibleDataProvidersRoutingModule} from './compatibleDataProviders-routing.module';
|
||||
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
|
||||
|
||||
@NgModule({
|
||||
|
@ -18,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchCompatibleDataprovidersComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchCompatibleDataprovidersComponent
|
||||
]
|
||||
|
|
|
@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
|
|||
|
||||
import{ EntityRegistriesRoutingModule} from './entityRegistries-routing.module';
|
||||
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
|
||||
|
||||
|
@ -17,7 +16,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchEntityRegistriesComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchEntityRegistriesComponent
|
||||
]
|
||||
|
|
|
@ -4,7 +4,6 @@ import { FormsModule } from '@angular/forms';
|
|||
|
||||
import{ JournalsRoutingModule} from './journals-routing.module';
|
||||
import{OpenaireSearchJournalsComponent} from './journals.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searchDataProviders.module";
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -14,7 +13,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchJournalsComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchJournalsComponent
|
||||
]
|
||||
|
|
|
@ -3,7 +3,6 @@ import { CommonModule } from '@angular/common';
|
|||
import { FormsModule } from '@angular/forms';
|
||||
import {OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
|
||||
import{ SearchDataProvidersRoutingModule} from './searchDataProviders-routing.module';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {SearchDataProvidersModule} from '../../openaireLibrary/searchPages/searchDataProviders.module';
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -14,7 +13,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
|
|||
declarations: [
|
||||
OpenaireSearchDataprovidersComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchDataprovidersComponent
|
||||
]
|
||||
|
|
|
@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
|
|||
import{ SearchOrganizationsRoutingModule} from './searchOrganizations-routing.module';
|
||||
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searchOrganizations.module";
|
||||
|
||||
|
||||
|
@ -18,7 +17,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchOrganizationsComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchOrganizationsComponent
|
||||
]
|
||||
|
|
|
@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
|
|||
import{ SearchProjectsRoutingModule} from './searchProjects-routing.module';
|
||||
import{OpenaireSearchProjectsComponent} from './searchProjects.component';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchProjects.module';
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
@ -15,7 +14,7 @@ import { SearchProjectsModule} from '../../openaireLibrary/searchPages/searchPro
|
|||
declarations: [
|
||||
OpenaireSearchProjectsComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchProjectsComponent
|
||||
]
|
||||
|
|
|
@ -5,7 +5,6 @@ import { FormsModule } from '@angular/forms';
|
|||
import{ SearchResearchResultsRoutingModule} from './searchResearchResults-routing.module';
|
||||
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/searchResearchResults.module";
|
||||
|
||||
@NgModule({
|
||||
|
@ -17,7 +16,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
|
|||
declarations: [
|
||||
OpenaireSearchResearchResultsComponent
|
||||
],
|
||||
providers:[PreviousRouteRecorder],
|
||||
providers:[],
|
||||
exports: [
|
||||
OpenaireSearchResearchResultsComponent
|
||||
]
|
||||
|
|
Before Width: | Height: | Size: 252 KiB After Width: | Height: | Size: 49 KiB |
Before Width: | Height: | Size: 226 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 240 KiB After Width: | Height: | Size: 61 KiB |
Before Width: | Height: | Size: 189 KiB After Width: | Height: | Size: 40 KiB |
Before Width: | Height: | Size: 242 KiB After Width: | Height: | Size: 56 KiB |
Before Width: | Height: | Size: 230 KiB After Width: | Height: | Size: 50 KiB |
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.876 70.876"><defs><style>.a{fill:#fff;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-width:3px;}.a,.b{stroke:#d95f2d;}.b{fill:#d95f2d;stroke-width:2px;}</style></defs><g transform="translate(-1000.9 -961.038)"><g transform="translate(1002.4 962.538)"><path class="a" d="M1036.338,1914.9a33.938,33.938,0,1,1-33.938,33.938A33.923,33.923,0,0,1,1036.338,1914.9Z" transform="translate(-1002.4 -1914.9)"/></g><path class="b" d="M1033.929,975.9a10.839,10.839,0,0,0-10.829,10.829.839.839,0,0,0,1.675.112h0a9.154,9.154,0,1,1,18.308,0,10.223,10.223,0,0,1-3.238,7.256,58.886,58.886,0,0,1-6.475,5.359.8.8,0,0,0-.335.67v6.587a.839.839,0,1,0,1.674.112h0v-6.252a53.715,53.715,0,0,0,6.252-5.247,12.159,12.159,0,0,0,3.684-8.373A10.66,10.66,0,0,0,1033.929,975.9Z" transform="translate(2.409 0.327)"/><circle class="b" cx="1.675" cy="1.675" r="1.675" transform="translate(1034.663 1013.514)"/></g></svg>
|
Before Width: | Height: | Size: 964 B |
|
@ -1 +1 @@
|
|||
Subproject commit 3b437aafda7a716a0a89785a106456cbe520dce3
|
||||
Subproject commit a4d8923b82a59ac1cc41e9c0574f1d64a61c0c1b
|
|
@ -1 +0,0 @@
|
|||
<svg xmlns="http://www.w3.org/2000/svg" width="1367" height="90.052" viewBox="0 0 1367 90.052"><defs><style>.a{fill:#fafafa;}.b{fill: #f4f4f4;}</style></defs><g transform="translate(11962 8145.052)"><rect class="a" width="1367" height="90" transform="translate(-11962 -8145)"/><path class="b" d="M1367,5S1215.409-18.052,965.38-18.052,590.781,18,350.769,18,0-10.052,0-10.052v-13H1367Z" transform="translate(-11962 -8122)"/></g></svg>
|
Before Width: | Height: | Size: 433 B |
|
@ -0,0 +1,3 @@
|
|||
.deposit {
|
||||
@import (multiple) "~src/assets/openaire-theme/less/_import";
|
||||
}
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 254 KiB |
Before Width: | Height: | Size: 8.3 KiB After Width: | Height: | Size: 3.6 KiB |
Before Width: | Height: | Size: 43 KiB After Width: | Height: | Size: 10 KiB |
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 18 KiB |
Before Width: | Height: | Size: 165 KiB After Width: | Height: | Size: 38 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 17 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 6.5 KiB |
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 34 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 73 KiB After Width: | Height: | Size: 36 KiB |