diff --git a/.changeset/thin-donkeys-drop.md b/.changeset/thin-donkeys-drop.md new file mode 100644 index 00000000..f9827e19 --- /dev/null +++ b/.changeset/thin-donkeys-drop.md @@ -0,0 +1,5 @@ +--- +"enspire": patch +--- + +Resolve ESLint issues diff --git a/.github/workflows/on-commit.yml b/.github/workflows/on-commit.yml index a86ae929..42c736a9 100644 --- a/.github/workflows/on-commit.yml +++ b/.github/workflows/on-commit.yml @@ -23,7 +23,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 - cache: 'pnpm' + cache: pnpm - name: Install dependencies run: pnpm install - name: Apply all pending migrations to the database diff --git a/.github/workflows/on-release.yml b/.github/workflows/on-release.yml index e23d029d..6ba94f51 100644 --- a/.github/workflows/on-release.yml +++ b/.github/workflows/on-release.yml @@ -31,7 +31,7 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20 - cache: 'pnpm' + cache: pnpm - name: Install dependencies run: pnpm install - name: Apply all pending migrations to the database diff --git a/.travis.yml b/.travis.yml index 8ea19569..29dda265 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,13 +6,13 @@ dist: jammy cache: npm: false directories: - - "~/.pnpm-store" - + - ~/.pnpm-store + before_install: - corepack enable - corepack prepare pnpm@latest-9 --activate - pnpm config set store-dir ~/.pnpm-store - + install: - pnpm install diff --git a/components/custom/CAS/ClassroomReservation/NewClassroomReservation.vue b/components/custom/CAS/ClassroomReservation/NewClassroomReservation.vue index 14cc4dcb..b7391d3c 100644 --- a/components/custom/CAS/ClassroomReservation/NewClassroomReservation.vue +++ b/components/custom/CAS/ClassroomReservation/NewClassroomReservation.vue @@ -15,12 +15,15 @@ import type { AllClubs } from '~/types/api/user/all_clubs' const { toast } = useToast() -const { data } = await useAsyncData('classroomStatuses', () => { - return $fetch(`/api/reservation/classroomId`, { - headers: useRequestHeaders(), - method: 'GET', - }) -}) +const { data } = await useAsyncData( + 'classroomStatuses', + () => { + return $fetch(`/api/reservation/classroomId`, { + headers: useRequestHeaders(), + method: 'GET', + }) + }, +) if (!data.value) { toast({ @@ -29,7 +32,7 @@ if (!data.value) { }) } else { - data.value = data.value.sort((a: any, b: any) => a.name < b.name ? -1 : 1) + data.value = data.value.sort((a: any, b: any) => (a.name < b.name ? -1 : 1)) } const { data: clubs } = await useAsyncData('clubs', () => { @@ -141,7 +144,9 @@ async function handleSubmit(e: any) { 预约时间 -
+
@@ -168,7 +173,11 @@ async function handleSubmit(e: any) { - + {{ enums.periods.map[period] }} @@ -200,7 +209,10 @@ async function handleSubmit(e: any) { - 可容纳{{ classroom.size }}人 + 可容纳{{ + classroom.size + }} + 人 @@ -217,28 +229,36 @@ async function handleSubmit(e: any) { - - + + {{ club.name.zh }} - - 社长 - + 社长 - + {{ club.name.zh }} - - 副社 - + 副社 - + {{ club.name.zh }} - - 成员 - + 成员 @@ -250,11 +270,15 @@ async function handleSubmit(e: any) { 备注 -