Skip to content

Commit a97fb6c

Browse files
authored
refactor!: upgrade to nuxt v4 (#658)
* refactor!: migrate to nuxt v4 * update path alias pt.2 * do not ignore shadcn components * still. do not ignore shadcn components * move utils to rootDir
1 parent 9861995 commit a97fb6c

File tree

262 files changed

+214
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

262 files changed

+214
-222
lines changed

.eslintignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

app.vue renamed to app/app.vue

File renamed without changes.
File renamed without changes.

components/custom/CAS/ClassroomReservation/NewClassroomReservation.vue renamed to app/components/custom/CAS/ClassroomReservation/NewClassroomReservation.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<script setup lang="ts">
2+
import type { AllClubs } from '@@/types/api/user/all_clubs'
23
import type { ClassroomData } from '@prisma/client'
3-
import type { AllClubs } from '~/types/api/user/all_clubs'
4+
import { enums } from '@/components/custom/enum2str'
45
import { Button } from '@/components/ui/button'
56
import {
67
Card,
@@ -11,7 +12,6 @@ import {
1112
} from '@/components/ui/card'
1213
import { useToast } from '@/components/ui/toast/use-toast'
1314
import { LoaderCircle } from 'lucide-vue-next'
14-
import { enums } from '~/components/custom/enum2str'
1515
1616
const { toast } = useToast()
1717

components/custom/CAS/Record/NewActivityRecord.vue renamed to app/components/custom/CAS/Record/NewActivityRecord.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<script setup lang="ts">
2+
import type { AllClubs } from '@@/types/api/user/all_clubs'
23
import { Button } from '@/components/ui/button'
34
import { Calendar } from '@/components/ui/calendar'
45
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
@@ -12,16 +13,15 @@ import {
1213
} from '@/components/ui/number-field'
1314
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
1415
import { Textarea } from '@/components/ui/textarea'
16+
import { Toaster } from '@/components/ui/toast'
1517
import { useToast } from '@/components/ui/toast/use-toast'
18+
import { cn } from '@/lib/utils'
1619
import { CalendarDate, DateFormatter, getLocalTimeZone, parseDate, today } from '@internationalized/date'
1720
import { toTypedSchema } from '@vee-validate/zod'
1821
import { Calendar as CalendarIcon } from 'lucide-vue-next'
1922
import { toDate } from 'radix-vue/date'
2023
import { useForm } from 'vee-validate'
2124
import * as z from 'zod'
22-
import { Toaster } from '~/components/ui/toast'
23-
import { cn } from '~/lib/utils'
24-
import type { AllClubs } from '~/types/api/user/all_clubs'
2525
2626
const emit = defineEmits(['refresh'])
2727

components/custom/CAS/Record/ViewMyActivityRecords.vue renamed to app/components/custom/CAS/Record/ViewMyActivityRecords.vue

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
2+
import type { MyRecords } from '@@/types/api/cas/record/my'
3+
import type { AllClubs } from '@@/types/api/user/all_clubs'
24
import type { Ref } from 'vue'
3-
import type { MyRecords } from '~/types/api/cas/record/my'
4-
import type { AllClubs } from '~/types/api/user/all_clubs'
55
import {
66
Card,
77
CardContent,
@@ -17,10 +17,9 @@ import {
1717
SelectTrigger,
1818
SelectValue,
1919
} from '@/components/ui/select'
20-
import { Toaster } from '~/components/ui/toast'
20+
import { Toaster } from '@/components/ui/toast'
2121
import { columns } from './view-activity-records/columns'
2222
import DataTable from './view-activity-records/DataTable.vue'
23-
import { useQuery } from '@tanstack/vue-query';
2423
2524
const props = defineProps<{
2625
refreshWatcher: Ref<boolean>
@@ -115,7 +114,7 @@ const totalCASTime = computed(() => {
115114
</Button>
116115
</div>
117116
<div v-if="selectedClub" class="mb-4 text-sm">
118-
<div class="rounded border p-2 mt-1 flex justify-between">
117+
<div class="mt-1 flex justify-between border rounded p-2">
119118
<div class="flex items-center space-x-0.5">
120119
<p class="font-bold">
121120
C:

components/custom/CAS/Record/view-activity-records/columns.ts renamed to app/components/custom/CAS/Record/view-activity-records/columns.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import type { ActivityRecord, Club, ClubMembership } from '@prisma/client'
22
import type { ColumnDef } from '@tanstack/vue-table'
3+
import DropdownAction from '@/components/custom/CAS/Record/view-activity-records/DataTableAction.vue'
4+
import { Button } from '@/components/ui/button'
35
import { ArrowUpDown } from 'lucide-vue-next'
46
import { h } from 'vue'
5-
import { Button } from '~/components/ui/button'
6-
import DropdownAction from './DataTableAction.vue'
77

88
export const columns: ColumnDef<ActivityRecord>[] = [
99
{

components/custom/Index/announcements.vue renamed to app/components/custom/Index/announcements.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<script setup lang="ts">
2-
import type { Announcements } from '~/types/payloadcms/announcements'
2+
import type { Announcements } from '@@/types/payloadcms/announcements'
33
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table'
44
55
const { data, suspense } = useQuery<Announcements>({

0 commit comments

Comments
 (0)