Merge branch 'update' into dev

nuxt.config.ts

@@ -13,6 +13,7 @@ export default defineNuxtConfig({
     "@nuxtjs/i18n",
     "@nuxthub/core"
   ],
+
   css: ["~/assets/main.css"],
 
   i18n: {
@@ -51,14 +52,18 @@ export default defineNuxtConfig({
       autoprefixer: {},
     },
   },
+
   shadcn: {
     prefix: "Ui",
     componentDir: "./components/ui"
   },
+
   colorMode: {
     classSuffix: "",
     preference: "dark",
     fallback: "dark",
   },
-  eslint: {}
-})
+
+  eslint: {},
+  compatibilityDate: "2025-02-14"
+})

package.json

@@ -13,44 +13,44 @@
     "lint:prettier": "prettier . --check"
   },
   "dependencies": {
-    "@nuxt/eslint": "^0.3.12",
-    "@nuxthub/core": "^0.8.7",
-    "@nuxtjs/i18n": "^8.5.1",
+    "@nuxt/eslint": "^1.1.0",
+    "@nuxthub/core": "^0.8.17",
+    "@nuxtjs/i18n": "^9.2.1",
     "@phosphor-icons/vue": "^2.2.1",
-    "@pinia/nuxt": "^0.5.1",
-    "@vueuse/core": "^10.9.0",
-    "@vueuse/integrations": "^10.11.0",
-    "@vueuse/nuxt": "^10.9.0",
-    "class-variance-authority": "^0.7.0",
+    "@pinia/nuxt": "^0.10.1",
+    "@vueuse/core": "^12.7.0",
+    "@vueuse/integrations": "^12.7.0",
+    "@vueuse/nuxt": "^12.7.0",
+    "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
-    "lucide-vue-next": "^0.364.0",
-    "nuxt": "^3.7.0",
-    "pinia": "^2.1.7",
-    "radix-vue": "^1.7.4",
-    "shadcn-nuxt": "^0.10.4",
-    "sortablejs": "^1",
-    "tailwind-merge": "^2.3.0",
+    "lucide-vue-next": "^0.475.0",
+    "nuxt": "^3.15.4",
+    "pinia": "^3.0.1",
+    "radix-vue": "^1.9.16",
+    "shadcn-nuxt": "^0.11.4",
+    "sortablejs": "^1.15.6",
+    "tailwind-merge": "^3.0.2",
     "tailwindcss-animate": "^1.0.7",
-    "vue": "^3.4.27",
-    "vue-router": "^4.3.2",
-    "zod": "^3.23.8"
+    "vue": "^3.5.13",
+    "vue-router": "^4.5.0",
+    "zod": "^3.24.2"
   },
   "devDependencies": {
-    "@nuxtjs/color-mode": "^3.4.1",
-    "@nuxtjs/supabase": "^1.2.2",
-    "@nuxtjs/tailwindcss": "^6.12.0",
-    "@stylistic/eslint-plugin-js": "^2.1.0",
-    "@typescript-eslint/eslint-plugin": "^7.8.0",
-    "@typescript-eslint/parser": "^7.8.0",
-    "eslint": "^8.49.0",
-    "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.1.3",
-    "eslint-plugin-vue": "^9.26.0",
-    "postcss": "^8.4.38",
-    "prettier": "^3.2.5",
-    "sass": "^1.72.0",
-    "tailwindcss": "^3.4.3",
-    "typescript": "~5.4.0",
-    "wrangler": "^3.90.0"
+    "@nuxtjs/color-mode": "^3.5.2",
+    "@nuxtjs/supabase": "^1.4.6",
+    "@nuxtjs/tailwindcss": "^6.13.1",
+    "@stylistic/eslint-plugin-js": "^3.1.0",
+    "@typescript-eslint/eslint-plugin": "^8.25.0",
+    "@typescript-eslint/parser": "^8.25.0",
+    "eslint": "^9.21.0",
+    "eslint-config-prettier": "^10.0.2",
+    "eslint-plugin-prettier": "^5.2.3",
+    "eslint-plugin-vue": "^9.32.0",
+    "postcss": "^8.5.3",
+    "prettier": "^3.5.2",
+    "sass": "^1.85.1",
+    "tailwindcss": "^3.4.17",
+    "typescript": "^5.7.3",
+    "wrangler": "^3.111.0"
   }
 }

pages/calendars/[id].vue

@@ -8,11 +8,8 @@ const shortId = route.params.id
 
 const user = useSupabaseUser()
 
-const { data: calendarData, pending: calPending, refresh: calRefresh } = await useLazyFetch("/api/calendars/query", { key: `calendar-${shortId}`, query: { shortId, full: true } })
-const { data: catData, pending: catPending, refresh: catRefresh } = await useLazyFetch("/api/calendars/categories/query", { key: `categories-${shortId}` })
-
-const cal = computed<Calendar>(() => calendarData?.value?.data as Calendar)
-const categories = computed<Category[]>(() => catData?.value?.data as Category[])
+const { data: calendarData, pending: calPending, refresh: calRefresh } = await useLazyFetch<{ data: Calendar }>("/api/calendars/query", { query: { shortId, full: true } })
+const { data: catData, pending: catPending, refresh: catRefresh } = await useLazyFetch<{ data: Category[] }>("/api/calendars/categories/query")
 
 watch(user, () => {
   calRefresh()
@@ -34,12 +31,12 @@ watch(user, () => {
     </div>
   </div>
 
-  <div v-else-if="cal && categories" class="h-full w-full">
+  <div v-else-if="calendarData && catData" class="h-full w-full">
     <Head>
-      <Title>{{ cal.name }}</Title>
+      <Title>{{ calendarData.data.name }}</Title>
     </Head>
 
-    <Calendar :calendar-data="cal" :categories />
+    <Calendar :calendar-data="calendarData.data" :categories="catData.data" />
   </div>
 
   <div v-else class="h-full w-full grid place-items-center">

server/api/calendars/query.get.ts

@@ -12,8 +12,6 @@ export default defineEventHandler(async (event) => {
   const client = await serverSupabaseClient(event)
   const query = await getValidatedQuery(event, querySchema.parse)
 
-  setHeader(event, "Cache-Control", "public, max-age=3600, s-maxage=7200")
-
   const partialFields = `
     id,
     shortId:short_id,