Merge remote-tracking branch 'origin/dev' into feat/user-routes
# Conflicts: # backend/src/controllers/students.ts # backend/src/controllers/teachers.ts # backend/src/data/classes/class-join-request-repository.ts # backend/src/routes/students.ts # backend/src/services/students.ts # backend/src/services/teachers.ts # backend/tests/test_assets/users/students.testdata.ts # frontend/src/controllers/controllers.ts # frontend/src/queries/themes.ts
This commit is contained in:
commit
7f189188e8
139 changed files with 3594 additions and 3063 deletions
|
@ -4,8 +4,8 @@ import { ThemeController } from "@/controllers/themes.ts";
|
|||
|
||||
const themeController = new ThemeController();
|
||||
|
||||
export const useThemeQuery = (language: MaybeRefOrGetter<string>) =>
|
||||
useQuery({
|
||||
export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>){
|
||||
return useQuery({
|
||||
queryKey: ["themes", language],
|
||||
queryFn: () => {
|
||||
const lang = toValue(language);
|
||||
|
@ -13,10 +13,12 @@ export const useThemeQuery = (language: MaybeRefOrGetter<string>) =>
|
|||
},
|
||||
enabled: () => Boolean(toValue(language)),
|
||||
});
|
||||
}
|
||||
|
||||
export const useThemeHruidsQuery = (themeKey: string | null) =>
|
||||
useQuery({
|
||||
export function useThemeHruidsQuery(themeKey: MaybeRefOrGetter<string | undefined>){
|
||||
return useQuery({
|
||||
queryKey: ["theme-hruids", themeKey],
|
||||
queryFn: () => themeController.getHruidsByKey(themeKey!),
|
||||
queryFn: () => themeController.getHruidsByKey(toValue(themeKey)!),
|
||||
enabled: Boolean(themeKey),
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue