diff --git a/package.json b/package.json index 9d9a3cf..0d7ddbc 100644 --- a/package.json +++ b/package.json @@ -21,19 +21,19 @@ }, "private": true, "dependencies": { - "@angular/animations": "^17.3.11", + "@angular/animations": "^18.1.0", "@angular/cdk": "^17.3.10", - "@angular/common": "^17.3.11", - "@angular/compiler": "^17.3.11", - "@angular/core": "^17.3.11", - "@angular/forms": "^17.3.11", - "@angular/localize": "^17.3.11", + "@angular/common": "^18.1.0", + "@angular/compiler": "^18.1.0", + "@angular/core": "^18.1.0", + "@angular/forms": "^18.1.0", + "@angular/localize": "^18.1.0", "@angular/material": "^17.3.10", - "@angular/platform-browser": "^17.3.11", - "@angular/platform-browser-dynamic": "^17.3.11", - "@angular/platform-server": "^17.3.11", - "@angular/router": "^17.3.11", - "@angular/ssr": "^17.3.8", + "@angular/platform-browser": "^18.1.0", + "@angular/platform-browser-dynamic": "^18.1.0", + "@angular/platform-server": "^18.1.0", + "@angular/router": "^18.1.0", + "@angular/ssr": "^18.1.0", "clipboard": "^1.5.16", "core-js": "^2.5.4", "express": "^4.15.2", @@ -47,10 +47,10 @@ "zone.js": "~0.14.0" }, "devDependencies": { - "@angular-devkit/build-angular": "^17.3.8", - "@angular/cli": "^17.3.8", - "@angular/compiler-cli": "^17.3.11", - "@angular/language-service": "^17.3.11", + "@angular-devkit/build-angular": "^18.1.0", + "@angular/cli": "^18.1.0", + "@angular/compiler-cli": "^18.1.0", + "@angular/language-service": "^18.1.0", "@types/compression": "^1.7.0", "@types/express": "^4.17.0", "@types/jasmine": "~3.6.0", diff --git a/src/app/app.module.ts b/src/app/app.module.ts index fa46475..ed158e2 100755 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -3,7 +3,7 @@ import {SharedModule} from './shared/shared.module'; 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'; +import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {AppComponent} from './app.component'; import {NavigationBarModule} from './openaireLibrary/sharedComponents/navigationBar.module'; import {CookieLawModule} from './openaireLibrary/sharedComponents/cookie-law/cookie-law.module'; @@ -17,38 +17,32 @@ import {ErrorInterceptorService} from "./openaireLibrary/error-interceptor.servi import {DEFAULT_TIMEOUT, TimeoutInterceptor} from "./openaireLibrary/timeout-interceptor.service"; import {ConfigurationService} from "./openaireLibrary/utils/configuration/configuration.service"; -@NgModule({ - imports: [ - SharedModule, - BrowserAnimationsModule, - CommonModule, - HttpClientModule, - ErrorModule, - NavigationBarModule, FeedbackModule, BottomModule, - CookieLawModule, - BrowserAnimationsModule, - BrowserModule, - AppRoutingModule - ], - declarations: [AppComponent, OpenaireErrorPageComponent], - exports: [AppComponent], - providers: [ - ConfigurationService, - {provide: APP_ID, useValue: 'aggregator'}, - { - provide: HTTP_INTERCEPTORS, - useClass: HttpInterceptorService, - multi: true - }, - { - provide: HTTP_INTERCEPTORS, - useClass: ErrorInterceptorService, - multi: true - }, - [{provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true}], - [{provide: DEFAULT_TIMEOUT, useValue: 30000}] - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, OpenaireErrorPageComponent], + exports: [AppComponent], + bootstrap: [AppComponent], imports: [SharedModule, + BrowserAnimationsModule, + CommonModule, + ErrorModule, + NavigationBarModule, FeedbackModule, BottomModule, + CookieLawModule, + BrowserAnimationsModule, + BrowserModule, + AppRoutingModule], providers: [ + ConfigurationService, + { provide: APP_ID, useValue: 'aggregator' }, + { + provide: HTTP_INTERCEPTORS, + useClass: HttpInterceptorService, + multi: true + }, + { + provide: HTTP_INTERCEPTORS, + useClass: ErrorInterceptorService, + multi: true + }, + [{ provide: HTTP_INTERCEPTORS, useClass: TimeoutInterceptor, multi: true }], + [{ provide: DEFAULT_TIMEOUT, useValue: 30000 }], + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/src/assets/common-assets b/src/assets/common-assets index ee1a55a..eb0051d 160000 --- a/src/assets/common-assets +++ b/src/assets/common-assets @@ -1 +1 @@ -Subproject commit ee1a55a529fde844f54761633e59f3be791717e3 +Subproject commit eb0051dc347cdaa44476048dea9f6b61200f257f