From 2351ecd2582cd2eb911d320b7906d66389f01303 Mon Sep 17 00:00:00 2001 From: FyloZ Date: Thu, 2 Dec 2021 14:07:15 -0500 Subject: [PATCH] Update to Angular 13 --- package.json | 2 +- src/app/modules/shared/utils/utils.ts | 2 +- src/app/modules/touch-up-kit/components/finish.sass | 2 +- src/app/modules/touch-up-kit/pages/touchupkit.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 375332c..19fd767 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,7 @@ "@mdi/angular-material": "^6.5.95", "bootstrap": "^4.5.2", "copy-webpack-plugin": "^10.0.0", - "js-joda": "^1.11.0", + "@js-joda/core": "^4.3.1", "material-design-icons": "^3.0.1", "ngx-material-file-input": "3.0.0", "rxjs": "^7.4.0", diff --git a/src/app/modules/shared/utils/utils.ts b/src/app/modules/shared/utils/utils.ts index 929c0c9..dfa6bf9 100644 --- a/src/app/modules/shared/utils/utils.ts +++ b/src/app/modules/shared/utils/utils.ts @@ -1,5 +1,5 @@ /** Returns [value] if it is not null or [or]. */ -import {DateTimeFormatter, LocalDate, LocalDateTime} from 'js-joda' +import {DateTimeFormatter, LocalDate, LocalDateTime} from '@js-joda/core' import {TouchUpKit} from '../model/touch-up-kit.model' import {environment} from '../../../../environments/environment' diff --git a/src/app/modules/touch-up-kit/components/finish.sass b/src/app/modules/touch-up-kit/components/finish.sass index 30c9991..7713c99 100644 --- a/src/app/modules/touch-up-kit/components/finish.sass +++ b/src/app/modules/touch-up-kit/components/finish.sass @@ -1,4 +1,4 @@ -@import '../../../../custom-theme' +@import '~src/variables' .touchupkit-finish-container display: inline-block diff --git a/src/app/modules/touch-up-kit/pages/touchupkit.ts b/src/app/modules/touch-up-kit/pages/touchupkit.ts index b9db2e4..4b661b7 100644 --- a/src/app/modules/touch-up-kit/pages/touchupkit.ts +++ b/src/app/modules/touch-up-kit/pages/touchupkit.ts @@ -10,9 +10,9 @@ import {Permission} from '../../shared/model/user' import {RecipeService} from '../../recipes/services/recipe.service' import {AppState} from '../../shared/app-state' import {map} from 'rxjs/operators' -import {LocalDate, Period} from 'js-joda' import {ConfigService} from '../../shared/service/config.service' import {Config} from '../../shared/model/config.model' +import {LocalDate, Period} from '@js-joda/core' @Component({ selector: 'touchupkit-banner',