From 91d174cbc49d9ac729e0cade7e1d7d76cf48cd23 Mon Sep 17 00:00:00 2001 From: marlon-erler Date: Mon, 22 Jul 2024 01:13:20 +0200 Subject: [PATCH] convert firstDayOfWeek: number -> string --- dist/index.js | 28 ++++------------------------ src/Model/settingsModel.ts | 10 +++++----- src/ViewModel/settingsViewModel.ts | 2 +- 3 files changed, 10 insertions(+), 30 deletions(-) diff --git a/dist/index.js b/dist/index.js index d8139f5d..08cbc39d 100644 --- a/dist/index.js +++ b/dist/index.js @@ -281,20 +281,6 @@ function checkIsValidObject(object) { return object.dataVersion == DATA_VERSION; } - function checkMatchesObjectStructure(objectToCheck, reference) { - for (const key of Object.keys(reference)) { - const requiredType = typeof reference[key]; - const actualType = typeof objectToCheck[key]; - if (requiredType != actualType) return false; - if (requiredType != "object") continue; - const doesNestedObjectMatch = checkMatchesObjectStructure( - reference[key], - objectToCheck[key] - ); - if (doesNestedObjectMatch == false) return false; - } - return true; - } // src/Model/Utility/utility.ts function createTimestamp() { @@ -2160,7 +2146,7 @@ setFirstDayOfWeek(newValue) { this.firstDayOfWeek = newValue; const path = storageKeys.firstDayOfWeek; - this.storageModel.writeStringifiable(path, newValue); + this.storageModel.write(path, newValue); } // load loadUsernam() { @@ -2170,8 +2156,8 @@ } loadFirstDayofWeek() { const path = storageKeys.firstDayOfWeek; - const content = this.storageModel.readStringifiable(path); - this.firstDayOfWeek = content ?? 0; + const content = this.storageModel.read(path); + this.firstDayOfWeek = content ?? "0"; } // init constructor(storageModel2) { @@ -2187,7 +2173,7 @@ // state username = new State(""); usernameInput = new State(""); - firstDayOfWeekInput = new State(0); + firstDayOfWeekInput = new State("0"); // guards cannotSetName = createProxyState( [this.usernameInput], @@ -2388,10 +2374,4 @@ ConnectionModal(connectionViewModel), StorageModal(storageViewModel) ); - console.log( - checkMatchesObjectStructure( - { a: 4263, b: "bla", d: true, c: [1, 2] }, - { a: 123, b: "hello", d: false, c: [1, 3] } - ) - ); })(); diff --git a/src/Model/settingsModel.ts b/src/Model/settingsModel.ts index 4e3ab2ad..687a01e4 100644 --- a/src/Model/settingsModel.ts +++ b/src/Model/settingsModel.ts @@ -6,7 +6,7 @@ export default class SettingsModel { storageModel: StorageModel; username: string; - firstDayOfWeek: number; + firstDayOfWeek: string; // set setName(newValue: string): void { @@ -15,10 +15,10 @@ export default class SettingsModel { this.storageModel.write(path, newValue); } - setFirstDayOfWeek(newValue: number): void { + setFirstDayOfWeek(newValue: string): void { this.firstDayOfWeek = newValue; const path = storageKeys.firstDayOfWeek; - this.storageModel.writeStringifiable(path, newValue); + this.storageModel.write(path, newValue); } // load @@ -30,8 +30,8 @@ export default class SettingsModel { loadFirstDayofWeek(): void { const path = storageKeys.firstDayOfWeek; - const content = this.storageModel.readStringifiable(path); - this.firstDayOfWeek = content ?? 0; + const content = this.storageModel.read(path); + this.firstDayOfWeek = content ?? "0"; } // init diff --git a/src/ViewModel/settingsViewModel.ts b/src/ViewModel/settingsViewModel.ts index c952b337..c94eabe9 100644 --- a/src/ViewModel/settingsViewModel.ts +++ b/src/ViewModel/settingsViewModel.ts @@ -8,7 +8,7 @@ export default class SettingsViewModel { // state username: React.State = new React.State(""); usernameInput: React.State = new React.State(""); - firstDayOfWeekInput: React.State = new React.State(0); + firstDayOfWeekInput: React.State = new React.State("0"); // guards cannotSetName: React.State = React.createProxyState(