FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Aw5739 Update to Angular v16.

Browse Source
This commit is contained in:
Peter Bastiani 2024-01-08 14:51:37 +01:00
parent 7339b91328
commit f70e30204d
10 changed files with 8177 additions and 2233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10346
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

32
package.json
View File

@ -11,15 +11,15 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^15.2.10",
"@angular/common": "^15.2.10",
"@angular/compiler": "^15.2.10",
"@angular/core": "^15.2.10",
"@angular/animations": "^16.2.12",
"@angular/common": "^16.2.12",
"@angular/compiler": "^16.2.12",
"@angular/core": "^16.2.12",
"@angular-eslint/eslint-plugin": "^15.2.1",
"@angular/forms": "^15.2.10",
"@angular/platform-browser": "^15.2.10",
"@angular/platform-browser-dynamic": "^15.2.10",
"@angular/router": "^15.2.10",
"@angular/forms": "^16.2.12",
"@angular/platform-browser": "^16.2.12",
"@angular/platform-browser-dynamic": "^16.2.12",
"@angular/router": "^16.2.12",
"@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "file:dist/common-map3d",
@ -42,7 +42,7 @@
"ngrx-store-localstorage": "^15",
"ngx-avatars": "1.5.0",
"ngx-clipboard": "^15.1.0",
"ngx-image-cropper": "^3.3.5",
"ngx-image-cropper": "^7.2.1",
"ngx-uploadx": "^5.2.0",
"ol": "~6.3.1",
"olcs": "^2.13.1",
@ -54,15 +54,15 @@
"tslib": "^2.4.0",
"url": "^0.11.0",
"util": "^0.12.4",
"zone.js": "~0.11.4"
"zone.js": "~0.13.3"
},
"devDependencies": {
"@angular-builders/custom-webpack": "^15",
"@angular-devkit/build-angular": "^15.2.10",
"@angular/cli": "^15.2.10",
"@angular/compiler-cli": "^15.2.10",
"@angular/language-service": "^15.2.10",
"@angular/localize": "^15.2.10",
"@angular-devkit/build-angular": "^16.2.11",
"@angular/cli": "^16.2.11",
"@angular/compiler-cli": "^16.2.12",
"@angular/language-service": "^16.2.12",
"@angular/localize": "^16.2.12",
"@types/arcgis-rest-api": "^10.4.5",
"@types/jasmine": "~2.8.8",
"@types/jasminewd2": "^2.0.9",
@ -81,7 +81,7 @@
"karma-coverage-istanbul-reporter": "^3.0.3",
"karma-jasmine": "^5.1.0",
"karma-jasmine-html-reporter": "^2.0.0",
"ng-packagr": "^15.2.2",
"ng-packagr": "^16.2.3",
"protractor": "~7.0.0",
"ts-node": "^8.8.1",
"typescript": "~4.9.3"

2
projects/common-map/src/fm-map/effects/map.effects.ts
View File

@ -41,7 +41,7 @@ export const {
selectRouteParam, // factory function to select a route param
selectRouteData, // select the current route data
selectUrl, // select the current url
} = fromRouter.getSelectors(getRouterState);
} = fromRouter.getRouterSelectors(getRouterState);
@Injectable()

2
projects/common/package-lock.json generated
View File

@ -21,7 +21,7 @@
"moment": ">=2.27.0",
"ngx-avatars": "1.5.0",
"ngx-clipboard": ">=15.1.0",
"ngx-image-cropper": ">=3.3.5",
"ngx-image-cropper": ">=7.2.1",
"ngx-uploadx": ">=5.1.0",
"tassign": ">=1.0.0"
}

2
projects/common/package.json
View File

@ -19,7 +19,7 @@
"angular-oauth2-oidc": ">=13.0.0",
"moment": ">=2.27.0",
"ngx-avatars": "1.5.0",
"ngx-image-cropper": ">=3.3.5",
"ngx-image-cropper": ">=7.2.1",
"ngx-clipboard": ">=15.1.0"
}
}

4
projects/common/src/fm/components/auth-callback/auth-callback.guard.ts
View File

@ -1,4 +1,4 @@
import { Router, CanActivate } from '@angular/router';
import { Router } from '@angular/router';
import { Injectable } from '@angular/core';
import { OAuthService } from 'angular-oauth2-oidc';
import { } from '@angular/router';
@ -6,7 +6,7 @@ import { } from '@angular/router';
@Injectable({
providedIn: 'root',
})
export class AuthCallbackGuard implements CanActivate {
export class AuthCallbackGuard {
constructor(private router$: Router,private oauthService$:OAuthService) {}

10
projects/common/src/fm/services/auth-guard.service.ts
View File

@ -1,11 +1,5 @@
import { Injectable } from '@angular/core';
import {
CanActivate, Router, CanLoad, Route, CanActivateChild ,
ActivatedRouteSnapshot,
RouterStateSnapshot,
UrlSegment,
UrlTree
} from '@angular/router';
import { Router, Route, ActivatedRouteSnapshot, RouterStateSnapshot, UrlSegment, UrlTree } from '@angular/router';
import { Store } from '@ngrx/store';
@ -19,7 +13,7 @@ import * as appCommonReducer from '../reducers/app-common.reducer';
@Injectable({
providedIn: 'root',
})
export class AuthGuard implements CanActivate, CanLoad, CanActivateChild {
export class AuthGuard {
constructor(private oauthService: OAuthService, private router: Router, private store: Store<appCommonReducer.State>) { }

4
projects/common/src/fm/services/full-screen-guard.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { CanActivate, CanActivateChild, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { Store } from '@ngrx/store';
@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
@Injectable({
providedIn: 'root',
})
export class FullScreenGuard implements CanActivate,CanActivateChild {
export class FullScreenGuard {
private loginDispatched = false;
constructor(private store: Store<appCommonReducer.State> ) { }

4
projects/common/src/fm/services/nav-bar-guard.service.ts
View File

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core';
import { CanLoad, Route, CanActivate, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { Route, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import { Store } from '@ngrx/store';
@ -10,7 +10,7 @@ import * as appCommonActions from '../actions/app-common.actions';
@Injectable({
providedIn: 'root',
})
export class NavBarGuard implements CanActivate {
export class NavBarGuard {
private loginDispatched = false;
constructor(private store: Store<appCommonReducer.State>) { }

4
projects/common/src/fm/services/package-guard.service.ts
View File

@ -1,11 +1,11 @@
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, CanActivate, RouterStateSnapshot} from '@angular/router';
import { ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
import {PackageService} from './package.service';
@Injectable({
providedIn: 'root',
})
export class PackageGuard implements CanActivate {
export class PackageGuard {
constructor(private packageService: PackageService) { }