From 86f1a7c221d321564d111a8e66cb4e96a3cefae9 Mon Sep 17 00:00:00 2001 From: Jesse Read Date: Sun, 21 Apr 2024 21:01:13 -0400 Subject: [PATCH 1/4] Show latest reading events by event date, not event creation date. --- src/jelu-ui/src/components/Welcome.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/jelu-ui/src/components/Welcome.vue b/src/jelu-ui/src/components/Welcome.vue index 1bb5cdae..8651871e 100644 --- a/src/jelu-ui/src/components/Welcome.vue +++ b/src/jelu-ui/src/components/Welcome.vue @@ -69,7 +69,7 @@ const nonCurrentlyReadingEvents: Array = [ReadingEventType.DRO const getMyEvents = async () => { recentEventsIsLoading.value = true try { - const res = await dataService.myReadingEvents(nonCurrentlyReadingEvents, undefined, undefined, undefined, undefined, undefined, 0, 8) + const res = await dataService.myReadingEvents(nonCurrentlyReadingEvents, undefined, undefined, undefined, undefined, undefined, 0, 8, 'endDate,desc') const notCurrentlyReading = res.content.filter(e => e.eventType !== ReadingEventType.CURRENTLY_READING) events.value = notCurrentlyReading recentEventsIsLoading.value = false From dbd45d89b5c5ca3c6e7e9579cb8269e6d2af9158 Mon Sep 17 00:00:00 2001 From: bayang Date: Wed, 24 Apr 2024 16:49:58 +0200 Subject: [PATCH 2/4] fix: use a better maintained barcode reader lib --- src/jelu-ui/package-lock.json | 54 ++++++++++++------------ src/jelu-ui/package.json | 2 +- src/jelu-ui/src/components/ScanModal.vue | 4 +- src/jelu-ui/src/declarations.d.ts | 2 + 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/src/jelu-ui/package-lock.json b/src/jelu-ui/package-lock.json index 4572d39e..fc73b3d0 100644 --- a/src/jelu-ui/package-lock.json +++ b/src/jelu-ui/package-lock.json @@ -1,12 +1,12 @@ { "name": "jelu-ui", - "version": "0.52.2", + "version": "0.53.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "jelu-ui", - "version": "0.52.2", + "version": "0.53.0", "dependencies": { "@formkit/i18n": "1.6.2", "@formkit/tailwindcss": "1.6.2", @@ -17,6 +17,7 @@ "@saekitominaga/isbn-verify": "2.0.1", "@splidejs/splide": "4.1.4", "@splidejs/vue-splide": "0.6.12", + "@teckel/vue-barcode-reader": "^1.1.6", "@vueuse/core": "10.9.0", "@vueuse/router": "10.9.0", "axios": "1.6.8", @@ -28,7 +29,6 @@ "theme-change": "2.5.0", "vue": "3.4.23", "vue-avatar-sdh": "1.0.3", - "vue-barcode-reader": "1.0.3", "vue-chartjs": "5.3.1", "vue-i18n": "9.13.0", "vue-router": "4.3.2", @@ -3099,6 +3099,14 @@ "tailwindcss": ">=3.0.0 || insiders" } }, + "node_modules/@teckel/vue-barcode-reader": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@teckel/vue-barcode-reader/-/vue-barcode-reader-1.1.6.tgz", + "integrity": "sha512-A8Hn4sPtktHYIviTMSw/DdIJsYgQ9fLkJbD+SS2qIi7gRXhTVZPUiX+TPKouAP7G0yfl+ES1XE4+GDgwoa9dgA==", + "dependencies": { + "@zxing/library": "^0.20.0" + } + }, "node_modules/@types/d3-scale": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", @@ -4165,11 +4173,11 @@ } }, "node_modules/@zxing/library": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.19.1.tgz", - "integrity": "sha512-rKwvl3Uuqs8yf364iU9l3HDDaIx8yPv+CH6DbtQaQr67VdKLG22G1ukEp9fOdDefE6tpLtRAdMnTrgtpiaKAZw==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.20.0.tgz", + "integrity": "sha512-6Ev6rcqVjMakZFIDvbUf0dtpPGeZMTfyxYg4HkVWioWeN7cRcnUWT3bU6sdohc82O1nPXcjq6WiGfXX2Pnit6A==", "dependencies": { - "ts-custom-error": "^3.0.0" + "ts-custom-error": "^3.2.1" }, "engines": { "node": ">= 10.4.0" @@ -11028,14 +11036,6 @@ "vue": "^3.0.5" } }, - "node_modules/vue-barcode-reader": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/vue-barcode-reader/-/vue-barcode-reader-1.0.3.tgz", - "integrity": "sha512-z4mv7+ai/8vECppBTb00tHnyFMMx6W1rAaQe+v214ihoaWK9iGrn8ZZsmgSxf3lwnrtGaibLdkonTtMrGsO+dA==", - "dependencies": { - "@zxing/library": "^0.19.1" - } - }, "node_modules/vue-chartjs": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.1.tgz", @@ -13840,6 +13840,14 @@ "postcss-selector-parser": "6.0.10" } }, + "@teckel/vue-barcode-reader": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@teckel/vue-barcode-reader/-/vue-barcode-reader-1.1.6.tgz", + "integrity": "sha512-A8Hn4sPtktHYIviTMSw/DdIJsYgQ9fLkJbD+SS2qIi7gRXhTVZPUiX+TPKouAP7G0yfl+ES1XE4+GDgwoa9dgA==", + "requires": { + "@zxing/library": "^0.20.0" + } + }, "@types/d3-scale": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz", @@ -14650,12 +14658,12 @@ } }, "@zxing/library": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.19.1.tgz", - "integrity": "sha512-rKwvl3Uuqs8yf364iU9l3HDDaIx8yPv+CH6DbtQaQr67VdKLG22G1ukEp9fOdDefE6tpLtRAdMnTrgtpiaKAZw==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@zxing/library/-/library-0.20.0.tgz", + "integrity": "sha512-6Ev6rcqVjMakZFIDvbUf0dtpPGeZMTfyxYg4HkVWioWeN7cRcnUWT3bU6sdohc82O1nPXcjq6WiGfXX2Pnit6A==", "requires": { "@zxing/text-encoding": "~0.9.0", - "ts-custom-error": "^3.0.0" + "ts-custom-error": "^3.2.1" } }, "@zxing/text-encoding": { @@ -19518,14 +19526,6 @@ "integrity": "sha512-Ab/8FaFMLhffmWqVFrnOPsvnpmnqVNhYub0vCp3Er45lXDqWoy8JtVYaIDbXhPxS3XCZILc/K7kxvocrAHY36w==", "requires": {} }, - "vue-barcode-reader": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/vue-barcode-reader/-/vue-barcode-reader-1.0.3.tgz", - "integrity": "sha512-z4mv7+ai/8vECppBTb00tHnyFMMx6W1rAaQe+v214ihoaWK9iGrn8ZZsmgSxf3lwnrtGaibLdkonTtMrGsO+dA==", - "requires": { - "@zxing/library": "^0.19.1" - } - }, "vue-chartjs": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/vue-chartjs/-/vue-chartjs-5.3.1.tgz", diff --git a/src/jelu-ui/package.json b/src/jelu-ui/package.json index 36419f51..ddafd3ac 100644 --- a/src/jelu-ui/package.json +++ b/src/jelu-ui/package.json @@ -18,6 +18,7 @@ "@saekitominaga/isbn-verify": "2.0.1", "@splidejs/splide": "4.1.4", "@splidejs/vue-splide": "0.6.12", + "@teckel/vue-barcode-reader": "^1.1.6", "@vueuse/core": "10.9.0", "@vueuse/router": "10.9.0", "axios": "1.6.8", @@ -29,7 +30,6 @@ "theme-change": "2.5.0", "vue": "3.4.23", "vue-avatar-sdh": "1.0.3", - "vue-barcode-reader": "1.0.3", "vue-chartjs": "5.3.1", "vue-i18n": "9.13.0", "vue-router": "4.3.2", diff --git a/src/jelu-ui/src/components/ScanModal.vue b/src/jelu-ui/src/components/ScanModal.vue index 4d08b849..df2f2fe2 100644 --- a/src/jelu-ui/src/components/ScanModal.vue +++ b/src/jelu-ui/src/components/ScanModal.vue @@ -1,6 +1,6 @@