From 30dab684685138b198bbf43f2473e40866149c01 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 11 Jan 2021 19:32:08 +0100 Subject: [PATCH 01/13] AW-1805 Add mollie service --- .../common/src/fm/common-service.module.ts | 4 ++- .../src/fm/models/mollie.payment.response.ts | 15 ++++++++ .../common/src/fm/services/mollie.service.ts | 34 +++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 projects/common/src/fm/models/mollie.payment.response.ts create mode 100644 projects/common/src/fm/services/mollie.service.ts diff --git a/projects/common/src/fm/common-service.module.ts b/projects/common/src/fm/common-service.module.ts index 7a340be..78f4827 100644 --- a/projects/common/src/fm/common-service.module.ts +++ b/projects/common/src/fm/common-service.module.ts @@ -31,6 +31,7 @@ import { StateSerializerService } from './services/state-serializer.service'; import { PackageService } from './services/package.service'; import { PackagePreloadStrategy } from './services/package-preload-strategy.service'; import { SenmlService } from './services/senml-service'; +import { MollieService } from './services/mollie.service'; export { FolderService, @@ -53,7 +54,8 @@ export { SchemaService, PackageService, SenmlService, - PackagePreloadStrategy + PackagePreloadStrategy, + MollieService }; @NgModule({ diff --git a/projects/common/src/fm/models/mollie.payment.response.ts b/projects/common/src/fm/models/mollie.payment.response.ts new file mode 100644 index 0000000..e9865e0 --- /dev/null +++ b/projects/common/src/fm/models/mollie.payment.response.ts @@ -0,0 +1,15 @@ + +export interface IMolliePaymentResponse { + createdAt?: Date, + expiresAt?: Date, + checkoutUrl?: string, + } + + export class MolliePaymentResponse implements IMolliePaymentResponse { + public createdAt?: Date; + public expiresAt?: Date; + public checkoutUrl?: string; + + constructor() { + } + } \ No newline at end of file diff --git a/projects/common/src/fm/services/mollie.service.ts b/projects/common/src/fm/services/mollie.service.ts new file mode 100644 index 0000000..457fb68 --- /dev/null +++ b/projects/common/src/fm/services/mollie.service.ts @@ -0,0 +1,34 @@ +import { Injectable } from '@angular/core'; +import { IItem } from '../models/item'; +import { IItemTask } from '../models/itemTask'; +import { HttpClient } from "@angular/common/http"; +import { AppConfig } from "../shared/app.config"; +import { Observable } from 'rxjs'; +import { IMolliePaymentResponse } from '../models/mollie.payment.response'; + +@Injectable({ + providedIn: 'root', +}) + +export class MollieService { + constructor( + public httpClient: HttpClient, + public appConfig: AppConfig) { + } + + ApiEndpoint() { + return this.appConfig.getConfig("apiEndPoint"); + } + + createMolliePayment(templatePackage: IItem, redirectUrl: string): Observable { + let payload = { + "currency": "EUR", + "amount": "100.00", + "redirectUrl": redirectUrl, + "itemCode": templatePackage.code, + "locale": "nl_NL", + "validity": "12m" + }; + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/items/create`, payload); + } +} \ No newline at end of file From 978360fad059bb32c6a8b920072ab322164f5788 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 11 Jan 2021 19:34:39 +0100 Subject: [PATCH 02/13] Build error --- projects/common/src/fm/services/mollie.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/mollie.service.ts b/projects/common/src/fm/services/mollie.service.ts index 457fb68..89b12d2 100644 --- a/projects/common/src/fm/services/mollie.service.ts +++ b/projects/common/src/fm/services/mollie.service.ts @@ -29,6 +29,6 @@ export class MollieService { "locale": "nl_NL", "validity": "12m" }; - return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/items/create`, payload); + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/items/create`, payload); } } \ No newline at end of file From 9a38630d019ddb971eb2086e34083438d55b1cea Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 11 Jan 2021 19:50:24 +0100 Subject: [PATCH 03/13] Fix URL --- projects/common/src/fm/services/mollie.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/mollie.service.ts b/projects/common/src/fm/services/mollie.service.ts index 89b12d2..ed3e1f8 100644 --- a/projects/common/src/fm/services/mollie.service.ts +++ b/projects/common/src/fm/services/mollie.service.ts @@ -29,6 +29,6 @@ export class MollieService { "locale": "nl_NL", "validity": "12m" }; - return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/items/create`, payload); + return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/payments/create`, payload); } } \ No newline at end of file From cc421742dfe222b04235e52368c6567bba04a87c Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Tue, 12 Jan 2021 09:05:27 +0100 Subject: [PATCH 04/13] AW-1805 Add support for validity --- projects/common/src/fm/services/mollie.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/services/mollie.service.ts b/projects/common/src/fm/services/mollie.service.ts index ed3e1f8..8d44245 100644 --- a/projects/common/src/fm/services/mollie.service.ts +++ b/projects/common/src/fm/services/mollie.service.ts @@ -27,7 +27,7 @@ export class MollieService { "redirectUrl": redirectUrl, "itemCode": templatePackage.code, "locale": "nl_NL", - "validity": "12m" + "validity": templatePackage.data?.validity }; return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/payments/create`, payload); } From a08eed7c676907a763a0a5cb08e90f1d7651198c Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 13 Jan 2021 16:40:35 +0100 Subject: [PATCH 05/13] AW-1805 Update mollie service (client) --- .../src/fm/models/mollie.payment.request.ts | 16 ++++++++++++++++ .../src/fm/models/mollie.payment.response.ts | 4 ++++ .../common/src/fm/services/mollie.service.ts | 17 +++++------------ 3 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 projects/common/src/fm/models/mollie.payment.request.ts diff --git a/projects/common/src/fm/models/mollie.payment.request.ts b/projects/common/src/fm/models/mollie.payment.request.ts new file mode 100644 index 0000000..7e7761c --- /dev/null +++ b/projects/common/src/fm/models/mollie.payment.request.ts @@ -0,0 +1,16 @@ +import { IItem } from "./item"; + +export interface IMolliePaymentRequest { + templatePackageItem?: IItem, + redirectUrl?: string, + locale?: string, + } + + export class MolliePaymentRequest implements IMolliePaymentRequest { + public templatePackageItem?: IItem; + public redirectUrl?: string; + public locale?: string; + + constructor() { + } + } \ No newline at end of file diff --git a/projects/common/src/fm/models/mollie.payment.response.ts b/projects/common/src/fm/models/mollie.payment.response.ts index e9865e0..7db9dfc 100644 --- a/projects/common/src/fm/models/mollie.payment.response.ts +++ b/projects/common/src/fm/models/mollie.payment.response.ts @@ -2,12 +2,16 @@ export interface IMolliePaymentResponse { createdAt?: Date, expiresAt?: Date, + currency?: string, + amount?: string, checkoutUrl?: string, } export class MolliePaymentResponse implements IMolliePaymentResponse { public createdAt?: Date; public expiresAt?: Date; + public currency?: string; + public amount?: string; public checkoutUrl?: string; constructor() { diff --git a/projects/common/src/fm/services/mollie.service.ts b/projects/common/src/fm/services/mollie.service.ts index 8d44245..5b38b21 100644 --- a/projects/common/src/fm/services/mollie.service.ts +++ b/projects/common/src/fm/services/mollie.service.ts @@ -1,10 +1,9 @@ import { Injectable } from '@angular/core'; -import { IItem } from '../models/item'; -import { IItemTask } from '../models/itemTask'; import { HttpClient } from "@angular/common/http"; import { AppConfig } from "../shared/app.config"; import { Observable } from 'rxjs'; import { IMolliePaymentResponse } from '../models/mollie.payment.response'; +import { IMolliePaymentRequest } from '../models/mollie.payment.request'; @Injectable({ providedIn: 'root', @@ -20,15 +19,9 @@ export class MollieService { return this.appConfig.getConfig("apiEndPoint"); } - createMolliePayment(templatePackage: IItem, redirectUrl: string): Observable { - let payload = { - "currency": "EUR", - "amount": "100.00", - "redirectUrl": redirectUrl, - "itemCode": templatePackage.code, - "locale": "nl_NL", - "validity": templatePackage.data?.validity - }; - return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/payments/create`, payload); + createMolliePayment(paymentRequest: IMolliePaymentRequest): Observable { + return this.httpClient.post( + `${this.ApiEndpoint()}/api/v1/payments/create`, + paymentRequest); } } \ No newline at end of file From ed5a74ed074fc5b94a504974997db72036919fcc Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 13 Jan 2021 17:18:45 +0100 Subject: [PATCH 06/13] Export new Mollie types --- projects/common/src/fm/common.module.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/projects/common/src/fm/common.module.ts b/projects/common/src/fm/common.module.ts index bd08884..334b47f 100644 --- a/projects/common/src/fm/common.module.ts +++ b/projects/common/src/fm/common.module.ts @@ -56,6 +56,8 @@ import { SecureOAuthStorage} from './shared/secureOAuthStorage'; import { GradientComponent } from './components/gradient/gradient.component'; import { GradientSelectComponent } from './components/gradient-select/gradient-select.component'; import { AppMenuComponent } from './components/app-menu/app-menu.component'; +import { IMolliePaymentRequest, MolliePaymentRequest } from './models/mollie.payment.request'; +import { IMolliePaymentResponse } from './models/mollie.payment.response'; export { SafePipe, @@ -96,7 +98,10 @@ export { ISenMLItem, IDataLayer, IColor, - IGradientstop + IGradientstop, + IMolliePaymentRequest, + MolliePaymentRequest, + IMolliePaymentResponse }; @NgModule({ From 41b1295f9e583476ee5366ecd6298ef5d4c8972f Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Wed, 13 Jan 2021 17:29:48 +0100 Subject: [PATCH 07/13] Move mollie code ( srvice ) uit farmmapslib halen ( is open source ), naar farmmaps --- .../common/src/fm/common-service.module.ts | 4 +-- projects/common/src/fm/common.module.ts | 7 +---- .../src/fm/models/mollie.payment.request.ts | 16 ----------- .../src/fm/models/mollie.payment.response.ts | 19 ------------- .../common/src/fm/services/mollie.service.ts | 27 ------------------- 5 files changed, 2 insertions(+), 71 deletions(-) delete mode 100644 projects/common/src/fm/models/mollie.payment.request.ts delete mode 100644 projects/common/src/fm/models/mollie.payment.response.ts delete mode 100644 projects/common/src/fm/services/mollie.service.ts diff --git a/projects/common/src/fm/common-service.module.ts b/projects/common/src/fm/common-service.module.ts index 78f4827..7a340be 100644 --- a/projects/common/src/fm/common-service.module.ts +++ b/projects/common/src/fm/common-service.module.ts @@ -31,7 +31,6 @@ import { StateSerializerService } from './services/state-serializer.service'; import { PackageService } from './services/package.service'; import { PackagePreloadStrategy } from './services/package-preload-strategy.service'; import { SenmlService } from './services/senml-service'; -import { MollieService } from './services/mollie.service'; export { FolderService, @@ -54,8 +53,7 @@ export { SchemaService, PackageService, SenmlService, - PackagePreloadStrategy, - MollieService + PackagePreloadStrategy }; @NgModule({ diff --git a/projects/common/src/fm/common.module.ts b/projects/common/src/fm/common.module.ts index 334b47f..bd08884 100644 --- a/projects/common/src/fm/common.module.ts +++ b/projects/common/src/fm/common.module.ts @@ -56,8 +56,6 @@ import { SecureOAuthStorage} from './shared/secureOAuthStorage'; import { GradientComponent } from './components/gradient/gradient.component'; import { GradientSelectComponent } from './components/gradient-select/gradient-select.component'; import { AppMenuComponent } from './components/app-menu/app-menu.component'; -import { IMolliePaymentRequest, MolliePaymentRequest } from './models/mollie.payment.request'; -import { IMolliePaymentResponse } from './models/mollie.payment.response'; export { SafePipe, @@ -98,10 +96,7 @@ export { ISenMLItem, IDataLayer, IColor, - IGradientstop, - IMolliePaymentRequest, - MolliePaymentRequest, - IMolliePaymentResponse + IGradientstop }; @NgModule({ diff --git a/projects/common/src/fm/models/mollie.payment.request.ts b/projects/common/src/fm/models/mollie.payment.request.ts deleted file mode 100644 index 7e7761c..0000000 --- a/projects/common/src/fm/models/mollie.payment.request.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { IItem } from "./item"; - -export interface IMolliePaymentRequest { - templatePackageItem?: IItem, - redirectUrl?: string, - locale?: string, - } - - export class MolliePaymentRequest implements IMolliePaymentRequest { - public templatePackageItem?: IItem; - public redirectUrl?: string; - public locale?: string; - - constructor() { - } - } \ No newline at end of file diff --git a/projects/common/src/fm/models/mollie.payment.response.ts b/projects/common/src/fm/models/mollie.payment.response.ts deleted file mode 100644 index 7db9dfc..0000000 --- a/projects/common/src/fm/models/mollie.payment.response.ts +++ /dev/null @@ -1,19 +0,0 @@ - -export interface IMolliePaymentResponse { - createdAt?: Date, - expiresAt?: Date, - currency?: string, - amount?: string, - checkoutUrl?: string, - } - - export class MolliePaymentResponse implements IMolliePaymentResponse { - public createdAt?: Date; - public expiresAt?: Date; - public currency?: string; - public amount?: string; - public checkoutUrl?: string; - - constructor() { - } - } \ No newline at end of file diff --git a/projects/common/src/fm/services/mollie.service.ts b/projects/common/src/fm/services/mollie.service.ts deleted file mode 100644 index 5b38b21..0000000 --- a/projects/common/src/fm/services/mollie.service.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { Injectable } from '@angular/core'; -import { HttpClient } from "@angular/common/http"; -import { AppConfig } from "../shared/app.config"; -import { Observable } from 'rxjs'; -import { IMolliePaymentResponse } from '../models/mollie.payment.response'; -import { IMolliePaymentRequest } from '../models/mollie.payment.request'; - -@Injectable({ - providedIn: 'root', -}) - -export class MollieService { - constructor( - public httpClient: HttpClient, - public appConfig: AppConfig) { - } - - ApiEndpoint() { - return this.appConfig.getConfig("apiEndPoint"); - } - - createMolliePayment(paymentRequest: IMolliePaymentRequest): Observable { - return this.httpClient.post( - `${this.ApiEndpoint()}/api/v1/payments/create`, - paymentRequest); - } -} \ No newline at end of file From 1ade8025ab24794581a5add8fb816eb42ae65245 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 18 Jan 2021 15:01:08 +0100 Subject: [PATCH 08/13] Fix HasPackageDirective --- .../src/fm/components/has-package/has-package.directive.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/projects/common/src/fm/components/has-package/has-package.directive.ts b/projects/common/src/fm/components/has-package/has-package.directive.ts index 9a4d202..9c4a6a8 100644 --- a/projects/common/src/fm/components/has-package/has-package.directive.ts +++ b/projects/common/src/fm/components/has-package/has-package.directive.ts @@ -16,7 +16,11 @@ export class HasPackageDirective implements OnInit,OnDestroy{ private packSub:Subscription; ngOnInit() { this.packages$.subscribe((packages) => { - if (packages[this.package] && packages[this.package].enabled) { + const today = new Date(Date.now()).setHours(0,0,0,0); + if (packages[this.package] && + packages[this.package].enabled && + (packages[this.package].DataDate && new Date(packages[this.package].DataDate).setHours(0, 0, 0, 0) <= today) && + (packages[this.package].DataEndDate == null || new Date(packages[this.package].DataEndDate).setHours(0, 0, 0, 0) >= today)) { this.viewContainerRef$.createEmbeddedView(this.templateRef$); this.hasView=true; } else if (this.hasView) { From 0f1ce45b2fef94b9bdc6130a16f624ac4696a476 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 18 Jan 2021 15:21:34 +0100 Subject: [PATCH 09/13] AW-1844 Fix fmHasPackage --- .../src/fm/components/has-package/has-package.directive.ts | 2 +- projects/common/src/fm/models/package.ts | 2 ++ projects/common/src/fm/reducers/app-common.reducer.ts | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/components/has-package/has-package.directive.ts b/projects/common/src/fm/components/has-package/has-package.directive.ts index 9c4a6a8..964ed6c 100644 --- a/projects/common/src/fm/components/has-package/has-package.directive.ts +++ b/projects/common/src/fm/components/has-package/has-package.directive.ts @@ -16,7 +16,7 @@ export class HasPackageDirective implements OnInit,OnDestroy{ private packSub:Subscription; ngOnInit() { this.packages$.subscribe((packages) => { - const today = new Date(Date.now()).setHours(0,0,0,0); + const today = new Date(Date.prototype.getUTCDate()).setHours(0,0,0,0); if (packages[this.package] && packages[this.package].enabled && (packages[this.package].DataDate && new Date(packages[this.package].DataDate).setHours(0, 0, 0, 0) <= today) && diff --git a/projects/common/src/fm/models/package.ts b/projects/common/src/fm/models/package.ts index 921953b..850e5fb 100644 --- a/projects/common/src/fm/models/package.ts +++ b/projects/common/src/fm/models/package.ts @@ -2,6 +2,8 @@ export interface IPackage { id:string name:string; enabled?:boolean; + dataDate?:Date; + dataEndDate?:Date; } export interface IPackages { diff --git a/projects/common/src/fm/reducers/app-common.reducer.ts b/projects/common/src/fm/reducers/app-common.reducer.ts index b2f561b..454150c 100644 --- a/projects/common/src/fm/reducers/app-common.reducer.ts +++ b/projects/common/src/fm/reducers/app-common.reducer.ts @@ -116,7 +116,9 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) let a = action as appCommonActions.InitUserPackagesSuccess; let packages = {} a.items.forEach((item) => { - packages[item.data.id]=item.data; + item.data.dataDate = item.dataDate; + item.data.dataEndDate = item.dataEndDate; + packages[item.data.id]=item.data; }); return tassign(state,{userPackages:packages}); From 65366ff09be0977bc18794998f7e72be42850a58 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 18 Jan 2021 15:23:44 +0100 Subject: [PATCH 10/13] Again.... --- .../src/fm/components/has-package/has-package.directive.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/common/src/fm/components/has-package/has-package.directive.ts b/projects/common/src/fm/components/has-package/has-package.directive.ts index 964ed6c..6d3fde5 100644 --- a/projects/common/src/fm/components/has-package/has-package.directive.ts +++ b/projects/common/src/fm/components/has-package/has-package.directive.ts @@ -19,8 +19,8 @@ export class HasPackageDirective implements OnInit,OnDestroy{ const today = new Date(Date.prototype.getUTCDate()).setHours(0,0,0,0); if (packages[this.package] && packages[this.package].enabled && - (packages[this.package].DataDate && new Date(packages[this.package].DataDate).setHours(0, 0, 0, 0) <= today) && - (packages[this.package].DataEndDate == null || new Date(packages[this.package].DataEndDate).setHours(0, 0, 0, 0) >= today)) { + (packages[this.package].dataDate && new Date(packages[this.package].dataDate).setHours(0, 0, 0, 0) <= today) && + (packages[this.package].dataEndDate == null || new Date(packages[this.package].dataEndDate).setHours(0, 0, 0, 0) >= today)) { this.viewContainerRef$.createEmbeddedView(this.templateRef$); this.hasView=true; } else if (this.hasView) { From 428e3b002d6cec8ceee8900bd7896dea9adc5131 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 18 Jan 2021 16:45:37 +0100 Subject: [PATCH 11/13] Fix UTC --- .../src/fm/components/has-package/has-package.directive.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/common/src/fm/components/has-package/has-package.directive.ts b/projects/common/src/fm/components/has-package/has-package.directive.ts index 6d3fde5..6072785 100644 --- a/projects/common/src/fm/components/has-package/has-package.directive.ts +++ b/projects/common/src/fm/components/has-package/has-package.directive.ts @@ -16,7 +16,7 @@ export class HasPackageDirective implements OnInit,OnDestroy{ private packSub:Subscription; ngOnInit() { this.packages$.subscribe((packages) => { - const today = new Date(Date.prototype.getUTCDate()).setHours(0,0,0,0); + const today = new Date(new Date(Date.now()).toUTCString()).setHours(0,0,0,0); if (packages[this.package] && packages[this.package].enabled && (packages[this.package].dataDate && new Date(packages[this.package].dataDate).setHours(0, 0, 0, 0) <= today) && From c266ce7d42c1d27df21fc3609c57c4f4093ca044 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Thu, 21 Jan 2021 11:03:37 +0100 Subject: [PATCH 12/13] Update libs --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index d6e5fb1..ed3cf74 100644 --- a/package.json +++ b/package.json @@ -19,9 +19,9 @@ "@angular/platform-browser": "~10.1.3", "@angular/platform-browser-dynamic": "~10.1.3", "@angular/router": "~10.1.3", - "@farmmaps/common": ">=0.0.1-prerelease.454 <0.0.1", - "@farmmaps/common-map": ">=0.0.1-prerelease.454 <0.0.1", - "@farmmaps/common-map3d": ">=0.0.1-prerelease.454 <0.0.1", + "@farmmaps/common": ">=0.0.1-prerelease.478 <0.0.1", + "@farmmaps/common-map": ">=0.0.1-prerelease.478 <0.0.1", + "@farmmaps/common-map3d": ">=0.0.1-prerelease.478 <0.0.1", "@microsoft/signalr": "^3.1.3", "@ng-bootstrap/ng-bootstrap": "^7.0", "@ngrx/effects": "^10.0", From a1079eb21f84c6dedbafe83d64494a69a30123c7 Mon Sep 17 00:00:00 2001 From: Willem Dantuma Date: Thu, 21 Jan 2021 11:04:22 +0100 Subject: [PATCH 13/13] update libs --- package-lock.json | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3757d21..7883d7d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -423,6 +423,12 @@ "ms": "^2.1.1" } }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + }, "uuid": { "version": "8.3.0", "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.0.tgz", @@ -1767,25 +1773,25 @@ } }, "@farmmaps/common": { - "version": "0.0.1-prerelease.454", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.454.tgz", - "integrity": "sha512-qG4p/+7nHkqDU0ZtaBoNFoTWuVimyVEcDKAy9G0fQ+grDw/btos5jDzB0ON7ufituGrSwe5D5NT/1m4BTLu9PQ==", + "version": "0.0.1-prerelease.478", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.478.tgz", + "integrity": "sha512-6gnsQiMYHpZt8yAUoURKlQQM+4ICB5KV2varDaUZKGyraSQpzlYrSS3Ru0bokpbPpr3DutcyOFSS68li5KsKhA==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map": { - "version": "0.0.1-prerelease.454", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.454.tgz", - "integrity": "sha512-wn1bNxlUCPMEwUZrs72hL/2+W33iwzSXCZY5+MmeQRH76XhvtHUj4dNyHAPday88BB9ttkYItRCMDFnRLCvnrA==", + "version": "0.0.1-prerelease.478", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.478.tgz", + "integrity": "sha512-/Q07gnwvluizvdMqgjJ2n3nJspQKjbKKnGEWyJcy69ZqoSAL5aTS8G1EE/Jl+rJx6/A6NjbR5syxQ5k7ofrl9A==", "requires": { "tslib": "^2.0.0" } }, "@farmmaps/common-map3d": { - "version": "0.0.1-prerelease.454", - "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.454.tgz", - "integrity": "sha512-W9wSW6Rmot0ij9U/Id5Dzbnua96hK6jp4Hw0yzLJtwrC3nxxexqnZsgYhS7UN9y1U6DsTOmqFISpLe3JG3N+ZQ==", + "version": "0.0.1-prerelease.478", + "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map3d/-/common-map3d-0.0.1-prerelease.478.tgz", + "integrity": "sha512-OZSsQWEsRNsvpI3IngGnT0s0/FzgvLw75DeXPyTFzwa3m1O+ePiFB6V8yei6my+bKW7axhkM0eh98ThMgKojmg==", "requires": { "tslib": "^2.0.0" } @@ -2067,6 +2073,14 @@ "pacote": "9.5.12", "semver": "7.3.2", "semver-intersect": "1.4.0" + }, + "dependencies": { + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==", + "dev": true + } } }, "@types/color-name": {