fix: merge + fixes
This commit is contained in:
parent
7d8a0fcbb2
commit
3c1eb82ce3
20 changed files with 52 additions and 41 deletions
|
@ -1,4 +1,4 @@
|
|||
import type { AssignmentDTO } from "dwengo-1-common/src/interfaces/assignment";
|
||||
import type { AssignmentDTO } from "@dwengo-1/interfaces/assignment";
|
||||
|
||||
export interface AssignmentsResponse {
|
||||
assignments: AssignmentDTO[];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import type { ClassDTO } from "dwengo-1-common/src/interfaces/class";
|
||||
import type { ClassDTO } from "@dwengo-1/interfaces/class";
|
||||
|
||||
export interface ClassesResponse {
|
||||
classes: ClassDTO[] | string[];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import type { GroupDTO } from "dwengo-1-common/src/interfaces/group";
|
||||
import type { GroupDTO } from "@dwengo-1/interfaces/group";
|
||||
|
||||
export interface GroupsResponse {
|
||||
groups: GroupDTO[];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import type { QuestionDTO, QuestionId } from "dwengo-1-common/src/interfaces/question";
|
||||
import type { QuestionDTO, QuestionId } from "@dwengo-1/interfaces/question";
|
||||
|
||||
export interface QuestionsResponse {
|
||||
questions: QuestionDTO[] | QuestionId[];
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
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";
|
||||
import type { StudentDTO } from "@dwengo-1/interfaces/student";
|
||||
import type { ClassJoinRequestDTO } from "@dwengo-1/interfaces/class-join-request";
|
||||
|
||||
export interface StudentsResponse {
|
||||
students: StudentDTO[] | string[];
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
import { type SubmissionDTO, SubmissionDTOId } from "dwengo-1-common/src/interfaces/submission";
|
||||
import { type SubmissionDTO, SubmissionDTOId } from "@dwengo-1/interfaces/submission";
|
||||
|
||||
export interface SubmissionsResponse {
|
||||
submissions: SubmissionDTO[] | SubmissionDTOId[];
|
||||
|
|
|
@ -2,7 +2,7 @@ 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";
|
||||
import type { TeacherDTO } from "@dwengo-1/interfaces/teacher";
|
||||
|
||||
export interface TeachersResponse {
|
||||
teachers: TeacherDTO[] | string[];
|
||||
|
|
|
@ -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/interfaces/theme";
|
||||
|
||||
export class ThemeController extends BaseController {
|
||||
constructor() {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
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 "../../../common/src/interfaces/theme";
|
||||
|
||||
const themeController = new ThemeController();
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue