[Aggregator | Trunk]: Upgrade to angular 11
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-aggregator-portal/trunk@61382 d315682c-612b-4755-9ff5-7f18f6832af3
This commit is contained in:
k.triantafyllou
parent
b6104fcfd9
commit
91f00469c1
|
|
@ -0,0 +1,11 @@
|
|||
# This file is currently used by autoprefixer to adjust CSS to support the below specified browsers
|
||||
# For additional information regarding the format and rule options, please see:
|
||||
# https://github.com/browserslist/browserslist#queries
|
||||
#
|
||||
# For IE 9-11 support, please remove 'not' from the last line of the file and adjust as needed
|
||||
|
||||
> 0.5%
|
||||
last 2 versions
|
||||
Firefox ESR
|
||||
not dead
|
||||
not IE 9-11
|
||||
59
README.md
59
README.md
|
|
@ -1,54 +1,39 @@
|
|||
# Angular Universal & Anguar-CLI minimal starter
|
||||
# Aggregator
|
||||
|
||||
> This demo is built following the [Angular-CLI Wiki guide](https://github.com/angular/angular-cli/wiki/stories-universal-rendering)
|
||||
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.
|
||||
|
||||
We're utilizing packages from the [Angular Universal @nguniversal](https://github.com/angular/universal) repo, such as [ng-module-map-ngfactory-loader](https://github.com/angular/universal/tree/master/modules/module-map-ngfactory-loader) to enable Lazy Loading.
|
||||
## Install packages
|
||||
|
||||
---
|
||||
Run npm install (maybe needs sudo), a script that will delete unused files from library will be run.
|
||||
|
||||
## Static or Dynamic
|
||||
This repo demonstrates the use of 2 different forms of Server Side Rendering.
|
||||
## Development server
|
||||
|
||||
**Static** Also known as "prerendering"
|
||||
* Happens at build time
|
||||
* Renders your application and replaces the dist index.html with a version rendered at the route `/`.
|
||||
Run `npm start` for a dev server. Navigate to `http://localhost:4400/`. The app will automatically reload if you change any of the source files.
|
||||
|
||||
**Dynamic**
|
||||
* Happens at runtime
|
||||
* Uses `ngExpressEngine` to render you application on the fly at the requested url.
|
||||
## Build - CSR
|
||||
|
||||
---
|
||||
Use the `npm run build-dev` for a development build.<br>
|
||||
Use the `npm run build-beta` for a beta build.<br>
|
||||
Use the `npm run build-prod` for a production build.
|
||||
|
||||
## Installation
|
||||
* `npm install` or `yarn`
|
||||
## Build - SSR
|
||||
|
||||
---
|
||||
Use the `npm run build:ssr-dev` for a development build.<br>
|
||||
Use the `npm run build:ssr-beta` for a beta build.<br>
|
||||
Use the `npm run build:ssr-prod` for a production build.
|
||||
|
||||
## Development (Client-side only rendering)
|
||||
* run `npm run start` which will start `ng serve` (project served at the standard: localhost:4200)
|
||||
## Run SSR
|
||||
|
||||
---
|
||||
`npm run serve:ssr` will run the last server build.
|
||||
|
||||
## Production
|
||||
## Webpack Analyzer
|
||||
|
||||
Depending on whether you're publishing dynamic or static prerendering, run the build command, and then serve up your dist folder assets.
|
||||
In order to analyze bundle size you can run `npm run webpack-bundle-analyzer`
|
||||
|
||||
> **NOTE**: To deploy your **Static** site to a static hosting platform you will have to deploy the *`dist/browser`* folder, rather than the usual *`dist`*
|
||||
## Running unit tests
|
||||
|
||||
ie: `npm run build:dynamic` or `npm run build:static`. All of the files that need to be served will be found within the `/dist` folder.
|
||||
|
||||
|
||||
|
||||
---
|
||||
|
||||
## Testing Universal (dynamic or static) builds -Locally-
|
||||
|
||||
**Dynamic** : **`npm run start:dynamic`**
|
||||
|
||||
Compiles your application and spins up a Node Express to dynamically serve your Universal application on `http://localhost:4000`.
|
||||
|
||||
**Static** : **`npm run start:static`**
|
||||
|
||||
- Compiles your application and prerenders your applications files, spinning up a demo http-server so you can view it on `http://127.0.0.1:8080`
|
||||
Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
|
||||
|
||||
## Running end-to-end tests
|
||||
|
||||
Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
|
||||
|
|
|
|||
272
angular.json
272
angular.json
|
|
@ -1,84 +1,158 @@
|
|||
{
|
||||
"$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
|
||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||
"version": 1,
|
||||
"newProjectRoot": "projects",
|
||||
"projects": {
|
||||
"openaire-aggregator": {
|
||||
"aggregator": {
|
||||
"root": "",
|
||||
"sourceRoot": "src",
|
||||
"projectType": "application",
|
||||
"prefix": "app",
|
||||
"schematics": {
|
||||
"@schematics/angular:class": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:component": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:directive": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:guard": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:module": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:pipe": {
|
||||
"skipTests": true
|
||||
},
|
||||
"@schematics/angular:service": {
|
||||
"skipTests": true
|
||||
}
|
||||
},
|
||||
"architect": {
|
||||
"build": {
|
||||
"builder": "@angular-devkit/build-angular:browser",
|
||||
"options": {
|
||||
"outputPath": "dist/browser",
|
||||
"aot": true,
|
||||
"outputPath": "dist/aggregator/browser",
|
||||
"index": "src/index.html",
|
||||
"main": "src/main.ts",
|
||||
"tsConfig": "src/tsconfig.app.json",
|
||||
"polyfills": "src/polyfills.ts",
|
||||
"tsConfig": "src/tsconfig.app.json",
|
||||
"assets": [
|
||||
"src/assets",
|
||||
"src/robots.txt",
|
||||
"src/sitemap.xml",
|
||||
{
|
||||
"glob": "**/*",
|
||||
"input": "src/sitemaps",
|
||||
"output": "/"
|
||||
}
|
||||
"src/robots.txt"
|
||||
],
|
||||
"styles": [
|
||||
"src/styles.css",
|
||||
"src/material.scss",
|
||||
"node_modules/datatables.net-dt/css/jquery.dataTables.css"
|
||||
"src/material.scss"
|
||||
],
|
||||
"scripts": [
|
||||
"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",
|
||||
"node_modules/datatables.net/js/jquery.dataTables.js"
|
||||
"node_modules/jquery/dist/jquery.js"
|
||||
]
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"development": {
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"extractCss": true,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
"fileReplacements": [
|
||||
"budgets": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
"type": "initial",
|
||||
"maximumWarning": "2mb",
|
||||
"maximumError": "5mb"
|
||||
},
|
||||
{
|
||||
"replace": "src/index.html",
|
||||
"with": "src/index.prod.html"
|
||||
},
|
||||
{
|
||||
"replace": "src/robots.txt",
|
||||
"with": "src/robots.prod.txt"
|
||||
"type": "anyComponentStyle",
|
||||
"maximumWarning": "6kb"
|
||||
}
|
||||
]
|
||||
},
|
||||
"beta": {
|
||||
"assets": [
|
||||
"src/assets",
|
||||
{
|
||||
"input": "src/beta/",
|
||||
"output": "/",
|
||||
"glob": "*.txt"
|
||||
}
|
||||
],
|
||||
"index": {
|
||||
"input": "src/beta/index.html",
|
||||
"output": "index.html"
|
||||
},
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.beta.ts"
|
||||
}
|
||||
],
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"extractCss": true,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
"budgets": [
|
||||
{
|
||||
"type": "initial",
|
||||
"maximumWarning": "2mb",
|
||||
"maximumError": "5mb"
|
||||
},
|
||||
{
|
||||
"type": "anyComponentStyle",
|
||||
"maximumWarning": "6kb"
|
||||
}
|
||||
]
|
||||
},
|
||||
"production": {
|
||||
"assets": [
|
||||
"src/assets",
|
||||
{
|
||||
"input": "src/prod/",
|
||||
"output": "/",
|
||||
"glob": "*.txt"
|
||||
}
|
||||
],
|
||||
"index": {
|
||||
"input": "src/prod/index.html",
|
||||
"output": "index.html"
|
||||
},
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.beta.ts"
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
}
|
||||
],
|
||||
"optimization": true,
|
||||
"outputHashing": "all",
|
||||
"sourceMap": false,
|
||||
"namedChunks": false,
|
||||
"aot": true,
|
||||
"extractLicenses": true,
|
||||
"vendorChunk": false,
|
||||
"buildOptimizer": true,
|
||||
"budgets": [
|
||||
{
|
||||
"type": "initial",
|
||||
"maximumWarning": "2mb",
|
||||
"maximumError": "5mb"
|
||||
},
|
||||
{
|
||||
"type": "anyComponentStyle",
|
||||
"maximumWarning": "6kb"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -87,47 +161,33 @@
|
|||
"serve": {
|
||||
"builder": "@angular-devkit/build-angular:dev-server",
|
||||
"options": {
|
||||
"browserTarget": "openaire-aggregator:build"
|
||||
"browserTarget": "aggregator:build"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"browserTarget": "openaire-aggregator:build:production"
|
||||
"browserTarget": "aggregator:build:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"extract-i18n": {
|
||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||
"options": {
|
||||
"browserTarget": "openaire-aggregator:build"
|
||||
"browserTarget": "aggregator:build"
|
||||
}
|
||||
},
|
||||
"test": {
|
||||
"builder": "@angular-devkit/build-angular:karma",
|
||||
"options": {
|
||||
"main": "src/test.ts",
|
||||
"karmaConfig": "./karma.conf.js",
|
||||
"polyfills": "src/polyfills.ts",
|
||||
"tsConfig": "src/tsconfig.spec.json",
|
||||
"scripts": [
|
||||
"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",
|
||||
"node_modules/datatables.net/js/jquery.dataTables.js"
|
||||
],
|
||||
"karmaConfig": "src/karma.conf.js",
|
||||
"styles": [
|
||||
"src/styles.css",
|
||||
"node_modules/datatables.net-dt/css/jquery.dataTables.css"
|
||||
"src/styles.css"
|
||||
],
|
||||
"scripts": [],
|
||||
"assets": [
|
||||
"src/assets",
|
||||
"src/robots.txt",
|
||||
"src/sitemap.xml",
|
||||
{
|
||||
"glob": "**/*",
|
||||
"input": "src/sitemaps",
|
||||
"output": "/"
|
||||
}
|
||||
"src/assets"
|
||||
]
|
||||
}
|
||||
},
|
||||
|
|
@ -146,57 +206,89 @@
|
|||
"server": {
|
||||
"builder": "@angular-devkit/build-angular:server",
|
||||
"options": {
|
||||
"outputPath": "dist/server",
|
||||
"main": "src/main.server.ts",
|
||||
"outputPath": "dist/aggregator/server",
|
||||
"main": "server.ts",
|
||||
"tsConfig": "src/tsconfig.server.json"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
},
|
||||
{
|
||||
"replace": "src/index.html",
|
||||
"with": "src/index.prod.html"
|
||||
},
|
||||
{
|
||||
"replace": "src/robots.txt",
|
||||
"with": "src/robots.prod.txt"
|
||||
}
|
||||
]
|
||||
"development": {
|
||||
"outputHashing": "media",
|
||||
"sourceMap": false,
|
||||
"optimization": true
|
||||
},
|
||||
"beta": {
|
||||
"outputHashing": "media",
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.beta.ts"
|
||||
}
|
||||
]
|
||||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true
|
||||
},
|
||||
"production": {
|
||||
"outputHashing": "media",
|
||||
"fileReplacements": [
|
||||
{
|
||||
"replace": "src/environments/environment.ts",
|
||||
"with": "src/environments/environment.prod.ts"
|
||||
}
|
||||
],
|
||||
"sourceMap": false,
|
||||
"optimization": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"serve-ssr": {
|
||||
"builder": "@nguniversal/builders:ssr-dev-server",
|
||||
"options": {
|
||||
"browserTarget": "aggregator:build",
|
||||
"serverTarget": "aggregator:server"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"browserTarget": "aggregator:build:production",
|
||||
"serverTarget": "aggregator:server:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"prerender": {
|
||||
"builder": "@nguniversal/builders:prerender",
|
||||
"options": {
|
||||
"browserTarget": "aggregator:build:production",
|
||||
"serverTarget": "aggregator:server:production",
|
||||
"routes": [
|
||||
"/"
|
||||
]
|
||||
},
|
||||
"configurations": {
|
||||
"production": {}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"openaire-aggregator-e2e": {
|
||||
"root": "e2e",
|
||||
"sourceRoot": "e2e",
|
||||
"aggregator-e2e": {
|
||||
"root": "e2e/",
|
||||
"projectType": "application",
|
||||
"prefix": "",
|
||||
"architect": {
|
||||
"e2e": {
|
||||
"builder": "@angular-devkit/build-angular:protractor",
|
||||
"options": {
|
||||
"protractorConfig": "./protractor.conf.js",
|
||||
"devServerTarget": "openaire-aggregator:serve"
|
||||
"protractorConfig": "e2e/protractor.conf.js",
|
||||
"devServerTarget": "aggregator:serve"
|
||||
},
|
||||
"configurations": {
|
||||
"production": {
|
||||
"devServerTarget": "aggregator:serve:production"
|
||||
}
|
||||
}
|
||||
},
|
||||
"lint": {
|
||||
"builder": "@angular-devkit/build-angular:tslint",
|
||||
"options": {
|
||||
"tsConfig": [
|
||||
"e2e/tsconfig.e2e.json"
|
||||
],
|
||||
"tsConfig": "e2e/tsconfig.e2e.json",
|
||||
"exclude": [
|
||||
"**/node_modules/**"
|
||||
]
|
||||
|
|
@ -205,33 +297,5 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"defaultProject": "openaire-aggregator",
|
||||
"schematics": {
|
||||
"@schematics/angular:class": {
|
||||
"spec": false
|
||||
},
|
||||
"@schematics/angular:component": {
|
||||
"spec": false,
|
||||
"inlineStyle": true,
|
||||
"inlineTemplate": true,
|
||||
"prefix": "app",
|
||||
"styleext": "css"
|
||||
},
|
||||
"@schematics/angular:directive": {
|
||||
"spec": false,
|
||||
"prefix": "app"
|
||||
},
|
||||
"@schematics/angular:guard": {
|
||||
"spec": false
|
||||
},
|
||||
"@schematics/angular:module": {
|
||||
"spec": false
|
||||
},
|
||||
"@schematics/angular:pipe": {
|
||||
"spec": false
|
||||
},
|
||||
"@schematics/angular:service": {
|
||||
"spec": false
|
||||
}
|
||||
}
|
||||
"defaultProject": "aggregator"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
cd src/app/openaireLibrary
|
||||
# Exclude Dashboard files
|
||||
echo "Exclude Dashboard files"
|
||||
svn update --set-depth exclude ./dashboard
|
||||
# Exclude ck-editor usages
|
||||
echo "Exclude ck-editor usages"
|
||||
svn update --set-depth exclude ./sharedComponents/subscriber-invite
|
||||
cd ../../../
|
||||
echo "Done"
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
{
|
||||
"environment" : "beta",
|
||||
"enablePiwikTrack" : false,
|
||||
"enableHelper" : false,
|
||||
"useCache" : true,
|
||||
"metricsAPIURL" : "https://beta.services.openaire.eu/usagestats/",
|
||||
"framesAPIURL" : "https://beta.openaire.eu/stats3/",
|
||||
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
|
||||
"statisticsFrameAPIURL":"https://beta.openaire.eu/stats/",
|
||||
"claimsAPIURL" : "https://beta.services.openaire.eu/claims/rest/claimsService/",
|
||||
"searchAPIURLLAst" : "https://beta.services.openaire.eu/search/v2/api/",
|
||||
"searchResourcesAPIURL" : "https://beta.services.openaire.eu/search/v2/api/resources",
|
||||
"openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=",
|
||||
"csvAPIURL" : "https://beta.services.openaire.eu/search/v2/api/reports",
|
||||
"searchCrossrefAPIURL" : "https://api.crossref.org/works",
|
||||
"searchDataciteAPIURL" : "https://api.datacite.org/works",
|
||||
"searchOrcidURL" : "https://pub.orcid.org/v2.1/",
|
||||
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
|
||||
"doiURL" : "https://dx.doi.org/",
|
||||
"cordisURL" : "http://cordis.europa.eu/projects/",
|
||||
"pmcURL" : "http://europepmc.org/articles/",
|
||||
"handleURL" : "http://hdl.handle.net/",
|
||||
"openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
|
||||
"r3DataURL": "http://service.re3data.org/repository/",
|
||||
"zenodo" : "https://zenodo.org/",
|
||||
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
|
||||
"openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
|
||||
"fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
|
||||
"h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
|
||||
"ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
|
||||
"helpdesk" : "https://www.openaire.eu/support/helpdesk",
|
||||
"uploadService" : "https://demo.openaire.eu/upload/",
|
||||
|
||||
"vocabulariesAPI" :"https://beta.services.openaire.eu/provision/mvc/vocabularies/",
|
||||
|
||||
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
|
||||
"piwikSiteId" : "6",
|
||||
"loginUrl" :"https://beta.services.openaire.eu/uoa-user-management/openid_connect_login",
|
||||
|
||||
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
|
||||
"cookieDomain" :".openaire.eu",
|
||||
|
||||
"feedbackmail" :"openaire.test@gmail.com",
|
||||
|
||||
"helperPageUrl" :"http://scoobydoo.di.uoa.gr:16000/api/page/route",
|
||||
|
||||
"cacheUrl" :"https://demo.openaire.eu/cache/get?url=",
|
||||
|
||||
"datasourcesAPI": "https://beta.services.openaire.eu/openaire/ds/search/",
|
||||
|
||||
"adminToolsAPIURL" :"https://beta.services.openaire.eu/uoa-admin-tools/",
|
||||
|
||||
"adminToolsCommunity" :"openaire",
|
||||
"contextsAPI":"https://beta.services.openaire.eu/openaire/context",
|
||||
"communityAPI": "https://beta.services.openaire.eu/openaire/community/",
|
||||
|
||||
"csvLimit": 2000,
|
||||
"pagingLimit": 20,
|
||||
"resultsPerPage": 10,
|
||||
|
||||
"baseLink" : "https://beta.explore.openaire.eu",
|
||||
|
||||
"searchLinkToPublication" : "/search/publication?articleId=",
|
||||
"searchLinkToProject" : "/search/project?projectId=",
|
||||
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
|
||||
"searchLinkToDataset" : "/search/dataset?datasetId=",
|
||||
"searchLinkToOrp" : "/search/other?orpId=",
|
||||
"searchLinkToOrganization" : "/search/organization?organizationId=",
|
||||
|
||||
"searchLinkToPublications" : "/search/find/publications",
|
||||
"searchLinkToDataProviders" : "/search/find/dataproviders",
|
||||
"searchLinkToProjects" : "/search/find/projects",
|
||||
"searchLinkToDatasets" : "/search/find/datasets",
|
||||
"searchLinkToSoftware" : "/search/find/software",
|
||||
"searchLinkToOrps" : "/search/find/other",
|
||||
"searchLinkToOrganizations" : "/search/find/organizations",
|
||||
"searchLinkToCompatibleDataProviders" : "/search/content-providers",
|
||||
"searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table",
|
||||
"searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
|
||||
"searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
|
||||
"searchLinkToJournals" : "/search/journals",
|
||||
"searchLinkToJournalsTable" : "/search/journals-table",
|
||||
|
||||
"searchLinkToAdvancedPublications" : "/search/advanced/publications",
|
||||
"searchLinkToAdvancedProjects" : "/search/advanced/projects",
|
||||
"searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
|
||||
"searchLinkToAdvancedSoftware" : "/search/advanced/software",
|
||||
"searchLinkToAdvancedOrps" : "/search/advanced/other",
|
||||
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
|
||||
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
|
||||
"lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
|
||||
"showLastIndexInformationLink" : false,
|
||||
"widgetLink" : "https://beta.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
|
||||
"claimsInformationLink": "https://beta.openaire.eu/linking"
|
||||
}
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
cp /home/argiro.kokogiannaki/sitemap/dataset/* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/dataset/* dist/browser/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/publication/* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/publication/* dist/browser/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/software/* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/software/* dist/browser/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/other/* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/other/* dist/browser/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/project/* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/project/* dist/browser/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/organization/* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/organization/* dist/browser/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/dataprovider//* dist/server/;
|
||||
cp /home/argiro.kokogiannaki/sitemap/dataprovider/* dist/browser/;
|
||||
|
|
@ -1,44 +0,0 @@
|
|||
#ATTENTION
|
||||
#DON'T run it in svn folder - it REMOVES files
|
||||
#Copy project in another file "deploy-folder"
|
||||
#cd "deploy-folder"
|
||||
#run the script
|
||||
|
||||
## cp the file according to the deploy environment
|
||||
|
||||
# cp production-properties.json ../src/assets/env-properties.json;
|
||||
# cp test-properties.json ../src/assets/env-properties.json;
|
||||
# cp beta-properties.json ../src/assets/env-properties.json;
|
||||
|
||||
## uncommect from here-->
|
||||
# echo -n 'Check that you have the correct properties file';
|
||||
# echo -n "Press key:";
|
||||
# read -n1 ans
|
||||
# pico ../src/assets/env-properties.json;
|
||||
# echo 'For Production keep meta for bots';
|
||||
# echo -n 'Check index.html: For test keep meta for noindex, for production remove noindex and keep meta for Search engines verification';
|
||||
# echo -n "Press key:";
|
||||
# read -n1 ans
|
||||
# echo -n "Pressed";
|
||||
# pico ../src/index.html;
|
||||
# echo -n 'Check Robots.txt: For test and beta add "Diasallow /", for production remove it!';
|
||||
# echo -n "Press key:";
|
||||
# read -n1 ans
|
||||
# echo -n "Pressed";
|
||||
# pico ../src/robots.txt;
|
||||
# rm -rf ../src/assets/common-assets/.svn/;
|
||||
# rm -rf ../src/app/openaireLibrary/.svn/;
|
||||
# cd ..; npm run build:ssr; cd deploy;
|
||||
# rm -rf ../src ../node_modules ../.idea/ ../installOpenaireLib.sh;
|
||||
# cd ..; rm -rf deploy;
|
||||
# echo 'Now copy to the server!'
|
||||
##<-- to here
|
||||
|
||||
#Deploy instructions!
|
||||
#copy "deploy-folder" in beta.explore.openaire.eu, test.openaire.eu or explore.openaire.eu depending which in environment want to deploy and properties selected
|
||||
#copies of previous deployments exist in "/home/argiro.kokogiannaki/deployments-folder/dashboardYYYY-MM-DD"
|
||||
#run "npm i"
|
||||
#become nodejs user: "sudo su nodejs -s /bin/bash"
|
||||
#go to "cd /srv/www/portal"
|
||||
#cp files from "cp -r HOME_PATH/deployments-folder/* ."
|
||||
#restart portal "pm2 restart openaire"
|
||||
|
|
@ -1,94 +0,0 @@
|
|||
{
|
||||
"environment" : "production",
|
||||
"enablePiwikTrack" : true,
|
||||
"enableHelper" : true,
|
||||
"useCache" : true,
|
||||
"metricsAPIURL" : "https://services.openaire.eu/usagestats/",
|
||||
"framesAPIURL" : "https://www.openaire.eu/stats3/",
|
||||
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
|
||||
"statisticsFrameAPIURL":"https://www.openaire.eu/stats/",
|
||||
"claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
|
||||
"searchAPIURLLAst" : "https://services.openaire.eu/search/v2/api/",
|
||||
"searchResourcesAPIURL" : "https://services.openaire.eu/search/v2/api/resources",
|
||||
"openCitationsAPIURL" : "https://services.openaire.eu/opencitations/getCitations?id=",
|
||||
"csvAPIURL" : "https://services.openaire.eu/search/v2/api/reports",
|
||||
"searchCrossrefAPIURL" : "https://api.crossref.org/works",
|
||||
"searchDataciteAPIURL" : "https://api.datacite.org/works",
|
||||
"searchOrcidURL" : "https://pub.orcid.org/v2.1/",
|
||||
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
|
||||
"doiURL" : "https://dx.doi.org/",
|
||||
"cordisURL" : "http://cordis.europa.eu/projects/",
|
||||
"pmcURL" : "http://europepmc.org/articles/",
|
||||
"handleURL" : "http://hdl.handle.net/",
|
||||
"openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
|
||||
"r3DataURL": "http://service.re3data.org/repository/",
|
||||
"zenodo" : "https://zenodo.org/",
|
||||
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
|
||||
"openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
|
||||
"fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
|
||||
"h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
|
||||
"ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
|
||||
"helpdesk" : "https://www.openaire.eu/support/helpdesk",
|
||||
"uploadService" : "https://explore.openaire.eu/upload/",
|
||||
|
||||
"vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/",
|
||||
|
||||
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
|
||||
"piwikSiteId" : "109",
|
||||
"loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login",
|
||||
|
||||
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
|
||||
"cookieDomain" :".openaire.eu",
|
||||
|
||||
"feedbackmail" :"feedback@openaire.eu",
|
||||
|
||||
"cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
|
||||
|
||||
"datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/",
|
||||
|
||||
"adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
|
||||
|
||||
"adminToolsCommunity" :"openaire",
|
||||
"contextsAPI":"https://services.openaire.eu/openaire/context",
|
||||
"communityAPI": "https://services.openaire.eu/openaire/community/",
|
||||
|
||||
"csvLimit": 2000,
|
||||
"pagingLimit": 20,
|
||||
"resultsPerPage": 10,
|
||||
|
||||
"baseLink" : "https://explore.openaire.eu",
|
||||
|
||||
"searchLinkToPublication" : "/search/publication?articleId=",
|
||||
"searchLinkToProject" : "/search/project?projectId=",
|
||||
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
|
||||
"searchLinkToDataset" : "/search/dataset?datasetId=",
|
||||
"searchLinkToOrp" : "/search/other?orpId=",
|
||||
"searchLinkToOrganization" : "/search/organization?organizationId=",
|
||||
|
||||
"searchLinkToPublications" : "/search/find/publications",
|
||||
"searchLinkToDataProviders" : "/search/find/dataproviders",
|
||||
"searchLinkToProjects" : "/search/find/projects",
|
||||
"searchLinkToDatasets" : "/search/find/datasets",
|
||||
"searchLinkToSoftware" : "/search/find/software",
|
||||
"searchLinkToOrps" : "/search/find/other",
|
||||
"searchLinkToOrganizations" : "/search/find/organizations",
|
||||
"searchLinkToCompatibleDataProviders" : "/search/content-providers",
|
||||
"searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table",
|
||||
"searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
|
||||
"searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
|
||||
"searchLinkToJournals" : "/search/journals",
|
||||
"searchLinkToJournalsTable" : "/search/journals-table",
|
||||
|
||||
"searchLinkToAdvancedPublications" : "/search/advanced/publications",
|
||||
"searchLinkToAdvancedProjects" : "/search/advanced/projects",
|
||||
"searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
|
||||
"searchLinkToAdvancedSoftware" : "/search/advanced/software",
|
||||
"searchLinkToAdvancedOrps" : "/search/advanced/other",
|
||||
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
|
||||
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
|
||||
"lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
|
||||
"showLastIndexInformationLink" : true,
|
||||
"widgetLink" : "https://www.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
|
||||
"claimsInformationLink": "https://www.openaire.eu/linking"
|
||||
}
|
||||
|
|
@ -1,93 +0,0 @@
|
|||
{
|
||||
"environment" : "test",
|
||||
"enablePiwikTrack" : true,
|
||||
"enableHelper" : true,
|
||||
"useCache" : true,
|
||||
"metricsAPIURL" : "https://services.openaire.eu/usagestats/",
|
||||
"framesAPIURL" : "https://test.openaire.eu/stats3/",
|
||||
"statisticsAPIURL" : "https://beta.services.openaire.eu/stats-api/",
|
||||
"statisticsFrameAPIURL":"https://test.openaire.eu/stats/",
|
||||
"claimsAPIURL" : "https://services.openaire.eu/claims/rest/claimsService/",
|
||||
"searchAPIURLLAst" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/",
|
||||
"searchResourcesAPIURL" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/resources",
|
||||
"csvAPIURL" : "http://services.openaire.eu:8480/shadowSearch/rest/v2/api/reports",
|
||||
"searchCrossrefAPIURL" : "https://api.crossref.org/works",
|
||||
"searchDataciteAPIURL" : "https://api.datacite.org/works",
|
||||
"searchOrcidURL" : "https://pub.orcid.org/v2.1/",
|
||||
"pmidURL" : "http://www.ncbi.nlm.nih.gov/pubmed/",
|
||||
"doiURL" : "https://dx.doi.org/",
|
||||
"cordisURL" : "http://cordis.europa.eu/projects/",
|
||||
"pmcURL" : "http://europepmc.org/articles/",
|
||||
"handleURL" : "http://hdl.handle.net/",
|
||||
"openDoarURL": "http://v2.sherpa.ac.uk/id/repository/",
|
||||
"r3DataURL": "http://service.re3data.org/repository/",
|
||||
"zenodo" : "https://zenodo.org/",
|
||||
"openAccess" : "https://www.openaire.eu/support/faq#article-id-234",
|
||||
"openAccessRepo" : "https://www.openaire.eu/support/faq#article-id-310",
|
||||
"fp7Guidlines" : "https://www.openaire.eu/open-access-in-fp7-seventh-research-framework-programme",
|
||||
"h2020Guidlines" : "https://www.openaire.eu/oa-publications/h2020/open-access-in-horizon-2020",
|
||||
"ercGuidlines" : "http://erc.europa.eu/sites/default/files/document/file/ERC_Open_Access_Guidelines-revised_2014.pdf",
|
||||
"helpdesk" : "https://www.openaire.eu/support/helpdesk",
|
||||
"uploadService" : "https://explore.openaire.eu/upload/",
|
||||
|
||||
"vocabulariesAPI" :"https://services.openaire.eu/provision/mvc/vocabularies/",
|
||||
|
||||
"piwikBaseUrl" :"https://analytics.openaire.eu/piwik.php?idsite=",
|
||||
"piwikSiteId" : "109",
|
||||
"loginUrl" :"https://services.openaire.eu/uoa-user-management/openid_connect_login",
|
||||
|
||||
"logoutUrl" :"https://aai.openaire.eu/proxy/saml2/idp/SingleLogoutService.php?ReturnTo=",
|
||||
|
||||
"cookieDomain" :".openaire.eu",
|
||||
|
||||
"feedbackmail" :"feedback@openaire.eu",
|
||||
|
||||
"cacheUrl" :"https://explore.openaire.eu/cache/get?url=",
|
||||
|
||||
"datasourcesAPI": "https://services.openaire.eu/openaire/ds/search/",
|
||||
|
||||
"adminToolsAPIURL" :"https://services.openaire.eu/uoa-admin-tools/",
|
||||
|
||||
"adminToolsCommunity" :"openaire",
|
||||
"contextsAPI":"https://services.openaire.eu/openaire/context",
|
||||
"communityAPI": "https://services.openaire.eu/openaire/community/",
|
||||
|
||||
"csvLimit": 2000,
|
||||
"pagingLimit": 20,
|
||||
"resultsPerPage": 10,
|
||||
|
||||
"baseLink" : "https://test.explore.openaire.eu",
|
||||
|
||||
"searchLinkToPublication" : "/search/publication?articleId=",
|
||||
"searchLinkToProject" : "/search/project?projectId=",
|
||||
"searchLinkToDataProvider" : "/search/dataprovider?datasourceId=",
|
||||
"searchLinkToDataset" : "/search/dataset?datasetId=",
|
||||
"searchLinkToOrp" : "/search/other?orpId=",
|
||||
"searchLinkToOrganization" : "/search/organization?organizationId=",
|
||||
|
||||
"searchLinkToPublications" : "/search/find/publications",
|
||||
"searchLinkToDataProviders" : "/search/find/dataproviders",
|
||||
"searchLinkToProjects" : "/search/find/projects",
|
||||
"searchLinkToDatasets" : "/search/find/datasets",
|
||||
"searchLinkToSoftware" : "/search/find/software",
|
||||
"searchLinkToOrps" : "/search/find/other",
|
||||
"searchLinkToOrganizations" : "/search/find/organizations",
|
||||
"searchLinkToCompatibleDataProviders" : "/search/content-providers",
|
||||
"searchLinkToCompatibleDataProvidersTable" : "/search/content-providers-table",
|
||||
"searchLinkToEntityRegistriesDataProviders" : "/search/entity-registries",
|
||||
"searchLinkToEntityRegistriesDataProvidersTable" : "/search/entity-registries-table",
|
||||
"searchLinkToJournals" : "/search/journals",
|
||||
"searchLinkToJournalsTable" : "/search/journals-table",
|
||||
|
||||
"searchLinkToAdvancedPublications" : "/search/advanced/publications",
|
||||
"searchLinkToAdvancedProjects" : "/search/advanced/projects",
|
||||
"searchLinkToAdvancedDatasets" : "/search/advanced/datasets",
|
||||
"searchLinkToAdvancedSoftware" : "/search/advanced/software",
|
||||
"searchLinkToAdvancedOrps" : "/search/advanced/other",
|
||||
"searchLinkToAdvancedDataProviders" : "/search/advanced/dataproviders",
|
||||
"searchLinkToAdvancedOrganizations" : "/search/advanced/organizations",
|
||||
"lastIndexInformationLink" : "https://www.openaire.eu/aggregation-and-content-provision-workflows",
|
||||
"showLastIndexInformationLink" : false,
|
||||
"widgetLink" : "https://test.openaire.eu/index.php?option=com_openaire&view=widget&format=raw&projectId=",
|
||||
"claimsInformationLink": "https://www.openaire.eu/linking"
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
// Protractor configuration file, see link for more information
|
||||
// https://github.com/angular/protractor/blob/master/lib/config.ts
|
||||
|
||||
const { SpecReporter } = require('jasmine-spec-reporter');
|
||||
|
||||
exports.config = {
|
||||
allScriptsTimeout: 11000,
|
||||
specs: [
|
||||
'./src/**/*.e2e-spec.ts'
|
||||
],
|
||||
capabilities: {
|
||||
'browserName': 'chrome'
|
||||
},
|
||||
directConnect: true,
|
||||
baseUrl: 'http://localhost:4200/',
|
||||
framework: 'jasmine',
|
||||
jasmineNodeOpts: {
|
||||
showColors: true,
|
||||
defaultTimeoutInterval: 30000,
|
||||
print: function() {}
|
||||
},
|
||||
onPrepare() {
|
||||
require('ts-node').register({
|
||||
project: require('path').join(__dirname, './tsconfig.e2e.json')
|
||||
});
|
||||
jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
|
||||
}
|
||||
};
|
||||
|
|
@ -0,0 +1,23 @@
|
|||
import { AppPage } from './app.po';
|
||||
import { browser, logging } from 'protractor';
|
||||
|
||||
describe('workspace-project App', () => {
|
||||
let page: AppPage;
|
||||
|
||||
beforeEach(() => {
|
||||
page = new AppPage();
|
||||
});
|
||||
|
||||
it('should display welcome message', () => {
|
||||
page.navigateTo();
|
||||
expect(page.getTitleText()).toEqual('Welcome to aggregator!');
|
||||
});
|
||||
|
||||
afterEach(async () => {
|
||||
// Assert that there are no errors emitted from the browser
|
||||
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
|
||||
expect(logs).not.toContain(jasmine.objectContaining({
|
||||
level: logging.Level.SEVERE,
|
||||
} as logging.Entry));
|
||||
});
|
||||
});
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
import { browser, by, element } from 'protractor';
|
||||
|
||||
export class AppPage {
|
||||
navigateTo() {
|
||||
return browser.get(browser.baseUrl) as Promise<any>;
|
||||
}
|
||||
|
||||
getTitleText() {
|
||||
return element(by.css('app-root h1')).getText() as Promise<string>;
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/app",
|
||||
"module": "commonjs",
|
||||
"target": "es5",
|
||||
"types": [
|
||||
"jasmine",
|
||||
"jasminewd2",
|
||||
"node"
|
||||
]
|
||||
}
|
||||
}
|
||||
116
package.json
116
package.json
|
|
@ -1,78 +1,72 @@
|
|||
{
|
||||
"name": "openaire-aggregator",
|
||||
"name": "aggregator",
|
||||
"version": "1.0.0",
|
||||
"license": "Openaire",
|
||||
"contributors": [
|
||||
"Argiro Kokogiannaki <argirok@di.uoa.gr>",
|
||||
"Konstantina Galouni <kgalouni@di.uoa.gr>"
|
||||
],
|
||||
"scripts": {
|
||||
"ng": "ng",
|
||||
"start": "ng serve --disable-host-check --host 0.0.0.0 --port 4400",
|
||||
"start:ssr": "npm run build:ssr && npm run serve:ssr",
|
||||
"start:prerender": "npm run build:prerender && npm run serve:prerender",
|
||||
"start:ssr-beta": "npm run build:ssr-beta && npm run serve:ssr",
|
||||
"start:prerender-beta": "npm run build:prerender-beta && npm run serve:prerender",
|
||||
"build": "ng build",
|
||||
"build:client-and-server-bundles": "ng build --prod --sourceMap --stats-json=true && ng run openaire-aggregator:server:production",
|
||||
"build:client-and-server-bundles-beta": "ng build --configuration=beta --sourceMap --stats-json=true && ng run openaire-aggregator:server:beta",
|
||||
"build:prerender": "npm run build:client-and-server-bundles && npm run webpack:server && npm run generate:prerender",
|
||||
"build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
|
||||
"build:prerender-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server && npm run generate:prerender",
|
||||
"build:ssr-beta": "npm run build:client-and-server-bundles-beta && npm run webpack:server",
|
||||
"generate:prerender": "cd dist && node prerender",
|
||||
"webpack:server": "webpack --config webpack.server.config.js --progress --colors",
|
||||
"serve:prerender": "cd dist/browser && http-server",
|
||||
"serve:ssr": "node dist/server",
|
||||
"after-build-clean": "rm -rf src node_modules .idea/ installOpenaireLib.sh deploy dist/browser/assets/common-assets/.svn/ dist/browser/stats.json ; "
|
||||
"build-dev": "ng build --configuration=development",
|
||||
"build-beta": "ng build --configuration=beta",
|
||||
"build-prod": "ng build --prod",
|
||||
"webpack-bundle-analyzer": "ng build --stats-json && webpack-bundle-analyzer dist/aggregator/browser/stats-es2015.json --host 0.0.0.0",
|
||||
"test": "ng test",
|
||||
"e2e": "ng e2e",
|
||||
"dev:ssr": "ng run aggregator:serve-ssr",
|
||||
"serve:ssr": "node dist/aggregator/server/main.js",
|
||||
"build:ssr-dev": "npm run build-dev && ng run aggregator:server:development",
|
||||
"build:ssr-beta": "npm run build-beta && ng run aggregator:server:beta",
|
||||
"build:ssr-prod": "npm run build-prod && ng run aggregator:server:production",
|
||||
"prerender": "ng run aggregator:prerender",
|
||||
"postinstall": "chmod +x clean-library.sh && ./clean-library.sh",
|
||||
"after-build-clean": "rm -rf dist/aggregator/browser/assets/common-assets/.svn/ src/app/openaireLibrary/.svn node_modules"
|
||||
},
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
"@angular/animations": "^7.2.14",
|
||||
"@angular/cdk": "^7.3.7",
|
||||
"@angular/common": "7.2.14",
|
||||
"@angular/compiler": "7.2.14",
|
||||
"@angular/core": "7.2.14",
|
||||
"@angular/forms": "7.2.14",
|
||||
"@angular/http": "7.2.14",
|
||||
"@angular/material": "^7.3.7",
|
||||
"@angular/platform-browser": "7.2.14",
|
||||
"@angular/platform-browser-dynamic": "7.2.14",
|
||||
"@angular/platform-server": "7.2.14",
|
||||
"@angular/router": "7.2.14",
|
||||
"@nguniversal/express-engine": "^6.0.0",
|
||||
"@nguniversal/module-map-ngfactory-loader": "^6.0.0",
|
||||
"@types/express": "^4.16.1",
|
||||
"angular-datatables": "^4.4.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.4.1",
|
||||
"datatables.net": "^1.10.19",
|
||||
"datatables.net-dt": "^1.10.19",
|
||||
"core-js": "^2.5.4",
|
||||
"express": "^4.15.2",
|
||||
"jquery": "^3.4.1",
|
||||
"ng-recaptcha": "^3.0.5",
|
||||
"ng2-ckeditor": "1.1.9",
|
||||
"ngx-json-ld": "0.1.6",
|
||||
"nouislider": "^14.6.0",
|
||||
"ng-recaptcha": "^7.0.1",
|
||||
"prom-client": "^11.3.0",
|
||||
"rxjs": "^6.5.1",
|
||||
"ts-md5": "^1.2.0",
|
||||
"tslib": "^1.9.0",
|
||||
"zone.js": "^0.8.26"
|
||||
"tslib": "^2.0.0",
|
||||
"zone.js": "~0.10.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular-devkit/build-angular": "~0.13.0",
|
||||
"@angular/cli": "^7.3.9",
|
||||
"@angular/compiler-cli": "7.2.14",
|
||||
"@angular/language-service": "7.2.14",
|
||||
"@types/datatables.net": "^1.10.17",
|
||||
"@types/jquery": "^3.3.29",
|
||||
"@types/node": "^8.0.30",
|
||||
"cpy-cli": "^1.0.1",
|
||||
"http-server": "^0.10.0",
|
||||
"reflect-metadata": "^0.1.10",
|
||||
"rxjs": "6.5.1",
|
||||
"rxjs-compat": "^6.5.1",
|
||||
"ts-loader": "^4.2.0",
|
||||
"typescript": "3.2.4",
|
||||
"webpack-cli": "^3.3.2"
|
||||
"@angular-devkit/build-angular": "~0.1102.14",
|
||||
"@angular/cli": "~11.2.14",
|
||||
"@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",
|
||||
"codelyzer": "^6.0.0",
|
||||
"jasmine-core": "~3.8.0",
|
||||
"jasmine-spec-reporter": "~5.0.0",
|
||||
"karma": "~6.3.3",
|
||||
"karma-chrome-launcher": "~3.1.0",
|
||||
"karma-coverage-istanbul-reporter": "~3.0.2",
|
||||
"karma-jasmine": "~4.0.0",
|
||||
"karma-jasmine-html-reporter": "^1.6.0",
|
||||
"protractor": "~7.0.0",
|
||||
"ts-node": "~7.0.0",
|
||||
"typescript": "~4.0.7"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
45
prerender.ts
45
prerender.ts
|
|
@ -1,45 +0,0 @@
|
|||
// Load zone.js for the server.
|
||||
import 'zone.js/dist/zone-node';
|
||||
import 'reflect-metadata';
|
||||
import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
|
||||
import { join } from 'path';
|
||||
|
||||
import { enableProdMode } from '@angular/core';
|
||||
// Faster server renders w/ Prod mode (dev mode never needed)
|
||||
enableProdMode();
|
||||
|
||||
// Express Engine
|
||||
import { ngExpressEngine } from '@nguniversal/express-engine';
|
||||
// Import module map for lazy loading
|
||||
import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
|
||||
import { renderModuleFactory } from '@angular/platform-server';
|
||||
import { ROUTES } from './static.paths';
|
||||
|
||||
// * NOTE :: leave this as require() since this file is built Dynamically from webpack
|
||||
const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
|
||||
|
||||
const BROWSER_FOLDER = join(process.cwd(), 'browser');
|
||||
|
||||
// Load the index.html file containing referances to your application bundle.
|
||||
const index = readFileSync(join('browser', 'index.html'), 'utf8');
|
||||
|
||||
let previousRender = Promise.resolve();
|
||||
|
||||
// Iterate each route path
|
||||
ROUTES.forEach(route => {
|
||||
const fullPath = join(BROWSER_FOLDER, route);
|
||||
|
||||
// Make sure the directory structure is there
|
||||
if(!existsSync(fullPath)){
|
||||
mkdirSync(fullPath);
|
||||
}
|
||||
|
||||
// Writes rendered HTML to index.html, replacing the file if it already exists.
|
||||
previousRender = previousRender.then(_ => renderModuleFactory(AppServerModuleNgFactory, {
|
||||
document: index,
|
||||
url: route,
|
||||
extraProviders: [
|
||||
provideModuleMap(LAZY_MODULE_MAP)
|
||||
]
|
||||
})).then(html => writeFileSync(join(fullPath, 'index.html'), html));
|
||||
});
|
||||
|
|
@ -46,31 +46,6 @@ export class Prometheus {
|
|||
help: 'organization Landing Page Counter',
|
||||
registers: [this.register]
|
||||
})],
|
||||
// ["/participate/deposit-datasets", new prom.Counter({
|
||||
// name: 'participate_deposit_datasets',
|
||||
// help: 'Participate Deposit Datasets Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/participate/deposit-datasets-result", new prom.Counter({
|
||||
// name: 'participate_deposit_datasets_result',
|
||||
// help: 'Participate Deposit Datasets Result Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/participate/deposit-subject-result", new prom.Counter({
|
||||
// name: 'participate_deposit_subject_result',
|
||||
// help: 'Participate Deposit Subject Result Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/participate/deposit-publications", new prom.Counter({
|
||||
// name: 'participate_deposit_publications',
|
||||
// help: 'Participate Deposit Publications Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/participate/deposit-publications-result", new prom.Counter({
|
||||
// name: 'participate_deposit_publications_result',
|
||||
// help: 'Participate Deposit Publications Result Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
["/search/find", new prom.Counter({
|
||||
name: 'search_find',
|
||||
help: 'Main Search Page Counter',
|
||||
|
|
@ -111,36 +86,6 @@ export class Prometheus {
|
|||
help: 'Organizations Search Page Counter',
|
||||
registers: [this.register]
|
||||
})],
|
||||
// ["/search/content-providers", new prom.Counter({
|
||||
// name: 'search_content_providers',
|
||||
// help: 'Repositories Search Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/search/content-providers-table", new prom.Counter({
|
||||
// name: 'search_content_providers_table',
|
||||
// help: 'Repositories Search Page Table Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/search/entity-registries", new prom.Counter({
|
||||
// name: 'search_entity_registries',
|
||||
// help: 'Registries Search Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/search/entity-registries-table", new prom.Counter({
|
||||
// name: 'search_entity_registries_table',
|
||||
// help: 'Registries Search Page Table Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/search/journals", new prom.Counter({
|
||||
// name: 'search_journals',
|
||||
// help: 'Journals Search Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/search/journals-table", new prom.Counter({
|
||||
// name: 'search_journals_table',
|
||||
// help: 'Journals Search Page Table Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
["/search/advanced/publications", new prom.Counter({
|
||||
name: 'search_advanced_publications',
|
||||
help: 'Publications Advanced Search Page Counter',
|
||||
|
|
@ -175,26 +120,6 @@ export class Prometheus {
|
|||
name: 'search_advanced_organizations',
|
||||
help: 'Organizations Advanced Search Page Counter',
|
||||
registers: [this.register]
|
||||
})],
|
||||
// ["/myclaims", new prom.Counter({
|
||||
// name: 'my_claims',
|
||||
// help: 'My Claims Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/claims", new prom.Counter({
|
||||
// name: 'claims',
|
||||
// help: 'Admin Claims Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/participate/claim", new prom.Counter({
|
||||
// name: 'participate_claim',
|
||||
// help: 'Linking Page Counter',
|
||||
// registers: [this.register]
|
||||
// })],
|
||||
// ["/participate/direct-claim", new prom.Counter({
|
||||
// name: 'participate_direct_claim',
|
||||
// help: 'Direct Linking Page Counter',
|
||||
// registers: [this.register]
|
||||
// })]
|
||||
})]
|
||||
]);
|
||||
}
|
||||
|
|
|
|||
172
server.ts
172
server.ts
|
|
@ -1,91 +1,109 @@
|
|||
import 'zone.js/dist/zone-node';
|
||||
import 'reflect-metadata';
|
||||
import { renderModuleFactory } from '@angular/platform-server';
|
||||
import { enableProdMode } from '@angular/core';
|
||||
|
||||
import * as express from 'express';
|
||||
import { join } from 'path';
|
||||
import { readFileSync } from 'fs';
|
||||
|
||||
// Faster server renders w/ Prod mode (dev mode never needed)
|
||||
enableProdMode();
|
||||
|
||||
// Express server
|
||||
const app = express();
|
||||
|
||||
const PORT = process.env.PORT || 3500;
|
||||
const DIST_FOLDER = join(process.cwd(), 'dist');
|
||||
|
||||
// Our index.html we'll use as our template
|
||||
const template = readFileSync(join(DIST_FOLDER, 'browser', 'index.html')).toString();
|
||||
|
||||
// * NOTE :: leave this as require() since this file is built Dynamically from webpack
|
||||
const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
|
||||
|
||||
// Express Engine
|
||||
import { ngExpressEngine } from '@nguniversal/express-engine';
|
||||
// Import module map for lazy loading
|
||||
import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
|
||||
import * as express from 'express';
|
||||
import * as compression from 'compression';
|
||||
import { join } from 'path';
|
||||
|
||||
import { AppServerModule } from './src/main.server';
|
||||
import { APP_BASE_HREF } from '@angular/common';
|
||||
import { existsSync } from 'fs';
|
||||
import {Prometheus} from "./prometheus";
|
||||
import {Counter} from "prom-client";
|
||||
import {REQUEST, RESPONSE} from "./src/app/openaireLibrary/utils/tokens";
|
||||
|
||||
/*
|
||||
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
|
||||
app.engine('html', ngExpressEngine({
|
||||
bootstrap: AppServerModuleNgFactory,
|
||||
providers: [
|
||||
provideModuleMap(LAZY_MODULE_MAP)
|
||||
]
|
||||
}));
|
||||
*/
|
||||
// be able to get request and get domain from there
|
||||
// The Express app is exported so that it can be used by serverless Functions.
|
||||
export function app() {
|
||||
const server = express();
|
||||
server.use(compression());
|
||||
const distFolder = join(process.cwd(), 'dist/aggregator/browser');
|
||||
const indexHtml = existsSync(join(distFolder, 'index.original.html')) ? 'index.original.html' : 'index';
|
||||
|
||||
const prometheus: Prometheus = new Prometheus();
|
||||
|
||||
// Our Universal express-engine (found @ https://github.com/angular/universal/tree/master/modules/express-engine)
|
||||
server.engine('html', ngExpressEngine({
|
||||
bootstrap: AppServerModule,
|
||||
}));
|
||||
|
||||
const prometheus: Prometheus = new Prometheus();
|
||||
server.set('view engine', 'html');
|
||||
server.set('views', distFolder);
|
||||
|
||||
app.engine('html', (_, options, callback) => {
|
||||
let engine = ngExpressEngine({
|
||||
bootstrap: AppServerModuleNgFactory,
|
||||
providers: [
|
||||
{ provide: 'request', useFactory: () => options.req, deps: [] },
|
||||
provideModuleMap(LAZY_MODULE_MAP)
|
||||
// Example Express Rest API endpoints
|
||||
// server.get('/api/**', (req, res) => { });
|
||||
// Serve static files from /browser
|
||||
server.get('*.*', express.static(distFolder, {
|
||||
maxAge: '1y'
|
||||
}));
|
||||
|
||||
server.get('/metrics', (req, res) => {
|
||||
res.set('Content-Type', prometheus.register.contentType);
|
||||
res.end(prometheus.register.metrics());
|
||||
});
|
||||
|
||||
// All regular routes use the Universal engine
|
||||
server.get('*', (req, res) => {
|
||||
let start = new Date();
|
||||
let counter: Counter = prometheus.counters.get(req.path);
|
||||
if(counter !== undefined) {
|
||||
counter.inc(1, new Date());
|
||||
res.render(indexHtml, {
|
||||
req, providers: [
|
||||
{
|
||||
provide: APP_BASE_HREF,
|
||||
useValue: req.baseUrl
|
||||
},
|
||||
{
|
||||
provide: REQUEST, useValue: (req)
|
||||
},
|
||||
{
|
||||
provide: RESPONSE, useValue: (res)
|
||||
}
|
||||
]
|
||||
});
|
||||
engine(_, options, callback);
|
||||
});
|
||||
});
|
||||
// event triggers when express is done sending response
|
||||
res.on('finish', function() {
|
||||
console.log(new Date().getTime() - start.getTime());
|
||||
});
|
||||
} else {
|
||||
res.render(indexHtml, {
|
||||
req, providers: [
|
||||
{
|
||||
provide: APP_BASE_HREF,
|
||||
useValue: req.baseUrl
|
||||
},
|
||||
{
|
||||
provide: REQUEST, useValue: (req)
|
||||
},
|
||||
{
|
||||
provide: RESPONSE, useValue: (res)
|
||||
}
|
||||
]
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
app.set('view engine', 'html');
|
||||
app.set('views', join(DIST_FOLDER, 'browser'));
|
||||
return server;
|
||||
}
|
||||
|
||||
/* - Example Express Rest API endpoints -
|
||||
app.get('/api/**', (req, res) => { });
|
||||
*/
|
||||
function run() {
|
||||
const port = process.env.PORT || 4000;
|
||||
|
||||
// Server static files from /browser
|
||||
app.get('*.*', express.static(join(DIST_FOLDER, 'browser'), {
|
||||
maxAge: '1y'
|
||||
}));
|
||||
// Start up the Node server
|
||||
const server = app();
|
||||
server.listen(port, () => {
|
||||
console.log(`Node Express server listening on http://localhost:${port}`);
|
||||
});
|
||||
}
|
||||
|
||||
app.get('/metrics', (req, res) => {
|
||||
res.set('Content-Type', prometheus.register.contentType);
|
||||
res.end(prometheus.register.metrics());
|
||||
});
|
||||
// All regular routes use the Universal engine
|
||||
app.get('*', (req, res) => {
|
||||
let start = new Date();
|
||||
let counter: Counter = prometheus.counters.get(req.path);
|
||||
if(counter !== undefined) {
|
||||
counter.inc(1, new Date());
|
||||
res.render('index', { req });
|
||||
// event triggers when express is done sending response
|
||||
res.on('finish', function() {
|
||||
console.log(new Date().getTime() - start.getTime());
|
||||
});
|
||||
} else {
|
||||
res.render('index', { req });
|
||||
}
|
||||
});
|
||||
// Webpack will replace 'require' with '__webpack_require__'
|
||||
// '__non_webpack_require__' is a proxy to Node 'require'
|
||||
// The below code is to ensure that the server is run only when not requiring the bundle.
|
||||
declare const __non_webpack_require__: NodeRequire;
|
||||
const mainModule = __non_webpack_require__.main;
|
||||
const moduleFilename = mainModule && mainModule.filename || '';
|
||||
if (moduleFilename === __filename || moduleFilename.includes('iisnode')) {
|
||||
run();
|
||||
}
|
||||
|
||||
// Start up the Node server
|
||||
app.listen(PORT, () => {
|
||||
console.log(`Node Express server listening on http://localhost:${PORT}`);
|
||||
});
|
||||
export * from './src/main.server';
|
||||
|
|
|
|||
|
|
@ -3,78 +3,78 @@ import {Routes, RouterModule, PreloadAllModules} from '@angular/router';
|
|||
import {OpenaireErrorPageComponent} from './error/errorPage.component';
|
||||
|
||||
const routes: Routes = [
|
||||
{path: '', loadChildren: './home/home.module#HomeModule'},
|
||||
{path: '', loadChildren: () => import('./home/home.module').then(m => m.HomeModule)},
|
||||
{
|
||||
path: 'search/result',
|
||||
loadChildren: './landingPages/result/libResult.module#LibResultModule'
|
||||
loadChildren: () => import('./landingPages/result/libResult.module').then(m => m.LibResultModule)
|
||||
},
|
||||
{
|
||||
path: 'search/publication',
|
||||
loadChildren: './landingPages/publication/libPublication.module#LibPublicationModule'
|
||||
loadChildren: () => import('./landingPages/publication/libPublication.module').then(m => m.LibPublicationModule)
|
||||
},
|
||||
{
|
||||
path: 'search/dataset',
|
||||
loadChildren: './landingPages/dataset/libDataset.module#LibDatasetModule'
|
||||
loadChildren: () => import('./landingPages/dataset/libDataset.module').then(m => m.LibDatasetModule)
|
||||
},
|
||||
{
|
||||
path: 'search/software',
|
||||
loadChildren: './landingPages/software/libSoftware.module#LibSoftwareModule'
|
||||
loadChildren: () => import('./landingPages/software/libSoftware.module').then(m => m.LibSoftwareModule)
|
||||
},
|
||||
{
|
||||
path: 'search/other',
|
||||
loadChildren: './landingPages/orp/libOrp.module#LibOrpModule'
|
||||
loadChildren: () => import('./landingPages/orp/libOrp.module').then(m => m.LibOrpModule)
|
||||
},
|
||||
{
|
||||
path: 'search/project',
|
||||
loadChildren: './landingPages/project/libProject.module#LibProjectModule'
|
||||
loadChildren: () => import('./landingPages/project/libProject.module').then(m => m.LibProjectModule)
|
||||
},
|
||||
{
|
||||
path: 'search/dataprovider',
|
||||
loadChildren: './landingPages/dataProvider/libDataProvider.module#LibDataProviderModule'
|
||||
loadChildren: () => import('./landingPages/dataProvider/libDataProvider.module').then(m => m.LibDataProviderModule)
|
||||
},
|
||||
{
|
||||
path: 'search/organization',
|
||||
loadChildren: './landingPages/organization/libOrganization.module#LibOrganizationModule'
|
||||
loadChildren: () => import('./landingPages/organization/libOrganization.module').then(m => m.LibOrganizationModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find',
|
||||
loadChildren: './searchPages/find/libSearch.module#LibMainSearchModule'
|
||||
loadChildren: () => import('./searchPages/find/libSearch.module').then(m => m.LibMainSearchModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find/research-outcomes',
|
||||
loadChildren: './searchPages/simple/searchResearchResults.module#OpenaireSearchResearchResultsModule'
|
||||
loadChildren: () => import('./searchPages/simple/searchResearchResults.module').then(m => m.OpenaireSearchResearchResultsModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find/projects',
|
||||
loadChildren: './searchPages/simple/searchProjects.module#LibSearchProjectsModule'
|
||||
loadChildren: () => import('./searchPages/simple/searchProjects.module').then(m => m.LibSearchProjectsModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find/dataproviders',
|
||||
loadChildren: './searchPages/simple/searchDataProviders.module#LibSearchDataProvidersModule'
|
||||
loadChildren: () => import('./searchPages/simple/searchDataProviders.module').then(m => m.LibSearchDataProvidersModule)
|
||||
},
|
||||
{
|
||||
path: 'search/find/organizations',
|
||||
loadChildren: './searchPages/simple/searchOrganizations.module#LibSearchOrganizationsModule'
|
||||
loadChildren: () => import('./searchPages/simple/searchOrganizations.module').then(m => m.LibSearchOrganizationsModule)
|
||||
},
|
||||
{
|
||||
path: 'search/advanced/research-outcomes',
|
||||
loadChildren: './searchPages/advanced/searchResearchResults.module#OpenaireAdvancedSearchResearchResultsModule'
|
||||
loadChildren: () => import('./searchPages/advanced/searchResearchResults.module').then(m => m.OpenaireAdvancedSearchResearchResultsModule)
|
||||
},
|
||||
{
|
||||
path: 'search/advanced/organizations',
|
||||
loadChildren: './searchPages/advanced/advancedSearchOrganizations.module#LibAdvancedSearchOrganizationsModule'
|
||||
loadChildren: () => import('./searchPages/advanced/advancedSearchOrganizations.module').then(m => m.LibAdvancedSearchOrganizationsModule)
|
||||
},
|
||||
{
|
||||
path: 'search/advanced/dataproviders',
|
||||
loadChildren: './searchPages/advanced/advancedSearchDataProviders.module#LibAdvancedSearchDataProvidersModule'
|
||||
loadChildren: () => import('./searchPages/advanced/advancedSearchDataProviders.module').then(m => m.LibAdvancedSearchDataProvidersModule)
|
||||
},
|
||||
{
|
||||
path: 'search/advanced/projects',
|
||||
loadChildren: './searchPages/advanced/advancedSearchProjects.module#LibAdvancedSearchProjectsModule'
|
||||
loadChildren: () => import('./searchPages/advanced/advancedSearchProjects.module').then(m => m.LibAdvancedSearchProjectsModule)
|
||||
},
|
||||
{
|
||||
path: 'project-report',
|
||||
loadChildren: './landingPages/htmlProjectReport/libHtmlProjectReport.module#LibHtmlProjectReportModule'
|
||||
loadChildren: () => import('./landingPages/htmlProjectReport/libHtmlProjectReport.module').then(m => m.LibHtmlProjectReportModule)
|
||||
},
|
||||
// Deposit Pages
|
||||
{ path: 'participate/deposit-datasets', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
|
|
@ -83,23 +83,21 @@ const routes: Routes = [
|
|||
{ path: 'participate/deposit-publications', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
{ path: 'participate/deposit-publications-result', redirectTo: 'participate/deposit/learn-how', pathMatch: 'full'},
|
||||
|
||||
{ path: 'participate/deposit/learn-how', loadChildren: './deposit/deposit.module#LibDepositModule'},
|
||||
{ path: 'participate/deposit/search', loadChildren: './deposit/searchDataprovidersToDeposit.module#LibSearchDataprovidersToDepositModule'},
|
||||
{ path: 'participate/deposit/learn-how', loadChildren: () => import('./deposit/deposit.module').then(m => m.LibDepositModule)},
|
||||
{ path: 'participate/deposit/search', loadChildren: () => import('./deposit/searchDataprovidersToDeposit.module').then(m => m.LibSearchDataprovidersToDepositModule)},
|
||||
// Linking Pages
|
||||
{ path: 'myclaims', loadChildren: './claims/myClaims/myClaims.module#LibMyClaimsModule'},
|
||||
{ path: 'participate/claim', loadChildren: './claims/linking/linkingGeneric.module#LibLinkingGenericModule'},
|
||||
{ path: 'participate/direct-claim', loadChildren: './claims/directLinking/directLinking.module#LibDirectLinkingModule'},
|
||||
{path: 'develop', loadChildren: './develop/develop.module#DevelopModule'},
|
||||
{path: 'user-info', loadChildren: './login/libUser.module#LibUserModule'},
|
||||
{ path: 'myclaims', loadChildren: () => import('./claims/myClaims/myClaims.module').then(m => m.LibMyClaimsModule)},
|
||||
{ path: 'participate/claim', loadChildren: () => import('./claims/linking/linkingGeneric.module').then(m => m.LibLinkingGenericModule)},
|
||||
{ path: 'participate/direct-claim', loadChildren: () => import('./claims/directLinking/directLinking.module').then(m => m.LibDirectLinkingModule)},
|
||||
{path: 'develop', loadChildren: () => import('./develop/develop.module').then(m => m.DevelopModule)},
|
||||
{path: 'user-info', loadChildren: () => import('./login/libUser.module').then(m => m.LibUserModule)},
|
||||
{path: 'error', component: OpenaireErrorPageComponent},
|
||||
{path: '**', pathMatch: 'full', component: OpenaireErrorPageComponent}
|
||||
];
|
||||
|
||||
@NgModule({
|
||||
imports: [RouterModule.forRoot(routes, {
|
||||
preloadingStrategy: PreloadAllModules,
|
||||
onSameUrlNavigation: "reload",
|
||||
relativeLinkResolution: 'corrected'
|
||||
})],
|
||||
exports: [RouterModule]
|
||||
})
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config
|
|||
CookieLawModule,
|
||||
BrowserAnimationsModule,
|
||||
BrowserTransferStateModule,
|
||||
BrowserModule.withServerTransition({appId: 'my-app'}),
|
||||
BrowserModule.withServerTransition({appId: 'aggregator'}),
|
||||
AppRoutingModule
|
||||
],
|
||||
declarations: [AppComponent, OpenaireErrorPageComponent],
|
||||
|
|
|
|||
|
|
@ -1,23 +1,15 @@
|
|||
import {NgModule} from '@angular/core';
|
||||
import {ServerModule} from '@angular/platform-server';
|
||||
import {ModuleMapLoaderModule} from '@nguniversal/module-map-ngfactory-loader';
|
||||
import { NgModule } from '@angular/core';
|
||||
import {ServerModule, ServerTransferStateModule} from '@angular/platform-server';
|
||||
|
||||
import {AppModule} from './app.module';
|
||||
import {AppComponent} from './app.component';
|
||||
//import {REQUEST} from "@nguniversal/express-engine/tokens";
|
||||
import { AppModule } from './app.module';
|
||||
import { AppComponent } from './app.component';
|
||||
|
||||
@NgModule({
|
||||
imports: [
|
||||
// The AppServerModule should import your AppModule followed
|
||||
// by the ServerModule from @angular/platform-server.
|
||||
AppModule,
|
||||
ServerModule,
|
||||
ModuleMapLoaderModule,
|
||||
ServerTransferStateModule
|
||||
],
|
||||
// Since the bootstrapped component is not inherited from your
|
||||
// imported AppModule, it needs to be repeated here.
|
||||
bootstrap: [AppComponent],
|
||||
})
|
||||
export class AppServerModule {
|
||||
/*constructor(@Inject(REQUEST) private request: Request) {}*/
|
||||
}
|
||||
export class AppServerModule {}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import {Component, ViewChild} from '@angular/core';
|
|||
import {Subscription} from 'rxjs';
|
||||
import {ActivatedRoute, Router} from '@angular/router';
|
||||
import {Location} from '@angular/common';
|
||||
import "rxjs/add/observable/zip";
|
||||
import {Meta, Title} from '@angular/platform-browser';
|
||||
import {ConfigurationService} from '../openaireLibrary/utils/configuration/configuration.service';
|
||||
import {SearchDataprovidersService} from '../openaireLibrary/services/searchDataproviders.service';
|
||||
|
|
@ -63,7 +62,7 @@ export class HomeComponent {
|
|||
customFilter:SearchCustomFilter= null;
|
||||
aggregatorId;
|
||||
aggregator:AggregatorInfo;
|
||||
@ViewChild('numbersComponent') numbersComponent: NumbersComponent;
|
||||
@ViewChild('numbersComponent', { static: true }) numbersComponent: NumbersComponent;
|
||||
|
||||
constructor (
|
||||
private route: ActivatedRoute,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ const COMPONENTS = [
|
|||
]
|
||||
})
|
||||
export class SharedModule {
|
||||
static forRoot(): ModuleWithProviders {
|
||||
static forRoot(): ModuleWithProviders<SharedModule> {
|
||||
return {
|
||||
ngModule: SharedModule,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,8 +1 @@
|
|||
// The file contents for the current environment will overwrite these during build.
|
||||
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
|
||||
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
|
||||
// The list of which env maps to which file can be found in `.angular-cli.json`.
|
||||
|
||||
export const portalProperties = {
|
||||
production: true
|
||||
};
|
||||
export const portalProperties = {};
|
||||
|
|
|
|||
|
|
@ -1,3 +1 @@
|
|||
export const portalProperties = {
|
||||
production: true
|
||||
};
|
||||
export const portalProperties = {};
|
||||
|
|
|
|||
|
|
@ -1,10 +1,4 @@
|
|||
// The file contents for the current environment will overwrite these during build.
|
||||
// The build system defaults to the dev environment which uses `environment.ts`, but if you do
|
||||
// `ng build --env=prod` then `environment.prod.ts` will be used instead.
|
||||
// The list of which env maps to which file can be found in `.angular-cli.json`.
|
||||
|
||||
export const portalProperties = {
|
||||
production: false,
|
||||
aggregator: "canada",
|
||||
title: "{Title}",
|
||||
logoPath: "assets/logo.png",
|
||||
|
|
|
|||
|
|
@ -0,0 +1,32 @@
|
|||
// Karma configuration file, see link for more information
|
||||
// https://karma-runner.github.io/1.0/config/configuration-file.html
|
||||
|
||||
module.exports = function (config) {
|
||||
config.set({
|
||||
basePath: '',
|
||||
frameworks: ['jasmine', '@angular-devkit/build-angular'],
|
||||
plugins: [
|
||||
require('karma-jasmine'),
|
||||
require('karma-chrome-launcher'),
|
||||
require('karma-jasmine-html-reporter'),
|
||||
require('karma-coverage-istanbul-reporter'),
|
||||
require('@angular-devkit/build-angular/plugins/karma')
|
||||
],
|
||||
client: {
|
||||
clearContext: false // leave Jasmine Spec Runner output visible in browser
|
||||
},
|
||||
coverageIstanbulReporter: {
|
||||
dir: require('path').join(__dirname, '../coverage/aggregator'),
|
||||
reports: ['html', 'lcovonly', 'text-summary'],
|
||||
fixWebpackSourcePaths: true
|
||||
},
|
||||
reporters: ['progress', 'kjhtml'],
|
||||
port: 9876,
|
||||
colors: true,
|
||||
logLevel: config.LOG_INFO,
|
||||
autoWatch: true,
|
||||
browsers: ['Chrome'],
|
||||
singleRun: false,
|
||||
restartOnFileChange: true
|
||||
});
|
||||
};
|
||||
|
|
@ -1 +1,15 @@
|
|||
/***************************************************************************************************
|
||||
* Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
|
||||
*/
|
||||
import '@angular/localize/init';
|
||||
|
||||
import { enableProdMode } from '@angular/core';
|
||||
|
||||
import {properties} from './environments/environment';
|
||||
|
||||
if (properties.environment !== "development") {
|
||||
enableProdMode();
|
||||
}
|
||||
|
||||
export { AppServerModule } from './app/app.server.module';
|
||||
export { renderModule, renderModuleFactory } from '@angular/platform-server';
|
||||
|
|
|
|||
|
|
@ -2,12 +2,13 @@ import { enableProdMode } from '@angular/core';
|
|||
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
|
||||
|
||||
import { AppModule } from './app/app.module';
|
||||
import {portalProperties} from "./environments/environment-aggregator";
|
||||
import { properties } from './environments/environment';
|
||||
|
||||
if (portalProperties.production) {
|
||||
if (properties.environment !== "development") {
|
||||
enableProdMode();
|
||||
}
|
||||
|
||||
document.addEventListener('DOMContentLoaded', () => {
|
||||
platformBrowserDynamic().bootstrapModule(AppModule);
|
||||
platformBrowserDynamic().bootstrapModule(AppModule)
|
||||
.catch(err => console.error(err));
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
/***************************************************************************************************
|
||||
* Load `$localize` onto the global scope - used if i18n tags appear in Angular templates.
|
||||
*/
|
||||
import '@angular/localize/init';
|
||||
/**
|
||||
* This file includes polyfills needed by Angular and is loaded before the app.
|
||||
* You can add your own extra polyfills to this file.
|
||||
|
|
@ -11,62 +15,53 @@
|
|||
* automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
|
||||
* Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
|
||||
*
|
||||
* Learn more in https://angular.io/docs/ts/latest/guide/browser-support.html
|
||||
* Learn more in https://angular.io/guide/browser-support
|
||||
*/
|
||||
|
||||
/***************************************************************************************************
|
||||
* BROWSER POLYFILLS
|
||||
*/
|
||||
|
||||
/** IE9, IE10 and IE11 requires all of the following polyfills. **/
|
||||
import 'core-js/es6/symbol';
|
||||
import 'core-js/es6/object';
|
||||
import 'core-js/es6/function';
|
||||
import 'core-js/es6/parse-int';
|
||||
import 'core-js/es6/parse-float';
|
||||
import 'core-js/es6/number';
|
||||
import 'core-js/es6/math';
|
||||
import 'core-js/es6/string';
|
||||
import 'core-js/es6/date';
|
||||
import 'core-js/es6/array';
|
||||
import 'core-js/es6/regexp';
|
||||
import 'core-js/es6/map';
|
||||
import 'core-js/es6/weak-map';
|
||||
import 'core-js/es6/set';
|
||||
|
||||
/** IE10 and IE11 requires the following for NgClass support on SVG elements */
|
||||
// import 'classlist.js'; // Run `npm install --save classlist.js`.
|
||||
|
||||
/** Evergreen browsers require these. **/
|
||||
import 'core-js/es6/reflect';
|
||||
import 'core-js/es7/reflect';
|
||||
|
||||
|
||||
/**
|
||||
* Required to support Web Animations `@angular/animation`.
|
||||
* Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
|
||||
**/
|
||||
* Web Animations `@angular/platform-browser/animations`
|
||||
* Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
|
||||
* Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
|
||||
*/
|
||||
// import 'web-animations-js'; // Run `npm install --save web-animations-js`.
|
||||
|
||||
|
||||
/**
|
||||
* By default, zone.js will patch all possible macroTask and DomEvents
|
||||
* user can disable parts of macroTask/DomEvents patch by setting following flags
|
||||
* because those flags need to be set before `zone.js` being loaded, and webpack
|
||||
* will put import in the top of bundle, so user need to create a separate file
|
||||
* in this directory (for example: zone-flags.ts), and put the following flags
|
||||
* into that file, and then add the following code before importing zone.js.
|
||||
* import './zone-flags.ts';
|
||||
*
|
||||
* The flags allowed in zone-flags.ts are listed here.
|
||||
*
|
||||
* The following flags will work for all browsers.
|
||||
*
|
||||
* (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
|
||||
* (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
|
||||
* (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
|
||||
*
|
||||
* in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
|
||||
* with the following flag, it will bypass `zone.js` patch for IE/Edge
|
||||
*
|
||||
* (window as any).__Zone_enable_cross_context_check = true;
|
||||
*
|
||||
*/
|
||||
|
||||
/***************************************************************************************************
|
||||
* Zone JS is required by Angular itself.
|
||||
* Zone JS is required by default for Angular itself.
|
||||
*/
|
||||
import 'zone.js/dist/zone'; // Included with Angular CLI.
|
||||
|
||||
|
||||
|
||||
/***************************************************************************************************
|
||||
* APPLICATION IMPORTS
|
||||
*/
|
||||
|
||||
/**
|
||||
* Date, currency, decimal and percent pipes.
|
||||
* Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
|
||||
*/
|
||||
// import 'intl'; // Run `npm install --save intl`.
|
||||
/**
|
||||
* Need to import at least one locale-data with intl.
|
||||
*/
|
||||
// import 'intl/locale-data/jsonp/en';
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
<meta property="og:description" content="openAIRE explore, open access, publications, research results, European commission, search"/>
|
||||
<meta property="og:title" content="OpenAIRE"/>
|
||||
<meta property="og:type" content="website"/>
|
||||
<meta property="og:url" content="https://beta.explore.openaire.eu"/>
|
||||
<meta property="og:url" content="https://explore.openaire.eu"/>
|
||||
<meta property="og:site_name" content="OpenAIRE"/>
|
||||
|
||||
<meta property="og:image" content="assets/common-assets/common/Symbol.png"/>
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
|
||||
|
||||
import 'zone.js/dist/zone-testing';
|
||||
import { getTestBed } from '@angular/core/testing';
|
||||
import {
|
||||
BrowserDynamicTestingModule,
|
||||
platformBrowserDynamicTesting
|
||||
} from '@angular/platform-browser-dynamic/testing';
|
||||
|
||||
declare const require: any;
|
||||
|
||||
// First, initialize the Angular testing environment.
|
||||
getTestBed().initTestEnvironment(
|
||||
BrowserDynamicTestingModule,
|
||||
platformBrowserDynamicTesting()
|
||||
);
|
||||
// Then we find all the tests.
|
||||
const context = require.context('./', true, /\.spec\.ts$/);
|
||||
// And load the modules.
|
||||
context.keys().map(context);
|
||||
|
|
@ -2,14 +2,13 @@
|
|||
"extends": "../tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/app",
|
||||
"baseUrl": "./",
|
||||
"module": "es2015",
|
||||
"types": [
|
||||
"node"
|
||||
]
|
||||
"types": []
|
||||
},
|
||||
"exclude": [
|
||||
"test.ts",
|
||||
"**/*.spec.ts"
|
||||
"files": [
|
||||
"main.ts",
|
||||
"polyfills.ts"
|
||||
],
|
||||
"include": [
|
||||
"src/**/*.d.ts"
|
||||
]
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +1,17 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"extends": "./tsconfig.app.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/app",
|
||||
"baseUrl": "./",
|
||||
// Set the module format to "commonjs":
|
||||
"module": "commonjs",
|
||||
"outDir": "../out-tsc/app-server",
|
||||
"target": "es2016",
|
||||
"types": [
|
||||
"node"
|
||||
]
|
||||
},
|
||||
"exclude": [
|
||||
"test.ts",
|
||||
"**/*.spec.ts"
|
||||
"files": [
|
||||
"main.server.ts",
|
||||
"../server.ts"
|
||||
],
|
||||
// Add "angularCompilerOptions" with the AppServerModule you wrote
|
||||
// setValues as the "entryModule".
|
||||
"angularCompilerOptions": {
|
||||
"entryModule": "app/app.server.module#AppServerModule"
|
||||
"entryModule": "./app/app.server.module#AppServerModule"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
{
|
||||
"extends": "../tsconfig.json",
|
||||
"compilerOptions": {
|
||||
"outDir": "../out-tsc/spec",
|
||||
"types": [
|
||||
"jasmine",
|
||||
"node"
|
||||
]
|
||||
},
|
||||
"files": [
|
||||
"test.ts",
|
||||
"polyfills.ts"
|
||||
],
|
||||
"include": [
|
||||
"**/*.spec.ts",
|
||||
"**/*.d.ts"
|
||||
]
|
||||
}
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
export const ROUTES = [
|
||||
'/',
|
||||
'/lazy',
|
||||
'/home',
|
||||
'/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization',
|
||||
'/search/find',
|
||||
'/search/person','/search/publication','/search/project','/search/dataset','/search/dataprovider','/search/organization',
|
||||
'/search/find/people','/search/find/publications','/search/find/projects','/search/find/datasets','/search/find/dataproviders','/search/find/organizations',
|
||||
'/search/advanced/people','/search/advanced/publications','/search/advanced/projects','/search/advanced/datasets','/search/advanced/dataproviders','/search/advanced/organizations',
|
||||
'/participate/deposit-publications','/participate/deposit-datasets','/participate/deposit-publications-result','/participate/deposit-datasets-result','/participate/deposit-subject-result',
|
||||
'/search/content-providers','/search/content-providers-table','/search/entity-registries','/search/entity-registries-table','/search/journals','/search/journals-table',
|
||||
'/project-report','/claims','/myclaims','/participate/claim','/participate/direct-claim','/claims-project-manager',
|
||||
'/test','/user-info',
|
||||
'/error', '/*path'
|
||||
];
|
||||
|
|
@ -1,22 +1,23 @@
|
|||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"importHelpers": true,
|
||||
"baseUrl": "./",
|
||||
"downlevelIteration": true,
|
||||
"outDir": "./dist/out-tsc",
|
||||
"sourceMap": true,
|
||||
"declaration": false,
|
||||
"module": "es2020",
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"target": "es5",
|
||||
"importHelpers": true,
|
||||
"target": "es2015",
|
||||
"typeRoots": [
|
||||
"node_modules/@types"
|
||||
],
|
||||
"lib": [
|
||||
"es2017",
|
||||
"es2018",
|
||||
"dom"
|
||||
],
|
||||
"module": "es2015",
|
||||
"baseUrl": "./"
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,52 +0,0 @@
|
|||
// Work around for https://github.com/angular/angular-cli/issues/7200
|
||||
|
||||
const path = require('path');
|
||||
const webpack = require('webpack');
|
||||
|
||||
module.exports = {
|
||||
//mode: 'none',
|
||||
entry: {
|
||||
// This is our Express server for Dynamic universal
|
||||
server: './server.ts',
|
||||
// This is an example of Static prerendering (generative)
|
||||
prerender: './prerender.ts'
|
||||
},
|
||||
target: 'node',
|
||||
resolve: { extensions: ['.ts', '.js'] },
|
||||
// Make sure we include all node_modules etc
|
||||
externals: [/(node_modules|main\..*\.js)/,],
|
||||
optimization: {
|
||||
minimize: false
|
||||
},
|
||||
output: {
|
||||
// Puts the output at the root of the dist folder
|
||||
path: path.join(__dirname, 'dist'),
|
||||
filename: '[name].js'
|
||||
},
|
||||
module: {
|
||||
rules: [
|
||||
{ test: /\.ts$/, loader: 'ts-loader' }
|
||||
,{
|
||||
// Mark files inside `@angular/core` as using SystemJS style dynamic imports.
|
||||
// Removing this will cause deprecation warnings to appear.
|
||||
test: /(\\|\/)@angular(\\|\/)core(\\|\/).+\.js$/,
|
||||
parser: { system: true },
|
||||
},
|
||||
]
|
||||
},
|
||||
plugins: [
|
||||
new webpack.ContextReplacementPlugin(
|
||||
// fixes WARNING Critical dependency: the request of a dependency is an expression
|
||||
/(.+)?angular(\\|\/)core(.+)?/,
|
||||
path.join(__dirname, 'src'), // location of your src
|
||||
{} // a map of your routes
|
||||
),
|
||||
new webpack.ContextReplacementPlugin(
|
||||
// fixes WARNING Critical dependency: the request of a dependency is an expression
|
||||
/(.+)?express(\\|\/)(.+)?/,
|
||||
path.join(__dirname, 'src'),
|
||||
{}
|
||||
)
|
||||
]
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue