From a64a2479ba0bfa854e22e5579640e05a5ec021e5 Mon Sep 17 00:00:00 2001 From: DecDuck Date: Fri, 14 Feb 2025 20:01:18 +1100 Subject: [PATCH] feat: migrate to tailwind v4 and fix user token API --- assets/core.scss | 13 +- assets/tailwindcss.css | 4 + components/AddLibraryButton.vue | 4 +- components/UserHeader/UserWidget.vue | 16 +- nuxt.config.ts | 12 +- package.json | 9 +- .../migration.sql | 8 + .../migration.sql | 14 ++ .../migration.sql | 20 ++ prisma/schema/auth.prisma | 6 +- prisma/schema/content.prisma | 4 +- prisma/schema/schema.prisma | 2 +- server/api/v1/user/token/[id]/index.delete.ts | 23 ++ .../token.get.ts => user/token/acls.get.ts} | 0 server/api/v1/user/token/index.get.ts | 15 ++ server/api/v1/user/token/index.post.ts | 41 ++++ server/internal/db/database.ts | 2 +- tailwind.config.js | 1 - yarn.lock | 211 +++++++++++++++--- 19 files changed, 348 insertions(+), 57 deletions(-) create mode 100644 assets/tailwindcss.css create mode 100644 prisma/migrations/20250208004345_add_api_token_name/migration.sql create mode 100644 prisma/migrations/20250208005625_add_id_to_token/migration.sql create mode 100644 prisma/migrations/20250211230021_ensure_non_null_launch_and_setup_commands/migration.sql create mode 100644 server/api/v1/user/token/[id]/index.delete.ts rename server/api/v1/{admin/user/token/token.get.ts => user/token/acls.get.ts} (100%) create mode 100644 server/api/v1/user/token/index.get.ts create mode 100644 server/api/v1/user/token/index.post.ts diff --git a/assets/core.scss b/assets/core.scss index c510b1d..eddfa75 100644 --- a/assets/core.scss +++ b/assets/core.scss @@ -1,7 +1,3 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; - $motiva: ( ("MotivaSansThin.ttf", "ttf", 100, normal), ("MotivaSansLight.woff.ttf", "woff", 300, normal), @@ -72,3 +68,12 @@ $helvetica: ( .store-caoursel > .carousel__viewport { overflow: visible !important; } + + +button { + cursor: pointer !important; +} + +html { + background-color: oklch(.21 .006 285.885); +} \ No newline at end of file diff --git a/assets/tailwindcss.css b/assets/tailwindcss.css new file mode 100644 index 0000000..c64f75c --- /dev/null +++ b/assets/tailwindcss.css @@ -0,0 +1,4 @@ +@import "tailwindcss"; +@plugin "@tailwindcss/typography"; +@plugin "@tailwindcss/forms"; +@config "../tailwind.config.js"; \ No newline at end of file diff --git a/components/AddLibraryButton.vue b/components/AddLibraryButton.vue index 171720b..19c7cee 100644 --- a/components/AddLibraryButton.vue +++ b/components/AddLibraryButton.vue @@ -4,7 +4,7 @@ :loading="isLibraryLoading" @click="() => toggleLibrary()" :style="'none'" - class="transition w-48 inline-flex items-center justify-center gap-x-2 rounded-l-md bg-white/10 group-hover:bg-white/15 text-zinc-100 backdrop-blur px-5 py-3 active:scale-95" + class="transition w-48 h-fit gap-x-2 rounded-none rounded-l-md bg-white/10 hover:bg-white/20 text-zinc-100 backdrop-blur px-5 py-3 active:scale-95" > {{ inLibrary ? "In Library" : "Add to Library" }}