From 6134f549bed1440ca52065127e3bb75e9e6b0c80 Mon Sep 17 00:00:00 2001 From: Bernd Storath <999999bst@gmail.com> Date: Fri, 16 May 2025 15:02:55 +0200 Subject: [PATCH] more refactoring --- .vscode/settings.json | 3 + src/app/components/Header/LangSelector.vue | 2 +- src/app/composables/useSubmit.ts | 3 +- src/app/pages/admin.vue | 2 +- src/app/pages/clients/[id].vue | 2 +- src/app/pages/index.vue | 4 +- src/app/pages/login.vue | 2 +- src/app/pages/me.vue | 8 ++- src/app/pages/setup/migrate.vue | 4 +- src/app/stores/clients.ts | 4 +- src/app/utils/math.ts | 5 +- src/cli/index.ts | 2 +- src/override.tsconfig.json | 8 +++ src/server/api/me/totp.post.ts | 69 ++++++++++--------- .../database/repositories/client/types.ts | 20 +++--- .../database/repositories/general/types.ts | 12 ++-- .../database/repositories/interface/types.ts | 12 ++-- .../repositories/oneTimeLink/types.ts | 4 +- .../database/repositories/user/types.ts | 26 +++---- .../database/repositories/userConfig/types.ts | 4 +- src/server/routes/metrics/json.get.ts | 2 +- src/server/tsconfig.json | 2 +- src/server/utils/ip.ts | 2 +- src/server/utils/template.ts | 8 ++- src/server/utils/types.ts | 46 ++++++------- src/tsconfig.json | 2 +- 26 files changed, 141 insertions(+), 117 deletions(-) create mode 100644 src/override.tsconfig.json diff --git a/.vscode/settings.json b/.vscode/settings.json index 0118b1d3..d862c8f9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -32,5 +32,8 @@ "i18n-ally.sortKeys": false, "i18n-ally.keepFulfilled": false, "i18n-ally.keystyle": "nested", + "i18n-ally.regex.usageMatchAppend": [ + "[^\\w\\d]\\$i18n\\(['\"`]({key})['\"`]" + ], "editor.gotoLocation.multipleDefinitions": "goto" } diff --git a/src/app/components/Header/LangSelector.vue b/src/app/components/Header/LangSelector.vue index c0452def..ad06f182 100644 --- a/src/app/components/Header/LangSelector.vue +++ b/src/app/components/Header/LangSelector.vue @@ -37,7 +37,7 @@ const { locales, locale, setLocale } = useI18n(); const langProxy = ref(locale); watchEffect(() => { - setLocale(langProxy.value); + void setLocale(langProxy.value); }); const langs = locales.value.sort((a, b) => a.code.localeCompare(b.code)); diff --git a/src/app/composables/useSubmit.ts b/src/app/composables/useSubmit.ts index 805c2b66..9911a8c5 100644 --- a/src/app/composables/useSubmit.ts +++ b/src/app/composables/useSubmit.ts @@ -52,12 +52,13 @@ export function useSubmit< }); } - // eslint-disable-next-line @typescript-eslint/no-explicit-any + // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-argument await opts.revert(true, res as any); } catch (e) { if (e instanceof FetchError) { toast.showToast({ type: 'error', + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access message: e.data.message, }); } else if (e instanceof Error) { diff --git a/src/app/pages/admin.vue b/src/app/pages/admin.vue index 9cf4a4fd..c6d3cce8 100644 --- a/src/app/pages/admin.vue +++ b/src/app/pages/admin.vue @@ -38,7 +38,7 @@