From 1e9d8a9f959d2abc83b60549db37f4470de06b3e Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 17 May 2023 13:14:37 +0200 Subject: [PATCH] update to angular 15 done --- httpdocs/plp-angular/angular.json | 5 ++++- .../plp-angular/src/app/interceptor/route-interceptor.ts | 4 +++- httpdocs/plp-angular/src/app/services/app.service.ts | 4 +++- httpdocs/plp-angular/src/app/services/common.service.ts | 4 +++- httpdocs/plp-angular/src/app/services/customer.service.ts | 4 +++- httpdocs/plp-angular/src/app/services/http.interceptor.ts | 4 +++- httpdocs/plp-angular/src/app/services/http.service.ts | 4 +++- httpdocs/plp-angular/src/app/services/meeting.service.ts | 4 +++- httpdocs/plp-angular/src/app/services/message.service.ts | 4 +++- httpdocs/plp-angular/src/scss/styles.scss | 5 ----- 10 files changed, 28 insertions(+), 14 deletions(-) diff --git a/httpdocs/plp-angular/angular.json b/httpdocs/plp-angular/angular.json index f5da50e..714ac4a 100644 --- a/httpdocs/plp-angular/angular.json +++ b/httpdocs/plp-angular/angular.json @@ -29,7 +29,10 @@ "src/assets" ], "styles": [ - "src/scss/styles.scss" + "src/scss/styles.scss", + "./node_modules/angular-calendar/css/angular-calendar.css", + "./node_modules/ag-grid-community/styles/ag-grid.css", + "./node_modules/ag-grid-community/styles/ag-theme-balham.css" ], "scripts": [] }, diff --git a/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts b/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts index b09dbe7..66e0dbc 100644 --- a/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts +++ b/httpdocs/plp-angular/src/app/interceptor/route-interceptor.ts @@ -4,7 +4,9 @@ import {AppService} from '../services/app.service'; import {Subscription} from 'rxjs/index'; import {ILoginState} from '../model/virtual/login-state'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class RouteInterceptor { private loginSub: Subscription; private loginState: ILoginState; diff --git a/httpdocs/plp-angular/src/app/services/app.service.ts b/httpdocs/plp-angular/src/app/services/app.service.ts index 892005f..a2f73b9 100644 --- a/httpdocs/plp-angular/src/app/services/app.service.ts +++ b/httpdocs/plp-angular/src/app/services/app.service.ts @@ -11,7 +11,9 @@ import {Utils} from '../utils/utils'; import {CustomerService} from './customer.service'; import {MeetingService} from './meeting.service'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class AppService { private loginState: BehaviorSubject; diff --git a/httpdocs/plp-angular/src/app/services/common.service.ts b/httpdocs/plp-angular/src/app/services/common.service.ts index 21147c6..23ff428 100644 --- a/httpdocs/plp-angular/src/app/services/common.service.ts +++ b/httpdocs/plp-angular/src/app/services/common.service.ts @@ -2,7 +2,9 @@ import {Injectable} from '@angular/core'; import {HttpService} from './http.service'; import {saveAs} from 'file-saver'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class CommonService { constructor(private httpService: HttpService) { diff --git a/httpdocs/plp-angular/src/app/services/customer.service.ts b/httpdocs/plp-angular/src/app/services/customer.service.ts index 74d8fb4..597b6d0 100644 --- a/httpdocs/plp-angular/src/app/services/customer.service.ts +++ b/httpdocs/plp-angular/src/app/services/customer.service.ts @@ -11,7 +11,9 @@ import {ServiceHelper} from '../utils/service-helper'; import {ICustomerNote} from '../model/entities/customer-note'; import {ICustomerData} from '../model/virtual/customer-data'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class CustomerService { private customers: BehaviorSubject; diff --git a/httpdocs/plp-angular/src/app/services/http.interceptor.ts b/httpdocs/plp-angular/src/app/services/http.interceptor.ts index b46efb6..62f2082 100644 --- a/httpdocs/plp-angular/src/app/services/http.interceptor.ts +++ b/httpdocs/plp-angular/src/app/services/http.interceptor.ts @@ -4,7 +4,9 @@ import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/com import {Observable} from 'rxjs'; /** Pass untouched request through to the next request handler. */ -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class HttpClientInterceptor implements HttpInterceptor { intercept(req: HttpRequest, next: HttpHandler): diff --git a/httpdocs/plp-angular/src/app/services/http.service.ts b/httpdocs/plp-angular/src/app/services/http.service.ts index 7ec439c..c21bf4a 100644 --- a/httpdocs/plp-angular/src/app/services/http.service.ts +++ b/httpdocs/plp-angular/src/app/services/http.service.ts @@ -9,7 +9,9 @@ import {CacheService} from './cache.service'; import {IAppServiceData} from '../model/virtual/app-service-data'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class HttpService { /** diff --git a/httpdocs/plp-angular/src/app/services/meeting.service.ts b/httpdocs/plp-angular/src/app/services/meeting.service.ts index 15fbbd3..14dfd6c 100644 --- a/httpdocs/plp-angular/src/app/services/meeting.service.ts +++ b/httpdocs/plp-angular/src/app/services/meeting.service.ts @@ -11,7 +11,9 @@ import {ICustomerMeeting} from '../model/entities/customer-meeting'; import {IInternalMeeting} from '../model/entities/internal-meeting'; import {IMeetingData} from '../model/virtual/meeting-data'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class MeetingService { private customerMeetings: BehaviorSubject; diff --git a/httpdocs/plp-angular/src/app/services/message.service.ts b/httpdocs/plp-angular/src/app/services/message.service.ts index 2614463..773f276 100644 --- a/httpdocs/plp-angular/src/app/services/message.service.ts +++ b/httpdocs/plp-angular/src/app/services/message.service.ts @@ -3,7 +3,9 @@ import {BehaviorSubject, Observable} from 'rxjs'; import {IMessage} from '../model/virtual/message'; import {Factory} from '../factory/factory'; -@Injectable() +@Injectable({ + providedIn: 'root' +}) export class MessageService { private message: BehaviorSubject; diff --git a/httpdocs/plp-angular/src/scss/styles.scss b/httpdocs/plp-angular/src/scss/styles.scss index 45b4fe2..e3f4526 100644 --- a/httpdocs/plp-angular/src/scss/styles.scss +++ b/httpdocs/plp-angular/src/scss/styles.scss @@ -12,11 +12,6 @@ @import "components/search_bar"; @import "components/tabs"; -/* angular-cli file: src/styles.css */ -/*@import "~angular-calendar/css/angular-calendar.css";*/ -@import "~ag-grid-community/styles/ag-grid.css"; -@import "~ag-grid-community/styles/ag-theme-balham.css"; - /* apply a natural box layout model to all elements, but allowing person to change */ html {box-sizing:border-box;} *, *:before, *:after {box-sizing:inherit;}