From 96fd11d3d6efeae7045a82bf796536470c23fbd6 Mon Sep 17 00:00:00 2001 From: Martin Drechsel Date: Thu, 22 May 2025 06:55:53 +0200 Subject: [PATCH] switch to nuxt layers --- app.config.ts | 7 - nuxt.config.ts | 34 +-- package.json | 1 + pnpm-lock.yaml | 4 +- src-tauri/tauri.conf.json | 17 +- src/assets/css/main.css | 9 - .../link/index.vue => haex/sidebar/link.vue} | 11 - src/components/ui/accordion/index.vue | 43 --- src/components/ui/button/action.vue | 79 ------ src/components/ui/button/index.vue | 14 - src/components/ui/button/types.d.ts | 8 - src/components/ui/dialog/index.vue | 95 ------- src/components/ui/dialog/test.vue | 58 ---- src/components/ui/dialog/title.vue | 5 - src/components/ui/dropdown/index.vue | 55 ---- src/components/ui/dropdown/locale.vue | 33 --- src/components/ui/dropdown/theme.vue | 26 -- src/components/ui/input/index.vue | 147 ---------- src/components/ui/input/password.vue | 53 ---- src/components/ui/input/url.vue | 56 ---- src/components/ui/logo/itemis.vue | 91 ------ src/components/ui/sidebar/button.vue | 24 -- src/components/ui/sidebar/index.vue | 62 ---- src/components/ui/sidebar/test.vue | 268 ------------------ src/components/ui/text/gradient.vue | 7 - src/components/ui/tooltip/index.vue | 61 ---- src/components/vault/button/create.vue | 16 +- src/components/vault/button/open.vue | 17 +- src/composables/helper.ts | 115 -------- src/i18n/i18n.config.ts | 16 -- src/layouts/app.vue | 8 +- src/pages/index.vue | 58 ++++ src/plugins/flyonui.client.ts | 13 - src/stores/ui/de.json | 6 - src/stores/ui/en.json | 6 - src/stores/ui/index.ts | 55 ---- 36 files changed, 101 insertions(+), 1477 deletions(-) delete mode 100644 app.config.ts delete mode 100644 src/assets/css/main.css rename src/components/{ui/sidebar/link/index.vue => haex/sidebar/link.vue} (77%) delete mode 100644 src/components/ui/accordion/index.vue delete mode 100644 src/components/ui/button/action.vue delete mode 100644 src/components/ui/button/index.vue delete mode 100644 src/components/ui/button/types.d.ts delete mode 100644 src/components/ui/dialog/index.vue delete mode 100644 src/components/ui/dialog/test.vue delete mode 100644 src/components/ui/dialog/title.vue delete mode 100644 src/components/ui/dropdown/index.vue delete mode 100644 src/components/ui/dropdown/locale.vue delete mode 100644 src/components/ui/dropdown/theme.vue delete mode 100644 src/components/ui/input/index.vue delete mode 100644 src/components/ui/input/password.vue delete mode 100644 src/components/ui/input/url.vue delete mode 100644 src/components/ui/logo/itemis.vue delete mode 100644 src/components/ui/sidebar/button.vue delete mode 100644 src/components/ui/sidebar/index.vue delete mode 100644 src/components/ui/sidebar/test.vue delete mode 100644 src/components/ui/text/gradient.vue delete mode 100644 src/components/ui/tooltip/index.vue delete mode 100644 src/composables/helper.ts delete mode 100644 src/i18n/i18n.config.ts delete mode 100644 src/plugins/flyonui.client.ts delete mode 100644 src/stores/ui/de.json delete mode 100644 src/stores/ui/en.json delete mode 100644 src/stores/ui/index.ts diff --git a/app.config.ts b/app.config.ts deleted file mode 100644 index 448c915..0000000 --- a/app.config.ts +++ /dev/null @@ -1,7 +0,0 @@ -// ~/app.config.ts -export default defineAppConfig({ - icon: { - mode: "css", - cssLayer: "base", - }, -}); diff --git a/nuxt.config.ts b/nuxt.config.ts index edd99a2..03472b1 100644 --- a/nuxt.config.ts +++ b/nuxt.config.ts @@ -2,19 +2,11 @@ import tailwindcss from "@tailwindcss/vite"; // https://nuxt.com/docs/api/configuration/nuxt-config export default defineNuxtConfig({ - compatibilityDate: "2024-11-01", - - modules: [ - "nuxt-zod-i18n", - "@nuxtjs/i18n", - "@pinia/nuxt", - "@vueuse/nuxt", - "@nuxt/icon", - "nuxt-snackbar", - - + extends: [ + "github:haexhub/haex-base-ui" ], + compatibilityDate: "2024-11-01", imports: { @@ -39,14 +31,7 @@ export default defineNuxtConfig({ ], }, - - - /* svgo: { - autoImportPath: '~/assets/svg/', - dts: true, - }, */ - - i18n: { + /* i18n: { strategy: "prefix_and_default", defaultLocale: "de", vueI18n: "~/i18n/i18n.config.ts", @@ -65,14 +50,9 @@ export default defineNuxtConfig({ bundle: { optimizeTranslationDirective: false, }, - }, + }, */ + - zodI18n: { - localeCodesMapping: { - "en-GB": "en", - "de-DE": "de", - }, - }, runtimeConfig: { public: { @@ -83,8 +63,6 @@ export default defineNuxtConfig({ }, }, - css: ["~/assets/css/main.css"], - devtools: { enabled: true }, srcDir: "./src", diff --git a/package.json b/package.json index 028f973..3e9cd95 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "nuxt-zod-i18n": "^1.11.5", "tailwindcss": "^4.1.7", "vue": "^3.5.14", + "vue-router": "^4.5.1", "zod": "^3.25.4" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7aebd36..4a46ecc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -86,6 +86,9 @@ importers: vue: specifier: ^3.5.14 version: 3.5.14(typescript@5.8.3) + vue-router: + specifier: ^4.5.1 + version: 4.5.1(vue@3.5.14(typescript@5.8.3)) zod: specifier: ^3.25.4 version: 3.25.4 @@ -3307,7 +3310,6 @@ packages: libsql@0.5.10: resolution: {integrity: sha512-lQu5RLqDLFuo6H5SuR3CnEstGVph77Jd8lm3fdW64p6tUjOC0X8Z9PlfAdZYxWyirYLH9uwcEZUrABsNKYwOiQ==} - cpu: [x64, arm64, wasm32, arm] os: [darwin, linux, win32] lightningcss-darwin-arm64@1.30.1: diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 1307807..a564271 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -19,17 +19,18 @@ ], "security": { "csp": { - "default-src": "'self' ipc: http://ipc.localhost; img-src 'self' asset: http://asset.localhost; default-src 'self' asset: http://asset.localhost", - "script-src": ["'self'", "haex-extension:"], - "style-src": ["'self'", "haex-extension:"], - "connect-src": ["'self'", "haex-extension:"], - "img-src": ["'self'", "haex-extension:", "data:"], - "font-src": ["'self'", "haex-extension:", "data:"], - "media-src": "'self' haex-extension: data: blob: asset:" + "default-src": ["'self'", "ipc: http://ipc.localhost", "blob:"], + "media-src": [ + "'self'", + "asset:", + "http://asset.localhost", + "blob:", + "asset: http://asset.localhost" + ] }, "assetProtocol": { "enable": true, - "scope": ["$RESOURCE/**", "$APPDATA/**"] + "scope": ["*"] } } }, diff --git a/src/assets/css/main.css b/src/assets/css/main.css deleted file mode 100644 index c59e33a..0000000 --- a/src/assets/css/main.css +++ /dev/null @@ -1,9 +0,0 @@ -@import "tailwindcss"; -@import "flyonui/variants.css"; - -@plugin "@iconify/tailwind4"; -@plugin "flyonui" { - themes: all; -} - -@source "../../node_modules/flyonui/flyonui.js"; diff --git a/src/components/ui/sidebar/link/index.vue b/src/components/haex/sidebar/link.vue similarity index 77% rename from src/components/ui/sidebar/link/index.vue rename to src/components/haex/sidebar/link.vue index 81214fb..48c0c60 100644 --- a/src/components/ui/sidebar/link/index.vue +++ b/src/components/haex/sidebar/link.vue @@ -39,15 +39,4 @@ const isActive = computed(() => { const linkRef = useTemplateRef('linkRef') const triggerNavigate = () => linkRef.value?.$el.click() - -/* computed(() => { - const found = useRouter() - .getRoutes() - .find((route) => route.name === useLocaleRoute()(props.to)?.name); - console.log('found route', found, useRoute()); - return ( - found?.name === useRoute().name || - found?.children.some((child) => child.name === useRoute().name) - ); -}); */ diff --git a/src/components/ui/accordion/index.vue b/src/components/ui/accordion/index.vue deleted file mode 100644 index 051f42e..0000000 --- a/src/components/ui/accordion/index.vue +++ /dev/null @@ -1,43 +0,0 @@ - - - diff --git a/src/components/ui/button/action.vue b/src/components/ui/button/action.vue deleted file mode 100644 index b414566..0000000 --- a/src/components/ui/button/action.vue +++ /dev/null @@ -1,79 +0,0 @@ - - - diff --git a/src/components/ui/button/index.vue b/src/components/ui/button/index.vue deleted file mode 100644 index 10c268a..0000000 --- a/src/components/ui/button/index.vue +++ /dev/null @@ -1,14 +0,0 @@ - - - diff --git a/src/components/ui/button/types.d.ts b/src/components/ui/button/types.d.ts deleted file mode 100644 index 4a9fc13..0000000 --- a/src/components/ui/button/types.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { RouteLocationRaw } from 'vue-router'; - -export interface IActionMenuItem { - label: string; - icon?: string; - action?: () => Promise; - to?: RouteLocationRaw; -} diff --git a/src/components/ui/dialog/index.vue b/src/components/ui/dialog/index.vue deleted file mode 100644 index 056200d..0000000 --- a/src/components/ui/dialog/index.vue +++ /dev/null @@ -1,95 +0,0 @@ - - - - - -{ - "de": { - "close": "Schließen" - }, - "en": { - "close": "Close" - } -} - diff --git a/src/components/ui/dialog/test.vue b/src/components/ui/dialog/test.vue deleted file mode 100644 index b37bd4b..0000000 --- a/src/components/ui/dialog/test.vue +++ /dev/null @@ -1,58 +0,0 @@ - diff --git a/src/components/ui/dialog/title.vue b/src/components/ui/dialog/title.vue deleted file mode 100644 index d31fa39..0000000 --- a/src/components/ui/dialog/title.vue +++ /dev/null @@ -1,5 +0,0 @@ - diff --git a/src/components/ui/dropdown/index.vue b/src/components/ui/dropdown/index.vue deleted file mode 100644 index e541936..0000000 --- a/src/components/ui/dropdown/index.vue +++ /dev/null @@ -1,55 +0,0 @@ - - - diff --git a/src/components/ui/dropdown/locale.vue b/src/components/ui/dropdown/locale.vue deleted file mode 100644 index ae61ad5..0000000 --- a/src/components/ui/dropdown/locale.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - diff --git a/src/components/ui/dropdown/theme.vue b/src/components/ui/dropdown/theme.vue deleted file mode 100644 index baea385..0000000 --- a/src/components/ui/dropdown/theme.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - diff --git a/src/components/ui/input/index.vue b/src/components/ui/input/index.vue deleted file mode 100644 index 8175360..0000000 --- a/src/components/ui/input/index.vue +++ /dev/null @@ -1,147 +0,0 @@ - - - diff --git a/src/components/ui/input/password.vue b/src/components/ui/input/password.vue deleted file mode 100644 index e11014a..0000000 --- a/src/components/ui/input/password.vue +++ /dev/null @@ -1,53 +0,0 @@ - - - - - -{ - "de": { - "password": "Passwort" - }, - "en": { - "password": "Password" - } -} - diff --git a/src/components/ui/input/url.vue b/src/components/ui/input/url.vue deleted file mode 100644 index 2e6cc95..0000000 --- a/src/components/ui/input/url.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - -{ - "de": { - "url": "Url" - }, - "en": { - "url": "Url" - } -} - diff --git a/src/components/ui/logo/itemis.vue b/src/components/ui/logo/itemis.vue deleted file mode 100644 index 199194a..0000000 --- a/src/components/ui/logo/itemis.vue +++ /dev/null @@ -1,91 +0,0 @@ - diff --git a/src/components/ui/sidebar/button.vue b/src/components/ui/sidebar/button.vue deleted file mode 100644 index 96799c5..0000000 --- a/src/components/ui/sidebar/button.vue +++ /dev/null @@ -1,24 +0,0 @@ - - - diff --git a/src/components/ui/sidebar/index.vue b/src/components/ui/sidebar/index.vue deleted file mode 100644 index 00308b8..0000000 --- a/src/components/ui/sidebar/index.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - diff --git a/src/components/ui/sidebar/test.vue b/src/components/ui/sidebar/test.vue deleted file mode 100644 index 02b5deb..0000000 --- a/src/components/ui/sidebar/test.vue +++ /dev/null @@ -1,268 +0,0 @@ - - - - - -de: - notifications: - label: Benachrichtigungen - view_all: Alle ansehen -en: - notifications: - label: Notifications - view_all: View all - diff --git a/src/components/ui/text/gradient.vue b/src/components/ui/text/gradient.vue deleted file mode 100644 index 7ea83ac..0000000 --- a/src/components/ui/text/gradient.vue +++ /dev/null @@ -1,7 +0,0 @@ - diff --git a/src/components/ui/tooltip/index.vue b/src/components/ui/tooltip/index.vue deleted file mode 100644 index 28a173b..0000000 --- a/src/components/ui/tooltip/index.vue +++ /dev/null @@ -1,61 +0,0 @@ - - - diff --git a/src/components/vault/button/create.vue b/src/components/vault/button/create.vue index 74b19d8..e137bca 100644 --- a/src/components/vault/button/create.vue +++ b/src/components/vault/button/create.vue @@ -1,13 +1,11 @@