tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
Archived
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

refactor: theme type

Browse source
This commit is contained in:
Gabriellvl 2025-04-02 14:29:07 +02:00
parent dadde1651b
commit 30c253c43c
5 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
backend/src/data/themes.ts
View file

@ -1,7 +1,4 @@
export interface Theme { import {Theme} from "dwengo-1-common/src/interfaces/theme";
title: string;
hruids: string[];
}
export const themes: Theme[] = [ export const themes: Theme[] = [
{ {

4
common/src/interfaces/theme.d.ts vendored Normal file
View file

@ -0,0 +1,4 @@
export interface Theme {
title: string;
hruids: string[];
}

3
frontend/src/controllers/themes.ts
View file

@ -1,11 +1,12 @@
import { BaseController } from "@/controllers/base-controller.ts"; import { BaseController } from "@/controllers/base-controller.ts";
import type {Theme} from "dwengo-1-common/src/interfaces/theme";
export class ThemeController extends BaseController { export class ThemeController extends BaseController {
constructor() { constructor() {
super("theme"); super("theme");
} }
async getAll(language: string | null = null): Promise<unknown> { async getAll(language: string | null = null): Promise<Theme[]> {
const query = language ? { language } : undefined; const query = language ? { language } : undefined;
return this.get("/", query); return this.get("/", query);
} }

18
frontend/src/queries/teachers.ts
View file

@ -43,7 +43,7 @@ export function useTeachersQuery(
): UseQueryReturnType<TeachersResponse, Error> { ): UseQueryReturnType<TeachersResponse, Error> {
return useQuery({ return useQuery({
queryKey: computed(() => TEACHERS_QUERY_KEY(toValue(full))), queryKey: computed(() => TEACHERS_QUERY_KEY(toValue(full))),
queryFn: () => teacherController.getAll(toValue(full)), queryFn: async () => teacherController.getAll(toValue(full)),
}); });
} }
@ -52,7 +52,7 @@ export function useTeacherQuery(
): UseQueryReturnType<TeacherResponse, Error> { ): UseQueryReturnType<TeacherResponse, Error> {
return useQuery({ return useQuery({
queryKey: computed(() => TEACHER_QUERY_KEY(toValue(username)!)), queryKey: computed(() => TEACHER_QUERY_KEY(toValue(username)!)),
queryFn: () => teacherController.getByUsername(toValue(username)!), queryFn: async () => teacherController.getByUsername(toValue(username)!),
enabled: () => Boolean(toValue(username)), enabled: () => Boolean(toValue(username)),
}); });
} }
@ -63,7 +63,7 @@ export function useTeacherClassesQuery(
): UseQueryReturnType<ClassesResponse, Error> { ): UseQueryReturnType<ClassesResponse, Error> {
return useQuery({ return useQuery({
queryKey: computed(() => TEACHER_CLASSES_QUERY_KEY(toValue(username)!, toValue(full))), queryKey: computed(() => TEACHER_CLASSES_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => teacherController.getClasses(toValue(username)!, toValue(full)), queryFn: async () => teacherController.getClasses(toValue(username)!, toValue(full)),
enabled: () => Boolean(toValue(username)), enabled: () => Boolean(toValue(username)),
}); });
} }
@ -74,7 +74,7 @@ export function useTeacherStudentsQuery(
): UseQueryReturnType<StudentsResponse, Error> { ): UseQueryReturnType<StudentsResponse, Error> {
return useQuery({ return useQuery({
queryKey: computed(() => TEACHER_STUDENTS_QUERY_KEY(toValue(username)!, toValue(full))), queryKey: computed(() => TEACHER_STUDENTS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => teacherController.getStudents(toValue(username)!, toValue(full)), queryFn: async () => teacherController.getStudents(toValue(username)!, toValue(full)),
enabled: () => Boolean(toValue(username)), enabled: () => Boolean(toValue(username)),
}); });
} }
@ -85,7 +85,7 @@ export function useTeacherQuestionsQuery(
): UseQueryReturnType<QuestionsResponse, Error> { ): UseQueryReturnType<QuestionsResponse, Error> {
return useQuery({ return useQuery({
queryKey: computed(() => TEACHER_QUESTIONS_QUERY_KEY(toValue(username)!, toValue(full))), queryKey: computed(() => TEACHER_QUESTIONS_QUERY_KEY(toValue(username)!, toValue(full))),
queryFn: () => teacherController.getQuestions(toValue(username)!, toValue(full)), queryFn: async () => teacherController.getQuestions(toValue(username)!, toValue(full)),
enabled: () => Boolean(toValue(username)), enabled: () => Boolean(toValue(username)),
}); });
} }
@ -96,7 +96,7 @@ export function useTeacherJoinRequestsQuery(
): UseQueryReturnType<JoinRequestsResponse, Error> { ): UseQueryReturnType<JoinRequestsResponse, Error> {
return useQuery({ return useQuery({
queryKey: computed(() => JOIN_REQUESTS_QUERY_KEY(toValue(username)!, toValue(classId)!)), queryKey: computed(() => JOIN_REQUESTS_QUERY_KEY(toValue(username)!, toValue(classId)!)),
queryFn: () => teacherController.getStudentJoinRequests(toValue(username)!, toValue(classId)!), queryFn: async () => teacherController.getStudentJoinRequests(toValue(username)!, toValue(classId)!),
enabled: () => Boolean(toValue(username)) && Boolean(toValue(classId)), enabled: () => Boolean(toValue(username)) && Boolean(toValue(classId)),
}); });
} }
@ -110,7 +110,7 @@ export function useCreateTeacherMutation(): UseMutationReturnType<
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: (data: TeacherDTO) => teacherController.createTeacher(data), mutationFn: async (data: TeacherDTO) => teacherController.createTeacher(data),
onSuccess: async () => { onSuccess: async () => {
await queryClient.invalidateQueries({ queryKey: ["teachers"] }); await queryClient.invalidateQueries({ queryKey: ["teachers"] });
}, },
@ -126,7 +126,7 @@ export function useDeleteTeacherMutation(): UseMutationReturnType<
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: (username: string) => teacherController.deleteTeacher(username), mutationFn: async (username: string) => teacherController.deleteTeacher(username),
onSuccess: async (deletedTeacher) => { onSuccess: async (deletedTeacher) => {
await queryClient.invalidateQueries({ queryKey: ["teachers"] }); await queryClient.invalidateQueries({ queryKey: ["teachers"] });
await queryClient.invalidateQueries({ queryKey: TEACHER_QUERY_KEY(deletedTeacher.teacher.username) }); await queryClient.invalidateQueries({ queryKey: TEACHER_QUERY_KEY(deletedTeacher.teacher.username) });
@ -143,7 +143,7 @@ export function useUpdateJoinRequestMutation(): UseMutationReturnType<
const queryClient = useQueryClient(); const queryClient = useQueryClient();
return useMutation({ return useMutation({
mutationFn: ({ teacherUsername, classId, studentUsername, accepted }) => mutationFn: async ({ teacherUsername, classId, studentUsername, accepted }) =>
teacherController.updateStudentJoinRequest(teacherUsername, classId, studentUsername, accepted), teacherController.updateStudentJoinRequest(teacherUsername, classId, studentUsername, accepted),
onSuccess: async (deletedJoinRequest) => { onSuccess: async (deletedJoinRequest) => {
const username = deletedJoinRequest.request.requester; const username = deletedJoinRequest.request.requester;

7
frontend/src/queries/themes.ts
View file

@ -1,10 +1,11 @@
import { useQuery } from "@tanstack/vue-query"; import {useQuery, type UseQueryReturnType} from "@tanstack/vue-query";
import { type MaybeRefOrGetter, toValue } from "vue"; import { type MaybeRefOrGetter, toValue } from "vue";
import { ThemeController } from "@/controllers/themes.ts"; import { ThemeController } from "@/controllers/themes.ts";
import type {Theme} from "dwengo-1-common/src/interfaces/theme";
const themeController = new ThemeController(); const themeController = new ThemeController();
export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>) { export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>): UseQueryReturnType<Theme[], Error> {
return useQuery({ return useQuery({
queryKey: ["themes", language], queryKey: ["themes", language],
queryFn: async () => { queryFn: async () => {
@ -15,7 +16,7 @@ export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>) {
}); });
} }
export function useThemeHruidsQuery(themeKey: MaybeRefOrGetter<string | undefined>) { export function useThemeHruidsQuery(themeKey: MaybeRefOrGetter<string | undefined>): UseQueryReturnType<string[], Error> {
return useQuery({ return useQuery({
queryKey: ["theme-hruids", themeKey], queryKey: ["theme-hruids", themeKey],
queryFn: async () => themeController.getHruidsByKey(toValue(themeKey)!), queryFn: async () => themeController.getHruidsByKey(toValue(themeKey)!),