fix: imports + merge
This commit is contained in:
		
							parent
							
								
									084f4fcdbd
								
							
						
					
					
						commit
						94e25fbcde
					
				
					 3 changed files with 5 additions and 5 deletions
				
			
		|  | @ -19,7 +19,7 @@ import type { AssignmentsResponse } from "@/controllers/assignments.ts"; | ||||||
| import type { GroupsResponse } from "@/controllers/groups.ts"; | import type { GroupsResponse } from "@/controllers/groups.ts"; | ||||||
| import type { SubmissionsResponse } from "@/controllers/submissions.ts"; | import type { SubmissionsResponse } from "@/controllers/submissions.ts"; | ||||||
| import type { QuestionsResponse } from "@/controllers/questions.ts"; | import type { QuestionsResponse } from "@/controllers/questions.ts"; | ||||||
| import type { StudentDTO } from "dwengo-1-common/src/interfaces/student"; | import type { StudentDTO } from "@dwengo-1/interfaces/student"; | ||||||
| 
 | 
 | ||||||
| const studentController = new StudentController(); | const studentController = new StudentController(); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ import { TeacherController, type TeacherResponse, type TeachersResponse } from " | ||||||
| import type { ClassesResponse } from "@/controllers/classes.ts"; | import type { ClassesResponse } from "@/controllers/classes.ts"; | ||||||
| import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts"; | import type { JoinRequestResponse, JoinRequestsResponse, StudentsResponse } from "@/controllers/students.ts"; | ||||||
| import type { QuestionsResponse } from "@/controllers/questions.ts"; | import type { QuestionsResponse } from "@/controllers/questions.ts"; | ||||||
| import type { TeacherDTO } from "dwengo-1-common/src/interfaces/teacher"; | import type { TeacherDTO } from "@dwengo-1/interfaces/teacher"; | ||||||
| import { studentJoinRequestQueryKey, studentJoinRequestsQueryKey } from "@/queries/students.ts"; | import { studentJoinRequestQueryKey, studentJoinRequestsQueryKey } from "@/queries/students.ts"; | ||||||
| 
 | 
 | ||||||
| const teacherController = new TeacherController(); | const teacherController = new TeacherController(); | ||||||
|  |  | ||||||
|  | @ -1,9 +1,9 @@ | ||||||
| import { useQuery, type UseQueryReturnType } 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 type { Theme } from "@dwengo-1/interfaces/theme"; | ||||||
| import type { Theme } from "../../../common/src/interfaces/theme"; | import {getThemeController} from "@/controllers/controllers.ts"; | ||||||
| 
 | 
 | ||||||
| const themeController = new ThemeController(); | const themeController = getThemeController(); | ||||||
| 
 | 
 | ||||||
| export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>): UseQueryReturnType<Theme[], Error> { | export function useThemeQuery(language: MaybeRefOrGetter<string | undefined>): UseQueryReturnType<Theme[], Error> { | ||||||
|     return useQuery({ |     return useQuery({ | ||||||
|  |  | ||||||
		Reference in a new issue
	
	 Gabriellvl
						Gabriellvl