From 899af4dec5a92f7c388176a7e58e81daa532c715 Mon Sep 17 00:00:00 2001 From: Lint Action Date: Wed, 2 Apr 2025 12:56:03 +0000 Subject: [PATCH] style: fix linting issues met Prettier --- backend/src/controllers/teachers.ts | 8 +-- backend/src/data/themes.ts | 2 +- backend/src/interfaces/question.ts | 2 +- backend/src/interfaces/student-request.ts | 3 +- backend/src/services/questions.ts | 8 +-- backend/tests/controllers/students.test.ts | 2 +- backend/tests/controllers/teachers.test.ts | 3 +- common/src/interfaces/class-join-request.d.ts | 2 +- frontend/src/controllers/assignments.ts | 6 ++- frontend/src/controllers/classes.ts | 6 ++- frontend/src/controllers/groups.ts | 6 ++- frontend/src/controllers/questions.ts | 6 ++- frontend/src/controllers/students.ts | 31 ++++++----- frontend/src/controllers/submissions.ts | 6 ++- frontend/src/controllers/teachers.ts | 29 ++++++---- frontend/src/controllers/themes.ts | 2 +- frontend/src/queries/students.ts | 54 ++++++++----------- frontend/src/queries/teachers.ts | 49 ++++++----------- frontend/src/queries/themes.ts | 8 +-- tsconfig.json | 2 +- 20 files changed, 117 insertions(+), 118 deletions(-) diff --git a/backend/src/controllers/teachers.ts b/backend/src/controllers/teachers.ts index 5022dddb..abb5be69 100644 --- a/backend/src/controllers/teachers.ts +++ b/backend/src/controllers/teachers.ts @@ -11,10 +11,10 @@ import { updateClassJoinRequestStatus, } from '../services/teachers.js'; import { requireFields } from './error-helper.js'; -import {TeacherDTO} from "dwengo-1-common/src/interfaces/teacher"; -import {ClassDTO} from "dwengo-1-common/src/interfaces/class"; -import {StudentDTO} from "dwengo-1-common/src/interfaces/student"; -import {QuestionDTO, QuestionId} from "dwengo-1-common/src/interfaces/question"; +import { TeacherDTO } from 'dwengo-1-common/src/interfaces/teacher'; +import { ClassDTO } from 'dwengo-1-common/src/interfaces/class'; +import { StudentDTO } from 'dwengo-1-common/src/interfaces/student'; +import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question'; export async function getAllTeachersHandler(req: Request, res: Response): Promise { const full = req.query.full === 'true'; diff --git a/backend/src/data/themes.ts b/backend/src/data/themes.ts index edbdb113..fb3ee47c 100644 --- a/backend/src/data/themes.ts +++ b/backend/src/data/themes.ts @@ -1,4 +1,4 @@ -import {Theme} from "dwengo-1-common/src/interfaces/theme"; +import { Theme } from 'dwengo-1-common/src/interfaces/theme'; export const themes: Theme[] = [ { diff --git a/backend/src/interfaces/question.ts b/backend/src/interfaces/question.ts index 04846bb9..9aa2c024 100644 --- a/backend/src/interfaces/question.ts +++ b/backend/src/interfaces/question.ts @@ -1,7 +1,7 @@ import { Question } from '../entities/questions/question.entity.js'; import { mapToStudentDTO } from './student.js'; import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question'; -import {LearningObjectIdentifier} from "../entities/content/learning-object-identifier"; +import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier'; function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier { return { diff --git a/backend/src/interfaces/student-request.ts b/backend/src/interfaces/student-request.ts index 4424f913..ad45f8fe 100644 --- a/backend/src/interfaces/student-request.ts +++ b/backend/src/interfaces/student-request.ts @@ -3,8 +3,7 @@ import { ClassJoinRequest, ClassJoinRequestStatus } from '../entities/classes/cl import { getClassJoinRequestRepository } from '../data/repositories.js'; import { Student } from '../entities/users/student.entity.js'; import { Class } from '../entities/classes/class.entity.js'; -import {ClassJoinRequestDTO} from "dwengo-1-common/src/interfaces/class-join-request"; - +import { ClassJoinRequestDTO } from 'dwengo-1-common/src/interfaces/class-join-request'; export function mapToStudentRequestDTO(request: ClassJoinRequest): ClassJoinRequestDTO { return { diff --git a/backend/src/services/questions.ts b/backend/src/services/questions.ts index 55fb8710..2cb6a7a5 100644 --- a/backend/src/services/questions.ts +++ b/backend/src/services/questions.ts @@ -1,13 +1,13 @@ import { getAnswerRepository, getQuestionRepository } from '../data/repositories.js'; -import {mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js'; +import { mapToQuestionDTO, mapToQuestionDTOId } from '../interfaces/question.js'; import { Question } from '../entities/questions/question.entity.js'; import { Answer } from '../entities/questions/answer.entity.js'; -import {mapToAnswerDTO, mapToAnswerDTOId} from '../interfaces/answer.js'; +import { mapToAnswerDTO, mapToAnswerDTOId } from '../interfaces/answer.js'; import { QuestionRepository } from '../data/questions/question-repository.js'; import { LearningObjectIdentifier } from '../entities/content/learning-object-identifier.js'; import { mapToStudent } from '../interfaces/student.js'; -import {QuestionDTO, QuestionId} from "dwengo-1-common/src/interfaces/question"; -import {AnswerDTO, AnswerId} from "dwengo-1-common/src/interfaces/answer"; +import { QuestionDTO, QuestionId } from 'dwengo-1-common/src/interfaces/question'; +import { AnswerDTO, AnswerId } from 'dwengo-1-common/src/interfaces/answer'; export async function getAllQuestions(id: LearningObjectIdentifier, full: boolean): Promise { const questionRepository: QuestionRepository = getQuestionRepository(); diff --git a/backend/tests/controllers/students.test.ts b/backend/tests/controllers/students.test.ts index 17dfffd4..44919c4a 100644 --- a/backend/tests/controllers/students.test.ts +++ b/backend/tests/controllers/students.test.ts @@ -20,7 +20,7 @@ import { NotFoundException } from '../../src/exceptions/not-found-exception.js'; import { BadRequestException } from '../../src/exceptions/bad-request-exception.js'; import { ConflictException } from '../../src/exceptions/conflict-exception.js'; import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js'; -import {StudentDTO} from "dwengo-1-common/src/interfaces/student"; +import { StudentDTO } from 'dwengo-1-common/src/interfaces/student'; describe('Student controllers', () => { let req: Partial; diff --git a/backend/tests/controllers/teachers.test.ts b/backend/tests/controllers/teachers.test.ts index cbf87e53..e5b33ea8 100644 --- a/backend/tests/controllers/teachers.test.ts +++ b/backend/tests/controllers/teachers.test.ts @@ -15,8 +15,7 @@ import { import { BadRequestException } from '../../src/exceptions/bad-request-exception.js'; import { EntityAlreadyExistsException } from '../../src/exceptions/entity-already-exists-exception.js'; import { getStudentRequestsHandler } from '../../src/controllers/students.js'; -import {TeacherDTO} from "dwengo-1-common/src/interfaces/teacher"; - +import { TeacherDTO } from 'dwengo-1-common/src/interfaces/teacher'; describe('Teacher controllers', () => { let req: Partial; diff --git a/common/src/interfaces/class-join-request.d.ts b/common/src/interfaces/class-join-request.d.ts index 090646a8..4ba6d520 100644 --- a/common/src/interfaces/class-join-request.d.ts +++ b/common/src/interfaces/class-join-request.d.ts @@ -1,4 +1,4 @@ -import {StudentDTO} from "./student"; +import { StudentDTO } from './student'; export interface ClassJoinRequestDTO { requester: StudentDTO; diff --git a/frontend/src/controllers/assignments.ts b/frontend/src/controllers/assignments.ts index 6783b876..f6da213e 100644 --- a/frontend/src/controllers/assignments.ts +++ b/frontend/src/controllers/assignments.ts @@ -1,3 +1,5 @@ -import type {AssignmentDTO} from "dwengo-1-common/src/interfaces/assignment"; +import type { AssignmentDTO } from "dwengo-1-common/src/interfaces/assignment"; -export interface AssignmentsResponse { assignments: AssignmentDTO[] } // TODO ID +export interface AssignmentsResponse { + assignments: AssignmentDTO[]; +} // TODO ID diff --git a/frontend/src/controllers/classes.ts b/frontend/src/controllers/classes.ts index 76e57783..c0755cac 100644 --- a/frontend/src/controllers/classes.ts +++ b/frontend/src/controllers/classes.ts @@ -1,3 +1,5 @@ -import type {ClassDTO} from "dwengo-1-common/src/interfaces/class"; +import type { ClassDTO } from "dwengo-1-common/src/interfaces/class"; -export interface ClassesResponse { classes: ClassDTO[] | string[] } +export interface ClassesResponse { + classes: ClassDTO[] | string[]; +} diff --git a/frontend/src/controllers/groups.ts b/frontend/src/controllers/groups.ts index 8de73049..4cc83dea 100644 --- a/frontend/src/controllers/groups.ts +++ b/frontend/src/controllers/groups.ts @@ -1,3 +1,5 @@ -import type {GroupDTO} from "dwengo-1-common/src/interfaces/group"; +import type { GroupDTO } from "dwengo-1-common/src/interfaces/group"; -export interface GroupsResponse { groups: GroupDTO[] } // | TODO id +export interface GroupsResponse { + groups: GroupDTO[]; +} // | TODO id diff --git a/frontend/src/controllers/questions.ts b/frontend/src/controllers/questions.ts index 14be81b1..0464578c 100644 --- a/frontend/src/controllers/questions.ts +++ b/frontend/src/controllers/questions.ts @@ -1,3 +1,5 @@ -import type {QuestionDTO, QuestionId} from "dwengo-1-common/src/interfaces/question"; +import type { QuestionDTO, QuestionId } from "dwengo-1-common/src/interfaces/question"; -export interface QuestionsResponse { questions: QuestionDTO[] | QuestionId[] } +export interface QuestionsResponse { + questions: QuestionDTO[] | QuestionId[]; +} diff --git a/frontend/src/controllers/students.ts b/frontend/src/controllers/students.ts index 9e81b03c..0640a971 100644 --- a/frontend/src/controllers/students.ts +++ b/frontend/src/controllers/students.ts @@ -1,17 +1,24 @@ import { BaseController } from "@/controllers/base-controller.ts"; -import type {StudentDTO} from "dwengo-1-common/src/interfaces/student"; -import type {ClassesResponse} from "@/controllers/classes.ts"; -import type {AssignmentsResponse} from "@/controllers/assignments.ts"; -import type {GroupsResponse} from "@/controllers/groups.ts"; -import type {SubmissionsResponse} from "@/controllers/submissions.ts"; -import type {QuestionsResponse} from "@/controllers/questions.ts"; -import type {ClassJoinRequestDTO} from "dwengo-1-common/src/interfaces/class-join-request"; - -export interface StudentsResponse { students: StudentDTO[] | string[] } -export interface StudentResponse { student: StudentDTO } -export interface JoinRequestsResponse { requests: ClassJoinRequestDTO[] } -export interface JoinRequestResponse { request: ClassJoinRequestDTO } +import type { StudentDTO } from "dwengo-1-common/src/interfaces/student"; +import type { ClassesResponse } from "@/controllers/classes.ts"; +import type { AssignmentsResponse } from "@/controllers/assignments.ts"; +import type { GroupsResponse } from "@/controllers/groups.ts"; +import type { SubmissionsResponse } from "@/controllers/submissions.ts"; +import type { QuestionsResponse } from "@/controllers/questions.ts"; +import type { ClassJoinRequestDTO } from "dwengo-1-common/src/interfaces/class-join-request"; +export interface StudentsResponse { + students: StudentDTO[] | string[]; +} +export interface StudentResponse { + student: StudentDTO; +} +export interface JoinRequestsResponse { + requests: ClassJoinRequestDTO[]; +} +export interface JoinRequestResponse { + request: ClassJoinRequestDTO; +} export class StudentController extends BaseController { constructor() { diff --git a/frontend/src/controllers/submissions.ts b/frontend/src/controllers/submissions.ts index 40816932..fa16cbaf 100644 --- a/frontend/src/controllers/submissions.ts +++ b/frontend/src/controllers/submissions.ts @@ -1,3 +1,5 @@ -import {type SubmissionDTO, SubmissionDTOId} from "dwengo-1-common/src/interfaces/submission"; +import { type SubmissionDTO, SubmissionDTOId } from "dwengo-1-common/src/interfaces/submission"; -export interface SubmissionsResponse { submissions: SubmissionDTO[] | SubmissionDTOId[] } +export interface SubmissionsResponse { + submissions: SubmissionDTO[] | SubmissionDTOId[]; +} diff --git a/frontend/src/controllers/teachers.ts b/frontend/src/controllers/teachers.ts index 192cac1c..d356e3a2 100644 --- a/frontend/src/controllers/teachers.ts +++ b/frontend/src/controllers/teachers.ts @@ -1,12 +1,15 @@ import { BaseController } from "@/controllers/base-controller.ts"; -import type {JoinRequestResponse, JoinRequestsResponse, StudentsResponse} from "@/controllers/students.ts"; -import type {QuestionsResponse} from "@/controllers/questions.ts"; -import type {ClassesResponse} from "@/controllers/classes.ts"; -import type {TeacherDTO} from "dwengo-1-common/src/interfaces/teacher"; - -export interface TeachersResponse { teachers: TeacherDTO[] | string[] } -export interface TeacherResponse { teacher: TeacherDTO } +import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts"; +import type { QuestionsResponse } from "@/controllers/questions.ts"; +import type { ClassesResponse } from "@/controllers/classes.ts"; +import type { TeacherDTO } from "dwengo-1-common/src/interfaces/teacher"; +export interface TeachersResponse { + teachers: TeacherDTO[] | string[]; +} +export interface TeacherResponse { + teacher: TeacherDTO; +} export class TeacherController extends BaseController { constructor() { @@ -45,8 +48,16 @@ export class TeacherController extends BaseController { return this.get(`/${username}/joinRequests/${classId}`); } - async updateStudentJoinRequest(teacherUsername: string, classId: string, studentUsername: string, accepted: boolean): Promise { - return this.put(`/${teacherUsername}/joinRequests/${classId}/${studentUsername}`, accepted); + async updateStudentJoinRequest( + teacherUsername: string, + classId: string, + studentUsername: string, + accepted: boolean, + ): Promise { + return this.put( + `/${teacherUsername}/joinRequests/${classId}/${studentUsername}`, + accepted, + ); } // GetInvitations(id: string) {return this.get<{ invitations: string[] }>(`/${id}/invitations`);} diff --git a/frontend/src/controllers/themes.ts b/frontend/src/controllers/themes.ts index 7804f2b7..c810bf93 100644 --- a/frontend/src/controllers/themes.ts +++ b/frontend/src/controllers/themes.ts @@ -1,5 +1,5 @@ import { BaseController } from "@/controllers/base-controller.ts"; -import type {Theme} from "dwengo-1-common/src/interfaces/theme"; +import type { Theme } from "dwengo-1-common/src/interfaces/theme"; export class ThemeController extends BaseController { constructor() { diff --git a/frontend/src/queries/students.ts b/frontend/src/queries/students.ts index 918bfc7c..d7876f5a 100644 --- a/frontend/src/queries/students.ts +++ b/frontend/src/queries/students.ts @@ -5,21 +5,21 @@ import { type UseMutationReturnType, useQuery, useQueryClient, - type UseQueryReturnType + type UseQueryReturnType, } from "@tanstack/vue-query"; import { type JoinRequestResponse, type JoinRequestsResponse, StudentController, type StudentResponse, - type StudentsResponse + type StudentsResponse, } from "@/controllers/students.ts"; -import type {ClassesResponse} from "@/controllers/classes.ts"; -import type {AssignmentsResponse} from "@/controllers/assignments.ts"; -import type {GroupsResponse} from "@/controllers/groups.ts"; -import type {SubmissionsResponse} from "@/controllers/submissions.ts"; -import type {QuestionsResponse} from "@/controllers/questions.ts"; -import type {StudentDTO} from "dwengo-1-common/src/interfaces/student"; +import type { ClassesResponse } from "@/controllers/classes.ts"; +import type { AssignmentsResponse } from "@/controllers/assignments.ts"; +import type { GroupsResponse } from "@/controllers/groups.ts"; +import type { SubmissionsResponse } from "@/controllers/submissions.ts"; +import type { QuestionsResponse } from "@/controllers/questions.ts"; +import type { StudentDTO } from "dwengo-1-common/src/interfaces/student"; const studentController = new StudentController(); @@ -52,9 +52,7 @@ export function studentJoinRequestQueryKey(username: string, classId: string): [ return ["student-join-request", username, classId]; } -export function useStudentsQuery( - full: MaybeRefOrGetter = true -): UseQueryReturnType { +export function useStudentsQuery(full: MaybeRefOrGetter = true): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentsQueryKey(toValue(full))), queryFn: async () => studentController.getAll(toValue(full)), @@ -62,7 +60,7 @@ export function useStudentsQuery( } export function useStudentQuery( - username: MaybeRefOrGetter + username: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentQueryKey(toValue(username)!)), @@ -73,7 +71,7 @@ export function useStudentQuery( export function useStudentClassesQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentClassesQueryKey(toValue(username)!, toValue(full))), @@ -84,7 +82,7 @@ export function useStudentClassesQuery( export function useStudentAssignmentsQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentAssignmentsQueryKey(toValue(username)!, toValue(full))), @@ -95,7 +93,7 @@ export function useStudentAssignmentsQuery( export function useStudentGroupsQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentGroupsQueryKeys(toValue(username)!, toValue(full))), @@ -105,7 +103,7 @@ export function useStudentGroupsQuery( } export function useStudentSubmissionsQuery( - username: MaybeRefOrGetter + username: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentSubmissionsQueryKey(toValue(username)!)), @@ -116,7 +114,7 @@ export function useStudentSubmissionsQuery( export function useStudentQuestionsQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = true + full: MaybeRefOrGetter = true, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentQuestionsQueryKey(toValue(username)!, toValue(full))), @@ -126,7 +124,7 @@ export function useStudentQuestionsQuery( } export function useStudentJoinRequestsQuery( - username: MaybeRefOrGetter + username: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentJoinRequestsQueryKey(toValue(username)!)), @@ -137,7 +135,7 @@ export function useStudentJoinRequestsQuery( export function useStudentJoinRequestQuery( username: MaybeRefOrGetter, - classId: MaybeRefOrGetter + classId: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => studentJoinRequestQueryKey(toValue(username)!, toValue(classId)!)), @@ -146,12 +144,7 @@ export function useStudentJoinRequestQuery( }); } -export function useCreateStudentMutation(): UseMutationReturnType< - StudentResponse, - Error, - StudentDTO, - unknown -> { +export function useCreateStudentMutation(): UseMutationReturnType { const queryClient = useQueryClient(); return useMutation({ @@ -162,12 +155,7 @@ export function useCreateStudentMutation(): UseMutationReturnType< }); } -export function useDeleteStudentMutation(): UseMutationReturnType< - StudentResponse, - Error, - string, - unknown -> { +export function useDeleteStudentMutation(): UseMutationReturnType { const queryClient = useQueryClient(); return useMutation({ @@ -190,7 +178,9 @@ export function useCreateJoinRequestMutation(): UseMutationReturnType< return useMutation({ mutationFn: async ({ username, classId }) => studentController.createJoinRequest(username, classId), onSuccess: async (newJoinRequest) => { - await queryClient.invalidateQueries({ queryKey: studentJoinRequestsQueryKey(newJoinRequest.request.requester) }); + await queryClient.invalidateQueries({ + queryKey: studentJoinRequestsQueryKey(newJoinRequest.request.requester), + }); }, }); } diff --git a/frontend/src/queries/teachers.ts b/frontend/src/queries/teachers.ts index b708b18b..6c7fc56e 100644 --- a/frontend/src/queries/teachers.ts +++ b/frontend/src/queries/teachers.ts @@ -1,18 +1,12 @@ import { computed, toValue } from "vue"; import type { MaybeRefOrGetter } from "vue"; -import { - useMutation, - useQuery, - useQueryClient, - UseMutationReturnType, - UseQueryReturnType, -} from "@tanstack/vue-query"; -import {TeacherController, type TeacherResponse, type TeachersResponse} from "@/controllers/teachers.ts"; -import type {ClassesResponse} from "@/controllers/classes.ts"; -import type {JoinRequestResponse, JoinRequestsResponse, StudentsResponse} from "@/controllers/students.ts"; -import type {QuestionsResponse} from "@/controllers/questions.ts"; -import type {TeacherDTO} from "dwengo-1-common/src/interfaces/teacher"; -import {studentJoinRequestQueryKey, studentJoinRequestsQueryKey} from "@/queries/students.ts"; +import { useMutation, useQuery, useQueryClient, UseMutationReturnType, UseQueryReturnType } from "@tanstack/vue-query"; +import { TeacherController, type TeacherResponse, type TeachersResponse } from "@/controllers/teachers.ts"; +import type { ClassesResponse } from "@/controllers/classes.ts"; +import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts"; +import type { QuestionsResponse } from "@/controllers/questions.ts"; +import type { TeacherDTO } from "dwengo-1-common/src/interfaces/teacher"; +import { studentJoinRequestQueryKey, studentJoinRequestsQueryKey } from "@/queries/students.ts"; const teacherController = new TeacherController(); @@ -37,10 +31,7 @@ function teacherQuestionsQueryKey(username: string, full: boolean): [string, str return ["teacher-questions", username, full]; } - -export function useTeachersQuery( - full: MaybeRefOrGetter = false -): UseQueryReturnType { +export function useTeachersQuery(full: MaybeRefOrGetter = false): UseQueryReturnType { return useQuery({ queryKey: computed(() => teachersQueryKey(toValue(full))), queryFn: async () => teacherController.getAll(toValue(full)), @@ -48,7 +39,7 @@ export function useTeachersQuery( } export function useTeacherQuery( - username: MaybeRefOrGetter + username: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => teacherQueryKey(toValue(username)!)), @@ -59,7 +50,7 @@ export function useTeacherQuery( export function useTeacherClassesQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = false + full: MaybeRefOrGetter = false, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => teacherClassesQueryKey(toValue(username)!, toValue(full))), @@ -70,7 +61,7 @@ export function useTeacherClassesQuery( export function useTeacherStudentsQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = false + full: MaybeRefOrGetter = false, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => teacherStudentsQueryKey(toValue(username)!, toValue(full))), @@ -81,7 +72,7 @@ export function useTeacherStudentsQuery( export function useTeacherQuestionsQuery( username: MaybeRefOrGetter, - full: MaybeRefOrGetter = false + full: MaybeRefOrGetter = false, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => teacherQuestionsQueryKey(toValue(username)!, toValue(full))), @@ -92,7 +83,7 @@ export function useTeacherQuestionsQuery( export function useTeacherJoinRequestsQuery( username: MaybeRefOrGetter, - classId: MaybeRefOrGetter + classId: MaybeRefOrGetter, ): UseQueryReturnType { return useQuery({ queryKey: computed(() => JOIN_REQUESTS_QUERY_KEY(toValue(username)!, toValue(classId)!)), @@ -101,12 +92,7 @@ export function useTeacherJoinRequestsQuery( }); } -export function useCreateTeacherMutation(): UseMutationReturnType< - TeacherResponse, - Error, - TeacherDTO, - unknown -> { +export function useCreateTeacherMutation(): UseMutationReturnType { const queryClient = useQueryClient(); return useMutation({ @@ -117,12 +103,7 @@ export function useCreateTeacherMutation(): UseMutationReturnType< }); } -export function useDeleteTeacherMutation(): UseMutationReturnType< - TeacherResponse, - Error, - string, - unknown -> { +export function useDeleteTeacherMutation(): UseMutationReturnType { const queryClient = useQueryClient(); return useMutation({ diff --git a/frontend/src/queries/themes.ts b/frontend/src/queries/themes.ts index dcd251e7..75a6d876 100644 --- a/frontend/src/queries/themes.ts +++ b/frontend/src/queries/themes.ts @@ -1,7 +1,7 @@ -import {useQuery, type UseQueryReturnType} from "@tanstack/vue-query"; +import { useQuery, type UseQueryReturnType } from "@tanstack/vue-query"; import { type MaybeRefOrGetter, toValue } from "vue"; import { ThemeController } from "@/controllers/themes.ts"; -import type {Theme} from "dwengo-1-common/src/interfaces/theme"; +import type { Theme } from "dwengo-1-common/src/interfaces/theme"; const themeController = new ThemeController(); @@ -16,7 +16,9 @@ export function useThemeQuery(language: MaybeRefOrGetter): U }); } -export function useThemeHruidsQuery(themeKey: MaybeRefOrGetter): UseQueryReturnType { +export function useThemeHruidsQuery( + themeKey: MaybeRefOrGetter, +): UseQueryReturnType { return useQuery({ queryKey: ["theme-hruids", themeKey], queryFn: async () => themeController.getHruidsByKey(toValue(themeKey)!), diff --git a/tsconfig.json b/tsconfig.json index 29c81809..b41449cf 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -120,6 +120,6 @@ // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ "skipLibCheck": true, /* Skip type checking all .d.ts files. */ - "resolveJsonModule": true, + "resolveJsonModule": true } }