diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34e1bfc --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.angular/ +node_modules/ +dist/ +.idea/ +package-lock.json +.angular \ No newline at end of file diff --git a/angular.json b/angular.json index 16fa119..05ad3e6 100644 --- a/angular.json +++ b/angular.json @@ -220,13 +220,16 @@ "main": "server.ts", "tsConfig": "src/tsconfig.server.json", "sourceMap": true, - "optimization": false + "optimization": false, + "buildOptimizer": false }, "configurations": { "development": { "outputHashing": "media", "sourceMap": false, - "optimization": true + "optimization": true, + "vendorChunk": true, + "buildOptimizer": true }, "beta": { "outputHashing": "media", @@ -237,7 +240,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true }, "production": { "outputHashing": "media", @@ -248,7 +252,8 @@ } ], "sourceMap": false, - "optimization": true + "optimization": true, + "buildOptimizer": true } }, "defaultConfiguration": "" @@ -300,8 +305,5 @@ } } } - }, - "cli": { - "analytics": false } } diff --git a/package.json b/package.json index bad0b03..78257f0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { - "name": "eosc", - "version": "3.1.0", + "name": "faircore4eosc", + "version": "1.0.0", "scripts": { "ng": "ng", "start": "ng serve --disable-host-check --host 0.0.0.0 --port 5200", @@ -21,37 +21,37 @@ }, "private": true, "dependencies": { - "@angular/animations": "^14.2.3", - "@angular/cdk": "^14.2.2", - "@angular/common": "^14.2.3", - "@angular/compiler": "^14.2.3", - "@angular/core": "^14.2.3", - "@angular/forms": "^14.2.3", - "@angular/localize": "^14.2.3", - "@angular/material": "^14.2.2", - "@angular/platform-browser": "^14.2.3", - "@angular/platform-browser-dynamic": "^14.2.3", - "@angular/platform-server": "^14.2.3", - "@angular/router": "^14.2.3", - "@nguniversal/express-engine": "^14.2.0", + "@angular/animations": "^16.1.8", + "@angular/cdk": "^16.1.7", + "@angular/common": "^16.1.8", + "@angular/compiler": "^16.1.8", + "@angular/core": "^16.1.8", + "@angular/forms": "^16.1.8", + "@angular/localize": "^16.1.8", + "@angular/material": "^16.1.7", + "@angular/platform-browser": "^16.1.8", + "@angular/platform-browser-dynamic": "^16.1.8", + "@angular/platform-server": "^16.1.8", + "@angular/router": "^16.1.8", + "@nguniversal/express-engine": "^16.1.1", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", "jquery": "^3.4.1", - "ng-recaptcha": "^10.0.0", + "ng-recaptcha": "^12.0.2", "prom-client": "^11.3.0", "rxjs": "^6.5.1", "ts-md5": "^1.2.0", "tslib": "^2.0.0", - "uikit": "3.13.10", - "zone.js": "~0.11.4" + "uikit": "3.16.24", + "zone.js": "~0.13.1" }, "devDependencies": { - "@angular-devkit/build-angular": "^14.2.3", - "@angular/cli": "^14.2.3", - "@angular/compiler-cli": "^14.2.3", - "@angular/language-service": "^14.2.3", - "@nguniversal/builders": "^14.2.0", + "@angular-devkit/build-angular": "^16.1.7", + "@angular/cli": "^16.1.7", + "@angular/compiler-cli": "^16.1.8", + "@angular/language-service": "^16.1.8", + "@nguniversal/builders": "^16.1.1", "@types/express": "^4.17.0", "@types/compression": "^1.7.0", "@types/node": "^12.11.1", @@ -67,6 +67,6 @@ "karma-jasmine-html-reporter": "^1.6.0", "protractor": "~7.0.0", "ts-node": "~7.0.0", - "typescript": "~4.6.4" + "typescript": "~4.9.5" } } diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 0534261..900df59 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,6 +1,6 @@ -import {NgModule} from '@angular/core'; +import {APP_ID, NgModule} from '@angular/core'; import {SharedModule} from './shared/shared.module'; -import {BrowserModule, BrowserTransferStateModule} from '@angular/platform-browser'; +import {BrowserModule} from '@angular/platform-browser'; import {BrowserAnimationsModule} from '@angular/platform-browser/animations'; import {CommonModule} from '@angular/common'; import {HTTP_INTERCEPTORS, HttpClientModule} from '@angular/common/http'; @@ -27,14 +27,14 @@ import {ConfigurationService} from "./openaireLibrary/utils/configuration/config NavigationBarModule, FeedbackModule, BottomModule, CookieLawModule, BrowserAnimationsModule, - BrowserTransferStateModule, - BrowserModule.withServerTransition({appId: 'eosc'}), + BrowserModule, AppRoutingModule ], declarations: [AppComponent, OpenaireErrorPageComponent], exports: [AppComponent], providers: [ ConfigurationService, + {provide: APP_ID, useValue: 'eosc'}, { provide: HTTP_INTERCEPTORS, useClass: HttpInterceptorService, diff --git a/src/app/app.server.module.ts b/src/app/app.server.module.ts index cc86a55..561695a 100644 --- a/src/app/app.server.module.ts +++ b/src/app/app.server.module.ts @@ -1,5 +1,5 @@ import { NgModule } from '@angular/core'; -import {ServerModule, ServerTransferStateModule} from '@angular/platform-server'; +import {ServerModule} from '@angular/platform-server'; import { AppModule } from './app.module'; import { AppComponent } from './app.component'; @@ -7,8 +7,7 @@ import { AppComponent } from './app.component'; @NgModule({ imports: [ AppModule, - ServerModule, - ServerTransferStateModule + ServerModule ], bootstrap: [AppComponent], }) diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary index 9b2524c..a2f52cf 160000 --- a/src/app/openaireLibrary +++ b/src/app/openaireLibrary @@ -1 +1 @@ -Subproject commit 9b2524c1c72972b593654081e1d917ca8a1a7909 +Subproject commit a2f52cf40ee28cb950dd789cd100fdbba16eb4c0 diff --git a/src/assets/common-assets b/src/assets/common-assets index 031329d..9e58421 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit 031329d5ca890663a0911e3dac5649eb5c00c601 +Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af diff --git a/src/assets/openaire-theme b/src/assets/openaire-theme index ac458b5..3a4aa92 160000 --- a/src/assets/openaire-theme +++ b/src/assets/openaire-theme @@ -1 +1 @@ -Subproject commit ac458b5a6d156167d7b6c9005ef1f9cfac75d3ae +Subproject commit 3a4aa92c441467994a45a2c6a4f0c21202945404 diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts index 886615a..155ef95 100644 --- a/src/environments/environment.beta.ts +++ b/src/environments/environment.beta.ts @@ -18,7 +18,6 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://beta.services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://beta.services.openaire.eu/search/v2/api/", @@ -112,7 +111,6 @@ export let properties: EnvProperties = { reCaptchaSiteKey: null, footerGrantText: "", eoscDataTransferAPI : "https://eosc-data-transfer.vm.fedcloud.eu", - eoscDataTransferLoginUrl:"https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", eoscDataTransferDestinations : [ {label: "EGI dCache (dcache-demo.desy.de)", value: {label : "EGI dCache (dcache-demo.desy.de)", url: "https://dcache-demo.desy.de:2443", id: "dcache", diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2403203..2ce71db 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -18,7 +18,6 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://www.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://services.openaire.eu/stats-tool/", - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "https://services.openaire.eu/claims/rest/claimsService/", searchAPIURLLAst: "https://services.openaire.eu/search/v2/api/", diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 2b26d4a..93bc491 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -18,7 +18,6 @@ export let properties: EnvProperties = { statisticsAPIURL: "https://beta.services.openaire.eu/stats-api/", statisticsFrameAPIURL: "https://beta.openaire.eu/stats/", statisticsFrameNewAPIURL: "https://beta.services.openaire.eu/stats-tool/", - bipFrameAPIURL: "https://bip.imsi.athenarc.gr/api/impact-chart?id=", useNewStatistisTool: true, claimsAPIURL: "http://dl170.madgik.di.uoa.gr:8180/dnet-claims-service-2.0.0-SNAPSHOT/rest/claimsService/", searchAPIURLLAst: "http://beta.services.openaire.eu/search/v2/api/", diff --git a/src/main.server.ts b/src/main.server.ts index d8775d6..0930b37 100644 --- a/src/main.server.ts +++ b/src/main.server.ts @@ -12,4 +12,4 @@ if (properties.environment !== "development") { } export { AppServerModule } from './app/app.server.module'; -export { renderModule } from '@angular/platform-server'; + diff --git a/src/test.ts b/src/test.ts index 6b03dbe..ae25f27 100644 --- a/src/test.ts +++ b/src/test.ts @@ -7,8 +7,6 @@ import { platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing'; -declare const require: any; - // First, initialize the Angular testing environment. getTestBed().initTestEnvironment( BrowserDynamicTestingModule, @@ -16,7 +14,3 @@ getTestBed().initTestEnvironment( teardown: { destroyAfterEach: false } } ); -// Then we find all the tests. -const context = require.context('./', true, /\.spec\.ts$/); -// And load the modules. -context.keys().map(context); diff --git a/src/tsconfig.server.json b/src/tsconfig.server.json index 39f85aa..5601502 100644 --- a/src/tsconfig.server.json +++ b/src/tsconfig.server.json @@ -2,7 +2,6 @@ "extends": "./tsconfig.app.json", "compilerOptions": { "outDir": "../out-tsc/app-server", - "target": "es2016", "types": [ "node" ] diff --git a/tsconfig.json b/tsconfig.json index fc8b4c1..668d981 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -10,13 +10,14 @@ "moduleResolution": "node", "experimentalDecorators": true, "importHelpers": true, - "target": "es2020", + "target": "ES2022", "typeRoots": [ "node_modules/@types" ], "lib": [ "es2018", "dom" - ] + ], + "useDefineForClassFields": false } }