diff --git a/ui/_legacy/public/index.html b/ui/_legacy/public/index.html index 17c86a1..ab4225b 100644 --- a/ui/_legacy/public/index.html +++ b/ui/_legacy/public/index.html @@ -1,4 +1,4 @@ - + @@ -29,9 +29,8 @@
diff --git a/ui/_legacy/tsconfig.json b/ui/_legacy/tsconfig.json index 1d59a2a..1a887f3 100644 --- a/ui/_legacy/tsconfig.json +++ b/ui/_legacy/tsconfig.json @@ -2,32 +2,20 @@ "extends": "@vue/tsconfig/tsconfig.dom.json", "compilerOptions": { "experimentalDecorators": true, - "lib": [ - "es2020", - "dom", - "dom.iterable", - "es2022.object", - "es2023.array", - ], + "lib": ["es2020", "dom", "dom.iterable", "es2022.object", "es2023.array"], // "moduleResolution": "node", // "sourceMap": true, "baseUrl": ".", - "types": [ - "webpack-env", - "mocha", - "chai", - ], + "types": ["webpack-env", "mocha", "chai"], "paths": { - "@/*": [ - "src/*", - ] - }, + "@/*": ["src/*"] + } }, "include": [ "src/**/*.vue", "src/**/*.ts", // "src/**/*.tsx", - "tests/**/*.ts", + "tests/**/*.ts" // "tests/**/*.tsx", - ], -} \ No newline at end of file + ] +} diff --git a/ui/eslint.config.ts b/ui/eslint.config.ts index 4e90ef7..15f26dd 100644 --- a/ui/eslint.config.ts +++ b/ui/eslint.config.ts @@ -1,9 +1,9 @@ -import { globalIgnores } from 'eslint/config' -import { defineConfigWithVueTs, vueTsConfigs } from '@vue/eslint-config-typescript' -import pluginVue from 'eslint-plugin-vue' -import pluginVitest from '@vitest/eslint-plugin' -import pluginOxlint from 'eslint-plugin-oxlint' -import skipFormatting from 'eslint-config-prettier/flat' +import { globalIgnores } from "eslint/config"; +import { defineConfigWithVueTs, vueTsConfigs } from "@vue/eslint-config-typescript"; +import pluginVue from "eslint-plugin-vue"; +import pluginVitest from "@vitest/eslint-plugin"; +import pluginOxlint from "eslint-plugin-oxlint"; +import skipFormatting from "eslint-config-prettier/flat"; // To allow more languages other than `ts` in `.vue` files, uncomment the following lines: // import { configureVueProject } from '@vue/eslint-config-typescript' @@ -12,21 +12,21 @@ import skipFormatting from 'eslint-config-prettier/flat' export default defineConfigWithVueTs( { - name: 'app/files-to-lint', - files: ['**/*.{vue,ts,mts,tsx}'], + name: "app/files-to-lint", + files: ["**/*.{vue,ts,mts,tsx}"], }, - globalIgnores(['**/dist/**', '**/dist-ssr/**', '**/coverage/**']), + globalIgnores(["**/dist/**", "**/dist-ssr/**", "**/coverage/**"]), - ...pluginVue.configs['flat/essential'], + ...pluginVue.configs["flat/essential"], vueTsConfigs.recommended, { ...pluginVitest.configs.recommended, - files: ['src/**/__tests__/*'], + files: ["src/**/__tests__/*"], }, - ...pluginOxlint.buildFromOxlintConfigFile('.oxlintrc.json'), + ...pluginOxlint.buildFromOxlintConfigFile(".oxlintrc.json"), skipFormatting, -) +); diff --git a/ui/index.html b/ui/index.html index 9e5fc8f..9d30802 100644 --- a/ui/index.html +++ b/ui/index.html @@ -1,9 +1,9 @@ - + - - - + + + Vite App diff --git a/ui/src/__tests__/App.spec.ts b/ui/src/__tests__/App.spec.ts index 5b17801..cf17422 100644 --- a/ui/src/__tests__/App.spec.ts +++ b/ui/src/__tests__/App.spec.ts @@ -1,11 +1,11 @@ -import { describe, it, expect } from 'vitest' +import { describe, it, expect } from "vitest"; -import { mount } from '@vue/test-utils' -import App from '../App.vue' +import { mount } from "@vue/test-utils"; +import App from "../App.vue"; -describe('App', () => { - it('mounts renders properly', () => { - const wrapper = mount(App) - expect(wrapper.text()).toContain('You did it!') - }) -}) +describe("App", () => { + it("mounts renders properly", () => { + const wrapper = mount(App); + expect(wrapper.text()).toContain("You did it!"); + }); +}); diff --git a/ui/src/components/Calendar.vue b/ui/src/components/Calendar.vue index 3eef36b..bae9c81 100644 --- a/ui/src/components/Calendar.vue +++ b/ui/src/components/Calendar.vue @@ -4,8 +4,8 @@

- Du hast noch keine Türchen geöffnet, vielleicht gibt es ein Anzeigeproblem - in Deinem Webbrowser? + Du hast noch keine Türchen geöffnet, vielleicht gibt es ein Anzeigeproblem in Deinem + Webbrowser?

diff --git a/ui/src/components/LoginModal.vue b/ui/src/components/LoginModal.vue index 534fb5f..7b52fad 100644 --- a/ui/src/components/LoginModal.vue +++ b/ui/src/components/LoginModal.vue @@ -12,12 +12,7 @@
- +
diff --git a/ui/src/components/MultiModal.vue b/ui/src/components/MultiModal.vue index b3102bb..6944b2b 100644 --- a/ui/src/components/MultiModal.vue +++ b/ui/src/components/MultiModal.vue @@ -18,10 +18,7 @@
-
diff --git a/ui/src/components/UserView.vue b/ui/src/components/UserView.vue index fe931b8..a88ad6e 100644 --- a/ui/src/components/UserView.vue +++ b/ui/src/components/UserView.vue @@ -7,12 +7,9 @@ Alle {{ store.user_doors.length }} Türchen offen! diff --git a/ui/src/components/admin/ConfigView.vue b/ui/src/components/admin/ConfigView.vue index 9f92e7a..a7afd69 100644 --- a/ui/src/components/admin/ConfigView.vue +++ b/ui/src/components/admin/ConfigView.vue @@ -9,15 +9,11 @@
Wert
Eingabe: - - "{{ admin_config_model.solution.value }}" - + "{{ admin_config_model.solution.value }}"
Ausgabe: - - "{{ admin_config_model.solution.clean }}" - + "{{ admin_config_model.solution.clean }}"
Transformation
@@ -47,9 +43,7 @@
{{ store.user_doors.length }}
Zeit zum nächsten Türchen
-
- Kein nächstes Türchen -
+
Kein nächstes Türchen
Erstes Türchen
@@ -65,9 +59,7 @@
{{ fmt_puzzle_date("end") }}
Zufalls-Seed
-
- "{{ admin_config_model.puzzle.seed }}" -
+
"{{ admin_config_model.puzzle.seed }}"
Extra-Tage
@@ -121,10 +113,7 @@
{{ admin_config_model.image.border }} px
Schriftarten
-
+
{{ font.file }} ({{ font.size }} pt)
@@ -276,10 +265,7 @@ async function on_open(): Promise { clear_credentials(creds.value.ui); } -async function load_credentials( - creds: Credentials, - endpoint: string, -): Promise { +async function load_credentials(creds: Credentials, endpoint: string): Promise { try { const new_creds = await API.request(endpoint); diff --git a/ui/src/components/admin/DoorMapEditor.vue b/ui/src/components/admin/DoorMapEditor.vue index 3e9c058..31315d8 100644 --- a/ui/src/components/admin/DoorMapEditor.vue +++ b/ui/src/components/admin/DoorMapEditor.vue @@ -8,11 +8,7 @@ :icon="['fas', 'fa-backward']" /> - + - + {{ text }} diff --git a/ui/src/components/bulma/Drawer.vue b/ui/src/components/bulma/Drawer.vue index 3b697ba..e1225e3 100644 --- a/ui/src/components/bulma/Drawer.vue +++ b/ui/src/components/bulma/Drawer.vue @@ -6,18 +6,13 @@

- +

diff --git a/ui/src/components/calendar/CalendarDoor.vue b/ui/src/components/calendar/CalendarDoor.vue index 0dba455..5a73e1b 100644 --- a/ui/src/components/calendar/CalendarDoor.vue +++ b/ui/src/components/calendar/CalendarDoor.vue @@ -6,7 +6,11 @@ >
{{ door.day }}
diff --git a/ui/src/components/calendar/SVGRect.vue b/ui/src/components/calendar/SVGRect.vue index 2e00db0..7792a86 100644 --- a/ui/src/components/calendar/SVGRect.vue +++ b/ui/src/components/calendar/SVGRect.vue @@ -27,13 +27,7 @@ import { computed } from "vue"; const store = advent22Store(); -type BulmaVariant = - | "primary" - | "link" - | "info" - | "success" - | "warning" - | "danger"; +type BulmaVariant = "primary" | "link" | "info" | "success" | "warning" | "danger"; withDefaults( defineProps<{ diff --git a/ui/src/components/calendar/ThouCanvas.vue b/ui/src/components/calendar/ThouCanvas.vue index 39cb98f..e6191cb 100644 --- a/ui/src/components/calendar/ThouCanvas.vue +++ b/ui/src/components/calendar/ThouCanvas.vue @@ -32,11 +32,7 @@ function get_event_thous(event: MouseEvent): Vector2D { type TCEventType = "mousedown" | "mousemove" | "mouseup" | "click" | "dblclick"; const is_tceventtype = (t: unknown): t is TCEventType => - t === "mousedown" || - t === "mousemove" || - t === "mouseup" || - t === "click" || - t === "dblclick"; + t === "mousedown" || t === "mousemove" || t === "mouseup" || t === "click" || t === "dblclick"; const emit = defineEmits<{ (event: TCEventType, e: MouseEvent, point: Vector2D): void; diff --git a/ui/src/components/editor/DoorCanvas.vue b/ui/src/components/editor/DoorCanvas.vue index ee9ad25..380f013 100644 --- a/ui/src/components/editor/DoorCanvas.vue +++ b/ui/src/components/editor/DoorCanvas.vue @@ -14,12 +14,7 @@ :door="door" force_visible /> - + diff --git a/ui/src/components/editor/DoorChooser.vue b/ui/src/components/editor/DoorChooser.vue index db19d4c..aa2e196 100644 --- a/ui/src/components/editor/DoorChooser.vue +++ b/ui/src/components/editor/DoorChooser.vue @@ -13,11 +13,7 @@
- +
diff --git a/ui/src/lib/helpers.ts b/ui/src/lib/helpers.ts index dd6e629..43144c5 100644 --- a/ui/src/lib/helpers.ts +++ b/ui/src/lib/helpers.ts @@ -1,10 +1,7 @@ import { nextTick, type UnwrapRef } from "vue"; import { APIError } from "./api_error"; -export function objForEach( - obj: T, - f: (k: keyof T, v: T[keyof T]) => void, -): void { +export function objForEach(obj: T, f: (k: keyof T, v: T[keyof T]) => void): void { for (const k in obj) { if (Object.prototype.hasOwnProperty.call(obj, k)) { f(k, obj[k]); diff --git a/ui/src/lib/rects/door.ts b/ui/src/lib/rects/door.ts index 33d03d3..a26d6b7 100644 --- a/ui/src/lib/rects/door.ts +++ b/ui/src/lib/rects/door.ts @@ -24,10 +24,7 @@ export class Door { // integer coercion let day = Number(value); - day = - !Number.isNaN(day) && Number.isFinite(day) - ? Math.trunc(day) - : Door.MIN_DAY; + day = !Number.isNaN(day) && Number.isFinite(day) ? Math.trunc(day) : Door.MIN_DAY; this._day = Math.max(day, Door.MIN_DAY); } diff --git a/ui/src/lib/rects/rectangle.ts b/ui/src/lib/rects/rectangle.ts index 40f9b18..0bb9bfc 100644 --- a/ui/src/lib/rects/rectangle.ts +++ b/ui/src/lib/rects/rectangle.ts @@ -71,9 +71,6 @@ export class Rectangle { } public move(vector: Vector2D): Rectangle { - return new Rectangle( - this.corner_1.plus(vector), - this.corner_2.plus(vector), - ); + return new Rectangle(this.corner_1.plus(vector), this.corner_2.plus(vector)); } } diff --git a/ui/src/lib/store.ts b/ui/src/lib/store.ts index f0105dc..cee8073 100644 --- a/ui/src/lib/store.ts +++ b/ui/src/lib/store.ts @@ -1,4 +1,4 @@ -import { acceptHMRUpdate, defineStore } from "pinia"; +import { defineStore } from "pinia"; import { API } from "./api"; import type { Loading } from "./helpers"; import type { Credentials, DoorSaved, ImageData, SiteConfigModel } from "./model"; @@ -55,31 +55,28 @@ export const advent22Store = defineStore("advent22", { const favicon = await API.request("user/favicon"); const link: HTMLLinkElement = - document.querySelector("link[rel*='icon']") ?? - document.createElement("link"); + document.querySelector("link[rel*='icon']") ?? document.createElement("link"); link.rel = "shortcut icon"; link.type = "image/x-icon"; link.href = favicon.data_url; if (link.parentElement === null) document.getElementsByTagName("head")[0]!.appendChild(link); - } catch { } + } catch {} try { - const [is_admin, site_config, background_image, user_doors, next_door] = - await Promise.all([ - this.update_is_admin(), - API.request("user/site_config"), - API.request("user/background_image"), - API.request("user/doors"), - API.request("user/next_door"), - ]); + const [is_admin, site_config, background_image, user_doors, next_door] = await Promise.all([ + this.update_is_admin(), + API.request("user/site_config"), + API.request("user/background_image"), + API.request("user/doors"), + API.request("user/next_door"), + ]); void is_admin; // discard value document.title = site_config.title; - if (site_config.subtitle !== "") - document.title += " – " + site_config.subtitle; + if (site_config.subtitle !== "") document.title += " – " + site_config.subtitle; this.site_config = site_config; this.background_image = background_image; @@ -123,9 +120,3 @@ export const advent22Store = defineStore("advent22", { }, }, }); - -if (import.meta.webpackHot) { - import.meta.webpackHot.accept( - acceptHMRUpdate(advent22Store, import.meta.webpackHot), - ); -} diff --git a/ui/src/stores/counter.ts b/ui/src/stores/counter.ts index b6757ba..374b4d0 100644 --- a/ui/src/stores/counter.ts +++ b/ui/src/stores/counter.ts @@ -1,12 +1,12 @@ -import { ref, computed } from 'vue' -import { defineStore } from 'pinia' +import { ref, computed } from "vue"; +import { defineStore } from "pinia"; -export const useCounterStore = defineStore('counter', () => { - const count = ref(0) - const doubleCount = computed(() => count.value * 2) +export const useCounterStore = defineStore("counter", () => { + const count = ref(0); + const doubleCount = computed(() => count.value * 2); function increment() { - count.value++ + count.value++; } - return { count, doubleCount, increment } -}) + return { count, doubleCount, increment }; +}); diff --git a/ui/vite.config.ts b/ui/vite.config.ts index 4217010..7483182 100644 --- a/ui/vite.config.ts +++ b/ui/vite.config.ts @@ -1,18 +1,15 @@ -import { fileURLToPath, URL } from 'node:url' +import { fileURLToPath, URL } from "node:url"; -import { defineConfig } from 'vite' -import vue from '@vitejs/plugin-vue' -import vueDevTools from 'vite-plugin-vue-devtools' +import { defineConfig } from "vite"; +import vue from "@vitejs/plugin-vue"; +import vueDevTools from "vite-plugin-vue-devtools"; // https://vite.dev/config/ export default defineConfig({ - plugins: [ - vue(), - vueDevTools(), - ], + plugins: [vue(), vueDevTools()], resolve: { alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) + "@": fileURLToPath(new URL("./src", import.meta.url)), }, }, -}) +}); diff --git a/ui/vitest.config.ts b/ui/vitest.config.ts index c328717..508a217 100644 --- a/ui/vitest.config.ts +++ b/ui/vitest.config.ts @@ -1,14 +1,14 @@ -import { fileURLToPath } from 'node:url' -import { mergeConfig, defineConfig, configDefaults } from 'vitest/config' -import viteConfig from './vite.config' +import { fileURLToPath } from "node:url"; +import { mergeConfig, defineConfig, configDefaults } from "vitest/config"; +import viteConfig from "./vite.config"; export default mergeConfig( viteConfig, defineConfig({ test: { - environment: 'jsdom', - exclude: [...configDefaults.exclude, 'e2e/**'], - root: fileURLToPath(new URL('./', import.meta.url)), + environment: "jsdom", + exclude: [...configDefaults.exclude, "e2e/**"], + root: fileURLToPath(new URL("./", import.meta.url)), }, }), -) +);