Compare commits
No commits in common. "master" and "production-release-october-2021" have entirely different histories.
master
...
production
|
|
@ -1,11 +1,6 @@
|
|||
.idea
|
||||
**/.angular/
|
||||
**/node_modules
|
||||
**/package-lock.json
|
||||
**/.idea
|
||||
**/dist
|
||||
**/uploads
|
||||
services/sitemaps/*.xml
|
||||
services/sitemaps/*.txt
|
||||
services/sitemaps/sitemaps
|
||||
services/sitemaps/sitemaps.zip
|
||||
|
|
@ -4,6 +4,3 @@
|
|||
[submodule "explore/src/assets/common-assets"]
|
||||
path = explore/src/assets/common-assets
|
||||
url = gitea@code-repo.d4science.org:MaDgIK/openaire-assets.git
|
||||
[submodule "explore/src/assets/openaire-theme"]
|
||||
path = explore/src/assets/openaire-theme
|
||||
url = gitea@code-repo.d4science.org:MaDgIK/openaire-theme.git
|
||||
|
|
|
|||
|
|
@ -1,218 +0,0 @@
|
|||
# Changelog
|
||||
|
||||
All notable changes to this project will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
|
||||
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
|
||||
|
||||
*For each release, use the following sub-sections:*
|
||||
|
||||
- *Added (for new features)*
|
||||
- *Changed (for changes in existing functionality)*
|
||||
- *Deprecated (for soon-to-be removed features)*
|
||||
- *Removed (for now removed features)*
|
||||
- *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
|
||||
* Removed "BETA" indication from FoS
|
||||
* Access search filter: Display always all the predefined values
|
||||
* Filters: remove number of values
|
||||
* Filters: Get 7 value (display 6) and 100 on "view more" click
|
||||
* My claims: remove urls for pending claims
|
||||
* Improve queries for search organizations & data sources
|
||||
|
||||
### Fixed
|
||||
* Search query with input full ORCID url or just ORCID id
|
||||
* In search, added also in count query for data sources the datasource pid check
|
||||
* Landing: min-height needed in metrics box
|
||||
|
||||
### Added
|
||||
* Linking: responsive in mobile
|
||||
|
||||
## [production-release-november-2023-v2] - 2023/11/28
|
||||
### Added
|
||||
* Add sorting options with impact factors in search results page
|
||||
|
||||
### Changed
|
||||
* Data source landing: get collected full texts from new stats API
|
||||
* Updated parsing of measures - in results: views/downloads per data source
|
||||
|
||||
### Fixed
|
||||
* Updated query for funders number in Funders page
|
||||
* Updated query for funders number is first page
|
||||
* Advanced Search Results: funder field to return all funders
|
||||
* Advanced Search Projects: funder field to return all funders
|
||||
|
||||
## [production-release-november-2023] - 2023/11/09
|
||||
### Added
|
||||
* Missing funders' logos locally in Explore assets
|
||||
|
||||
### Changed
|
||||
* Deposit search page: UI improvement in “Go to repository” button
|
||||
|
||||
### Fixed
|
||||
* Reverted version of UIkit back to version 3.16.24 - previous version caused bug with dropdowns
|
||||
|
||||
## [production-release-october-2023] - 2023/10/18
|
||||
### Added
|
||||
* Search page: Add view more option on overflow (e.g authors, partners, subjects, projects)
|
||||
|
||||
### Changed
|
||||
* Upgrade to Angular 16
|
||||
* New Claims API
|
||||
* New Funders Page
|
||||
|
||||
### Fixed
|
||||
* Reverted version of UIkit to version 3.16.14 because of parallax
|
||||
* A persistent identifier can resolve in more than one pid types
|
||||
|
||||
## [production-release-september-2023] - 2023/09/25
|
||||
### FIXED
|
||||
* Error on grant access in ORCID Search & Link Wizard
|
||||
* Added missing id in linking from the project landing
|
||||
* Added check in search data sources parsing
|
||||
|
||||
## [production-release-august-2023] - 2023/08/25
|
||||
### Added
|
||||
* Search mobile: Added actions
|
||||
* Detailed pages - mobile: Added search-bar
|
||||
* Mobile: new drops and dropdowns
|
||||
|
||||
### Changed
|
||||
* Linking: Redesign of results view
|
||||
* Advanced search form: Add autocomplete input for eosc subject field
|
||||
* Detailed pages - mobile: UI updates & improvements
|
||||
|
||||
### Fixed
|
||||
* Advanced search and detailed page
|
||||
* Added a necessary check in html of detailed pages
|
||||
|
||||
## [production-release-may-2023] - 2023/05/19
|
||||
### Added
|
||||
* Detailed research products page: Added suggest modals for Sustainable Development Goals and Fields of Science
|
||||
* Get research products, projects & data sources usage counts from index
|
||||
|
||||
### Changed
|
||||
* Redesign of detailed pages and mobile version
|
||||
|
||||
### Fixed
|
||||
* Fix path for fos/sdg vocabularies in advanced search
|
||||
* Search page improvements
|
||||
* UI updates & improvements in search results and detailed pages (minor)
|
||||
|
||||
## [production-release-january-2023] - 2023/01/18
|
||||
### FIXED
|
||||
* Contact us form: Email body was either empty or incomplete
|
||||
* Contact us page: After sending an email, clear recaptcha
|
||||
|
||||
|
||||
## [production-release-december-2022] - 2022/12/21
|
||||
### Added
|
||||
* Link to blog in Sustainable Development Goals page
|
||||
|
||||
### Changed
|
||||
* SEO updates and mobile menu
|
||||
|
||||
### Fixed
|
||||
* Linking: Changed Crossref requests for bulk uploaded DOIs
|
||||
* Medium screens: not sticky navbar causing error
|
||||
|
||||
## [production-release-november-2022] - 2022/11/30
|
||||
### Added
|
||||
* EOSC subjects from eoscifguidelines field & Advanced field "EOSC Subject"
|
||||
* New Contact us page
|
||||
|
||||
### Changed
|
||||
* Upgrade to Angular 14
|
||||
* Refinement of filters
|
||||
* Advanced search form: UI updates and smooth scrolling
|
||||
* FoS and deposit pages updates
|
||||
* Bip Finder: Updated parsing and labels for Bip Finder scores & updated link to BiP Finder
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
# Explore
|
||||
|
||||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 16.1.7.
|
||||
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.3.10 and has been updated to 11.2.14.
|
||||
|
||||
## Install packages
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:module": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:pipe": {
|
||||
"skipTests": true
|
||||
|
|
@ -34,6 +35,7 @@
|
|||
"build": {
|
||||
"builder": "@angular-devkit/build-angular:browser",
|
||||
"options": {
|
||||
"aot": true,
|
||||
"outputPath": "dist/explore/browser",
|
||||
"index": "src/index.html",
|
||||
"main": "src/main.ts",
|
||||
|
|
@ -51,36 +53,23 @@
|
|||
}
|
||||
],
|
||||
"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"
|
||||
"src/styles.css",
|
||||
"src/material.scss"
|
||||
],
|
||||
"scripts": [
|
||||
"node_modules/uikit/dist/js/uikit.min.js",
|
||||
"node_modules/uikit/dist/js/uikit-icons.min.js",
|
||||
"src/assets/common-assets/common/jquery.js",
|
||||
"src/assets/common-assets/common/uikit.min.js",
|
||||
"src/assets/common-assets/common/uikit-icons.min.js",
|
||||
"node_modules/jquery/dist/jquery.js"
|
||||
],
|
||||
"vendorChunk": true,
|
||||
"extractLicenses": false,
|
||||
"buildOptimizer": false,
|
||||
"sourceMap": true,
|
||||
"optimization": false,
|
||||
"namedChunks": true
|
||||
]
|
||||
},
|
||||
"configurations": {
|
||||
"development": {
|
||||
"optimization": {
|
||||
"scripts": true,
|
||||
"styles": {
|
||||
"minify": true,
|
||||
"inlineCritical": false
|
||||
},
|
||||
"fonts": true
|
||||
},
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
|
|
@ -103,17 +92,11 @@
|
|||
"with": "src/environments/environment.test.ts"
|
||||
}
|
||||
],
|
||||
"optimization": {
|
||||
"scripts": true,
|
||||
"styles": {
|
||||
"minify": true,
|
||||
"inlineCritical": false
|
||||
},
|
||||
"fonts": true
|
||||
},
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
|
|
@ -155,17 +138,11 @@
|
|||
"with": "src/environments/environment.beta.ts"
|
||||
}
|
||||
],
|
||||
"optimization": {
|
||||
"scripts": true,
|
||||
"styles": {
|
||||
"minify": true,
|
||||
"inlineCritical": false
|
||||
},
|
||||
"fonts": true
|
||||
},
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
|
|
@ -207,17 +184,11 @@
|
|||
"with": "src/environments/environment.prod.ts"
|
||||
}
|
||||
],
|
||||
"optimization": {
|
||||
"scripts": true,
|
||||
"styles": {
|
||||
"minify": true,
|
||||
"inlineCritical": false
|
||||
},
|
||||
"fonts": true
|
||||
},
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
|
|
@ -233,8 +204,7 @@
|
|||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": ""
|
||||
}
|
||||
},
|
||||
"serve": {
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
|
|
@ -269,23 +239,30 @@
|
|||
]
|
||||
}
|
||||
},
|
||||
"lint": {
|
||||
"builder": "@angular-devkit/build-angular:tslint",
|
||||
"options": {
|
||||
"tsConfig": [
|
||||
"src/tsconfig.app.json",
|
||||
"src/tsconfig.spec.json"
|
||||
],
|
||||
"exclude": [
|
||||
"**/node_modules/**"
|
||||
]
|
||||
}
|
||||
},
|
||||
"server": {
|
||||
"builder": "@angular-devkit/build-angular:server",
|
||||
"options": {
|
||||
"outputPath": "dist/explore/server",
|
||||
"main": "server.ts",
|
||||
"tsConfig": "src/tsconfig.server.json",
|
||||
"sourceMap": true,
|
||||
"optimization": false,
|
||||
"buildOptimizer": false
|
||||
"tsConfig": "src/tsconfig.server.json"
|
||||
},
|
||||
"configurations": {
|
||||
"development": {
|
||||
"outputHashing": "media",
|
||||
"sourceMap": false,
|
||||
"optimization": true,
|
||||
"vendorChunk": true,
|
||||
"buildOptimizer": true
|
||||
"optimization": true
|
||||
},
|
||||
"test": {
|
||||
"outputHashing": "media",
|
||||
|
|
@ -296,8 +273,7 @@
|
|||
}
|
||||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true,
|
||||
"buildOptimizer": true
|
||||
"optimization": true
|
||||
},
|
||||
"beta": {
|
||||
"outputHashing": "media",
|
||||
|
|
@ -308,8 +284,7 @@
|
|||
}
|
||||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true,
|
||||
"buildOptimizer": true
|
||||
"optimization": true
|
||||
},
|
||||
"production": {
|
||||
"outputHashing": "media",
|
||||
|
|
@ -320,11 +295,9 @@
|
|||
}
|
||||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true,
|
||||
"buildOptimizer": true
|
||||
"optimization": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"defaultConfiguration": ""
|
||||
},
|
||||
"serve-ssr": {
|
||||
"builder": "@nguniversal/builders:ssr-dev-server",
|
||||
|
|
@ -370,11 +343,18 @@
|
|||
"devServerTarget": "explore:serve:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"lint": {
|
||||
"builder": "@angular-devkit/build-angular:tslint",
|
||||
"options": {
|
||||
"tsConfig": "e2e/tsconfig.e2e.json",
|
||||
"exclude": [
|
||||
"**/node_modules/**"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"cli": {
|
||||
"analytics": false
|
||||
}
|
||||
"defaultProject": "explore"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
"build-dev": "ng build --configuration=development",
|
||||
"build-test": "ng build --configuration=test",
|
||||
"build-beta": "ng build --configuration=beta",
|
||||
"build-prod": "ng build --configuration production",
|
||||
"build-prod": "ng build --prod",
|
||||
"webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/explore/browser/stats.json --host 0.0.0.0",
|
||||
"test": "ng test",
|
||||
"e2e": "ng e2e",
|
||||
|
|
@ -19,47 +19,45 @@
|
|||
"build:ssr-beta": "npm run build-beta && ng run explore:server:beta",
|
||||
"build:ssr-prod": "npm run build-prod && ng run explore:server:production",
|
||||
"prerender": "ng run explore:prerender",
|
||||
"after-build-clean": "rm -rf dist/explore/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules .angular src/assets/common-assets/.git/ .git .idea"
|
||||
"after-build-clean": "rm -rf dist/explore/browser/assets/common-assets/.git/ src/app/openaireLibrary/.git node_modules src/assets/common-assets/.git/ .git .idea"
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^16.1.7",
|
||||
"@angular/cdk": "^16.1.6",
|
||||
"@angular/common": "^16.1.7",
|
||||
"@angular/compiler": "^16.1.7",
|
||||
"@angular/core": "^16.1.7",
|
||||
"@angular/forms": "^16.1.7",
|
||||
"@angular/localize": "^16.1.7",
|
||||
"@angular/material": "^16.1.6",
|
||||
"@angular/platform-browser": "^16.1.7",
|
||||
"@angular/platform-browser-dynamic": "^16.1.7",
|
||||
"@angular/platform-server": "^16.1.7",
|
||||
"@angular/router": "^16.1.7",
|
||||
"@nguniversal/express-engine": "^16.1.1",
|
||||
"@angular/animations": "~11.2.14",
|
||||
"@angular/cdk": "^11.2.13",
|
||||
"@angular/common": "~11.2.14",
|
||||
"@angular/compiler": "~11.2.14",
|
||||
"@angular/core": "~11.2.14",
|
||||
"@angular/forms": "~11.2.14",
|
||||
"@angular/localize": "^11.2.14",
|
||||
"@angular/material": "^11.2.13",
|
||||
"@angular/platform-browser": "~11.2.14",
|
||||
"@angular/platform-browser-dynamic": "~11.2.14",
|
||||
"@angular/platform-server": "~11.2.14",
|
||||
"@angular/router": "~11.2.14",
|
||||
"@nguniversal/express-engine": "^11.2.1",
|
||||
"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",
|
||||
"ng-recaptcha": "^7.0.1",
|
||||
"prom-client": "^11.3.0",
|
||||
"rxjs": "^6.5.1",
|
||||
"ts-md5": "^1.2.0",
|
||||
"tslib": "^2.0.0",
|
||||
"uikit": "3.16.24",
|
||||
"zone.js": "~0.13.1"
|
||||
"zone.js": "~0.10.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "^16.1.6",
|
||||
"@angular/cli": "^16.1.6",
|
||||
"@angular/compiler-cli": "^16.1.7",
|
||||
"@angular/language-service": "^16.1.7",
|
||||
"@nguniversal/builders": "^16.1.1",
|
||||
"@types/compression": "^1.7.0",
|
||||
"@angular-devkit/build-angular": "~0.1102.13",
|
||||
"@angular/cli": "~11.2.13",
|
||||
"@angular/compiler-cli": "~11.2.14",
|
||||
"@angular/language-service": "~11.2.14",
|
||||
"@nguniversal/builders": "^11.2.1",
|
||||
"@types/express": "^4.17.0",
|
||||
"@types/compression": "^1.7.0",
|
||||
"@types/node": "^12.11.1",
|
||||
"@types/jasmine": "~3.6.0",
|
||||
"@types/jasminewd2": "~2.0.3",
|
||||
"@types/node": "^16.18.50",
|
||||
"codelyzer": "^6.0.0",
|
||||
"jasmine-core": "~3.8.0",
|
||||
"jasmine-spec-reporter": "~5.0.0",
|
||||
|
|
@ -70,6 +68,6 @@
|
|||
"karma-jasmine-html-reporter": "^1.6.0",
|
||||
"protractor": "~7.0.0",
|
||||
"ts-node": "~7.0.0",
|
||||
"typescript": "~4.9.5"
|
||||
"typescript": "~4.0.7"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -13,8 +13,6 @@ export const routes = [
|
|||
'/participate/deposit-subject-result',
|
||||
'/participate/deposit-publications',
|
||||
'/participate/deposit-publications-result',
|
||||
'/participate/deposit/learn-how',
|
||||
'/participate/deposit/search',
|
||||
'/search/find/research-outcomes',
|
||||
'/search/find',
|
||||
'/search/find/publications',
|
||||
|
|
@ -42,9 +40,4 @@ export const routes = [
|
|||
'/claims',
|
||||
'/participate/claim',
|
||||
'/participate/direct-claim',
|
||||
'/my-orcid-links',
|
||||
'/sdgs',
|
||||
'/fields-of-science',
|
||||
'/funders',
|
||||
'/contact-us',
|
||||
];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import 'zone.js/node';
|
||||
import 'zone.js/dist/zone-node';
|
||||
|
||||
import { ngExpressEngine } from '@nguniversal/express-engine';
|
||||
import * as express from 'express';
|
||||
|
|
@ -39,7 +39,6 @@ export function app() {
|
|||
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
|
||||
server.engine('html', ngExpressEngine({
|
||||
bootstrap: AppServerModule,
|
||||
inlineCriticalCss: false
|
||||
}));
|
||||
|
||||
server.set('view engine', 'html');
|
||||
|
|
@ -57,29 +56,6 @@ export function app() {
|
|||
res.end(register.metrics());
|
||||
});
|
||||
|
||||
server.get('/health-check', async (_req, res, _next) => {
|
||||
var uptime = process.uptime();
|
||||
const date = new Date(uptime*1000);
|
||||
const days = date.getUTCDate() - 1,
|
||||
hours = date.getUTCHours(),
|
||||
minutes = date.getUTCMinutes(),
|
||||
seconds = date.getUTCSeconds(),
|
||||
milliseconds = date.getUTCMilliseconds();
|
||||
|
||||
|
||||
const healthcheck = {
|
||||
uptime: days + " days, " + hours + " hours, " + minutes + " minutes, " + seconds + " seconds, " + milliseconds + " milliseconds",
|
||||
message: 'OK',
|
||||
timestamp: new Date()
|
||||
};
|
||||
try {
|
||||
res.send(healthcheck);
|
||||
} catch (error) {
|
||||
healthcheck.message = error;
|
||||
res.status(503).send();
|
||||
}
|
||||
});
|
||||
|
||||
// All regular routes use the Universal engine
|
||||
server.get('*', (req, res) => {
|
||||
if (routes.indexOf(req.path) !== -1) {
|
||||
|
|
|
|||
|
|
@ -1,50 +1,55 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule, Routes} from '@angular/router';
|
||||
import {PreloadAllModules, 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: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)},
|
||||
//{ path: 'home', loadChildren: './home/home.module#HomeModule'},
|
||||
{path: 'home', redirectTo: '', pathMatch: 'full'},
|
||||
{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}},
|
||||
{path: 'mail-preferences', loadChildren: () => import('./userEmailPreferences/mailPrefs.module').then(m => m.LibMailPrefsModule)},
|
||||
// ORCID Pages
|
||||
{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)},
|
||||
{path: 'orcid', loadChildren: () => import('./orcid/orcid.module').then(m => m.LibOrcidModule)},
|
||||
{path: 'my-orcid-links', loadChildren: () => import('./orcid/my-orcid-links/myOrcidLinks.module').then(m => m.LibMyOrcidLinksModule)},
|
||||
// Landing Pages
|
||||
{path: 'search/result', loadChildren: () => import('./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/result', loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule)},
|
||||
{path: 'search/publication', loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule)},
|
||||
{path: 'search/dataset', loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule)},
|
||||
{path: 'search/software', loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule)},
|
||||
{path: 'search/other', loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule)},
|
||||
{path: 'search/project', loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule)},
|
||||
{
|
||||
path: 'search/dataprovider',
|
||||
loadChildren: () => import('./openaireLibrary/landingPages/dataProvider/dataProvider.module').then(m => m.DataProviderModule),
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
|
||||
loadChildren: () => import('././landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule)
|
||||
},
|
||||
{
|
||||
path: 'search/organization',
|
||||
loadChildren: () => import('./openaireLibrary/landingPages/organization/organization.module').then(m => m.OrganizationModule),
|
||||
data: {hasQuickContact: false, hasMenuSearchBar: true, community: 'openaire'}
|
||||
loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule)
|
||||
},
|
||||
|
||||
// Search Pages
|
||||
{
|
||||
path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
|
||||
path: 'project-report',
|
||||
loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
|
||||
},
|
||||
// Search Pages
|
||||
{path: 'search/find', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)},
|
||||
{
|
||||
path: 'search/find/research-outcomes',
|
||||
loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
|
||||
},
|
||||
{path: 'search/find/publications', component: PageURLResolverComponent},
|
||||
{path: 'search/find/datasets', component: PageURLResolverComponent},
|
||||
{path: 'search/find/software', component: PageURLResolverComponent},
|
||||
{path: 'search/find/other', component: PageURLResolverComponent},
|
||||
{path: 'search/find/projects', loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)},
|
||||
{
|
||||
path: 'search/find/:entity', loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
|
||||
path: 'search/find/dataproviders',
|
||||
loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find/organizations',
|
||||
loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
|
||||
},
|
||||
|
||||
// Advanced Search Pages
|
||||
{
|
||||
path: 'search/advanced/research-outcomes',
|
||||
|
|
@ -71,14 +76,14 @@ const routes: Routes = [
|
|||
path: 'search/content-providers',
|
||||
loadChildren: () => import('./searchPages/dataProviders/compatibleDataProviders.module').then(m => m.LibCompatibleDataProvidersModule)
|
||||
},
|
||||
{path: 'search/content-providers-table', redirectTo: 'search/content-providers', pathMatch: 'full'},
|
||||
{path: 'search/content-providers-table', redirectTo: 'search/content-providers'},
|
||||
{
|
||||
path: 'search/entity-registries',
|
||||
loadChildren: () => import('./searchPages/dataProviders/entityRegistries.module').then(m => m.LibEntityRegistriesModule)
|
||||
},
|
||||
{path: 'search/entity-registries-table', redirectTo: 'search/entity-registries', pathMatch: 'full'},
|
||||
{path: 'search/entity-registries-table', redirectTo: 'search/entity-registries'},
|
||||
{path: 'search/journals', loadChildren: () => import('./searchPages/dataProviders/journals.module').then(m => m.LibJournalsModule)},
|
||||
{path: 'search/journals-table', redirectTo: 'search/journals', pathMatch: 'full'},
|
||||
{path: 'search/journals-table', redirectTo: 'search/journals'},
|
||||
// Deposit Pages
|
||||
{path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{path: 'participate/deposit-datasets-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
|
|
@ -100,10 +105,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('./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}
|
||||
{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}
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
|
|
|
|||
|
|
@ -1,9 +1,12 @@
|
|||
import {AfterViewInit, ChangeDetectorRef, Component, ElementRef, ViewChild} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Component} from '@angular/core';
|
||||
import {ActivatedRoute, NavigationStart, Router} from '@angular/router';
|
||||
|
||||
import {EnvProperties} from './openaireLibrary/utils/properties/env-properties';
|
||||
import {MenuItem} from './openaireLibrary/sharedComponents/menu';
|
||||
import {MenuItem, RootMenuItem} from './openaireLibrary/sharedComponents/menu';
|
||||
import {EnvironmentSpecificService} from './openaireLibrary/utils/properties/environment-specific.service';
|
||||
|
||||
import {Session, User} from './openaireLibrary/login/utils/helper.class';
|
||||
import {HelperFunctions} from "./openaireLibrary/utils/HelperFunctions.class";
|
||||
import {UserManagementService} from "./openaireLibrary/services/user-management.service";
|
||||
import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service";
|
||||
import {Header} from "./openaireLibrary/sharedComponents/navigationBar.component";
|
||||
|
|
@ -12,39 +15,21 @@ import {Meta} from "@angular/platform-browser";
|
|||
import {properties} from "../environments/environment";
|
||||
import {SmoothScroll} from "./openaireLibrary/utils/smooth-scroll";
|
||||
import {SEOService} from "./openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {OpenaireEntities} from "./openaireLibrary/utils/properties/searchFields";
|
||||
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
|
||||
import {QuickContactComponent} from './openaireLibrary/sharedComponents/quick-contact/quick-contact.component';
|
||||
import {EmailService} from './openaireLibrary/utils/email/email.service';
|
||||
import {Composer} from "./openaireLibrary/utils/email/composer";
|
||||
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: `
|
||||
<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'"
|
||||
[logoURL]="properties.domain+properties.baseLink+'/assets/common-assets/logo-small-explore.png'"
|
||||
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.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>-->
|
||||
<div class="custom-main-content">
|
||||
<main>
|
||||
<router-outlet></router-outlet>
|
||||
</main>
|
||||
|
|
@ -54,266 +39,44 @@ import {ISVocabulariesService} from "./openaireLibrary/utils/staticAutoComplete/
|
|||
Cookies are small pieces of data that websites store in your browser to allow us to give you the best browsing
|
||||
experience possible.</span>
|
||||
By using the OpenAIRE portal you accept our use of cookies. <a
|
||||
href="https://www.openaire.eu/privacy-policy#cookies" target="_blank"> Read more <span class="uk-icon">
|
||||
href="//ec.europa.eu/ipg/basics/legal/cookies/index_en.htm" target="_blank"> Read more <span class="uk-icon">
|
||||
<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg" icon="chevron-right"
|
||||
ratio="1"><polyline fill="none" stroke="#000" stroke-width="1.03" points="7 4 13 10 7 16"></polyline></svg>
|
||||
</span></a>
|
||||
</cookie-law>
|
||||
<bottom id="bottom" #bottom *ngIf="isClient && properties" [properties]="properties"></bottom>
|
||||
<quick-contact #quickContact *ngIf="bottomNotIntersecting && displayQuickContact && showQuickContact && contactForm" (sendEmitter)="send($event)"
|
||||
[contactForm]="contactForm" [sending]="sending" [contact]="'Help'" class="uk-visible@m"></quick-contact>
|
||||
<modal-alert #modal [overflowBody]="false"></modal-alert>
|
||||
<bottom *ngIf="isClient && properties" [properties]="properties"></bottom>
|
||||
`
|
||||
})
|
||||
export class AppComponent implements AfterViewInit {
|
||||
loading: boolean = false;
|
||||
rootClass: string;
|
||||
export class AppComponent {
|
||||
isClient: boolean = false;
|
||||
userMenuItems: MenuItem[] = [];
|
||||
menuItems: MenuItem [] = [];
|
||||
menuItems: RootMenuItem [] = [];
|
||||
feedbackmail: string;
|
||||
properties: EnvProperties = properties;
|
||||
user: User;
|
||||
header: Header;
|
||||
/* Contact */
|
||||
public showQuickContact: boolean;
|
||||
public bottomNotIntersecting: boolean;
|
||||
public displayQuickContact: boolean; // intersecting with specific section in home page
|
||||
public contactForm: FormGroup;
|
||||
public sending: boolean = false;
|
||||
@ViewChild('quickContact') quickContact: QuickContactComponent;
|
||||
@ViewChild('modal') modal: AlertModal;
|
||||
@ViewChild('bottom', {read: ElementRef}) bottom: ElementRef;
|
||||
|
||||
logoPath: string = 'assets/common-assets/';
|
||||
subscriptions = [];
|
||||
|
||||
constructor(private route: ActivatedRoute, private propertiesService: EnvironmentSpecificService,
|
||||
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 ISVocabulariesService: ISVocabulariesService) {
|
||||
private configurationService: ConfigurationService, private _meta: Meta, private seoService: SEOService,) {
|
||||
this.userMenuItems.push(new MenuItem("", "My profile", "", "", false, [], [], {}));
|
||||
this.userMenuItems.push(new MenuItem("", "My ORCID links", "", "/my-orcid-links", false, [], [""], {}));
|
||||
this.userMenuItems.push(new MenuItem("", "My links", "", "/myclaims", false, [], ["/myclaims"], {}));
|
||||
|
||||
this.subscriptions.push(router.events.forEach((event) => {
|
||||
if (event instanceof NavigationStart) {
|
||||
HelperFunctions.scroll();
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
// 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;
|
||||
}
|
||||
this.configurationService.initPortal(this.properties, this.properties.adminToolsCommunity);
|
||||
this.configurationService.initCommunityInformation(this.properties, this.properties.adminToolsCommunity);
|
||||
this.feedbackmail = this.properties.feedbackmail;
|
||||
if (this.properties.environment == "production" || this.properties.environment == "development") {
|
||||
this.subscriptions.push(this.route.queryParams.subscribe(data => {
|
||||
|
|
@ -329,24 +92,11 @@ export class AppComponent implements AfterViewInit {
|
|||
route: "/",
|
||||
url: null,
|
||||
title: 'explore',
|
||||
logoUrl: 'assets/common-assets/logo-services/explore/main.svg',
|
||||
logoSmallUrl: 'assets/common-assets/logo-services/explore/small.svg',
|
||||
logoUrl: this.logoPath + 'logo-large-explore.png',
|
||||
logoSmallUrl: this.logoPath + 'logo-small-explore.png',
|
||||
position: 'left',
|
||||
badge: true
|
||||
};
|
||||
this.reset();
|
||||
}));
|
||||
this.subscriptions.push(this.layoutService.hasQuickContact.subscribe(hasQuickContact => {
|
||||
if(this.showQuickContact !== hasQuickContact) {
|
||||
this.showQuickContact = hasQuickContact;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
}));
|
||||
this.subscriptions.push(this.quickContactService.isDisplayed.subscribe(display => {
|
||||
if(this.displayQuickContact !== display) {
|
||||
this.displayQuickContact = display;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
}));
|
||||
}
|
||||
|
||||
|
|
@ -354,8 +104,6 @@ export class AppComponent implements AfterViewInit {
|
|||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
} else if (typeof IntersectionObserver !== "undefined" && subscription instanceof IntersectionObserver) {
|
||||
subscription.disconnect();
|
||||
}
|
||||
});
|
||||
this.configurationService.clearSubscriptions();
|
||||
|
|
@ -363,94 +111,45 @@ export class AppComponent implements AfterViewInit {
|
|||
this.smoothScroll.clearSubscriptions();
|
||||
}
|
||||
|
||||
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)
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
createObservers() {
|
||||
let options = {
|
||||
root: null,
|
||||
rootMargin: '0px',
|
||||
threshold: 0.1
|
||||
};
|
||||
let intersectionObserver = new IntersectionObserver(entries => {
|
||||
entries.forEach(entry => {
|
||||
if(this.bottomNotIntersecting !== (!entry.isIntersecting)) {
|
||||
this.bottomNotIntersecting = !entry.isIntersecting;
|
||||
this.cdr.detectChanges();
|
||||
}
|
||||
});
|
||||
}, options);
|
||||
intersectionObserver.observe(this.bottom.nativeElement);
|
||||
this.subscriptions.push(intersectionObserver);
|
||||
}
|
||||
|
||||
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"], {});
|
||||
let researchOutcomesMenu = new MenuItem("", "Research Outcomes", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {resultbestaccessright: '"' + encodeURIComponent("Open Access") + '"'});
|
||||
researchOutcomesMenu.items = [
|
||||
new MenuItem("", OpenaireEntities.PUBLICATIONS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("publications") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.DATASETS, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("datasets") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.SOFTWARE, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("software") + '"'}),
|
||||
new MenuItem("", OpenaireEntities.OTHER, "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"'})];
|
||||
new MenuItem("", "Publications", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("publications") + '"'}),
|
||||
new MenuItem("", "Research data", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("datasets") + '"'}),
|
||||
new MenuItem("", "Software", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("software") + '"'}),
|
||||
new MenuItem("", "Other research products", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {type: '"' + encodeURIComponent("other") + '"'})];
|
||||
//TODO add check for research results route
|
||||
this.menuItems = [
|
||||
new MenuItem("search", "Search", "", "/search/find/research-outcomes", false, [], ["/search/find/research-outcomes"], {},
|
||||
null, null, null, null, "_blank", "internal", false,
|
||||
[
|
||||
{
|
||||
rootItem: new MenuItem("search", "Search", "", "/search/find", false, [], ["/search/find"], {qf: true}),
|
||||
items: [
|
||||
researchOutcomesMenu,
|
||||
new MenuItem("", OpenaireEntities.PROJECTS, "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
||||
new MenuItem("", OpenaireEntities.DATASOURCES, "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
||||
new MenuItem("", OpenaireEntities.ORGANIZATIONS, "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
|
||||
new MenuItem("", "Projects", "", "/search/find/projects/", false, ["project"], ["/search/find/projects"], {}),
|
||||
new MenuItem("", "Content Providers", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {}),
|
||||
new MenuItem("", "Organizations", "", "/search/find/organizations/", false, ["organization"], ["/search/find/organizations"], {})
|
||||
]
|
||||
),
|
||||
new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}),
|
||||
new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], {},
|
||||
null, null, null, null, "_blank", "internal", false,
|
||||
[new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], {}),
|
||||
},
|
||||
{
|
||||
rootItem: new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}),
|
||||
//rootItem: new MenuItem("deposit", "Deposit", "", "/participate/deposit/learn-how", false, [], ["/participate/deposit/learn-how"], {}),
|
||||
items: []
|
||||
//rootItem: new MenuItem("share", "Share", "", "", false, [], ["/participate/deposit-publications", "/participate/deposit-datasets"], {}),
|
||||
//items: [new MenuItem("", "Publications", "", "/participate/deposit-publications", false, ["publication"], ["/participate/deposit-publications"], {}),
|
||||
// new MenuItem("", "Research Data", "", "/participate/deposit-datasets", false, ["dataset"], ["/participate/deposit-datasets"], {})]
|
||||
},
|
||||
{
|
||||
rootItem: new MenuItem("link", "Link", "", "/participate/claim", false, [], ["/participate/claim"], {}),
|
||||
items: [new MenuItem("", "Start linking", "", "/participate/claim", false, [], ["/participate/claim"], {}),
|
||||
new MenuItem("", "Learn more", this.properties.claimsInformationLink, "", false, [], [], {})]
|
||||
),
|
||||
new MenuItem("datasources", OpenaireEntities.DATASOURCES, "", "", false, ["datasource"], [], {},
|
||||
null, null, null, null, "_blank", "internal", false,
|
||||
[new MenuItem("", "Data Policies", "https://beta.openaire.eu/oa-policies-mandates", "", false, ["datasource"], [""], {}),
|
||||
},
|
||||
{
|
||||
rootItem: new MenuItem("datasources", "Content Providers", "", "", false, ["datasource"], [], {}),
|
||||
items: [new MenuItem("", "Data Policies", "https://beta.openaire.eu/oa-policies-mandates", "", false, ["datasource"], [""], {}),
|
||||
new MenuItem("", "Repositories", "", "/search/content-providers", false, ["datasource"], ["/search/content-providers"], {}),
|
||||
new MenuItem("", "Journals", "", "/search/journals", false, ["datasource"], ["/search/journals"], {}),
|
||||
new MenuItem("", "Registries", "", "/search/entity-registries", false, ["datasource"], ["/search/entity-registries"], {}),
|
||||
new MenuItem("", "Browse all", "", "/search/find/dataproviders", false, ["datasource"], ["/search/find/dataproviders"], {})]
|
||||
),
|
||||
new MenuItem("funders", "Funders", "", "/funders", false, [], ["/funders"], {}),
|
||||
}
|
||||
];
|
||||
if (Session.isPortalAdministrator(this.user)) {
|
||||
this.userMenuItems.push(new MenuItem("", "Manage all links", "", "/claims", false, [], ["/claims"], {}));
|
||||
|
|
@ -462,66 +161,6 @@ export class AppComponent implements AfterViewInit {
|
|||
if (this.user) {
|
||||
this.userMenuItems.push(new MenuItem("", "User information", "", "/user-info", false, [], [], {}));
|
||||
}
|
||||
}
|
||||
|
||||
public send(event) {
|
||||
if (event.valid === true) {
|
||||
this.sendMail(this.properties.admins);
|
||||
}
|
||||
}
|
||||
|
||||
private sendMail(admins: string[]) {
|
||||
this.sending = true;
|
||||
this.subscriptions.push(this.emailService.contact(this.properties,
|
||||
Composer.composeEmailForExplore(this.contactForm.value, admins),
|
||||
this.contactForm.value.recaptcha).subscribe(
|
||||
res => {
|
||||
if (res) {
|
||||
this.sending = false;
|
||||
this.reset();
|
||||
this.modalOpen();
|
||||
} else {
|
||||
this.handleError('Email <b>sent failed!</b> Please try again.');
|
||||
}
|
||||
},
|
||||
error => {
|
||||
this.handleError('Email <b>sent failed!</b> Please try again.', error);
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
public reset() {
|
||||
if (this.quickContact) {
|
||||
this.quickContact.close();
|
||||
}
|
||||
this.contactForm = this.fb.group({
|
||||
name: this.fb.control('', Validators.required),
|
||||
surname: this.fb.control('', Validators.required),
|
||||
email: this.fb.control('', [Validators.required, Validators.email]),
|
||||
affiliation: this.fb.control(''),
|
||||
message: this.fb.control('', Validators.required),
|
||||
recaptcha: this.fb.control('', Validators.required),
|
||||
});
|
||||
}
|
||||
|
||||
public modalOpen() {
|
||||
this.modal.okButton = true;
|
||||
this.modal.alertTitle = 'Your request has been successfully submitted';
|
||||
this.modal.message = 'Our team will respond to your submission soon.';
|
||||
this.modal.cancelButton = false;
|
||||
this.modal.okButtonLeft = false;
|
||||
this.modal.okButtonText = 'OK';
|
||||
this.modal.open();
|
||||
}
|
||||
|
||||
handleError(message: string, error = null) {
|
||||
if (error) {
|
||||
console.error(error);
|
||||
}
|
||||
this.sending = false;
|
||||
this.quickContact.close();
|
||||
NotificationHandler.rise(message, 'danger');
|
||||
this.contactForm.get('recaptcha').setValue('');
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import {APP_ID, NgModule} from '@angular/core';
|
||||
import {SharedModule} from './openaireLibrary/shared/shared.module';
|
||||
import {BrowserModule} from '@angular/platform-browser';
|
||||
import {NgModule} from '@angular/core';
|
||||
import {SharedModule} from './shared/shared.module';
|
||||
import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser';
|
||||
import {BrowserAnimationsModule} from '@angular/platform-browser/animations';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http';
|
||||
|
|
@ -9,6 +9,7 @@ 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";
|
||||
|
|
@ -16,9 +17,6 @@ import {Schema2jsonldModule} from "./openaireLibrary/sharedComponents/schema2jso
|
|||
import {CacheInterceptorService} from "./openaireLibrary/cache-interceptor.service";
|
||||
import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service";
|
||||
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: [
|
||||
|
|
@ -28,22 +26,19 @@ import {LoadingModule} from "./openaireLibrary/utils/loading/loading.module";
|
|||
ErrorModule,
|
||||
NavigationBarModule, BottomModule,
|
||||
CookieLawModule,
|
||||
BrowserModule,
|
||||
BrowserModule.withServerTransition({ appId: 'explore' }),
|
||||
AppRoutingModule,
|
||||
BrowserAnimationsModule, PageURLResolverModule,
|
||||
Schema2jsonldModule,
|
||||
QuickContactModule,
|
||||
AlertModalModule, LoadingModule
|
||||
BrowserTransferStateModule,
|
||||
BrowserAnimationsModule, PageURLResolverModule, Schema2jsonldModule
|
||||
],
|
||||
declarations: [AppComponent],
|
||||
declarations: [AppComponent, OpenaireErrorPageComponent],
|
||||
exports: [AppComponent],
|
||||
providers: [
|
||||
{provide: APP_ID, useValue: 'explore'},
|
||||
// {
|
||||
// provide: HTTP_INTERCEPTORS,
|
||||
// useClass: CacheInterceptorService,
|
||||
// multi: true
|
||||
// },
|
||||
{
|
||||
provide: HTTP_INTERCEPTORS,
|
||||
useClass: CacheInterceptorService,
|
||||
multi: true
|
||||
},
|
||||
{
|
||||
provide: HTTP_INTERCEPTORS,
|
||||
useClass: HttpInterceptorService,
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {ServerModule} from '@angular/platform-server';
|
||||
import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
|
||||
|
||||
import { AppModule } from './app.module';
|
||||
import { AppComponent } from './app.component';
|
||||
|
|
@ -7,7 +7,8 @@ import { AppComponent } from './app.component';
|
|||
@NgModule({
|
||||
imports: [
|
||||
AppModule,
|
||||
ServerModule
|
||||
ServerModule,
|
||||
ServerTransferStateModule
|
||||
],
|
||||
bootstrap: [AppComponent],
|
||||
})
|
||||
|
|
|
|||
|
|
@ -4,14 +4,13 @@ import { OpenaireClaimsAdminComponent } from './claimsAdmin.component';
|
|||
import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireClaimsAdminComponent, canActivate: [IsRouteEnabled, ClaimsCuratorGuard],
|
||||
data: {redirect: properties.errorLink, community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
|
||||
data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
|
||||
]
|
||||
})
|
||||
export class ClaimsAdminRoutingModule { }
|
||||
|
|
|
|||
|
|
@ -4,17 +4,19 @@ import {properties} from "../../../environments/environment";
|
|||
@Component({
|
||||
selector: 'openaire-claims-admin',
|
||||
template: `
|
||||
<claims-admin *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
|
||||
<claims-admin *ngIf="claimsInfoURL && userInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
|
||||
</claims-admin>
|
||||
`,
|
||||
})
|
||||
export class OpenaireClaimsAdminComponent implements OnInit {
|
||||
claimsInfoURL: string;
|
||||
userInfoURL: string;
|
||||
|
||||
constructor() {
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.claimsInfoURL = properties.claimsInformationLink;
|
||||
this.userInfoURL = properties.userInfoUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,10 +1,13 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
|
||||
import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
||||
import { SharedModule } from '../../shared/shared.module';
|
||||
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: [
|
||||
|
|
@ -12,7 +15,7 @@ import{ ClaimsCuratorGuard} from '../../openaireLibrary/login/claimsCuratorGuar
|
|||
ClaimsAdminRoutingModule,
|
||||
ClaimsAdminModule
|
||||
],
|
||||
providers:[ClaimsCuratorGuard],
|
||||
providers:[ClaimsCuratorGuard, PreviousRouteRecorder,IsRouteEnabled],
|
||||
declarations: [
|
||||
OpenaireClaimsAdminComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -5,14 +5,13 @@ import { OpenaireDirectLinkingComponent } from './directLinking.component';
|
|||
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireDirectLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder]},
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
|
||||
import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
||||
import { SharedModule } from '../../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:[],
|
||||
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
|
||||
declarations: [
|
||||
OpenaireDirectLinkingComponent
|
||||
], exports:[OpenaireDirectLinkingComponent]
|
||||
|
|
|
|||
|
|
@ -4,14 +4,13 @@ import { OpenaireLinkingComponent } from './linkingGeneric.component';
|
|||
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireLinkingComponent, canActivate: [IsRouteEnabled, LoginGuard], data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder]},
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,15 +1,18 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
|
||||
import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
||||
import { SharedModule } from '../../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:[],
|
||||
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
|
||||
declarations: [
|
||||
OpenaireLinkingComponent
|
||||
], exports:[
|
||||
|
|
|
|||
|
|
@ -5,14 +5,13 @@ import {OpenaireMyClaimsComponent } from './myClaims.component';
|
|||
import {LoginGuard} from '../../openaireLibrary/login/loginGuard.guard';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../../openaireLibrary/error/isRouteEnabled.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireMyClaimsComponent, canActivate: [IsRouteEnabled, LoginGuard],
|
||||
data: {redirect: properties.errorLink, community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
|
||||
data: {redirect: '/error', community : 'openaire'}, canDeactivate: [PreviousRouteRecorder]}])
|
||||
]
|
||||
})
|
||||
export class MyClaimsRoutingModule { }
|
||||
|
|
|
|||
|
|
@ -5,18 +5,20 @@ import {properties} from "../../../environments/environment";
|
|||
@Component({
|
||||
selector: 'openaire-my-claims',
|
||||
template: `
|
||||
<my-claims *ngIf="claimsInfoURL" [claimsInfoURL]="claimsInfoURL">
|
||||
<my-claims *ngIf="userInfoURL && claimsInfoURL" [claimsInfoURL]=claimsInfoURL [userInfoURL]="userInfoURL">
|
||||
</my-claims>
|
||||
`
|
||||
|
||||
})
|
||||
export class OpenaireMyClaimsComponent implements OnInit {
|
||||
claimsInfoURL: string;
|
||||
userInfoURL: string;
|
||||
|
||||
constructor() {
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.claimsInfoURL = properties.claimsInformationLink;
|
||||
this.userInfoURL = properties.userInfoUrl;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,13 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
|
||||
import { SharedModule } from '../../openaireLibrary/shared/shared.module';
|
||||
import { SharedModule } from '../../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: [
|
||||
|
|
@ -12,7 +16,7 @@ import{ MyClaimsModule} from '../../openaireLibrary/claims/myClaims/myClaims.mo
|
|||
MyClaimsModule
|
||||
|
||||
],
|
||||
providers:[],
|
||||
providers:[LoginGuard, PreviousRouteRecorder, IsRouteEnabled],
|
||||
declarations: [
|
||||
OpenaireMyClaimsComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
import {ContactComponent} from './contact.component';
|
||||
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: ContactComponent, canActivate: [IsRouteEnabled], canDeactivate: [PreviousRouteRecorder]}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class ContactRoutingModule { }
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<div>
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-section uk-padding-remove-top uk-container uk-container-large uk-flex uk-flex-center"
|
||||
uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
|
||||
<div class="uk-padding-small uk-width-1-2@l uk-width-2-3@m uk-width-1-1">
|
||||
<contact-us #contactUs [sending]="sending" [scrollspy]="true"
|
||||
[contactForm]="contactForm" (sendEmitter)="send($event)">
|
||||
<h1 page-title class="uk-margin-auto uk-text-center" uk-scrollspy-class>
|
||||
Contact us to <br> learn more<span class="uk-text-primary">.</span>
|
||||
</h1>
|
||||
</contact-us>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<modal-alert #modal (alertOutput)="goToHome()">
|
||||
Our team will respond to your submission soon.<br>
|
||||
Press OK to redirect to OpenAIRE Explore home page.
|
||||
</modal-alert>
|
||||
|
|
@ -1,157 +0,0 @@
|
|||
import {Component, OnInit, ViewChild} from '@angular/core';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {EmailService} from "../openaireLibrary/utils/email/email.service";
|
||||
import {Email} from "../openaireLibrary/utils/email/email";
|
||||
import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
|
||||
import {Composer} from "../openaireLibrary/utils/email/composer";
|
||||
import {Meta, Title} from "@angular/platform-browser";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {HelperFunctions} from "../openaireLibrary/utils/HelperFunctions.class";
|
||||
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {FormBuilder, FormGroup, Validators} from "@angular/forms";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {Subscriber} from "rxjs";
|
||||
import {properties} from "../../environments/environment";
|
||||
import {NotificationHandler} from "../openaireLibrary/utils/notification-handler";
|
||||
import {ContactUsComponent} from "../openaireLibrary/contact-us/contact-us.component";
|
||||
|
||||
@Component({
|
||||
selector: 'contact',
|
||||
templateUrl: './contact.component.html',
|
||||
})
|
||||
|
||||
export class ContactComponent implements OnInit {
|
||||
public url: string = null;
|
||||
public pageTitle: string = "OpenAIRE - Explore | Contact Us";
|
||||
public description: string = "Contact us to learn more about OpenAIRE Explore";
|
||||
public sending = true;
|
||||
public email: Email;
|
||||
public properties: EnvProperties = properties;
|
||||
public pageContents = null;
|
||||
public divContents = null;
|
||||
public breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'Contact us'}];
|
||||
public contactForm: FormGroup;
|
||||
@ViewChild('modal') modal;
|
||||
private subscriptions = [];
|
||||
@ViewChild('contactUs') contactUsComponent : ContactUsComponent;
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
constructor(private route: ActivatedRoute,
|
||||
private _router: Router,
|
||||
private _emailService: EmailService,
|
||||
private _meta: Meta,
|
||||
private _title: Title,
|
||||
private seoService: SEOService,
|
||||
private _piwikService: PiwikService,
|
||||
private fb: FormBuilder,
|
||||
private helper: HelperService) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this._title.setTitle('OpenAIRE - Explore | Contact Us');
|
||||
|
||||
this.email = {body: '', subject: '', recipients: []};
|
||||
this.subscriptions.push( this._piwikService.trackView(this.properties, this.pageTitle).subscribe());
|
||||
this.url = this.properties.domain + this._router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription(this.description);
|
||||
this.reset();
|
||||
// this.getPageContents();
|
||||
this.sending = false;
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'explore', this._router.url).subscribe(contents => {
|
||||
this.pageContents = contents;
|
||||
}));
|
||||
}
|
||||
|
||||
public send(event) {
|
||||
HelperFunctions.scroll();
|
||||
if(event.valid === true) {
|
||||
this.sendMail(this.properties.admins);
|
||||
}
|
||||
}
|
||||
|
||||
public reset() {
|
||||
this.contactForm = this.fb.group( {
|
||||
name: this.fb.control('', Validators.required),
|
||||
surname: this.fb.control('', Validators.required),
|
||||
email: this.fb.control('', [Validators.required, Validators.email]),
|
||||
affiliation: this.fb.control(''),
|
||||
message: this.fb.control('', Validators.required),
|
||||
recaptcha: this.fb.control('', Validators.required),
|
||||
});
|
||||
if(this.contactUsComponent) {
|
||||
this.contactUsComponent.resetRecaptcha();
|
||||
}
|
||||
}
|
||||
|
||||
private sendMail(admins: any) {
|
||||
this.sending = true;
|
||||
this.subscriptions.push(this._emailService.contact(this.properties,
|
||||
Composer.composeEmailForExplore(this.contactForm.value, admins),
|
||||
this.contactForm.value.recaptcha).subscribe(
|
||||
res => {
|
||||
if (res) {
|
||||
this.sending = false;
|
||||
this.reset();
|
||||
this.modalOpen();
|
||||
} else {
|
||||
this.handleError('Email <b>sent failed!</b> Please try again.');
|
||||
}
|
||||
},
|
||||
error => {
|
||||
this.handleError('Email sent failed! Please try again.', error);
|
||||
}
|
||||
));
|
||||
}
|
||||
|
||||
public modalOpen() {
|
||||
this.modal.okButton = true;
|
||||
this.modal.alertTitle = 'Your request has been successfully submitted';
|
||||
this.modal.alertMessage = false;
|
||||
this.modal.cancelButton = false;
|
||||
this.modal.okButtonLeft = false;
|
||||
this.modal.okButtonText = 'OK';
|
||||
this.modal.open();
|
||||
}
|
||||
|
||||
handleError(message: string, error = null) {
|
||||
if(error) {
|
||||
console.error(error);
|
||||
}
|
||||
NotificationHandler.rise(message, 'danger');
|
||||
this.sending = false;
|
||||
this.contactForm.get('recaptcha').setValue('');
|
||||
}
|
||||
|
||||
public goToHome() {
|
||||
this._router.navigate(['/']);
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
}
|
||||
|
||||
private updateTitle(title: string) {
|
||||
var _title = ((title.length > 50) ? title.substring(0, 50) : title);
|
||||
this._title.setTitle(_title);
|
||||
this._meta.updateTag({content: _title}, "property='og:title'");
|
||||
}
|
||||
|
||||
private updateUrl(url: string) {
|
||||
this._meta.updateTag({content: url}, "property='og:url'");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {ContactComponent} from './contact.component';
|
||||
import {ContactRoutingModule} from "./contact-routing.module";
|
||||
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
||||
import {HelperModule} from "../openaireLibrary/utils/helper/helper.module";
|
||||
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";
|
||||
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
|
||||
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
ContactRoutingModule, CommonModule, RouterModule,
|
||||
AlertModalModule, HelperModule,
|
||||
Schema2jsonldModule, SEOServiceModule, ContactUsModule, BreadcrumbsModule, LoadingModule
|
||||
],
|
||||
declarations: [
|
||||
ContactComponent
|
||||
],
|
||||
providers: [],
|
||||
exports: [
|
||||
ContactComponent
|
||||
]
|
||||
})
|
||||
|
||||
export class ContactModule { }
|
||||
|
|
@ -3,13 +3,12 @@ import { RouterModule } from '@angular/router';
|
|||
import { OpenaireDepositComponent } from './deposit.component';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireDepositComponent, canActivate: [IsRouteEnabled], data: {
|
||||
redirect: properties.errorLink
|
||||
redirect: '/error'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import {Component, OnDestroy, OnInit} from '@angular/core';
|
||||
import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service";
|
||||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-deposit',
|
||||
|
|
@ -8,17 +7,11 @@ import {LayoutService} from "../openaireLibrary/dashboard/sharedComponents/sideb
|
|||
`
|
||||
})
|
||||
|
||||
export class OpenaireDepositComponent implements OnInit, OnDestroy {
|
||||
export class OpenaireDepositComponent {
|
||||
|
||||
constructor(private layoutService: LayoutService) {
|
||||
constructor() {
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.layoutService.setRootClass('deposit');
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.layoutService.setRootClass(null);
|
||||
}
|
||||
public ngOnInit() {}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,12 +2,17 @@ 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";
|
||||
|
||||
import {ZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/zenodo-communities.service";
|
||||
import {CommunityService} from "../openaireLibrary/connect/community/community.service";
|
||||
import {SearchZenodoCommunitiesService} from "../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunities.service";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
|
|
@ -20,8 +25,7 @@ import {CommunityService} from "../openaireLibrary/connect/community/community.s
|
|||
exports: [
|
||||
OpenaireDepositComponent,
|
||||
],
|
||||
providers: [
|
||||
ZenodoCommunitiesService, CommunityService
|
||||
]
|
||||
providers: [PreviousRouteRecorder, IsRouteEnabled,
|
||||
ZenodoCommunitiesService, CommunityService, SearchZenodoCommunitiesService]
|
||||
})
|
||||
export class LibDepositModule { }
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ import { RouterModule } from '@angular/router';
|
|||
import { OpenaireSearchDataprovidersToDepositComponent } from './searchDataprovidersToDeposit.component';
|
||||
import {PreviousRouteRecorder} from '../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {IsRouteEnabled} from '../openaireLibrary/error/isRouteEnabled.guard'
|
||||
import {properties} from "../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchDataprovidersToDepositComponent, canActivate: [IsRouteEnabled], data: {
|
||||
redirect: properties.errorLink
|
||||
redirect: '/error'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -6,15 +6,19 @@ 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 {SearchZenodoCommunitiesServiceModule} from '../openaireLibrary/connect/zenodoCommunities/searchZenodoCommunitiesService.module';
|
||||
|
||||
import {CommunityService} from '../openaireLibrary/connect/community/community.service';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
CommonModule, FormsModule,
|
||||
SearchDataprovidersToDepositRoutingModule,
|
||||
SearchDataprovidersToDepositModule,
|
||||
ZenodoCommunitiesServiceModule
|
||||
SearchDataprovidersToDepositRoutingModule,
|
||||
ZenodoCommunitiesServiceModule, SearchZenodoCommunitiesServiceModule
|
||||
],
|
||||
declarations: [
|
||||
OpenaireSearchDataprovidersToDepositComponent
|
||||
|
|
@ -22,6 +26,6 @@ import {CommunityService} from '../openaireLibrary/connect/community/community.s
|
|||
exports: [
|
||||
OpenaireSearchDataprovidersToDepositComponent,
|
||||
],
|
||||
providers: [CommunityService]
|
||||
providers: [PreviousRouteRecorder, IsRouteEnabled, CommunityService]
|
||||
})
|
||||
export class LibSearchDataprovidersToDepositModule { }
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-error',
|
||||
template: `
|
||||
<error></error>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireErrorPageComponent {
|
||||
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {FundersComponent} from './funders.component';
|
||||
import {IsRouteEnabled} from "../openaireLibrary/error/isRouteEnabled.guard";
|
||||
import {PreviousRouteRecorder} from "../openaireLibrary/utils/piwik/previousRouteRecorder.guard";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{
|
||||
path: '', component: FundersComponent,
|
||||
canActivate: [IsRouteEnabled],
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class FundersRoutingModule { }
|
||||
|
|
@ -1,377 +0,0 @@
|
|||
<schema2jsonld *ngIf="url" [URL]="url" [name]="pageTitle" type="other" [description]="pageDescription"></schema2jsonld>
|
||||
<div class="funders">
|
||||
<div class="uk-background-muted">
|
||||
<div class="uk-container uk-container-large uk-section uk-section-small uk-padding-remove-bottom">
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal">
|
||||
<breadcrumbs [breadcrumbs]="breadcrumbs"></breadcrumbs>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-container uk-container-large uk-section" uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
|
||||
<div class="uk-grid uk-grid-large uk-grid-stack uk-flex-middle uk-padding-small" uk-grid>
|
||||
<div class="uk-width-1-2@m uk-width-1-1 uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-align-left uk-margin-remove-bottom uk-flex uk-flex-middle">
|
||||
<span class="custom-coins-dot"></span>
|
||||
<span uk-scrollspy-class class="uk-text-large funders-title">Funders</span>
|
||||
</span>
|
||||
<div style="max-width: 600px;">
|
||||
<h1 uk-scrollspy-class class="uk-h1 uk-margin-remove-top">
|
||||
<span>Be an integral part of the open R&I ecosystem<span class="custom-handshake-dot"></span></span>
|
||||
</h1>
|
||||
<div uk-scrollspy-class>
|
||||
Welcome to the Funders’ page on OpenAIRE Explore. Discover key details about each funder, their commitment to open access, and the impactful research they enable. Our aim? To foster transparency, inspire collaboration.
|
||||
<!-- Welcome to the Funders' page on OpenAIRE Explore. This dedicated hub spotlights our ever-growing extensive network of funding partners:
|
||||
{{formatNumber(projectsNumber)}} grants from
|
||||
{{formatNumber(fundersNumber)}} funders currently linked to
|
||||
{{formatNumber(researchProductsNumber)}} funded research outputs.
|
||||
Discover key details about each funder, their commitment to open access, and the impactful research they enable.
|
||||
Our aim? To foster transparency, inspire collaboration. -->
|
||||
</div>
|
||||
<div class="uk-margin-medium-top" uk-scrollspy-class>
|
||||
<a class="uk-button uk-button-primary uk-text-uppercase" target="_blank" href="https://www.openaire.eu/funders-how-to-join-guide">
|
||||
Join Us
|
||||
</a>
|
||||
</div>
|
||||
<div *ngIf="showContentWithNumbers" class="uk-margin-medium-top" uk-scrollspy-class>
|
||||
<div class="uk-grid uk-grid-divider" uk-grid>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-h4 uk-text-primary uk-margin-xsmall-bottom">
|
||||
{{formatNumber(projectsNumber)}}+
|
||||
</span>
|
||||
<span class="uk-text-uppercase">
|
||||
grants
|
||||
</span>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-h4 uk-text-primary uk-margin-xsmall-bottom">
|
||||
{{formatNumber(fundersNumber)}}
|
||||
</span>
|
||||
<span class="uk-text-uppercase">
|
||||
funders
|
||||
</span>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-column uk-flex-center">
|
||||
<span class="uk-h4 uk-text-primary uk-margin-xsmall-bottom">
|
||||
{{formatNumber(researchProductsNumber)}}+
|
||||
</span>
|
||||
<span class="uk-text-uppercase">
|
||||
funded research outputs
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-1-2@m uk-width-1-1 uk-text-center" uk-scrollspy-class>
|
||||
<img src="assets/explore-assets/funders/funders.png" alt="Funders advertisement image">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<ng-container *ngIf="showLoading">
|
||||
<div class="uk-container uk-container-large uk-section">
|
||||
<loading></loading>
|
||||
</div>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="!showLoading && funders?.length">
|
||||
<div class="uk-container uk-container-large">
|
||||
<div id="target" class="uk-section uk-padding-remove-top uk-margin-top" uk-height-match="target: .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">
|
||||
<div class="uk-width-small uk-margin-medium-right">
|
||||
<div input
|
||||
type="select" placeholder="Show" inputClass="border-bottom"
|
||||
[options]="showOptions" [(value)]="show" (valueChange)="filtering()">
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-small uk-margin-medium-right">
|
||||
<div input
|
||||
type="select" placeholder="Sort by" inputClass="border-bottom"
|
||||
[options]="sortOptions" [(value)]="sortBy" (valueChange)="sortByChanged()">
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-width-xsmall">
|
||||
<div input
|
||||
type="select" placeholder="Results per page" inputClass="border-bottom"
|
||||
[options]="pageOptions" [(value)]="pageSize" (valueChange)="sizeChanged($event)">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-middle uk-width-auto@m uk-width-1-1 uk-margin-top">
|
||||
<div search-input [searchControl]="keywordControl" searchInputClass="border-bottom" iconPosition="right"
|
||||
placeholder="Search funder" [disabled]="showLoading" class="uk-width-auto@m uk-width-medium@s uk-width-1-1">
|
||||
</div>
|
||||
<div class="uk-visible@m uk-flex uk-flex-middle uk-margin-medium-left">
|
||||
<a (click)="gridView = true"
|
||||
class="uk-link-reset custom-view-button" [ngClass]="gridView ? 'active' : ''">
|
||||
<icon [name]="'apps'" [ratio]="1.5" [type]="'round'" [flex]="true"></icon>
|
||||
</a>
|
||||
<a (click)="gridView = false"
|
||||
class="uk-link-reset custom-view-button uk-margin-xsmall-left" [ngClass]="gridView ? '' : 'active'">
|
||||
<icon [name]="'view_list'" [ratio]="1.5" [type]="'round'" [flex]="true"></icon>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="uk-margin-large-bottom" uk-height-match="target: .name;">
|
||||
<div *ngIf="!displayedFunders || displayedFunders?.length == 0" class="uk-text-center uk-margin-large-top">
|
||||
No funders available
|
||||
</div>
|
||||
<div class="uk-grid uk-grid-match uk-padding-small" [ngClass]="gridView ? 'uk-child-width-1-2@m uk-child-width-1-3@l' : 'uk-child-width-1-1'"
|
||||
uk-grid uk-height-match="target: .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">
|
||||
<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>
|
||||
<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-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" loading="lazy">
|
||||
<ng-template #elseBlock>
|
||||
<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-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>
|
||||
<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" >
|
||||
<span>{{funder.name}}</span>
|
||||
</ng-container>
|
||||
</div>
|
||||
<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>
|
||||
</div>
|
||||
</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>
|
||||
<!-- 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>
|
||||
{{funder.projects | number}}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
<!-- Research products -->
|
||||
<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>
|
||||
{{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>
|
||||
<!-- funder's card for LIST view -->
|
||||
<ng-template #elseBlock>
|
||||
<div class="uk-card uk-card-default uk-card-hover uk-padding-small funder-list">
|
||||
<div class="uk-grid uk-grid-divider uk-grid-small" uk-grid>
|
||||
<div class="uk-width-expand uk-flex uk-flex-middle">
|
||||
<div class="uk-width-1-6 uk-flex uk-flex-middle uk-flex-center">
|
||||
<img *ngIf="funder.logoUrl; else elseBlock" [src]="funder | logoUrl" [alt]="funder.name + ' logo'" class="uk-height-max-xsmall uk-blend-multiply" loading="lazy">
|
||||
<ng-template #elseBlock>
|
||||
<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-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">
|
||||
<span>{{funder.name}}</span>
|
||||
</ng-container>
|
||||
<ng-container *ngIf="funder.shortName" >
|
||||
<span class="uk-text-uppercase">
|
||||
({{funder.shortName}})
|
||||
</span>
|
||||
</ng-container>
|
||||
</div>
|
||||
</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.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.':'')+'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>
|
||||
{{funder.projects | number}}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<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>
|
||||
{{funder.researchProducts | number}}
|
||||
</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<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]="0.8"></icon>
|
||||
</span>
|
||||
<span class="uk-text-large uk-text-bold">{{funder.openAccessPercentage}}%</span>
|
||||
</div>
|
||||
</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>
|
||||
</div>
|
||||
</ng-template>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<paging-no-load *ngIf="displayedFunders.length > pageSize"
|
||||
(pageChange)="updateCurrentPage($event)"
|
||||
[currentPage]="currentPage" [size]="pageSize"
|
||||
[totalResults]="displayedFunders.length">
|
||||
</paging-no-load>
|
||||
</div>
|
||||
</div>
|
||||
</ng-container>
|
||||
</div>
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
@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: "";
|
||||
background-image: url("~src/assets/explore-assets/funders/coins.svg");
|
||||
display: inline-block;
|
||||
background-size: 100% 100%;
|
||||
height: 35px;
|
||||
width: 35px;
|
||||
margin-right: 10px;
|
||||
}
|
||||
|
||||
.custom-handshake-dot:after {
|
||||
content: "";
|
||||
background-image: url("~src/assets/explore-assets/funders/handshake.svg");
|
||||
display: inline-block;
|
||||
background-size: 100% 100%;
|
||||
height: 30px;
|
||||
width: 30px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
//.custom-view-button {
|
||||
// padding: 4px;
|
||||
// background: @light-color;
|
||||
// border: 1px solid @disable-color;
|
||||
// border-radius: 4px;
|
||||
// icon {
|
||||
// color: @disable-color;
|
||||
// }
|
||||
//
|
||||
// &.active {
|
||||
// background: transparent linear-gradient(315deg, @primary-light-color 0%, @primary-dark-color 100%) 0% 0% no-repeat padding-box;
|
||||
// icon {
|
||||
// color: @light-color;
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
// .uk-card {
|
||||
// &.funder-grid {
|
||||
// border-bottom: 4px solid fade(@funder-color, 30%);
|
||||
// }
|
||||
// &.funder-list {
|
||||
// border-left: 4px solid fade(@funder-color, 30%);
|
||||
// }
|
||||
// }
|
||||
|
|
@ -1,426 +0,0 @@
|
|||
import {ChangeDetectorRef, Component, OnInit} from '@angular/core';
|
||||
import {Router} from '@angular/router';
|
||||
import {Subscriber, Subscription, zip} from "rxjs";
|
||||
import {Meta, Title} from "@angular/platform-browser";
|
||||
|
||||
import {EnvProperties} from "../openaireLibrary/utils/properties/env-properties";
|
||||
import {PiwikService} from "../openaireLibrary/utils/piwik/piwik.service";
|
||||
import {SEOService} from "../openaireLibrary/sharedComponents/SEO/SEO.service";
|
||||
import {Breadcrumb} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.component";
|
||||
import {properties} from "../../environments/environment";
|
||||
import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
|
||||
import {StakeholderService} from '../openaireLibrary/monitor/services/stakeholder.service';
|
||||
import {Option} from '../openaireLibrary/sharedComponents/input/input.component';
|
||||
import {StringUtils} from '../openaireLibrary/utils/string-utils.class';
|
||||
import {HelperFunctions} from '../openaireLibrary/utils/HelperFunctions.class';
|
||||
import {NumberUtils} from '../openaireLibrary/utils/number-utils.class';
|
||||
import {LayoutService} from '../openaireLibrary/dashboard/sharedComponents/sidebar/layout.service';
|
||||
import {FormBuilder, FormControl} from '@angular/forms';
|
||||
import {debounceTime, distinctUntilChanged} from 'rxjs/operators';
|
||||
import {GroupedRequestsService} from "../openaireLibrary/services/groupedRequests.service";
|
||||
import {OpenaireEntities} from "../openaireLibrary/utils/properties/searchFields";
|
||||
|
||||
@Component({
|
||||
selector: 'funders',
|
||||
templateUrl: './funders.component.html',
|
||||
styleUrls: ['funders.component.less']
|
||||
})
|
||||
|
||||
export class FundersComponent implements OnInit {
|
||||
private subscriptions: Subscription[] = [];
|
||||
url: string = null;
|
||||
pageTitle: string = "OpenAIRE - Explore | Funders";
|
||||
pageDescription: string = "Funders | Be an integral part of the open R&I ecosystem";
|
||||
properties: EnvProperties = properties;
|
||||
public openaireEntities = OpenaireEntities;
|
||||
breadcrumbs: Breadcrumb[] = [{name: 'home', route: '/'}, {name: 'funders'}];
|
||||
showLoading: boolean = true;
|
||||
isMobile: boolean = false;
|
||||
funders: any[] = [];
|
||||
displayedFunders: any[] = [];
|
||||
showOptions: Option[];
|
||||
sortOptions: Option[];
|
||||
pageOptions: number[] = [10, 20, 30, 40];
|
||||
show: string = 'all';
|
||||
sortBy: string = 'alphAsc';
|
||||
gridView: boolean = true;
|
||||
currentPage: number = 1;
|
||||
pageSize: number = 10;
|
||||
keywordControl: FormControl;
|
||||
keyword: string;
|
||||
fundersNumber: number = 0;
|
||||
researchProductsNumber: number = 0;
|
||||
projectsNumber: number = 0;
|
||||
fundersMap = new Map<string, {
|
||||
"id": string,
|
||||
"name": string,
|
||||
"shortName": string,
|
||||
// "alias": string,
|
||||
// "irishAlias": string,
|
||||
"researchProducts": number,
|
||||
"openAccessResearchProducts": number,
|
||||
"openAccessPercentage": number,
|
||||
"projects": number,
|
||||
"monitorDashboard": string,
|
||||
"monitorDashboardStatus": string,
|
||||
"irishDashboard": string,
|
||||
"irishDashboardStatus": string,
|
||||
"logoUrl": string,
|
||||
"websiteUrl": string,
|
||||
"country": string,
|
||||
"registered": boolean
|
||||
}>();
|
||||
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,
|
||||
private meta: Meta,
|
||||
private title: Title,
|
||||
private seoService: SEOService,
|
||||
private piwikService: PiwikService,
|
||||
private refineFieldResultsService: RefineFieldResultsService,
|
||||
private stakeholderService: StakeholderService,
|
||||
private layoutService: LayoutService,
|
||||
private cdr: ChangeDetectorRef,
|
||||
private fb: FormBuilder,
|
||||
private groupedRequestsService: GroupedRequestsService) {
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
this.layoutService.setRootClass('funders');
|
||||
this.title.setTitle('OpenAIRE - Explore | Funders');
|
||||
this.subscriptions.push( this.piwikService.trackView(this.properties, this.pageTitle).subscribe());
|
||||
this.url = this.properties.domain + this.router.url;
|
||||
this.seoService.createLinkForCanonicalURL(this.url);
|
||||
this.updateUrl(this.url);
|
||||
this.updateTitle(this.pageTitle);
|
||||
this.updateDescription(this.pageDescription);
|
||||
this.subscriptions.push(this.layoutService.isMobile.subscribe(isMobile => {
|
||||
this.isMobile = isMobile;
|
||||
this.cdr.detectChanges();
|
||||
}));
|
||||
this.showOptions = [
|
||||
{value: 'all', label: 'All funders'},
|
||||
{value: '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 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('');
|
||||
this.subscriptions.push(this.keywordControl.valueChanges.pipe(debounceTime(500), distinctUntilChanged()).subscribe(value => {
|
||||
this.keyword = value;
|
||||
this.filtering();
|
||||
}));
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.subscriptions.forEach(subscription => {
|
||||
if (subscription instanceof Subscriber) {
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
});
|
||||
this.layoutService.setRootClass(null);
|
||||
}
|
||||
|
||||
private updateDescription(description: string) {
|
||||
this.meta.updateTag({content: description}, "name='description'");
|
||||
this.meta.updateTag({content: description}, "property='og:description'");
|
||||
}
|
||||
|
||||
private updateTitle(title: string) {
|
||||
var title = ((title.length > 50) ? title.substring(0, 50) : title);
|
||||
this.title.setTitle(title);
|
||||
this.meta.updateTag({content: title}, "property='og:title'");
|
||||
}
|
||||
|
||||
private updateUrl(url: string) {
|
||||
this.meta.updateTag({content: url}, "property='og:url'");
|
||||
}
|
||||
|
||||
private getFunders() {
|
||||
this.subscriptions.push(this.groupedRequestsService.funders().subscribe(data => {
|
||||
let funders = data["funders"];
|
||||
funders.forEach(queriedFunder => {
|
||||
let id = queriedFunder.id;
|
||||
let funder = {
|
||||
"id": id,
|
||||
"name": this.removePartAfterCharacters(queriedFunder.name, "||"),
|
||||
"shortName": queriedFunder.shortName,
|
||||
// "alias": '',
|
||||
// "irishAlias": '',
|
||||
"researchProducts": +queriedFunder.results,
|
||||
"openAccessResearchProducts": +queriedFunder.openResults,
|
||||
"openAccessPercentage": 0,
|
||||
"projects": +queriedFunder.projects,
|
||||
"monitorDashboard": '',
|
||||
"monitorDashboardStatus": '',
|
||||
"irishDashboard": '',
|
||||
"irishDashboardStatus": '',
|
||||
"logoUrl": '',
|
||||
"websiteUrl": '',
|
||||
"country": queriedFunder.country,
|
||||
"registered": queriedFunder.registered
|
||||
};
|
||||
|
||||
if((!funder.researchProducts || funder.researchProducts == 0) && (!funder.projects || funder.projects == 0)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if(queriedFunder.stakeholder) {
|
||||
let stakeholder = queriedFunder.stakeholder;
|
||||
// funder.alias = stakeholder.alias;
|
||||
// funder.irishAlias = stakeholder.irishAlias;
|
||||
// if(!funder.shortName) {
|
||||
// funder.shortName = stakeholder.alias;
|
||||
// }
|
||||
funder.monitorDashboard = stakeholder.alias;
|
||||
funder.monitorDashboardStatus = stakeholder.visibility;
|
||||
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) {
|
||||
funder.openAccessPercentage = Math.round((funder.openAccessResearchProducts / funder.researchProducts) * 100);
|
||||
}
|
||||
|
||||
if(!funder.logoUrl && this.staticLogos.has(funder.id)) {
|
||||
funder.logoUrl = "assets/explore-assets/funders/logos/"+this.staticLogos.get(funder.id)+".png";
|
||||
}
|
||||
|
||||
this.fundersMap.set(queriedFunder.id, funder);
|
||||
});
|
||||
// convert funders map into an array
|
||||
this.funders = Array.from(this.fundersMap.values());
|
||||
// calculate total numbers for intro content
|
||||
this.fundersNumber = data.count;
|
||||
this.researchProductsNumber = data.results;
|
||||
this.projectsNumber = data.projects;
|
||||
// sort funders
|
||||
this.funders.sort((a, b) => a['name'].localeCompare(b['name']));
|
||||
// initialize displayedFunders
|
||||
this.displayedFunders = this.funders;
|
||||
this.showLoading = false;
|
||||
}))
|
||||
|
||||
// let refineParams = '&fq=resultbestaccessright%20exact%20%22Open%20Access%22';
|
||||
// this.subscriptions.push(
|
||||
// zip(
|
||||
// this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties),
|
||||
// this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('relfunder', 'result', this.properties, refineParams),
|
||||
// this.refineFieldResultsService.getAllRefineFieldResultsByFieldName('funder', 'project', this.properties),
|
||||
// this.stakeholderService.getStakeholders(this.properties.monitorServiceAPIURL, 'funder')
|
||||
// ).subscribe((data: any[]) => {
|
||||
// // storing all needed data to a map
|
||||
// // 1st call
|
||||
// let queriedFunders1 = data[0][1][0].values;
|
||||
// queriedFunders1.forEach(queriedFunder => {
|
||||
// this.fundersMap.set(queriedFunder.id, {
|
||||
// "id": queriedFunder.id,
|
||||
// "name": queriedFunder.name,
|
||||
// "alias": '',
|
||||
// "researchProducts": +queriedFunder.number,
|
||||
// "openAccessResearchProducts": 0,
|
||||
// "openAccessPercentage": 0,
|
||||
// "projects": 0,
|
||||
// "monitorDashboard": '',
|
||||
// "monitorDashboardStatus": '',
|
||||
// "logoUrl": ''
|
||||
// });
|
||||
// });
|
||||
//
|
||||
// // 2nd call
|
||||
// let queriedFunders2 = data[1][1][0].values;
|
||||
// queriedFunders2.forEach(queriedFunder => {
|
||||
// if(this.fundersMap.has(queriedFunder.id)) {
|
||||
// this.fundersMap.get(queriedFunder.id).openAccessResearchProducts = +queriedFunder.number;
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// // 3rd call
|
||||
// let queriedFunders3 = data[2][1][0].values;
|
||||
// queriedFunders3.forEach(queriedFunder => {
|
||||
// if(+queriedFunder.number > 1) {
|
||||
// if (this.fundersMap.has(queriedFunder.id)) {
|
||||
// this.fundersMap.get(queriedFunder.id).projects = +queriedFunder.number;
|
||||
// } else {
|
||||
// this.fundersMap.set(queriedFunder.id, {
|
||||
// "id": queriedFunder.id,
|
||||
// "name": queriedFunder.name,
|
||||
// "alias": '',
|
||||
// "researchProducts": 0,
|
||||
// "openAccessResearchProducts": 0,
|
||||
// "openAccessPercentage": 0,
|
||||
// "projects": +queriedFunder.number,
|
||||
// "monitorDashboard": '',
|
||||
// "monitorDashboardStatus": '',
|
||||
// "logoUrl": ''
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
//
|
||||
// // 4th call
|
||||
// let queriedFunders4 = data[3];
|
||||
// queriedFunders4.forEach(queriedFunder => {
|
||||
// let id = queriedFunder.index_id + '||' + queriedFunder.index_name + '||' + queriedFunder.index_shortName;
|
||||
// if(this.fundersMap.has(id) && (
|
||||
// !this.fundersMap.get(id).monitorDashboardStatus
|
||||
// ||
|
||||
// (this.fundersMap.get(id).monitorDashboardStatus == "RESTRICTED" && queriedFunder.visibility == "PUBLIC")
|
||||
// ||
|
||||
// (this.fundersMap.get(id).monitorDashboardStatus == "PRIVATE" && (queriedFunder.visibility == "RESTRICTED" || queriedFunder.visibility == "PUBLIC")))) {
|
||||
// this.fundersMap.get(id).alias = queriedFunder.alias;
|
||||
// this.fundersMap.get(id).monitorDashboard = queriedFunder.alias;
|
||||
// this.fundersMap.get(id).monitorDashboardStatus = queriedFunder.visibility;
|
||||
// this.fundersMap.get(id).logoUrl = (queriedFunder.isUpload ? properties.utilsService + "/download/" : "")+ (queriedFunder.logoUrl);
|
||||
// }
|
||||
// });
|
||||
// this.fundersMap.forEach((value) => {
|
||||
// if(value.openAccessResearchProducts > 0) {
|
||||
// value.openAccessPercentage = Math.round((value.openAccessResearchProducts / value.researchProducts) * 100);
|
||||
// }
|
||||
// if(!value.logoUrl && this.staticLogos.has(value.id)) {
|
||||
// let split = value.id.split("||");
|
||||
// let shortname = (split && split.length==3) ? value.id.split("||")[2] : value.id;
|
||||
// value.logoUrl = "assets/explore-assets/funders/logos/"+shortname+".png";
|
||||
// }
|
||||
// });
|
||||
// // convert funders map into an array
|
||||
// this.funders = Array.from(this.fundersMap.values());
|
||||
// // calculate total numbers for intro content
|
||||
// this.calculateNumbers();
|
||||
// // sort funders
|
||||
// this.funders.sort((a, b) => a['name'].localeCompare(b['name']));
|
||||
// // initialize displayedFunders
|
||||
// this.displayedFunders = this.funders;
|
||||
// console.log(this.funders);
|
||||
// this.showLoading = false;
|
||||
// })
|
||||
// );
|
||||
}
|
||||
|
||||
private calculateSum(array, property) {
|
||||
let sum = 0;
|
||||
array.forEach(element => {
|
||||
sum += element[property];
|
||||
});
|
||||
return sum;
|
||||
}
|
||||
|
||||
private calculateNumbers() {
|
||||
this.fundersNumber = this.funders.length;
|
||||
this.researchProductsNumber = this.calculateSum(this.funders, 'researchProducts');
|
||||
this.projectsNumber = this.calculateSum(this.funders, 'projects');
|
||||
}
|
||||
|
||||
get showContentWithNumbers() {
|
||||
return this.fundersNumber && this.researchProductsNumber && this.projectsNumber;
|
||||
}
|
||||
|
||||
formatNumber(num: number | string) {
|
||||
let formatted = NumberUtils.roundNumber(+num);
|
||||
return formatted.number + formatted.size;
|
||||
}
|
||||
|
||||
urlEncodeAndQuote(str: string): string {
|
||||
return StringUtils.quote(StringUtils.URIEncode(str));
|
||||
}
|
||||
|
||||
sortByChanged() {
|
||||
switch(this.sortBy) {
|
||||
case 'alphAsc':
|
||||
this.funders = this.funders.sort((a, b) => a['name'].localeCompare(b['name']));
|
||||
break;
|
||||
case 'alphDsc':
|
||||
this.funders = this.funders.sort((a, b) => b['name'].localeCompare(a['name']));
|
||||
break;
|
||||
case 'oaDsc':
|
||||
this.funders = this.funders.sort((a, b) => b['openAccessPercentage'] - a['openAccessPercentage']);
|
||||
break;
|
||||
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();
|
||||
}
|
||||
|
||||
sizeChanged($event) {
|
||||
this.pageSize = $event;
|
||||
this.currentPage = 1;
|
||||
}
|
||||
|
||||
filtering() {
|
||||
let displayedFunders = this.funders;
|
||||
if(!this.keyword){
|
||||
this.keyword = '';
|
||||
}
|
||||
if(this.funders.length) {
|
||||
displayedFunders = displayedFunders.filter(item => (item['name'] && item['name'].toLowerCase().includes(this.keyword.toLowerCase()))
|
||||
|| (item['monitorDashboard'] && item['monitorDashboard'].toLowerCase().includes(this.keyword.toLowerCase())
|
||||
|| (item['irishDashboard'] && item['irishDashboard'].toLowerCase().includes(this.keyword.toLowerCase()))));
|
||||
}
|
||||
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;
|
||||
this.currentPage = 1;
|
||||
}
|
||||
|
||||
public updateCurrentPage($event) {
|
||||
this.currentPage = $event.value;
|
||||
HelperFunctions.scrollToId('target');
|
||||
}
|
||||
|
||||
private removePartAfterCharacters(field, characters):string {
|
||||
if(field && field.indexOf(characters) !=-1){
|
||||
return field.split(characters)[0];
|
||||
|
||||
}
|
||||
return field;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {CommonModule} from '@angular/common';
|
||||
import {RouterModule} from '@angular/router';
|
||||
|
||||
import {FundersComponent} from './funders.component';
|
||||
import {FundersRoutingModule} from "./funders-routing.module";
|
||||
import {AlertModalModule} from "../openaireLibrary/utils/modal/alertModal.module";
|
||||
import {Schema2jsonldModule} from "../openaireLibrary/sharedComponents/schema2jsonld/schema2jsonld.module";
|
||||
import {SEOServiceModule} from "../openaireLibrary/sharedComponents/SEO/SEOService.module";
|
||||
import {BreadcrumbsModule} from "../openaireLibrary/utils/breadcrumbs/breadcrumbs.module";
|
||||
import {LoadingModule} from "../openaireLibrary/utils/loading/loading.module";
|
||||
import {RefineFieldResultsServiceModule} from '../openaireLibrary/services/refineFieldResultsService.module';
|
||||
import {LogoUrlPipeModule} from '../openaireLibrary/utils/pipes/logoUrlPipe.module';
|
||||
import {IconsModule} from '../openaireLibrary/utils/icons/icons.module';
|
||||
import {IconsService} from '../openaireLibrary/utils/icons/icons.service';
|
||||
import {open_access} from '../openaireLibrary/utils/icons/icons';
|
||||
import {closed_access} from '../openaireLibrary/utils/icons/icons';
|
||||
import {InputModule} from '../openaireLibrary/sharedComponents/input/input.module';
|
||||
import {PagingModule} from '../openaireLibrary/utils/paging.module';
|
||||
import {SearchInputModule} from '../openaireLibrary/sharedComponents/search-input/search-input.module';
|
||||
import {GroupedRequestsServiceModule} from "../openaireLibrary/services/groupedRequestsService.module";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
FundersRoutingModule, CommonModule, RouterModule, AlertModalModule,
|
||||
Schema2jsonldModule, SEOServiceModule, BreadcrumbsModule, LoadingModule,
|
||||
RefineFieldResultsServiceModule, LogoUrlPipeModule, IconsModule, InputModule,
|
||||
PagingModule, SearchInputModule, GroupedRequestsServiceModule
|
||||
],
|
||||
declarations: [
|
||||
FundersComponent
|
||||
],
|
||||
providers: [],
|
||||
exports: [
|
||||
FundersComponent
|
||||
]
|
||||
})
|
||||
|
||||
export class FundersModule {
|
||||
constructor(private iconsService: IconsService) {
|
||||
this.iconsService.registerIcons([open_access, closed_access]);
|
||||
}
|
||||
}
|
||||
|
|
@ -1,318 +1,308 @@
|
|||
<ng-template #_logos let-logo="logo" let-class="class">
|
||||
<div *ngIf="logo" [class]="'uk-margin-top uk-flex uk-flex-middle uk-flex-center uk-padding-remove-horizontal '+class">
|
||||
<div *ngIf="logo" [class]="'uk-flex uk-flex-middle uk-flex-center uk-padding-remove-horizontal '+class">
|
||||
<div class="">
|
||||
<!-- <img src="assets/ExploreLogos/grouped/{{logo}}" alt="{{logo}} logo" loading="lazy" width="112px" height="44px">-->
|
||||
<img src="assets/ExploreLogos/{{logo}}" alt="{{logo}} logo" loading="lazy" width="100%" height="auto">
|
||||
<img src="assets/ExploreLogos/{{logo}}" alt="{{logo}} logo" loading="lazy" width="112px" height="44px">
|
||||
</div>
|
||||
</div>
|
||||
</ng-template>
|
||||
|
||||
<div class="image-front-topbar mainPageSearchForm">
|
||||
<div class="uk-section">
|
||||
<div class="uk-container">
|
||||
<div class="search_box_bg uk-flex uk-flex-center">
|
||||
<div>
|
||||
<div class="uk-section uk-padding-remove-bottom uk-overflow-hidden">
|
||||
<div class="uk-container uk-container-large"
|
||||
uk-scrollspy="target: [uk-scrollspy-class]; cls: uk-animation-slide-bottom-medium; delay: 200">
|
||||
<div class="uk-grid uk-flex-middle" uk-grid>
|
||||
<div class="uk-width-3-5@m uk-margin-large-bottom">
|
||||
<h1 class="uk-h2 uk-width-1-2@m" uk-scrollspy-class>
|
||||
Discover open linked research<span class="uk-text-primary">.</span>
|
||||
</h1>
|
||||
<numbers #numbersComponent [defaultInit]="false" (results)="numbers = $event"></numbers>
|
||||
<!-- [class.uk-invisible]="disableSelect" -->
|
||||
<div class="uk-margin-medium-top" style="max-width: 600px;" uk-scrollspy-class>
|
||||
<div class="uk-flex uk-flex-right uk-text-small">
|
||||
<a [routerLink]="properties.searchLinkToAdvancedResults" class="uk-margin-small-bottom">
|
||||
Advanced search
|
||||
</a>
|
||||
<form class="uk-margin">
|
||||
<div class="uk-grid uk-margin-small-left">
|
||||
<div class="uk-margin-small-top uk-padding-remove-left">
|
||||
<entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||
[properties]="properties" [onChangeNavigate]="false"
|
||||
(selectionChange)="entityChanged($event)"
|
||||
></entities-selection>
|
||||
</div>
|
||||
<!-- <advanced-search-input #advanced (searchEmitter)="goTo()">-->
|
||||
<!-- <entities-selection [simpleView]="true" currentEntity="all" [selectedEntity]="selectedEntity"
|
||||
(selectionChange)="entityChanged($event);advanced.focusNext(input, $event)" (disableSelectEmitter)="disableSelectChange($event)"
|
||||
[onChangeNavigate]="false" class="uk-width-2-5"></entities-selection> -->
|
||||
<!-- <div class="uk-width-expand" input #input placeholder="Search in Explore" [searchable]="true" [hint]="'What are you looking for?'" [(value)]="keyword"></div>-->
|
||||
<!-- </advanced-search-input>-->
|
||||
<div search-input [(value)]="keyword"
|
||||
[placeholder]="'Search'+(portalName ? (' in '+portalName) : '')" (searchEmitter)="goTo()"
|
||||
[searchInputClass]="'inner background'"></div>
|
||||
<div class=" uk-padding-remove-left uk-margin-small-top">
|
||||
<div class="uk-inline">
|
||||
<a *ngIf="keyword.length > 0" class="uk-form-icon uk-form-icon-flip" (click)="keyword = ''"
|
||||
uk-icon="icon: close"></a>
|
||||
<input type="text" class="uk-input uk-width-xlarge@l uk-width-large@m uk-width-medium"
|
||||
placeholder="Search in OpenAIRE for scholarly works"
|
||||
[(ngModel)]="keyword"
|
||||
name="keyword">
|
||||
</div>
|
||||
<div class=" quickSelectionsBox uk-width-xlarge@l uk-width-large@m uk-width-medium">
|
||||
<quick-selections *ngIf="selectedEntity == 'result'" [resultTypes]="resultTypes"
|
||||
[quickFilter]="resultsQuickFilter"
|
||||
[properties]="properties">
|
||||
</quick-selections>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-padding-remove-left uk-margin-small-top">
|
||||
|
||||
<!-- <div *ngIf="selectedEntity === 'result' && input.focused" (click)="$event.stopPropagation();advanced.focusNext(input, $event)" class="uk-dropdown uk-display-block uk-margin-small-top uk-width-auto">
|
||||
<div class="uk-padding-small">
|
||||
<quick-selections [resultTypes]="resultTypes" [quickFilter]="resultsQuickFilter"></quick-selections>
|
||||
</div>
|
||||
</div> -->
|
||||
</div>
|
||||
<div class="uk-padding-small uk-margin-small-top">
|
||||
<div class="uk-text-meta">
|
||||
Try browsing by:
|
||||
</div>
|
||||
<div class="link-actions uk-flex uk-flex-column uk-flex-top uk-margin-small-top">
|
||||
<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text uk-margin-small-bottom"
|
||||
routerLinkActive="router-link-active" routerLink="/sdgs">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/sdg/sdg-dot-img.svg" alt="SDGs logo" loading="lazy" width="17px" height="17px">
|
||||
<span class="uk-margin-small-left">Sustainable Development Goals (SDG<span
|
||||
class="uk-text-lowercase">s</span>)</span>
|
||||
</span>
|
||||
</a>
|
||||
<a class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text"
|
||||
routerLinkActive="router-link-active" routerLink="/fields-of-science">
|
||||
<span class="uk-flex uk-flex-middle">
|
||||
<img src="assets/common-assets/fos/fos-icon.svg" alt="FOS logo" loading="lazy" width="17px" height="8px">
|
||||
<span class="uk-margin-small-left">Fields of Science (FoS)</span>
|
||||
</span>
|
||||
</a>
|
||||
<button (click)="goTo(true)" type="submit"
|
||||
class="uk-button portal-button uk-text-bold uk-padding uk-padding-remove-vertical uk-margin-small-left">
|
||||
Search
|
||||
</button>
|
||||
<div class="uk-margin-small-top uk-margin-left">
|
||||
<!-- (click)="goTo(false)"-->
|
||||
<a *ngIf="selectedEntity!='all'" (click)="goTo(false)" class="portal-link">Advanced Search</a>
|
||||
<a *ngIf="selectedEntity=='all'" class="portal-link ">Advanced Search</a></div>
|
||||
<div *ngIf="selectedEntity=='all'" uk-dropdown class="uk-dropdown default-dropdown">
|
||||
<ul class="uk-list uk-margin-remove-bottom">
|
||||
<li *ngIf="showSoftware || showPublications || showOrp || showDatasets"><a
|
||||
[routerLink]="properties.searchLinkToAdvancedResults"
|
||||
[queryParams]="{qf:true, q: keyword, op: 'and'}"
|
||||
>Research
|
||||
outcomes</a></li>
|
||||
<li *ngIf="showProjects"><a
|
||||
[routerLink]="properties.searchLinkToAdvancedProjects"
|
||||
[queryParams]="{q: keyword, op: 'and'}">
|
||||
Projects</a></li>
|
||||
<li *ngIf="showDataProviders"><a
|
||||
[routerLink]="properties.searchLinkToAdvancedDataProviders"
|
||||
[queryParams]="{q: keyword, op: 'and'}">
|
||||
Content providers</a></li>
|
||||
<li *ngIf="showOrganizations"><a
|
||||
[routerLink]="properties.searchLinkToAdvancedOrganizations"
|
||||
[queryParams]="{q: keyword, op: 'and'}">
|
||||
Organizations</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-visible@m uk-width-expand" uk-scrollspy-class>
|
||||
<div class="uk-position-relative">
|
||||
<img src="assets/explore-assets/home/explore.jpg" alt="researchers" uk-parallax="y: 500" loading="lazy">
|
||||
<img class="uk-position-bottom-left" src="assets/explore-assets/home/mask.svg" alt="search" loading="lazy">
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-section uk-section-large uk-padding-remove-top">
|
||||
<div class="uk-container uk-container-large uk-width-2-3">
|
||||
<div uk-slider="autoplay: false; autoplay-interval: 2500" class="">
|
||||
<div class="uk-margin-medium">
|
||||
<div class="uk-container uk-container-large explore-numbers uk-margin-medium-bottom">
|
||||
<div class="search_box_bg uk-grid uk-grid-stack" uk-grid="">
|
||||
<div class="uk-width-1-1@m uk-first-column">
|
||||
<div class="uk-grid uk-margin uk-margin-bottom uk-width-xxlarge uk-margin-auto">
|
||||
<div class="uk-width-expand uk-padding-remove">
|
||||
|
||||
<div uk-slider="autoplay: true; autoplay-interval: 2500" class="uk-margin-top">
|
||||
<div class="uk-position-relative">
|
||||
<div class="uk-slider-container">
|
||||
<ul class="uk-slider-items" uk-height-match="target: > li > div > div > .logo1; row: false;">
|
||||
<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">
|
||||
<h2 class="uk-text-center uk-margin-bottom uk-text-primary uk-h4">
|
||||
<span *ngIf="type=='publication' && numbersComponent.showPublications && numbers?.publicationsSize">
|
||||
<h1 class="uk-text-center uk-margin-bottom portal-color uk-h3">
|
||||
<span *ngIf="type=='publication' && showPublications && numbers?.publicationsSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.publicationsSize.number|number}}{{numbers.publicationsSize.size}}
|
||||
{{openaireEntities.PUBLICATIONS}}</span><span> deduplicated</span>
|
||||
publications</span><span> deduplicated</span>
|
||||
</span>
|
||||
<span
|
||||
*ngIf="type=='dataset' && numbersComponent.showDatasets && (numbers?.datasetsLinkedSize || numbers?.datasetsSize)">
|
||||
*ngIf="type=='dataset' && showDatasets && (numbers?.datasetsLinkedSize || numbers?.datasetsSize)">
|
||||
<span *ngIf="numbers?.datasetsLinkedSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.datasetsLinkedSize.number|number}}{{numbers.datasetsLinkedSize.size}}
|
||||
datasets</span> interlinked with publications</span>
|
||||
<span *ngIf="numbers?.datasetsSize && !numbers?.datasetsLinkedSize"
|
||||
class="uk-text-bold">{{numbers.datasetsSize.number|number}}{{numbers.datasetsSize.size}}
|
||||
{{openaireEntities.DATASETS}}</span>
|
||||
research data</span>
|
||||
</span>
|
||||
<span
|
||||
*ngIf="type=='software' && numbersComponent.showSoftware && (numbers?.softwareSize || numbers?.softwareLinkedSize)">
|
||||
*ngIf="type=='software' && showSoftware && (numbers?.softwareSize || numbers?.softwareLinkedSize)">
|
||||
<span *ngIf="numbers?.softwareLinkedSize">
|
||||
<span
|
||||
class="uk-text-bol ">{{numbers.softwareLinkedSize.number|number}}{{numbers.softwareLinkedSize.size}}
|
||||
{{openaireEntities.SOFTWARE}}</span> interlinked with publications</span>
|
||||
research
|
||||
software</span> interlinked with publications</span>
|
||||
<span *ngIf="numbers?.softwareSize && !numbers?.softwareLinkedSize"
|
||||
class="uk-text-bold">{{numbers.softwareSize.number|number}}{{numbers.softwareSize.size}}
|
||||
{{openaireEntities.SOFTWARE}}</span>
|
||||
research software</span>
|
||||
</span>
|
||||
<span *ngIf="type=='persistent'">
|
||||
<span>Persistent identifiers and registries</span>
|
||||
</span>
|
||||
<span *ngIf="type=='funder' && numbersComponent.showProjects && numbers?.mergedFundersSize && numbers?.projectsSize">
|
||||
<span *ngIf="type=='funder' && showProjects && numbers?.fundersSize">
|
||||
<span
|
||||
class="uk-text-bold">{{numbers.mergedFundersSize.number|number}}{{numbers.mergedFundersSize.size}}
|
||||
class="uk-text-bold">{{numbers.fundersSize.number|number}}{{numbers.fundersSize.size}}
|
||||
funders</span><span> and</span>
|
||||
<span
|
||||
class="uk-text-bold"> {{numbers.projectsSize.number|number}}{{numbers.projectsSize.size}}
|
||||
funded grants</span>
|
||||
</span>
|
||||
|
||||
</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-->
|
||||
<!-- class="uk-grid-small uk-child-width-1-6 uk-text-center grid uk-flex uk-flex-center"-->
|
||||
<!-- uk-grid uk-height-match="target: > div > .logo2; row: false;">-->
|
||||
<!-- <div-->
|
||||
<!-- *ngFor="let logo of logos[type][j].slice(0,ceil(logos[type][j].length/2)); let i=index">-->
|
||||
<!-- <ng-container-->
|
||||
<!-- *ngTemplateOutlet="_logos; context: { logo: logo, class: 'logo1 '}"></ng-container>-->
|
||||
<!-- <ng-container-->
|
||||
<!-- *ngTemplateOutlet="_logos; context: { logo: logos[type][j][ceil(logos[type][j].length/2)+i], class: 'uk-margin-top logo2 '}"></ng-container>-->
|
||||
<!-- </div>-->
|
||||
</h1>
|
||||
<div
|
||||
class="uk-grid-small uk-child-width-1-6 uk-text-center grid uk-flex uk-flex-center"
|
||||
uk-grid uk-height-match="target: > div > .logo2; row: false;">
|
||||
<div
|
||||
*ngFor="let logo of logos[type][j].slice(0,ceil(logos[type][j].length/2)); let i=index">
|
||||
<ng-container
|
||||
*ngTemplateOutlet="_logos; context: { logo: logo, class: 'logo1 '}"></ng-container>
|
||||
<ng-container
|
||||
*ngTemplateOutlet="_logos; context: { logo: logos[type][j][ceil(logos[type][j].length/2)+i], class: 'uk-margin-top logo2 '}"></ng-container>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
</ng-container>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<a class="uk-position-center-left-out" uk-slider-item="previous"><span
|
||||
uk-icon="icon: chevron-left; ratio: 2"></span></a>
|
||||
<a class="uk-position-center-right-out" uk-slider-item="next"><span
|
||||
uk-icon="icon: chevron-right; ratio: 2"></span></a>
|
||||
<div class="uk-hidden@s">
|
||||
<a class="uk-position-center-left uk-position-small" href="#" uk-slidenav-previous
|
||||
uk-slider-item="previous"><span class="visually-hidden">prev</span></a>
|
||||
<a class="uk-position-center-right uk-position-small" href="#" uk-slidenav-next
|
||||
uk-slider-item="next"><span class="visually-hidden">next</span></a>
|
||||
</div>
|
||||
|
||||
<div class="uk-visible@s">
|
||||
<a class="uk-position-center-left-out uk-position-small" href="#" uk-slidenav-previous
|
||||
uk-slider-item="previous"><span class="visually-hidden">prev</span></a>
|
||||
<a class="uk-position-center-right-out uk-position-small" href="#" uk-slidenav-next
|
||||
uk-slider-item="next"><span class="visually-hidden">next</span></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<helper *ngIf="pageContents && pageContents['top'] && pageContents['top'].length > 0"
|
||||
[texts]="pageContents['top']"></helper>
|
||||
</div>
|
||||
<div class="uk-section uk-section-secondary explore-dark-logo-background">
|
||||
<div class="uk-container uk-container-large uk-margin-large-bottom">
|
||||
<div class="uk-width-1-1 uk-margin-medium-bottom">
|
||||
<h2 class="uk-h1 uk-margin-large-top">Share your research<span class="uk-text-primary">.</span></h2>
|
||||
</div>
|
||||
<slider-container [total]="2" [period]="8000" [infinite]="true" [navigation]="'progress'">
|
||||
<slider-column type="slider">
|
||||
<slider-item type="static">
|
||||
<img class="uk-position-center uk-position-z-index" src="assets/explore-assets/home/tablet.png"
|
||||
alt="ipad" loading="lazy">
|
||||
</slider-item>
|
||||
<slider-item type="slide" [start]="0">
|
||||
<img src="assets/explore-assets/home/1.png" alt="Deposit search" loading="lazy">
|
||||
</slider-item>
|
||||
<slider-item type="slide" [start]="0.5">
|
||||
<img src="assets/explore-assets/home/2.png" alt="Deposit in OpenAIRE or Zenodo" loading="lazy">
|
||||
</slider-item>
|
||||
<slider-item type="slide" [start]="1">
|
||||
<img src="assets/explore-assets/home/3.png" alt="Search links" loading="lazy">
|
||||
</slider-item>
|
||||
<slider-item type="slide" [start]="1.5">
|
||||
<img src="assets/explore-assets/home/4.png" alt="link" loading="lazy">
|
||||
</slider-item>
|
||||
</slider-column>
|
||||
<slider-column type="nav" class="slider-nav">
|
||||
<slider-nav-item [start]="0">
|
||||
<h3 class="uk-h6">
|
||||
<i class="uk-text-primary">Deposit</i> your research<span class="uk-text-primary">.</span>
|
||||
</div>
|
||||
<!--<schema2jsonld [URL]="properties.baseLink"-->
|
||||
<!-- [logoURL]="properties.baseLink+'/assets/common-assets/logo-small-explore.png'" type="home"-->
|
||||
<!-- name="OpenAIRE Explore"></schema2jsonld>-->
|
||||
<div *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
|
||||
class="uk-section graph-background">
|
||||
<div class="uk-container">
|
||||
<div class="uk-flex uk-flex-top uk-child-width-1-1 uk-child-width-1-2@m" uk-grid>
|
||||
<div class="uk-flex-last@m">
|
||||
<div [class.lines-10]="!readMore" class="uk-margin-bottom multi-line-ellipsis">
|
||||
<helper [texts]="pageContents['right']"></helper>
|
||||
</div>
|
||||
<div *ngIf="!readMore" class="uk-text-center clickable" (click)="readMore = true">
|
||||
<span>Read more<span class="space" uk-icon="chevron-down"></span></span>
|
||||
</div>
|
||||
<div *ngIf="readMore" class="uk-text-center clickable" (click)="readMore = false">
|
||||
<span>Read less<span class="space" uk-icon="chevron-up"></span></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-flex uk-flex-bottom">
|
||||
<div class="uk-width-1-3 uk-width-1-2@m">
|
||||
<img src="assets/explore-assets/graph.png" alt="graph image" loading="lazy">
|
||||
</div>
|
||||
<div class="uk-padding uk-width-1-2">
|
||||
<img src="assets/common-assets/logo-large-graph.png" alt="graph image" loading="lazy">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="pageContents && pageContents['right'] && pageContents['right'].length > 0"
|
||||
class="graph-background-bottom uk-section uk-padding-remove-vertical uk-background-cover"></div>
|
||||
<helper *ngIf="pageContents && pageContents['bottom'] && pageContents['bottom'].length > 0"
|
||||
[texts]="pageContents['bottom']"></helper>
|
||||
<div class="uk-section uk-padding-remove-bottom">
|
||||
<h3 class="uk-text-center uk-margin-medium-bottom">Our growing <span class="uk-text-bold">Community</span></h3>
|
||||
<numbers #numbersComponent [defaultInit]="false" backgroundClass="numbers-background"
|
||||
(results)="numbers = $event"></numbers>
|
||||
</div>
|
||||
<!--<div class="uk-section uk-padding-remove-bottom">
|
||||
<div class="uk-container uk-text-center uk-margin-medium-bottom">
|
||||
<div class="uk-margin-medium uk-flex-center">
|
||||
<div class="uk-first-column">
|
||||
<div class="uk-panel">
|
||||
<h3 class="uk-margin uk-text-center">
|
||||
Our growing <span class="uk-text-bold">Community</span>
|
||||
</h3>
|
||||
<div class="uk-margin-bottom">
|
||||
Whether it’s publications, data or software,
|
||||
select an OpenAIRE compatible repository and
|
||||
share using community standards. Alternatively
|
||||
use Zenodo, a catch-all repository hosted by CERN.
|
||||
All results will be indexed, discoverable and accessible
|
||||
via EXPLORE.
|
||||
</div>
|
||||
<div class="uk-margin-top">
|
||||
<a class="uk-button uk-button-text uk-text-primary" routerLink="/participate/deposit/learn-how">Start
|
||||
Deposit</a>
|
||||
</div>
|
||||
</slider-nav-item>
|
||||
<slider-nav-item [start]="1">
|
||||
<h3 class="uk-h6">
|
||||
<i class="uk-text-primary">Link</i> your work<span class="uk-text-primary">.</span>
|
||||
<div class="uk-margin-large-top uk-container uk-margin-bottom uk-text-center">
|
||||
<div class="uk-grid uk-flex uk-flex-center">
|
||||
<div *ngIf="fundersSize" class="uk-width-1-3@m">
|
||||
<h3>
|
||||
<a [routerLink]="properties.searchLinkToProjects" class="uk-text-bold number">
|
||||
{{fundersSize.number|number}}<span class="number-size">{{fundersSize.size}}</span>
|
||||
</a>
|
||||
</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,
|
||||
that reaches out to many external sources via APIs, and
|
||||
claim them to your Grant or ORCID. Use the service to provide
|
||||
meaningful links between publications-datasets-software.
|
||||
<div class="uk-text-uppercase uk-text-large">Funders</div>
|
||||
</div>
|
||||
<div class="uk-margin-top">
|
||||
<a class="uk-button uk-button-text uk-text-primary" routerLink="/participate/claim">Start Linking</a>
|
||||
<div *ngIf="datasourcesSize" class="uk-width-1-3@m">
|
||||
<h3>
|
||||
<a [routerLink]="properties.searchLinkToDataProviders" class="uk-text-bold number">
|
||||
{{datasourcesSize.number|number}}<span class="number-size">{{datasourcesSize.size}}</span>
|
||||
</a>
|
||||
</h3>
|
||||
<div class="uk-text-uppercase uk-text-large">Content providers</div>
|
||||
</div>
|
||||
</slider-nav-item>
|
||||
</slider-column>
|
||||
</slider-container>
|
||||
<div *ngIf="projectsSize" class="uk-width-1-3@m">
|
||||
<h3>
|
||||
<a [routerLink]="properties.searchLinkToProjects" class="uk-text-bold number">
|
||||
{{projectsSize.number|number}}<span class="number-size">{{projectsSize.size}}</span>
|
||||
</a>
|
||||
</h3>
|
||||
<div class="uk-text-uppercase uk-text-large">Projects</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="numbers-background uk-section">
|
||||
<div class="uk-container">
|
||||
<div class="uk-grid uk-margin-auto-left uk-margin-auto-right uk-grid-large" uk-grid>
|
||||
<div *ngIf="publicationsSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom" [routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'publications', qf: false}">
|
||||
{{publicationsSize.count|number}} </a>
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="book" ratio="1.5" [flex]="true" class="uk-margin-right" customClass="portal-color"></icon>
|
||||
<span>publications</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="datasetsSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom"
|
||||
[routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'datasets', qf: false}">{{datasetsSize.count|number}} </a>
|
||||
|
||||
<!-- Not yet! -->
|
||||
<!-- <div class="uk-section">
|
||||
<div class="uk-container uk-container-large">
|
||||
<h2 class="uk-h1 uk-text-center">
|
||||
New sources in OpenAIRE<span class="uk-text-primary">.</span>
|
||||
</h2>
|
||||
<div class="cards-on-slider">
|
||||
TODO: Repositories content
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="database" ratio="1.5" [flex]="true" class="uk-margin-right"
|
||||
customClass="portal-color"></icon>
|
||||
<span>research data</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="softwareSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom" [routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'software', qf: false}">
|
||||
{{softwareSize.count|number}} </a>
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="cog" ratio="1.5" [flex]="true" class="uk-margin-right" customClass="portal-color"></icon>
|
||||
<span>software</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div *ngIf="otherSize" class="uk-width-1-2@m uk-flex uk-flex-center">
|
||||
<div class="number-width">
|
||||
<a class="number uk-text-bold uk-margin-bottom" [routerLink]="properties.searchLinkToResults"
|
||||
[queryParams]="{type: 'other', qf: false}">{{otherSize.count|number}} </a>
|
||||
<div class="uk-text-uppercase uk-flex uk-flex-middle">
|
||||
<icon name="earth" ratio="1.5" [flex]="true" class="uk-margin-right" customClass="portal-color"></icon>
|
||||
<span>other research products</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>-->
|
||||
|
||||
<div class="uk-background-muted">
|
||||
<div class="uk-position-relative">
|
||||
<div class="uk-section uk-section-large">
|
||||
<div class="uk-container">
|
||||
<div class="uk-grid uk-child-width-1-2@m" uk-grid>
|
||||
<div>
|
||||
<div style="max-width: 550px;">
|
||||
<h2>Linked Open Research.</h2>
|
||||
<div class="">
|
||||
EXPLORE is built on the <a href="https://graph.openaire.eu/" target="_blank"
|
||||
class="graph">OpenAIRE Graph</a>, one of the largest
|
||||
open scholarly record collections worldwide. Conceived as a public and
|
||||
transparent good, populated out of data sources trusted by scientists, the
|
||||
OpenAIRE Graph brings discovery, monitoring, and assessment of science
|
||||
back in the hands of the scientific community.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div></div>
|
||||
<img class="uk-visible@m uk-height-1-1 uk-position-top-right"
|
||||
src="assets/common-assets/common/graph-nodes.svg" alt="Graph nodes" loading="lazy">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="uk-section uk-padding-remove-top">
|
||||
<div class="uk-container">
|
||||
<div class="uk-width-1-2@m uk-margin-auto uk-margin-small-top uk-text-center" style="max-width: 600px;">
|
||||
<div>
|
||||
Within a constantly emerging scholarly communication environment, the OpenAIRE Graph is a moving
|
||||
target, continuously integrating new sources, new types or research objects, and embedding
|
||||
access measures. We therefore welcome the community to work with us to improve all its aspects:
|
||||
its <span class="uk-text-bold">coverage</span> (geographic and thematic), <span
|
||||
class="uk-text-bold">quality</span> (disambiguation and semantics) and <span
|
||||
class="uk-text-bold">access</span> (APIs).
|
||||
</div>
|
||||
<div class="uk-margin-top">
|
||||
Find information about the OpenAIRE Graph, how to test it and contribute to improving it.
|
||||
</div>
|
||||
<div class="uk-margin-top">
|
||||
<a href="https://www.openaire.eu/blogs/the-openaire-research-graph" target="_blank"
|
||||
class="uk-display-inline-block uk-text-uppercase uk-button uk-button-text">
|
||||
Learn more. Contribute
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="uk-section uk-section-large">
|
||||
<helper *ngIf="pageContents && pageContents['left'] && pageContents['left'].length > 0"
|
||||
[texts]="pageContents['left']"></helper>
|
||||
<div class="uk-section-muted"
|
||||
uk-scrollspy="{"target":"[uk-scrollspy-class]","cls":"uk-animation-fade","delay":false}">
|
||||
<div class="uk-container uk-container-large">
|
||||
<h2 class="uk-h5 uk-margin-remove uk-text-primary">
|
||||
Did you know that
|
||||
</h2>
|
||||
<h2 class="uk-heading-large uk-margin-large-bottom uk-margin-remove-top">
|
||||
you may
|
||||
</h2>
|
||||
<div class="uk-container">
|
||||
<div class="uk-grid uk-child-width-1-2@l uk-child-width-1-1 uk-grid-large" uk-grid
|
||||
uk-height-match=".link-title">
|
||||
<div>
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal custom-link">
|
||||
<a href="https://provide.openaire.eu/home" target="_blank"
|
||||
class="uk-button uk-button-text uk-text-left uk-text-large">
|
||||
<span class="link-title">have your repository, Journal or CRIS system indexed in EXPLORE and take advantage of services for enriching metadata and counting usage?</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="uk-padding-small uk-padding-remove-horizontal custom-link">
|
||||
<a href="https://canada.explore.openaire.eu/" target="_blank"
|
||||
class="uk-button uk-button-text uk-text-left uk-text-large">
|
||||
<span class="link-title">use EXPLORE as an application platform as a service (aPaaS) and set up a national portal for Open Science, such as Canada.EXPLORE?</span>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div #contact class="uk-section">
|
||||
<div class="uk-container uk-container-large uk-margin-large-bottom uk-text-center">
|
||||
<h3 class="uk-h2 uk-margin-remove">
|
||||
Need more information?
|
||||
</h3>
|
||||
<h4 class="uk-h4 uk-margin-small-top uk-margin-medium-bottom">
|
||||
Get in touch and let us help you<span class="uk-text-primary">.</span>
|
||||
</h4>
|
||||
<a class="uk-button uk-button-primary uk-text-uppercase uk-margin-top uk-margin-medium-bottom"
|
||||
routerLink="/contact-us">Contact us</a>
|
||||
</div>
|
||||
<other-portals portal="explore" [properties]="properties"></other-portals>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,58 +0,0 @@
|
|||
@import (reference) "~src/assets/openaire-theme/less/_import-variables";
|
||||
|
||||
@trello-color: #0076BA;
|
||||
|
||||
.home-background {
|
||||
background-color: @global-inverse-color;
|
||||
}
|
||||
|
||||
.link-actions img {
|
||||
width: 17px;
|
||||
}
|
||||
|
||||
.home-logo {
|
||||
img {
|
||||
-webkit-filter: grayscale(1);
|
||||
filter: grayscale(1);
|
||||
transition-duration: 0.3s;
|
||||
}
|
||||
|
||||
&:hover img {
|
||||
-webkit-filter: grayscale(0);
|
||||
filter: grayscale(0);
|
||||
transition-duration: 0.3s;
|
||||
}
|
||||
}
|
||||
|
||||
.custom-link {
|
||||
border-bottom: @global-border-width solid @global-border;
|
||||
|
||||
a {
|
||||
text-transform: none;
|
||||
|
||||
.link-title {
|
||||
color: @global-emphasis-color;
|
||||
}
|
||||
|
||||
&:hover .link-title {
|
||||
color: @global-secondary-background;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.slider-image {
|
||||
min-width: 550px;
|
||||
}
|
||||
|
||||
@media only screen and (min-width: @breakpoint-large) {
|
||||
.explore-dark-logo-background {
|
||||
background-image: url("~src/assets/explore-assets/home/explore-dark-logo.svg");
|
||||
background-repeat: no-repeat;
|
||||
background-position: -5% 102%;
|
||||
background-size: 35%;
|
||||
}
|
||||
|
||||
.slider-nav {
|
||||
max-width: 650px;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,87 +1,136 @@
|
|||
import {
|
||||
AfterViewInit,
|
||||
ChangeDetectorRef,
|
||||
Component,
|
||||
ElementRef,
|
||||
OnDestroy,
|
||||
OnInit,
|
||||
QueryList,
|
||||
ViewChild,
|
||||
ViewChildren
|
||||
} from '@angular/core';
|
||||
import {Subscriber} from 'rxjs';
|
||||
import {Router} from '@angular/router';
|
||||
import {Component, ViewChild} from '@angular/core';
|
||||
import {Subscription} from 'rxjs';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
import {Meta, Title} from '@angular/platform-browser';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {OpenaireEntities, SearchFields} from '../openaireLibrary/utils/properties/searchFields';
|
||||
import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
|
||||
import {SearchProjectsService} from '../openaireLibrary/services/searchProjects.service';
|
||||
import {SearchOrganizationsService} from '../openaireLibrary/services/searchOrganizations.service';
|
||||
import {RefineFieldResultsService} from '../openaireLibrary/services/refineFieldResults.service';
|
||||
import {SearchFields} from '../openaireLibrary/utils/properties/searchFields';
|
||||
|
||||
import {RouterHelper} from '../openaireLibrary/utils/routerHelper.class';
|
||||
import {EnvProperties} from '../openaireLibrary/utils/properties/env-properties';
|
||||
import {ErrorCodes} from '../openaireLibrary/utils/properties/errorCodes';
|
||||
import {PiwikService} from '../openaireLibrary/utils/piwik/piwik.service';
|
||||
import {SEOService} from '../openaireLibrary/sharedComponents/SEO/SEO.service';
|
||||
import {SearchResearchResultsService} from "../openaireLibrary/services/searchResearchResults.service";
|
||||
import {HelperService} from "../openaireLibrary/utils/helper/helper.service";
|
||||
import {Filter} from "../openaireLibrary/searchPages/searchUtils/searchHelperClasses.class";
|
||||
import {properties} from "../../environments/environment";
|
||||
import {Numbers, NumbersComponent} from "../openaireLibrary/sharedComponents/numbers/numbers.component";
|
||||
import {StringUtils} from "../openaireLibrary/utils/string-utils.class";
|
||||
import {QuickContactService} from '../openaireLibrary/sharedComponents/quick-contact/quick-contact.service';
|
||||
|
||||
@Component({
|
||||
selector: 'home',
|
||||
templateUrl: 'home.component.html',
|
||||
styleUrls: ['home.component.less']
|
||||
})
|
||||
export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||
export class HomeComponent {
|
||||
// MAX 12 logos in every slide
|
||||
public logos = {
|
||||
"publication": [
|
||||
[
|
||||
"publications.png"
|
||||
"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"
|
||||
],
|
||||
[
|
||||
"publications2.png"
|
||||
"logo-crossref.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"
|
||||
]
|
||||
],
|
||||
"software": [
|
||||
[
|
||||
"software.png"
|
||||
"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"
|
||||
]
|
||||
],
|
||||
"dataset": [
|
||||
[
|
||||
"datasets.png"
|
||||
"logo-scholexplorer.png",
|
||||
"logo-zenodo.png",
|
||||
"logo-datacite.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"
|
||||
]
|
||||
],
|
||||
//"other": [],
|
||||
"persistent": [
|
||||
[
|
||||
"pids.png"
|
||||
"logo-re3data.png",
|
||||
"logo-orcid.png",
|
||||
"logo-opendoar.png",
|
||||
"logo-grid.png"
|
||||
]
|
||||
],
|
||||
"funder": [
|
||||
[
|
||||
"funders.png"
|
||||
"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"
|
||||
]
|
||||
]
|
||||
};
|
||||
public portalName: string = "";
|
||||
|
||||
public pageTitle = "OpenAIRE";
|
||||
public keyword: string = "";
|
||||
|
||||
public searchFields: SearchFields = new SearchFields();
|
||||
public errorCodes: ErrorCodes = new ErrorCodes();
|
||||
public routerHelper: RouterHelper = new RouterHelper();
|
||||
public numbers: Numbers = {};
|
||||
public properties: EnvProperties = properties;
|
||||
public openaireEntities = OpenaireEntities;
|
||||
public numbers: Numbers;
|
||||
showPublications: boolean = false;
|
||||
showDatasets: boolean = false;
|
||||
showSoftware: boolean = false;
|
||||
showOrp: boolean = false;
|
||||
showProjects: boolean = false;
|
||||
showDataProviders: boolean = false;
|
||||
showOrganizations: boolean = false;
|
||||
properties: EnvProperties = properties;
|
||||
public readMore: boolean = false;
|
||||
@ViewChild('contact') contact: ElementRef;
|
||||
subscriptions: any[] = [];
|
||||
@ViewChildren('scrolling_element') elements: QueryList<ElementRef>;
|
||||
resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = null;//{
|
||||
// filter: null,
|
||||
// selected: true,
|
||||
// filterId: "resultbestaccessright",
|
||||
// value: "Open Access"
|
||||
// };
|
||||
|
||||
subs: Subscription[] = [];
|
||||
|
||||
resultsQuickFilter: { filter: Filter, selected: boolean, filterId: string, value: string } = {
|
||||
filter: null,
|
||||
selected: true,
|
||||
filterId: "resultbestaccessright",
|
||||
value: "Open Access"
|
||||
};
|
||||
selectedEntity = "all";
|
||||
selectedEntitySimpleUrl;
|
||||
selectedEntityAdvancedUrl;
|
||||
|
|
@ -92,31 +141,23 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
filterType: 'checkbox',
|
||||
originalFilterId: "",
|
||||
valueIsExact: true,
|
||||
title: "Type",
|
||||
title: "Result Types",
|
||||
filterOperator: "or"
|
||||
};
|
||||
public pageContents = null;
|
||||
@ViewChild("numbersComponent", { static: true }) numbersComponent: NumbersComponent;
|
||||
specialSubjects = [
|
||||
{value: "Physics::Atomic Physics", label: "Atomic Physics"},
|
||||
{value: "Mathematics::Combinatorics", label: "Mathematics Combinatorics"},
|
||||
{value: "lcsh:Medicine", label: "Medicine"},
|
||||
{value: "lcsh:Science", label: "Science"},
|
||||
{value: "lcsh:Biology (General)", label: "Biology"},
|
||||
{value: "lcsh:Chemistry", label: "Chemistry"},
|
||||
{value: "lcsh:Engineering (General). Civil engineering (General)", label: "Civil engineering"},
|
||||
{value: "lcsh:Technology", label: "Technology"},
|
||||
];
|
||||
stringUtils = new StringUtils();
|
||||
// disableSelect: boolean = true;
|
||||
|
||||
constructor(
|
||||
private route: ActivatedRoute,
|
||||
private _router: Router,
|
||||
private _piwikService: PiwikService,
|
||||
private _searchResearchResultsService: SearchResearchResultsService,
|
||||
private _searchDataprovidersService: SearchDataprovidersService,
|
||||
private _searchProjectsService: SearchProjectsService,
|
||||
private _searchOrganizationsService: SearchOrganizationsService,
|
||||
private _refineFieldResultsService: RefineFieldResultsService,
|
||||
private location: Location, private _piwikService: PiwikService,
|
||||
private config: ConfigurationService, private _meta: Meta, private _title: Title, private seoService: SEOService,
|
||||
private helper: HelperService,
|
||||
private cdr: ChangeDetectorRef,
|
||||
private quickContactService: QuickContactService
|
||||
private helper: HelperService
|
||||
) {
|
||||
let description = "OpenAIRE Explore: Over 100M of research deduplicated, 170K research software, 11M research data. One of the largest open scholarly records collection worldwide.";
|
||||
let title = "OpenAIRE | Find and Share research";
|
||||
|
|
@ -124,11 +165,10 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
this._meta.updateTag({content: description}, "name='description'");
|
||||
this._meta.updateTag({content: description}, "property='og:description'");
|
||||
this._meta.updateTag({content: title}, "property='og:title'");
|
||||
this.quickContactService.setDisplay(false);
|
||||
}
|
||||
|
||||
private getPageContents() {
|
||||
this.subscriptions.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => {
|
||||
this.subs.push(this.helper.getPageHelpContents(this.properties, 'openaire', this._router.url).subscribe(contents => {
|
||||
this.pageContents = contents;
|
||||
}));
|
||||
}
|
||||
|
|
@ -149,80 +189,42 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
return Math.ceil(num);
|
||||
}
|
||||
|
||||
clear() {
|
||||
this.subscriptions.forEach(value => {
|
||||
if (value instanceof Subscriber) {
|
||||
value.unsubscribe();
|
||||
} else if (value instanceof IntersectionObserver || value instanceof MutationObserver) {
|
||||
value.disconnect();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public ngOnInit() {
|
||||
this.seoService.createLinkForCanonicalURL(this.properties.domain + this.properties.baseLink + this._router.url, false);
|
||||
this.getPageContents();
|
||||
if (this.properties != null) {
|
||||
var url = this.properties.domain + this.properties.baseLink + this._router.url;
|
||||
this._meta.updateTag({content: url}, "property='og:url'");
|
||||
this.subscriptions.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
|
||||
if(this.numbersComponent) {
|
||||
this.numbersComponent.showPublications = false;
|
||||
this.numbersComponent.showDatasets = false;
|
||||
this.numbersComponent.showSoftware = false;
|
||||
this.numbersComponent.showOrp = false;
|
||||
this.numbersComponent.showProjects = false;
|
||||
this.numbersComponent.showDataProviders = false;
|
||||
this.numbersComponent.showOrganizations = false;
|
||||
if (this.properties.enablePiwikTrack && (typeof document !== 'undefined')) {
|
||||
this.subs.push(this._piwikService.trackView(this.properties, "OpenAIRE").subscribe());
|
||||
}
|
||||
this.subscriptions.push(this.config.portalAsObservable.subscribe(data => {
|
||||
//this.config.getCommunityInformation(this.properties, this.properties.adminToolsCommunity ).subscribe(data => {
|
||||
this.subs.push(this.config.communityInformationState.subscribe(data => {
|
||||
if (data) {
|
||||
if(data.name) {
|
||||
this.portalName = data.name;
|
||||
}
|
||||
var showEntity = {};
|
||||
for (var i = 0; i < data['entities'].length; i++) {
|
||||
showEntity["" + data['entities'][i]["pid"] + ""] = data['entities'][i]["isEnabled"];
|
||||
}
|
||||
if(this.numbersComponent) {
|
||||
this.numbersComponent.showPublications = !!showEntity["publication"];
|
||||
this.numbersComponent.showDatasets = !!showEntity["dataset"];
|
||||
this.numbersComponent.showSoftware = !!showEntity["software"];
|
||||
this.numbersComponent.showOrp = !!showEntity["orp"];
|
||||
this.numbersComponent.showProjects = !!showEntity["project"];
|
||||
this.numbersComponent.showDataProviders = !!showEntity["datasource"];
|
||||
this.numbersComponent.showOrganizations = !!showEntity["organization"];
|
||||
this.showPublications = !!showEntity["publication"];
|
||||
this.showDatasets = !!showEntity["dataset"];
|
||||
this.showSoftware = !!showEntity["software"];
|
||||
this.showOrp = !!showEntity["orp"];
|
||||
this.showProjects = !!showEntity["project"];
|
||||
this.showDataProviders = !!showEntity["datasource"];
|
||||
this.showOrganizations = !!showEntity["organization"];
|
||||
if (this.showPublications) {
|
||||
this.resultTypes.values.push({name: "Publications", id: "publications", selected: true, number: 0});
|
||||
}
|
||||
if(this.numbersComponent && this.numbersComponent.showPublications) {
|
||||
this.resultTypes.values.push({
|
||||
name: this.openaireEntities.PUBLICATIONS,
|
||||
id: "publications",
|
||||
selected: false,
|
||||
number: 0
|
||||
});
|
||||
if (this.showDatasets) {
|
||||
this.resultTypes.values.push({name: "Research data", id: "datasets", selected: true, number: 0});
|
||||
}
|
||||
if(this.numbersComponent && this.numbersComponent.showDatasets) {
|
||||
this.resultTypes.values.push({
|
||||
name: this.openaireEntities.DATASETS,
|
||||
id: "datasets",
|
||||
selected: false,
|
||||
number: 0
|
||||
});
|
||||
if (this.showSoftware) {
|
||||
this.resultTypes.values.push({name: "Software", id: "software", selected: true, number: 0});
|
||||
}
|
||||
if(this.numbersComponent && this.numbersComponent.showSoftware) {
|
||||
this.resultTypes.values.push({
|
||||
name: this.openaireEntities.SOFTWARE,
|
||||
id: "software",
|
||||
selected: false,
|
||||
number: 0
|
||||
});
|
||||
}
|
||||
if(this.numbersComponent && this.numbersComponent.showOrp) {
|
||||
this.resultTypes.values.push({name: this.openaireEntities.OTHER, id: "other", selected: false, number: 0});
|
||||
}
|
||||
if(this.numbersComponent) {
|
||||
this.numbersComponent.init(this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showPublications, this.numbersComponent.showDatasets, this.numbersComponent.showSoftware, this.numbersComponent.showOrp, this.numbersComponent.showProjects, this.numbersComponent.showDataProviders, this.numbersComponent.showOrganizations);
|
||||
if (this.showOrp) {
|
||||
this.resultTypes.values.push({name: "Other research products", id: "other", selected: true, number: 0});
|
||||
}
|
||||
this.numbersComponent.init(this.showDatasets, this.showSoftware, this.showPublications, this.showDatasets, this.showSoftware, this.showOrp, this.showProjects, this.showDataProviders);
|
||||
}
|
||||
},
|
||||
error => {
|
||||
|
|
@ -232,50 +234,10 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
public ngOnDestroy() {
|
||||
this.quickContactService.setDisplay(true);
|
||||
this.clear();
|
||||
for (let sub of this.subs) {
|
||||
sub.unsubscribe();
|
||||
}
|
||||
|
||||
ngAfterViewInit() {
|
||||
if (typeof window !== "undefined") {
|
||||
this.createObservers();
|
||||
}
|
||||
}
|
||||
|
||||
createObservers() {
|
||||
let options = {
|
||||
root: null,
|
||||
rootMargin: '200px',
|
||||
threshold: 1.0
|
||||
};
|
||||
let intersectionObserver = new IntersectionObserver(entries => {
|
||||
entries.forEach(entry => {
|
||||
this.quickContactService.setDisplay(!entry.isIntersecting);
|
||||
});
|
||||
}, options);
|
||||
intersectionObserver.observe(this.contact.nativeElement);
|
||||
let mutationObserver = new MutationObserver(entries => {
|
||||
entries.forEach(entry => {
|
||||
if (entry.attributeName === 'style') {
|
||||
let opacities: number[] = this.elements.map(element => +element.nativeElement.style.opacity);
|
||||
let active: number = opacities.indexOf(Math.max(...opacities));
|
||||
this.elements.forEach((element, index) => {
|
||||
if (index === active) {
|
||||
element.nativeElement.classList.remove('uk-disabled');
|
||||
} else {
|
||||
element.nativeElement.classList.add('uk-disabled');
|
||||
}
|
||||
})
|
||||
}
|
||||
})
|
||||
});
|
||||
this.elements.forEach(element => {
|
||||
mutationObserver.observe(element.nativeElement, {attributes: true});
|
||||
});
|
||||
this.subscriptions.push(intersectionObserver);
|
||||
this.subscriptions.push(mutationObserver);
|
||||
}
|
||||
|
||||
private handleError(message: string, error) {
|
||||
|
|
@ -288,47 +250,39 @@ export class HomeComponent implements OnInit, OnDestroy, AfterViewInit {
|
|||
this.selectedEntityAdvancedUrl = $event.advancedUrl;
|
||||
}
|
||||
|
||||
goTo() {
|
||||
goTo(simple: boolean) {
|
||||
let url = (simple) ? this.selectedEntitySimpleUrl : this.selectedEntityAdvancedUrl;
|
||||
let parameterNames = [];
|
||||
let parameterValues = [];
|
||||
// if (this.selectedEntity == "result") {
|
||||
// if (this.resultTypes) {
|
||||
// let values = [];
|
||||
// for (let value of this.resultTypes.values) {
|
||||
// if (value.selected) {
|
||||
// values.push(value.id);
|
||||
// }
|
||||
// }
|
||||
// if (values.length > 0 && values.length != 4) {
|
||||
// parameterNames.push("type");
|
||||
// parameterValues.push(values.join(","));
|
||||
// }
|
||||
// if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
// parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
// parameterValues.push('"' + encodeURIComponent(this.resultsQuickFilter.value) + '"');
|
||||
// }
|
||||
// }
|
||||
// } else if (this.selectedEntity == "all") {
|
||||
if (this.selectedEntity == "result") {
|
||||
if (this.resultTypes) {
|
||||
let values = [];
|
||||
for (let value of this.resultTypes.values) {
|
||||
if (value.selected) {
|
||||
values.push(value.id);
|
||||
}
|
||||
}
|
||||
if (values.length > 0 && values.length != 4) {
|
||||
parameterNames.push("type");
|
||||
parameterValues.push(values.join(","));
|
||||
}
|
||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
parameterValues.push('"'+ encodeURIComponent(this.resultsQuickFilter.value)+'"');
|
||||
}
|
||||
// }
|
||||
}
|
||||
} else if (this.selectedEntity == "all") {
|
||||
if (this.resultsQuickFilter && this.resultsQuickFilter.selected) {
|
||||
parameterNames.push(this.resultsQuickFilter.filterId);
|
||||
parameterValues.push('"'+ encodeURIComponent(this.resultsQuickFilter.value)+'"');
|
||||
}
|
||||
}
|
||||
if (this.keyword.length > 0) {
|
||||
parameterNames.push("fv0");
|
||||
parameterValues.push(this.keyword);
|
||||
parameterNames.push("f0");
|
||||
parameterValues.push("q");
|
||||
}
|
||||
this._router.navigate([this.properties.searchLinkToAll], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
||||
this._router.navigate([url], {queryParams: this.routerHelper.createQueryParams(parameterNames, parameterValues)});
|
||||
}
|
||||
|
||||
getSubjectParameter(param) {
|
||||
return {'f0': 'resultsubject', 'fv0': '"' + (param) + '"', size: 50};
|
||||
}
|
||||
|
||||
// disableSelectChange(event: boolean) {
|
||||
// this.disableSelect = event;
|
||||
// this.cdr.detectChanges();
|
||||
// }
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,10 +10,12 @@ 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";
|
||||
|
|
@ -21,33 +23,32 @@ import {EntitiesSelectionModule} from "../openaireLibrary/searchPages/searchUtil
|
|||
import {QuickSelectionsModule} from "../openaireLibrary/searchPages/searchUtils/quick-selections.module";
|
||||
import {IconsModule} from "../openaireLibrary/utils/icons/icons.module";
|
||||
import {IconsService} from "../openaireLibrary/utils/icons/icons.service";
|
||||
import {book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
|
||||
import {arrow_right, book, cog, database, earth} from "../openaireLibrary/utils/icons/icons";
|
||||
import {NumbersModule} from "../openaireLibrary/sharedComponents/numbers/numbers.module";
|
||||
import {AdvancedSearchInputModule} from "../openaireLibrary/sharedComponents/advanced-search-input/advanced-search-input.module";
|
||||
import {InputModule} from "../openaireLibrary/sharedComponents/input/input.module";
|
||||
import {SearchInputModule} from "../openaireLibrary/sharedComponents/search-input/search-input.module";
|
||||
import {SliderUtilsModule} from "../openaireLibrary/sharedComponents/slider-utils/slider-utils.module";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
HomeRoutingModule,
|
||||
CommonModule, FormsModule, RouterModule,
|
||||
RefineFieldResultsServiceModule,
|
||||
DataProvidersServiceModule, SearchResearchResultsServiceModule,
|
||||
ProjectsServiceModule, OrganizationsServiceModule,
|
||||
PiwikServiceModule,
|
||||
HomeRoutingModule,
|
||||
HelperModule,
|
||||
SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule, AdvancedSearchInputModule, InputModule, SearchInputModule, SliderUtilsModule
|
||||
SEOServiceModule, OtherPortalsModule, EntitiesSelectionModule, QuickSelectionsModule, IconsModule, NumbersModule
|
||||
],
|
||||
declarations: [
|
||||
HomeComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[
|
||||
PreviousRouteRecorder
|
||||
],
|
||||
exports: [
|
||||
HomeComponent
|
||||
]
|
||||
})
|
||||
export class HomeModule {
|
||||
constructor(private iconsService: IconsService) {
|
||||
this.iconsService.registerIcons([book, cog, database, earth]);
|
||||
this.iconsService.registerIcons([arrow_right, book, cog, database, earth]);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,17 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireDataProviderComponent } from './dataProvider.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireDataProviderComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class DataProviderRoutingModule { }
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-dataprovider',
|
||||
template: `<dataprovider></dataprovider>`,
|
||||
})
|
||||
export class OpenaireDataProviderComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { OpenaireDatasetComponent } from './dataset.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireDatasetComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class DatasetRoutingModule { }
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-dataset',
|
||||
template: `<result-landing type="dataset"></result-landing>`,
|
||||
})
|
||||
export class OpenaireDatasetComponent{}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireHtmlProjectReportComponent ,canDeactivate: [PreviousRouteRecorder]}
|
||||
])
|
||||
]
|
||||
})
|
||||
export class HtmlProjectReportRoutingModule { }
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-htmlProjectReport',
|
||||
template: `<htmlProjectReport></htmlProjectReport>`,
|
||||
})
|
||||
export class OpenaireHtmlProjectReportComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
import { NgModule} from '@angular/core';
|
||||
import { HtmlProjectReportModule } from '../../openaireLibrary/landingPages/htmlProjectReport/htmlProjectReport.module';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import { OpenaireHtmlProjectReportComponent } from './htmlProjectReport.component';
|
||||
import {HtmlProjectReportRoutingModule} from './htmlProjectReport-routing.module';
|
||||
|
||||
@NgModule({
|
||||
imports: [HtmlProjectReportModule, HtmlProjectReportRoutingModule],
|
||||
declarations:[OpenaireHtmlProjectReportComponent],
|
||||
providers:[ PreviousRouteRecorder],
|
||||
exports:[OpenaireHtmlProjectReportComponent]
|
||||
})
|
||||
export class LibHtmlProjectReportModule { }
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireOrganizationComponent } from './organization.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireOrganizationComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class OrganizationRoutingModule { }
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-organization',
|
||||
template: `<organization></organization>`,
|
||||
})
|
||||
export class OpenaireOrganizationComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireOrpComponent } from './orp.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireOrpComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class OrpRoutingModule { }
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-orp',
|
||||
template: `<result-landing type="orp"></result-landing>`,
|
||||
})
|
||||
export class OpenaireOrpComponent{}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import { OpenaireProjectComponent } from './project.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireProjectComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class ProjectRoutingModule { }
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-project',
|
||||
template: `<project></project>`,
|
||||
})
|
||||
export class OpenaireProjectComponent{
|
||||
constructor ( ) {
|
||||
|
||||
}
|
||||
|
||||
ngOnInit() {
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenairePublicationComponent } from './publication.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenairePublicationComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class PublicationRoutingModule { }
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
template: `
|
||||
<result-landing type="publication"></result-landing>`,
|
||||
})
|
||||
export class OpenairePublicationComponent {}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
import { NgModule } from '@angular/core';
|
||||
import { RouterModule } from '@angular/router';
|
||||
|
||||
import {OpenaireResultComponent } from './result.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireResultComponent, data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder] }
|
||||
])
|
||||
]
|
||||
})
|
||||
export class ResultRoutingModule { }
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-publication',
|
||||
template: `<result-landing type="result"></result-landing>`,
|
||||
})
|
||||
export class OpenaireResultComponent{}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-software',
|
||||
template: `<result-landing type="software"></result-landing>`,
|
||||
})
|
||||
export class OpenaireSoftwareComponent{}
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-user',
|
||||
template: `<user></user>`
|
||||
})
|
||||
|
||||
export class OpenaireUserComponent {
|
||||
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
Subproject commit f1fd1ef60c5a964e283ced7840876dc5896af9be
|
||||
Subproject commit 64051887ce031b36d74349496912e5c337801c15
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
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";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireMyOrcidLinksComponent,
|
||||
canActivate: [LoginGuard], data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class MyOrcidLinksRoutingModule { }
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
import {Component} from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-my-orcid-links',
|
||||
template: `
|
||||
<my-orcid-links></my-orcid-links>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireMyOrcidLinksComponent {
|
||||
|
||||
constructor() {}
|
||||
|
||||
public ngOnInit() {}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
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";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireOrcidComponent,
|
||||
canActivate: [LoginGuard], data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},
|
||||
canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class OrcidRoutingModule { }
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
import { Component } from '@angular/core';
|
||||
|
||||
@Component({
|
||||
selector: 'openaire-orcid',
|
||||
template: `
|
||||
<orcid></orcid>
|
||||
`
|
||||
})
|
||||
|
||||
export class OpenaireOrcidComponent {}
|
||||
|
|
@ -0,0 +1,24 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
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";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
// { path: '', component: OpenaireSearchMyResultsInOrcidComponent, canActivate: [IsRouteEnabled], data: {
|
||||
{ path: '', component: OpenaireSearchRecommendedResultsForOrcidComponent,
|
||||
canActivate: [LoginGuard], data: {
|
||||
redirect: '/error', community : 'openaire'
|
||||
},
|
||||
canDeactivate: [PreviousRouteRecorder]
|
||||
}
|
||||
|
||||
])
|
||||
]
|
||||
})
|
||||
export class SearchRecommendedResultsForOrcidRoutingModule { }
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
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() {}
|
||||
}
|
||||
|
||||
|
|
@ -0,0 +1,27 @@
|
|||
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 { }
|
||||
|
|
@ -0,0 +1,18 @@
|
|||
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 {
|
||||
}
|
||||
|
|
@ -2,7 +2,6 @@ import { NgModule } from '@angular/core';
|
|||
import { RouterModule } from '@angular/router';
|
||||
import{OpenaireAdvancedSearchDataProvidersComponent} from './advancedSearchDataProviders.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
|
||||
|
|
@ -10,7 +9,7 @@ import {properties} from "../../../environments/environment";
|
|||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireAdvancedSearchDataProvidersComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireAdvancedSearchOrganizationsComponent} from './advancedSearchOrganizations.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireAdvancedSearchOrganizationsComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
},canDeactivate: [PreviousRouteRecorder]}
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -9,9 +9,10 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
|
|||
|
||||
@NgModule({
|
||||
imports: [
|
||||
AdvancedSearchOrganizationsRoutingModule,
|
||||
CommonModule, FormsModule,
|
||||
SearchOrganizationsModule
|
||||
SearchOrganizationsModule,
|
||||
AdvancedSearchOrganizationsRoutingModule
|
||||
|
||||
],
|
||||
declarations: [
|
||||
OpenaireAdvancedSearchOrganizationsComponent
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireAdvancedSearchProjectsComponent} from './advancedSearchProjects.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireAdvancedSearchProjectsComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -8,9 +8,10 @@ import {SearchProjectsModule} from "../../openaireLibrary/searchPages/searchProj
|
|||
|
||||
@NgModule({
|
||||
imports: [
|
||||
AdvancedSearchProjectsRoutingModule,
|
||||
CommonModule, FormsModule,
|
||||
SearchProjectsModule
|
||||
SearchProjectsModule,
|
||||
AdvancedSearchProjectsRoutingModule
|
||||
|
||||
],
|
||||
declarations: [
|
||||
OpenaireAdvancedSearchProjectsComponent
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireSearchResearchResultsComponent} from './searchResearchResults.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchResearchResultsComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ 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({
|
||||
|
|
@ -16,7 +17,7 @@ import {SearchResearchResultsModule} from "../../openaireLibrary/searchPages/sea
|
|||
declarations: [
|
||||
OpenaireSearchResearchResultsComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports: [
|
||||
OpenaireSearchResearchResultsComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireSearchCompatibleDataprovidersComponent} from './compatibleDataProviders.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchCompatibleDataprovidersComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ 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({
|
||||
|
|
@ -16,7 +18,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchCompatibleDataprovidersComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports: [
|
||||
OpenaireSearchCompatibleDataprovidersComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,13 +3,12 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireSearchEntityRegistriesComponent} from './entityRegistries.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchEntityRegistriesComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ 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";
|
||||
|
||||
|
|
@ -16,7 +17,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchEntityRegistriesComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports: [
|
||||
OpenaireSearchEntityRegistriesComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireSearchJournalsComponent} from './journals.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchJournalsComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ 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: [
|
||||
|
|
@ -13,7 +14,7 @@ import {SearchDataProvidersModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchJournalsComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports: [
|
||||
OpenaireSearchJournalsComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireSearchDataprovidersComponent} from './searchDataproviders.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchDataprovidersComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ 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: [
|
||||
|
|
@ -13,7 +14,7 @@ SearchDataProvidersModule, SearchDataProvidersRoutingModule
|
|||
declarations: [
|
||||
OpenaireSearchDataprovidersComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports: [
|
||||
OpenaireSearchDataprovidersComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ import { RouterModule } from '@angular/router';
|
|||
import{OpenaireSearchOrganizationsComponent} from './searchOrganizations.component';
|
||||
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
|
||||
|
|
@ -12,7 +11,7 @@ import {properties} from "../../../environments/environment";
|
|||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchOrganizationsComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ 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";
|
||||
|
||||
|
||||
|
|
@ -17,7 +18,7 @@ import {SearchOrganizationsModule} from "../../openaireLibrary/searchPages/searc
|
|||
declarations: [
|
||||
OpenaireSearchOrganizationsComponent
|
||||
],
|
||||
providers:[],
|
||||
providers:[PreviousRouteRecorder],
|
||||
exports: [
|
||||
OpenaireSearchOrganizationsComponent
|
||||
]
|
||||
|
|
|
|||
|
|
@ -3,14 +3,13 @@ import { RouterModule } from '@angular/router';
|
|||
|
||||
import{OpenaireSearchProjectsComponent} from './searchProjects.component';
|
||||
import {PreviousRouteRecorder} from '../../openaireLibrary/utils/piwik/previousRouteRecorder.guard';
|
||||
import {properties} from "../../../environments/environment";
|
||||
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
RouterModule.forChild([
|
||||
{ path: '', component: OpenaireSearchProjectsComponent, data: {
|
||||
redirect: properties.errorLink, community : 'openaire'
|
||||
redirect: '/error', community : 'openaire'
|
||||
}, canDeactivate: [PreviousRouteRecorder] }
|
||||
|
||||
])
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue