diff --git a/components/custom/CAS/Info/EditClubInfo.vue b/components/custom/CAS/Info/EditClubInfo.vue new file mode 100644 index 00000000..04121a5d --- /dev/null +++ b/components/custom/CAS/Info/EditClubInfo.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/components/custom/CAS/Info/ViewClubInfo.vue b/components/custom/CAS/Info/ViewClubInfo.vue new file mode 100644 index 00000000..8d1ff829 --- /dev/null +++ b/components/custom/CAS/Info/ViewClubInfo.vue @@ -0,0 +1,66 @@ + + + diff --git a/components/custom/CAS/Leave/NewLeaveRequest.vue b/components/custom/CAS/Leave/NewLeaveRequest.vue index 025a8785..5cf84df1 100644 --- a/components/custom/CAS/Leave/NewLeaveRequest.vue +++ b/components/custom/CAS/Leave/NewLeaveRequest.vue @@ -30,7 +30,7 @@ const formSchema = toTypedSchema(z.object({ })) const { data } = await useAsyncData('allClubs', () => { - return $fetch('/api/user/all_clubs', { + return $fetch('/api/user/all_clubs', { headers: useRequestHeaders(), method: 'GET', }) diff --git a/components/custom/CAS/Leave/ViewMyLeaveRequests.vue b/components/custom/CAS/Leave/ViewMyLeaveRequests.vue index 1e370516..443d6ba3 100644 --- a/components/custom/CAS/Leave/ViewMyLeaveRequests.vue +++ b/components/custom/CAS/Leave/ViewMyLeaveRequests.vue @@ -14,7 +14,7 @@ definePageMeta({ }) const { data, refresh } = await useAsyncData('allRequests', () => { - return $fetch('/api/cas/leave/my', { + return $fetch('/api/cas/leave/my', { headers: useRequestHeaders(), method: 'GET', }) diff --git a/package.json b/package.json index 5cc10100..938cd9cd 100644 --- a/package.json +++ b/package.json @@ -14,56 +14,58 @@ "typecheck": "vue-tsc --noEmit --skipLibCheck" }, "dependencies": { - "@clerk/clerk-sdk-node": "^4.13.14", + "@clerk/clerk-sdk-node": "^4.13.15", "@nuxt/content": "^2.12.1", "@radix-icons/vue": "^1.0.0", - "@tanstack/vue-table": "^8.15.3", + "@tanstack/vue-table": "^8.16.0", "@vee-validate/zod": "^4.12.6", "@vueuse/core": "^10.9.0", "class-variance-authority": "^0.7.0", - "clsx": "^2.1.0", + "clsx": "^2.1.1", "date-fns": "^3.6.0", "h3": "^1.11.1", - "h3-clerk": "^0.3.9", - "iron-webcrypto": "^1.1.0", + "h3-clerk": "^0.3.10", + "iron-webcrypto": "^1.1.1", "lucide-vue-next": "^0.365.0", "nitropack": "2.9.6", - "radix-vue": "^1.6.2", - "tailwind-merge": "^2.2.2", + "qr-scanner-wechat": "^0.1.3", + "radix-vue": "^1.7.2", + "tailwind-merge": "^2.3.0", "tailwindcss-animate": "^1.0.7", "uncrypto": "^0.1.3", "unstorage": "^1.10.2", + "uqr": "^0.1.2", "uuid": "^9.0.1", "v-calendar": "^3.1.2", "vee-validate": "^4.12.6", - "vue-clerk": "^0.2.1", - "zod": "^3.22.4" + "vue-clerk": "^0.2.2", + "zod": "^3.23.4" }, "devDependencies": { - "@antfu/eslint-config": "^2.12.2", + "@antfu/eslint-config": "^2.16.0", "@nuxt/fonts": "^0.6.1", "@nuxtjs/google-fonts": "^3.2.0", - "@nuxtjs/tailwindcss": "^6.11.4", - "@prisma/client": "^5.12.1", + "@nuxtjs/tailwindcss": "^6.12.0", + "@prisma/client": "^5.13.0", "@rollup/plugin-wasm": "^6.2.2", - "@sentry/node": "^7.109.0", - "@sentry/profiling-node": "^7.109.0", - "@sentry/vue": "^7.109.0", - "@tailwindcss/typography": "^0.5.12", + "@sentry/node": "^7.112.2", + "@sentry/profiling-node": "^7.112.2", + "@sentry/vue": "^7.112.2", + "@tailwindcss/typography": "^0.5.13", "@types/uuid": "^9.0.8", "@types/ws": "^8.5.10", "eslint": "^8.57.0", "nuxt": "3.11.2", "nuxt-icon": "^0.6.10", "nuxt-svgo": "^4.0.0", - "prisma": "^5.12.1", - "shadcn-nuxt": "^0.10.2", + "prisma": "^5.13.0", + "shadcn-nuxt": "^0.10.4", "ts-node": "^10.9.2", - "tsx": "^4.7.2", - "typescript": "^5.4.4", - "vue": "^3.4.21", - "vue-router": "^4.3.0", - "vue-tsc": "^2.0.11" + "tsx": "^4.7.3", + "typescript": "^5.4.5", + "vue": "^3.4.25", + "vue-router": "^4.3.2", + "vue-tsc": "^2.0.14" }, "prisma": { "schema": "db/schema.prisma" diff --git a/pages/cas/clubs/[id].vue b/pages/cas/clubs/[id].vue deleted file mode 100644 index bc84cc8b..00000000 --- a/pages/cas/clubs/[id].vue +++ /dev/null @@ -1,186 +0,0 @@ - - - diff --git a/pages/cas/clubs/[id]/edit.vue b/pages/cas/clubs/[id]/edit.vue new file mode 100644 index 00000000..aaabc00d --- /dev/null +++ b/pages/cas/clubs/[id]/edit.vue @@ -0,0 +1,144 @@ + + +