style: fix linting issues met Prettier

This commit is contained in:
Lint Action 2025-03-30 21:24:37 +00:00
parent 9895d22521
commit ee5f69cbc8
20 changed files with 188 additions and 192 deletions

View file

@ -33,12 +33,12 @@ export class TeacherController extends BaseController {
return this.get<{ questions: any[] }>(`/${username}/questions`, { full });
}
getStudentJoinRequests(username: string, classId: string){
getStudentJoinRequests(username: string, classId: string) {
return this.get<{ joinRequests: any[] }>(`/${username}/joinRequests/${classId}`);
}
updateStudentJoinRequest(teacherUsername: string, classId: string, studentUsername: string, accepted: boolean){
return this.put(`/${teacherUsername}/joinRequests/${classId}/${studentUsername}`, accepted)
updateStudentJoinRequest(teacherUsername: string, classId: string, studentUsername: string, accepted: boolean) {
return this.put(`/${teacherUsername}/joinRequests/${classId}/${studentUsername}`, accepted);
}
// GetInvitations(id: string) {return this.get<{ invitations: string[] }>(`/${id}/invitations`);}

View file

@ -1,21 +1,20 @@
import { computed, toValue } from "vue";
import type { MaybeRefOrGetter } from "vue";
import {useMutation, useQuery, useQueryClient} from "@tanstack/vue-query";
import {StudentController} from "@/controllers/students.ts";
import { useMutation, useQuery, useQueryClient } from "@tanstack/vue-query";
import { StudentController } from "@/controllers/students.ts";
const studentController = new StudentController();
/** 🔑 Query keys */
const STUDENTS_QUERY_KEY = (full: boolean) => ['students', full];
const STUDENT_QUERY_KEY = (username: string) => ['student', username];
const STUDENT_CLASSES_QUERY_KEY = (username: string, full: boolean) => ['student-classes', username, full];
const STUDENT_ASSIGNMENTS_QUERY_KEY = (username: string, full: boolean) => ['student-assignments', username, full];
const STUDENT_GROUPS_QUERY_KEY = (username: string, full: boolean) => ['student-groups', username, full];
const STUDENT_SUBMISSIONS_QUERY_KEY = (username: string) => ['student-submissions', username];
const STUDENT_QUESTIONS_QUERY_KEY = (username: string, full: boolean) => ['student-questions', username, full];
const STUDENTS_QUERY_KEY = (full: boolean) => ["students", full];
const STUDENT_QUERY_KEY = (username: string) => ["student", username];
const STUDENT_CLASSES_QUERY_KEY = (username: string, full: boolean) => ["student-classes", username, full];
const STUDENT_ASSIGNMENTS_QUERY_KEY = (username: string, full: boolean) => ["student-assignments", username, full];
const STUDENT_GROUPS_QUERY_KEY = (username: string, full: boolean) => ["student-groups", username, full];
const STUDENT_SUBMISSIONS_QUERY_KEY = (username: string) => ["student-submissions", username];
const STUDENT_QUESTIONS_QUERY_KEY = (username: string, full: boolean) => ["student-questions", username, full];
const STUDENT_JOIN_REQUESTS_QUERY_KEY = (username: string) => ["student-join-requests", username];
export function useStudentsQuery(full: MaybeRefOrGetter<boolean> = true) {
return useQuery({
queryKey: computed(() => STUDENTS_QUERY_KEY(toValue(full))),
@ -31,7 +30,10 @@ export function useStudentQuery(username: MaybeRefOrGetter<string | undefined>)
});
}
export function useStudentClassesQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = true) {
export function useStudentClassesQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = true,
) {
return useQuery({
queryKey: computed(() => STUDENT_CLASSES_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => studentController.getClasses(toValue(username)!, toValue(full)),
@ -39,7 +41,10 @@ export function useStudentClassesQuery(username: MaybeRefOrGetter<string | undef
});
}
export function useStudentAssignmentsQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = true) {
export function useStudentAssignmentsQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = true,
) {
return useQuery({
queryKey: computed(() => STUDENT_ASSIGNMENTS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => studentController.getAssignments(toValue(username)!, toValue(full)),
@ -47,7 +52,10 @@ export function useStudentAssignmentsQuery(username: MaybeRefOrGetter<string | u
});
}
export function useStudentGroupsQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = true) {
export function useStudentGroupsQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = true,
) {
return useQuery({
queryKey: computed(() => STUDENT_GROUPS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => studentController.getGroups(toValue(username)!, toValue(full)),
@ -63,7 +71,10 @@ export function useStudentSubmissionsQuery(username: MaybeRefOrGetter<string | u
});
}
export function useStudentQuestionsQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = true) {
export function useStudentQuestionsQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = true,
) {
return useQuery({
queryKey: computed(() => STUDENT_QUESTIONS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => studentController.getQuestions(toValue(username)!, toValue(full)),
@ -77,7 +88,7 @@ export function useCreateStudentMutation() {
return useMutation({
mutationFn: (data: any) => studentController.createStudent(data),
onSuccess: () => {
await queryClient.invalidateQueries({ queryKey: ['students'] });
await queryClient.invalidateQueries({ queryKey: ["students"] });
},
onError: (err) => {
alert("Create student failed:", err);
@ -94,7 +105,7 @@ export function useDeleteStudentMutation() {
return useMutation({
mutationFn: (username: string) => studentController.deleteStudent(username),
onSuccess: () => {
await queryClient.invalidateQueries({ queryKey: ['students'] });
await queryClient.invalidateQueries({ queryKey: ["students"] });
},
onError: (err) => {
alert("Delete student failed:", err);
@ -145,7 +156,3 @@ export function useDeleteJoinRequestMutation() {
},
});
}

View file

@ -1,7 +1,7 @@
import { computed, toValue } from "vue";
import type { MaybeRefOrGetter } from "vue";
import { useQuery, useMutation, useQueryClient } from "@tanstack/vue-query";
import {TeacherController} from "@/controllers/teachers.ts";
import { TeacherController } from "@/controllers/teachers.ts";
const teacherController = new TeacherController();
@ -28,7 +28,10 @@ export function useTeacherQuery(username: MaybeRefOrGetter<string | undefined>)
});
}
export function useTeacherClassesQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = false) {
export function useTeacherClassesQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = false,
) {
return useQuery({
queryKey: computed(() => TEACHER_CLASSES_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => teacherController.getClasses(toValue(username)!, toValue(full)),
@ -36,7 +39,10 @@ export function useTeacherClassesQuery(username: MaybeRefOrGetter<string | undef
});
}
export function useTeacherStudentsQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = false) {
export function useTeacherStudentsQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = false,
) {
return useQuery({
queryKey: computed(() => TEACHER_STUDENTS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => teacherController.getStudents(toValue(username)!, toValue(full)),
@ -44,7 +50,10 @@ export function useTeacherStudentsQuery(username: MaybeRefOrGetter<string | unde
});
}
export function useTeacherQuestionsQuery(username: MaybeRefOrGetter<string | undefined>, full: MaybeRefOrGetter<boolean> = false) {
export function useTeacherQuestionsQuery(
username: MaybeRefOrGetter<string | undefined>,
full: MaybeRefOrGetter<boolean> = false,
) {
return useQuery({
queryKey: computed(() => TEACHER_QUESTIONS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => teacherController.getQuestions(toValue(username)!, toValue(full)),
@ -52,7 +61,10 @@ export function useTeacherQuestionsQuery(username: MaybeRefOrGetter<string | und
});
}
export function useTeacherJoinRequestsQuery(username: MaybeRefOrGetter<string | undefined>, classId: MaybeRefOrGetter<string | undefined>) {
export function useTeacherJoinRequestsQuery(
username: MaybeRefOrGetter<string | undefined>,
classId: MaybeRefOrGetter<string | undefined>,
) {
return useQuery({
queryKey: computed(() => JOIN_REQUESTS_QUERY_KEY(toValue(username)!, toValue(classId)!)),
queryFn: () => teacherController.getStudentJoinRequests(toValue(username)!, toValue(classId)!),
@ -66,7 +78,7 @@ export function useCreateTeacherMutation() {
return useMutation({
mutationFn: (data: any) => teacherController.createTeacher(data),
onSuccess: () => {
await queryClient.invalidateQueries({ queryKey: ['teachers'] });
await queryClient.invalidateQueries({ queryKey: ["teachers"] });
},
onError: (err) => {
alert("Create teacher failed:", err);
@ -80,7 +92,7 @@ export function useDeleteTeacherMutation() {
return useMutation({
mutationFn: (username: string) => teacherController.deleteTeacher(username),
onSuccess: () => {
await queryClient.invalidateQueries({ queryKey: ['teachers'] });
await queryClient.invalidateQueries({ queryKey: ["teachers"] });
},
onError: (err) => {
alert("Delete teacher failed:", err);
@ -92,7 +104,12 @@ export function useUpdateJoinRequestMutation() {
const queryClient = useQueryClient();
return useMutation({
mutationFn: ({ teacherUsername, classId, studentUsername, accepted }: {
mutationFn: ({
teacherUsername,
classId,
studentUsername,
accepted,
}: {
teacherUsername: string;
classId: string;
studentUsername: string;

View file

@ -1,6 +1,6 @@
import { useQuery } from "@tanstack/vue-query";
import { type MaybeRefOrGetter, toValue } from "vue";
import {ThemeController} from "@/controllers/themes.ts";
import { ThemeController } from "@/controllers/themes.ts";
const themeController = new ThemeController();

View file

@ -1,20 +1,20 @@
import { describe, it, expect, beforeAll } from 'vitest';
import {StudentController} from "../../src/controllers/students";
import { describe, it, expect, beforeAll } from "vitest";
import { StudentController } from "../../src/controllers/students";
const controller = new StudentController();
describe('StudentController', () => {
describe("StudentController", () => {
const newStudent = {
username: 'teststudent1',
firstName: 'Testy',
lastName: 'McTestface',
username: "teststudent1",
firstName: "Testy",
lastName: "McTestface",
};
beforeAll(() => {
// Start backend
});
it('creates a student and fetches it by username', async () => {
it("creates a student and fetches it by username", async () => {
// Create student
await controller.createStudent(newStudent);
@ -29,7 +29,6 @@ describe('StudentController', () => {
expect(student.firstName).toBe(newStudent.firstName);
expect(student.lastName).toBe(newStudent.lastName);
await controller.deleteStudent(newStudent.username);
});
});

View file

@ -1,20 +1,20 @@
import { describe, it, expect, beforeAll } from 'vitest';
import {TeacherController} from "../../src/controllers/teachers";
import { describe, it, expect, beforeAll } from "vitest";
import { TeacherController } from "../../src/controllers/teachers";
const controller = new TeacherController();
describe('TeacherController', () => {
describe("TeacherController", () => {
const newTeacher = {
username: 'testteacher3',
firstName: 'Testy',
lastName: 'McTestface',
username: "testteacher3",
firstName: "Testy",
lastName: "McTestface",
};
beforeAll(() => {
// Start backend
});
it('creates a student and fetches it by username', async () => {
it("creates a student and fetches it by username", async () => {
// Create student
await controller.createTeacher(newTeacher);
@ -29,7 +29,6 @@ describe('TeacherController', () => {
expect(teacher.firstName).toBe(newTeacher.firstName);
expect(teacher.lastName).toBe(newTeacher.lastName);
await controller.deleteTeacher(newTeacher.username);
});
});