diff --git a/src/App.tsx b/src/App.tsx index f9fe6d3..05debee 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -13,6 +13,7 @@ import KakaoCallbackPage from '@/pages/common/KakaoCallbackPage'; import PrivateRoute from '@/widgets/private-route/ui/PrivateRoute'; import {useSyncUserRole} from '@/features/auth/sync-user-role/model/useSyncUserRole'; import UnitEditorPage from '@/pages/unit-editor/UnitEditorPage'; +import AssignmentManagePage from '@/pages/manage-assignment/AssignmentManagePage'; const AppRoutes = () => { useSyncUserRole(); @@ -37,7 +38,10 @@ const AppRoutes = () => { }> } /> - {/* } /> */} + } + /> } diff --git a/src/entities/assignment/api/assignmentApi.ts b/src/entities/assignment/api/assignmentApi.ts index 23940b5..c8d9329 100644 --- a/src/entities/assignment/api/assignmentApi.ts +++ b/src/entities/assignment/api/assignmentApi.ts @@ -1,8 +1,45 @@ -import type {DashboardScheduleListResponse} from '@/entities/course/model/types'; +import {z} from 'zod'; import {privateAxios} from '@/shared/api/axiosInstance'; +import {apiResponseSchema} from '@/shared/model/schemas'; +import {assignmentScheduleSchema} from '../model/schemas'; +import {assignmentCourseSchema} from '@/entities/course/model/schemas'; -export const getAssignmentSchedules = - async (): Promise => { - const response = await privateAxios.get('/assignments/schedule'); - return response.data; - }; +// 과제 일정 조회 API +export const getAssignmentSchedules = async () => { + const response = await privateAxios.get('/assignments/schedule'); + return apiResponseSchema( + z.object({count: z.number(), schedule: z.array(assignmentScheduleSchema)}) + ).parse(response.data); +}; + +// 전체 과제 목록 조회 API +export const getAllAssignments = async () => { + const response = await privateAxios.get('/assignments/my'); + return apiResponseSchema( + z.object({ + count: z.number(), + assignments: z.array( + z + .object({assignmentId: z.number(), title: z.string()}) + .transform(({assignmentId, title}) => ({id: assignmentId, title})) + ), + }) + ).parse(response.data); +}; + +// 강의별 과제 목록 조회 API +export const getAssignmentsByCourse = async (courseId: number) => { + const response = await privateAxios.get(`/courses/${courseId}/assignments`); + return apiResponseSchema( + z.object({ + count: z.number(), + courses: z.array(assignmentCourseSchema), + }) + ).parse(response.data); +}; + +// 과제 삭제 API +export const deleteAssignment = async (assignmentId: number) => { + const response = await privateAxios.delete(`/assignments/${assignmentId}`); + return apiResponseSchema(z.string()).parse(response.data); +}; diff --git a/src/entities/assignment/api/assignmentMutations.ts b/src/entities/assignment/api/assignmentMutations.ts new file mode 100644 index 0000000..5ce85f1 --- /dev/null +++ b/src/entities/assignment/api/assignmentMutations.ts @@ -0,0 +1,8 @@ +import {deleteAssignment} from './assignmentApi'; + +export const assignmentMutations = { + deleteAssignment: { + mutationKey: ['deleteAssignment'], + mutationFn: (assignmentId: number) => deleteAssignment(assignmentId), + }, +}; diff --git a/src/entities/assignment/api/assignmentQueries.ts b/src/entities/assignment/api/assignmentQueries.ts new file mode 100644 index 0000000..d2554d8 --- /dev/null +++ b/src/entities/assignment/api/assignmentQueries.ts @@ -0,0 +1,30 @@ +import {queryOptions} from '@tanstack/react-query'; +import { + getAllAssignments, + getAssignmentsByCourse, + getAssignmentSchedules, +} from './assignmentApi'; + +export const assignmentQueries = { + // 과제 일정 조회 쿼리 옵션 + getAssignmentSchedules: () => + queryOptions({ + queryKey: ['schedules'], + queryFn: getAssignmentSchedules, + }), + + // 전체 과제 목록 조회 쿼리 옵션 + getAllAssignments: () => + queryOptions({ + queryKey: ['assignments'], + queryFn: getAllAssignments, + }), + + // 강의별 과제 목록 조회 쿼리 옵션 + getAssignmentsByCourse: (courseId: number) => + queryOptions({ + queryKey: ['courses', courseId, 'assignments'], + queryFn: () => getAssignmentsByCourse(courseId), + enabled: !!courseId, // courseId가 있을 때만 쿼리 실행 + }), +}; diff --git a/src/entities/assignment/api/assignmentQueryOptions.ts b/src/entities/assignment/api/assignmentQueryOptions.ts deleted file mode 100644 index 89af95e..0000000 --- a/src/entities/assignment/api/assignmentQueryOptions.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {queryOptions} from '@tanstack/react-query'; -import {getAssignmentSchedules} from './assignmentApi'; - -export default function assignmentQueryOptions() { - return queryOptions({ - queryKey: ['schedules'], - queryFn: getAssignmentSchedules, - }); -} diff --git a/src/entities/assignment/model/schemas.ts b/src/entities/assignment/model/schemas.ts new file mode 100644 index 0000000..66da9d5 --- /dev/null +++ b/src/entities/assignment/model/schemas.ts @@ -0,0 +1,20 @@ +import {submissionStatusSchema} from '@/shared/model/schemas'; +import z from 'zod'; + +export const assignmentSchema = z.object({ + id: z.number(), + title: z.string(), + submittedStatus: submissionStatusSchema.optional(), +}); + +export const assignmentScheduleSchema = z.object({ + date: z.string(), + remainingDays: z.number(), + assignments: z.array( + z.object({ + course: z.string(), + section: z.string(), + assignment: z.string(), + }) + ), +}); diff --git a/src/entities/assignment/model/types.ts b/src/entities/assignment/model/types.ts index 331c549..543ccf8 100644 --- a/src/entities/assignment/model/types.ts +++ b/src/entities/assignment/model/types.ts @@ -1,10 +1,5 @@ -import type {SubmissionStatus} from '@/shared/model/common'; +import type {z} from 'zod'; +import type {assignmentScheduleSchema, assignmentSchema} from './schemas'; -/** - * 과제(Assignment) 인터페이스 정의 - */ -export interface Assignment { - id: number; - title: string; - submittedStatus?: SubmissionStatus; -} +export type Assignment = z.infer; +export type AssignmentSchedule = z.infer; diff --git a/src/entities/auth/api/authApi.ts b/src/entities/auth/api/authApi.ts index 72c46a2..da80a9b 100644 --- a/src/entities/auth/api/authApi.ts +++ b/src/entities/auth/api/authApi.ts @@ -1,14 +1,6 @@ import {publicAxios} from '@/shared/api/axiosInstance'; -import type {UserType} from '@/shared/model/common'; - -interface KakaoLoginApiResponse { - memberId: number; - name: string; - role: 'ADMIN' | 'USER'; - studentId: string; - email: string; - accessToken: string; -} +import type {UserType} from '@/shared/model/type'; +import {kakaoLoginResponseSchema} from '../model/schemas'; export const kakaoLogin = async ( oAuthToken: string, @@ -21,7 +13,7 @@ export const kakaoLogin = async ( ...(studentId && {studentId}), OAuthToken: oAuthToken, }); - const data: KakaoLoginApiResponse = response.data.response; + const data = kakaoLoginResponseSchema.parse(response.data.response); return { userName: data.name, userType: (data.role === 'ADMIN' ? 'admin' : 'student') as Exclude< diff --git a/src/entities/auth/model/schemas.ts b/src/entities/auth/model/schemas.ts new file mode 100644 index 0000000..260c6bf --- /dev/null +++ b/src/entities/auth/model/schemas.ts @@ -0,0 +1,10 @@ +import {z} from 'zod'; + +export const kakaoLoginResponseSchema = z.object({ + memberId: z.number(), + name: z.string(), + role: z.enum(['ADMIN', 'USER']), + studentId: z.string(), + email: z.string().nullable(), + accessToken: z.string(), +}); diff --git a/src/entities/auth/model/useUserStore.ts b/src/entities/auth/model/useUserStore.ts index 2a08cb8..e64cf29 100644 --- a/src/entities/auth/model/useUserStore.ts +++ b/src/entities/auth/model/useUserStore.ts @@ -1,6 +1,6 @@ import {create} from 'zustand'; import {persist} from 'zustand/middleware'; -import type {UserType} from '@/shared/model/common'; +import type {UserType} from '@/shared/model/type'; type AuthenticatedUserType = Exclude; diff --git a/src/entities/course/api/courseApi.ts b/src/entities/course/api/courseApi.ts index deae300..2251335 100644 --- a/src/entities/course/api/courseApi.ts +++ b/src/entities/course/api/courseApi.ts @@ -1,15 +1,18 @@ -import type {ApiResponse} from '@/shared/model/common'; -import type {DashboardCourseListResponse} from '@/entities/course/model/types'; +import {z} from 'zod'; import {privateAxios} from '@/shared/api/axiosInstance'; +import {apiResponseSchema} from '@/shared/model/schemas'; +import {dashboardCourseSchema} from '../model/schemas'; -export const getAllCourses = async (): Promise => { +// 전체 강의 목록 조회 API +export const getAllCourses = async () => { const response = await privateAxios.get('/courses/my'); - return response.data; + return apiResponseSchema( + z.object({count: z.number(), courses: z.array(dashboardCourseSchema)}) + ).parse(response.data); }; -export const deleteCourse = async ( - courseId: number -): Promise> => { +// 강의 삭제 API +export const deleteCourse = async (courseId: number) => { const response = await privateAxios.delete(`/courses/${courseId}`); - return response.data; + return apiResponseSchema(z.string()).parse(response.data); }; diff --git a/src/entities/course/api/courseMutations.ts b/src/entities/course/api/courseMutations.ts new file mode 100644 index 0000000..0eea045 --- /dev/null +++ b/src/entities/course/api/courseMutations.ts @@ -0,0 +1,9 @@ +import {deleteCourse} from './courseApi'; + +export const courseMutations = { + // 강의 삭제 뮤테이션 옵션 + deleteCourse: { + mutationKey: ['deleteCourse'], + mutationFn: (courseId: number) => deleteCourse(courseId), + }, +}; diff --git a/src/entities/course/api/courseQueries.ts b/src/entities/course/api/courseQueries.ts new file mode 100644 index 0000000..2999360 --- /dev/null +++ b/src/entities/course/api/courseQueries.ts @@ -0,0 +1,11 @@ +import {getAllCourses} from './courseApi'; +import {queryOptions} from '@tanstack/react-query'; + +export const courseQueries = { + // 전체 강의 조회 쿼리 옵션 + getAllCourses: () => + queryOptions({ + queryKey: ['courses'], + queryFn: getAllCourses, + }), +}; diff --git a/src/entities/course/api/courseQueryOptions.ts b/src/entities/course/api/courseQueryOptions.ts deleted file mode 100644 index ab5d82f..0000000 --- a/src/entities/course/api/courseQueryOptions.ts +++ /dev/null @@ -1,9 +0,0 @@ -import {getAllCourses} from './courseApi'; -import {queryOptions} from '@tanstack/react-query'; - -export default function courseQueryOptions() { - return queryOptions({ - queryKey: ['courses'], - queryFn: getAllCourses, - }); -} diff --git a/src/entities/course/index.ts b/src/entities/course/index.ts deleted file mode 100644 index 6b5cfff..0000000 --- a/src/entities/course/index.ts +++ /dev/null @@ -1 +0,0 @@ -export {getAllCourses, deleteCourse} from './api/courseApi'; diff --git a/src/entities/course/model/schemas.ts b/src/entities/course/model/schemas.ts new file mode 100644 index 0000000..a634048 --- /dev/null +++ b/src/entities/course/model/schemas.ts @@ -0,0 +1,41 @@ +import {z} from 'zod'; +import {semesterCodeSchema} from '@/shared/model/schemas'; +import { + assignmentSchema, + assignmentScheduleSchema, +} from '@/entities/assignment/model/schemas'; +import {unitSchema} from '@/entities/unit/model/schemas'; + +export const courseOverviewSchema = z.object({ + id: z.number(), + title: z.string(), + year: z.number(), + semester: semesterCodeSchema, + section: z.string(), + unitCount: z.number(), + studentCount: z.number().optional(), + units: z.array(unitSchema), +}); + +export const dashboardCourseSchema = z.object({ + id: z.number(), + title: z.string(), + year: z.number(), + semester: semesterCodeSchema, + section: z.string(), + unitCount: z.number(), + description: z.string(), + assignmentCount: z.number(), +}); + +export const assignmentCourseSchema = z.object({ + id: z.number(), + title: z.string(), + year: z.number(), + semester: semesterCodeSchema, + section: z.string(), + count: z.number(), + assignments: z.array(assignmentSchema.pick({id: true, title: true})), +}); + +export {assignmentScheduleSchema as scheduleSchema}; diff --git a/src/entities/course/model/types.ts b/src/entities/course/model/types.ts index 9ca93c8..0e017e2 100644 --- a/src/entities/course/model/types.ts +++ b/src/entities/course/model/types.ts @@ -1,102 +1,10 @@ -import type {Assignment} from '@/entities/assignment/model/types'; -import type {ApiResponse, SemesterCode} from '@/shared/model/common'; - -/** - * 일정(Schedule) 인터페이스 정의 - */ -export interface Schedule { - date: string; - remainingDays: number; - assignments: { - course: string; - section: string; - assignment: string; - }[]; -} - -/** - * 단원(Unit) 인터페이스 정의 - */ -export interface Unit { - id: number; - title: string; - releaseDate: string; - dueDate: string; - isOpen?: boolean; - assignmentCount: number; - assignments: Assignment[]; -} - -/** - * 강의 기본 정보 인터페이스 정의 - */ -export interface BaseCourse { - id: number; - title: string; - year: number; - semester: SemesterCode; - section: string; - unitCount: number; -} - -/** - * 강의 상세 페이지용 (course-overview) 인터페이스 정의 - * 기본 정보 + 단원, 과제 상세 리스트 - */ -export interface CourseOverview extends BaseCourse { - studentCount?: number; - units: Unit[]; -} - -/** - * 대시보드 강의 목록용 인터페이스 정의 - * 기본 정보 + 강의 설명, 과제 개수 - */ -export interface DashboardCourse extends BaseCourse { - description: string; - assignmentCount: number; -} - -/** - * 문제 선택 페이지용 강의 인터페이스 정의 - */ -export interface AssignmentSelectCourse extends Omit { - count: number; - assignments: Pick[]; -} - -// 강의 상세 응답 타입 정의 -export type CourseOverviewResponse = ApiResponse; - -// 대시보드 강의 목록 응답 타입 정의 -export type DashboardCourseListResponse = ApiResponse<{ - count: number; - courses: DashboardCourse[]; -}>; - -// 대시보드 일정 목록 응답 타입 정의 -export type DashboardScheduleListResponse = ApiResponse<{ - count: number; - schedule: Schedule[]; -}>; - -// 문제 선택 페이지 응답 타입 정의 -export type AssignmentSelectResponse = ApiResponse<{ - count: number; - courses: AssignmentSelectCourse[]; -}>; - -// 강의 옵션 목록 응답 타입 정의 -export type CourseOptionsResponse = ApiResponse<{ - count: number; - courses: DashboardCourse[]; -}>; - -// 단원 조회-생성 페이지 응답 타입 정의 - 단일 단원 -export type SingleUnitResponse = ApiResponse; - -// 단원 조회-생성 페이지 응답 타입 정의 - 전체 단원 목록 -export type AllUnitsResponse = ApiResponse<{ - count: number; - units: Pick[]; -}>; +import type {z} from 'zod'; +import type { + courseOverviewSchema, + dashboardCourseSchema, + assignmentCourseSchema, +} from './schemas'; + +export type CourseOverview = z.infer; +export type DashboardCourse = z.infer; +export type AssignmentCourse = z.infer; diff --git a/src/entities/student/model/schemas.ts b/src/entities/student/model/schemas.ts new file mode 100644 index 0000000..a038be9 --- /dev/null +++ b/src/entities/student/model/schemas.ts @@ -0,0 +1,35 @@ +import {z} from 'zod'; + +export const progressStatusSchema = z.enum([ + 'PASSED', + 'NOT_SUBMITTED', + 'PARTIAL', + 'FAILED', +]); + +export const studentProgressSchema = z.object({ + status: progressStatusSchema, + assignmentName: z.string().optional(), + score: z.number().optional(), + totalScore: z.number().optional(), + plagiarismRate: z.number().optional(), +}); + +export const studentUnitSchema = z.object({ + id: z.number(), + name: z.string(), + title: z.string(), + startDate: z.string(), + endDate: z.string(), + assignments: z.array(studentProgressSchema), +}); + +export const studentSchema = z.object({ + id: z.number(), + studentId: z.string(), + name: z.string(), + score: z.number(), + totalScore: z.number(), + progress: z.array(studentProgressSchema), + units: z.array(studentUnitSchema).optional(), +}); diff --git a/src/entities/student/model/types.ts b/src/entities/student/model/types.ts index 0a5fc2b..eca8b5f 100644 --- a/src/entities/student/model/types.ts +++ b/src/entities/student/model/types.ts @@ -1,33 +1,16 @@ -import type {ApiResponse} from '@/shared/model/common'; +import type {z} from 'zod'; +import type {ApiResponse} from '@/shared/model/type'; +import { + progressStatusSchema, + studentProgressSchema, + studentUnitSchema, + studentSchema, +} from './schemas'; -export type ProgressStatus = 'PASSED' | 'NOT_SUBMITTED' | 'PARTIAL' | 'FAILED'; - -export interface StudentProgress { - status: ProgressStatus; - assignmentName?: string; - score?: number; - totalScore?: number; - plagiarismRate?: number; -} - -export interface Unit { - id: number; - name: string; - title: string; - startDate: string; - endDate: string; - assignments: StudentProgress[]; -} - -export interface Student { - id: number; - studentId: string; - name: string; - score: number; - totalScore: number; - progress: StudentProgress[]; - units?: Unit[]; -} +export type ProgressStatus = z.infer; +export type StudentProgress = z.infer; +export type Unit = z.infer; +export type Student = z.infer; export type CourseStudentsResponse = ApiResponse<{ id: number; diff --git a/src/entities/unit/api/unitApi.ts b/src/entities/unit/api/unitApi.ts index b716386..6c2b37e 100644 --- a/src/entities/unit/api/unitApi.ts +++ b/src/entities/unit/api/unitApi.ts @@ -1,46 +1,53 @@ +import {z} from 'zod'; import {privateAxios} from '@/shared/api/axiosInstance'; -import type {TUnitFormSchema} from '../model/types'; -import type {ApiResponse} from '@/shared/model'; -import type {AllUnitsResponse, Unit} from '@/entities/course/model/types'; +import {apiResponseSchema} from '@/shared/model/schemas'; +import {type TUnitFormSchema} from '../model/types'; +import {unitSchema} from '../model/schemas'; // 강의별 전체 단원 조회 -export const getAllUnitsByCourseId = async ( - courseId: number -): Promise => { +export const getAllUnitsByCourseId = async (courseId: number) => { const response = await privateAxios.get(`/courses/${courseId}/units`); - return response.data; + return apiResponseSchema( + z.object({ + count: z.number(), + units: z.array( + unitSchema.pick({id: true, title: true, assignmentCount: true}) + ), + }) + ).parse(response.data); }; // 단일 단원 조회 -export const getUnitById = async ( - unitId: number | null -): Promise> => { +export const getUnitById = async (unitId: number) => { const response = await privateAxios.get(`/units/${unitId}`); - return response.data; + return apiResponseSchema(unitSchema).parse(response.data); }; // 단원 삭제 -export const deleteUnit = async ( - unitId: number -): Promise> => { +export const deleteUnit = async (unitId: number) => { const response = await privateAxios.delete(`/units/${unitId}`); - return response.data; + return apiResponseSchema(z.string()).parse(response.data); }; // 단원 생성 -export const createUnit = async ( - courseId: number, - unit: TUnitFormSchema -): Promise> => { +export const createUnit = async (courseId: number, unit: TUnitFormSchema) => { const response = await privateAxios.post(`/units/${courseId}`, unit); - return response.data; + return apiResponseSchema(unitSchema).parse(response.data); }; // 단원 수정 -export const updateUnit = async ( - unitId: number, - unit: TUnitFormSchema -): Promise> => { +export const updateUnit = async (unitId: number, unit: TUnitFormSchema) => { const response = await privateAxios.put(`/units/${unitId}`, unit); - return response.data; + return apiResponseSchema(unitSchema).parse(response.data); +}; + +// 단원에 등록된 과제 삭제 +export const deleteAssignmentFromUnit = async ( + unitId: number, + assignmentId: number +) => { + const response = await privateAxios.delete( + `/units/${unitId}/assignments/${assignmentId}` + ); + return apiResponseSchema(z.string()).parse(response.data); }; diff --git a/src/entities/unit/api/unitMutations.ts b/src/entities/unit/api/unitMutations.ts index a0e6c91..d114344 100644 --- a/src/entities/unit/api/unitMutations.ts +++ b/src/entities/unit/api/unitMutations.ts @@ -5,8 +5,13 @@ export const unitMutations = { // 단원 추가 뮤테이션 옵션 createUnit: { mutationKey: ['createUnit'], - mutationFn: ({courseId, unit}: {courseId: number; unit: TUnitFormSchema}) => - createUnit(courseId, unit), + mutationFn: ({ + courseId, + unitForm, + }: { + courseId: number; + unitForm: TUnitFormSchema; + }) => createUnit(courseId, unitForm), }, // 단원 수정 뮤테이션 옵션 diff --git a/src/entities/unit/api/unitQueries.ts b/src/entities/unit/api/unitQueries.ts index ff10576..9346b60 100644 --- a/src/entities/unit/api/unitQueries.ts +++ b/src/entities/unit/api/unitQueries.ts @@ -1,4 +1,4 @@ -import {queryOptions} from '@tanstack/react-query'; +import {queryOptions, skipToken} from '@tanstack/react-query'; import {getAllUnitsByCourseId, getUnitById} from './unitApi'; export const unitQueries = { @@ -7,13 +7,20 @@ export const unitQueries = { queryOptions({ queryKey: ['units', courseId], queryFn: () => getAllUnitsByCourseId(courseId), + select: (data) => ({ + unitList: data.response.units, + unitCount: data.response.count, + firstUnitId: data.response.units[0]?.id ?? null, + }), }), // 단일 단원 조회 쿼리 옵션 getUnitDetails: (unitId: number | null) => queryOptions({ queryKey: ['units', 'detail', unitId], - queryFn: () => getUnitById(unitId), - enabled: !!unitId, + queryFn: unitId ? () => getUnitById(unitId) : skipToken, + select: (data) => { + return data.response; + }, }), }; diff --git a/src/entities/unit/model/schemas.ts b/src/entities/unit/model/schemas.ts new file mode 100644 index 0000000..7d844fe --- /dev/null +++ b/src/entities/unit/model/schemas.ts @@ -0,0 +1,26 @@ +import {assignmentSchema} from '@/entities/assignment/model/schemas'; +import {z} from 'zod'; + +// 단원 도메인 스키마 +export const unitSchema = z.object({ + id: z.number(), + title: z.string(), + releaseDate: z.string(), + dueDate: z.string(), + isOpen: z.boolean().optional(), + assignmentCount: z.number(), + assignments: z.array(assignmentSchema), +}); + +// 단원 생성/수정 폼 스키마 +export const unitFormSchema = z + .object({ + title: z.string().min(1, '단원 제목을 입력해주세요.'), + releaseDate: z.string().min(1, '공개일을 입력해주세요.'), + dueDate: z.string().min(1, '마감일을 입력해주세요.'), + assignmentIds: z.array(z.number()).optional(), + }) + .refine((data) => data.releaseDate <= data.dueDate, { + message: '날짜 범위가 올바르지 않습니다.', + path: ['dueDate'], + }); diff --git a/src/entities/unit/model/types.ts b/src/entities/unit/model/types.ts index d6b1c63..7c9c697 100644 --- a/src/entities/unit/model/types.ts +++ b/src/entities/unit/model/types.ts @@ -1,17 +1,5 @@ import {z} from 'zod'; +import type {unitFormSchema, unitSchema} from './schemas'; -// 단원 생성/수정 폼 스키마 -export const unitFormSchema = z - .object({ - title: z.string().min(1, '단원 제목을 입력해주세요.'), - releaseDate: z.string().min(1, '공개일을 입력해주세요.'), - dueDate: z.string().min(1, '마감일을 입력해주세요.'), - assignmentIds: z.array(z.number()).optional(), - }) - .refine((data) => data.releaseDate <= data.dueDate, { - message: '날짜 범위가 올바르지 않습니다.', - path: ['dueDate'], - }); - -// 단원 생성/수정 폼 타입 +export type Unit = z.infer; export type TUnitFormSchema = z.infer; diff --git a/src/entities/unit/model/useUnitStore.ts b/src/entities/unit/model/useUnitStore.ts new file mode 100644 index 0000000..ea0def8 --- /dev/null +++ b/src/entities/unit/model/useUnitStore.ts @@ -0,0 +1,51 @@ +import type {Assignment} from '@/entities/assignment/model/types'; +import {create} from 'zustand'; +import {createJSONStorage, persist} from 'zustand/middleware'; + +interface UnitState { + title: string; + releaseDate: string; + dueDate: string; + assignments: Assignment[]; + storeFormData: (title: string, releaseDate: string, dueDate: string) => void; + resetStore: () => void; + setAssignments: (assignments: Assignment[]) => void; +} + +export const useUnitStore = create()( + persist( + (set) => ({ + title: '', + releaseDate: '', + dueDate: '', + assignments: [], + + // 단원 폼 임시 저장 + storeFormData: (title, releaseDate, dueDate) => + set({ + title: title, + releaseDate: releaseDate, + dueDate: dueDate, + }), + + // 선택된 과제 ID 저장 + setAssignments: (assignments) => set({assignments}), + + // 단원 폼 초기화 + resetStore: () => + set({title: '', releaseDate: '', dueDate: '', assignments: []}), + }), + { + name: 'unit-session-storage', + storage: createJSONStorage(() => sessionStorage), + partialize: (state) => ({ + title: state.title, + releaseDate: state.releaseDate, + dueDate: state.dueDate, + assignments: state.assignments, + }), + } + ) +); + +export default useUnitStore; diff --git a/src/features/assignment/filter-assignmnet/lib/useAssignmentList.ts b/src/features/assignment/filter-assignmnet/lib/useAssignmentList.ts new file mode 100644 index 0000000..2a5fe1d --- /dev/null +++ b/src/features/assignment/filter-assignmnet/lib/useAssignmentList.ts @@ -0,0 +1,28 @@ +import {useQuery} from '@tanstack/react-query'; +import {assignmentQueries} from '@/entities/assignment/api/assignmentQueries'; +import type {Assignment} from '@/entities/assignment/model/types'; + +// 중복 제거 +const unique = (list: Assignment[]) => + Array.from(new Map(list.map((a) => [a.id, a])).values()); + +export const useAssignmentList = ( + selectedCourseId: number | null +): Assignment[] => { + const {data: allAssignments} = useQuery( + assignmentQueries.getAllAssignments() + ); + const {data: assignments} = useQuery( + assignmentQueries.getAssignmentsByCourse(selectedCourseId ?? 0) + ); + + if (selectedCourseId) { + return unique( + assignments?.response.courses.flatMap((course) => + course.id === selectedCourseId ? course.assignments : [] + ) ?? [] + ); + } + + return unique(allAssignments?.response.assignments ?? []); +}; diff --git a/src/pages/course-overview/ui/CourseHero.tsx b/src/pages/course-overview/ui/CourseHero.tsx index 81a7ff7..553db7f 100644 --- a/src/pages/course-overview/ui/CourseHero.tsx +++ b/src/pages/course-overview/ui/CourseHero.tsx @@ -3,7 +3,7 @@ import {formatCourseTerm} from '@/shared/lib/course'; import CourseActionsBar from './CourseActionsBar'; import {useUserStore} from '@/entities/auth/model/useUserStore'; import type {CourseOverview} from '@/entities/course/model/types'; -import type {SemesterCode} from '@/shared/model/common'; +import type {SemesterCode} from '@/shared/model/type'; interface CourseHeroProps { courseData: Omit; @@ -66,8 +66,8 @@ const CourseInfo = ({title, year, semester, section}: CourseInfoProps) => { return (
snowCode logo -

{title}

-

+

{title}

+

{formatCourseTerm(year, semester, section)}

diff --git a/src/pages/course-overview/ui/UnitItem.tsx b/src/pages/course-overview/ui/UnitItem.tsx index 10049d9..1bc22e3 100644 --- a/src/pages/course-overview/ui/UnitItem.tsx +++ b/src/pages/course-overview/ui/UnitItem.tsx @@ -2,7 +2,7 @@ import AssignmentList from './AssignmentList'; import Lock from '@/assets/svg/lock.svg?react'; import Badge from '@/shared/ui/badge/Badge'; import {formatPeriod} from '@/shared/lib/course'; -import type {Unit} from '@/entities/course/model/types'; +import type {Unit} from '@/entities/unit/model/types'; interface UnitProps extends Unit { index: number; diff --git a/src/pages/dashboard/Dashboard.tsx b/src/pages/dashboard/Dashboard.tsx index e1ca73a..d9acfd6 100644 --- a/src/pages/dashboard/Dashboard.tsx +++ b/src/pages/dashboard/Dashboard.tsx @@ -5,15 +5,15 @@ import AddIcon from '@/assets/svg/addIcon.svg?react'; import ScheduleList from './ui/ScheduleList'; import {Link} from 'react-router-dom'; import {useUserStore} from '@/entities/auth/model/useUserStore'; -import courseQueryOptions from '@/entities/course/api/courseQueryOptions'; import { useMutation, useQueryClient, useSuspenseQueries, } from '@tanstack/react-query'; -import assignmentQueryOptions from '@/entities/assignment/api/assignmentQueryOptions'; -import {deleteCourse} from '@/entities/course'; import {EmptyState} from '@/shared/ui/EmptyState'; +import {courseQueries} from '@/entities/course/api/courseQueries'; +import {courseMutations} from '@/entities/course/api/courseMutations'; +import {assignmentQueries} from '@/entities/assignment/api/assignmentQueries'; const Dashboard = () => { const userType = useUserStore((state) => state.userType); @@ -21,19 +21,22 @@ const Dashboard = () => { // 강의 및 스케쥴 데이터 패칭 const [{data: courses}, {data: schedules}] = useSuspenseQueries({ - queries: [courseQueryOptions(), assignmentQueryOptions()], + queries: [ + courseQueries.getAllCourses(), + assignmentQueries.getAssignmentSchedules(), + ], }); - // 강의 삭제 뮤테이션 + // 강의 삭제 const {mutate} = useMutation({ - mutationFn: (courseId: number) => deleteCourse(courseId), + ...courseMutations.deleteCourse, onSuccess: () => { // 강의 목록 및 스케쥴 목록 갱신 queryClient.invalidateQueries({ - queryKey: courseQueryOptions().queryKey, + queryKey: courseQueries.getAllCourses().queryKey, }); queryClient.invalidateQueries({ - queryKey: assignmentQueryOptions().queryKey, + queryKey: assignmentQueries.getAssignmentSchedules().queryKey, }); alert('강의가 성공적으로 삭제되었습니다.'); }, diff --git a/src/pages/manage-assignment/AssignmentManagePage.tsx b/src/pages/manage-assignment/AssignmentManagePage.tsx new file mode 100644 index 0000000..140d0bb --- /dev/null +++ b/src/pages/manage-assignment/AssignmentManagePage.tsx @@ -0,0 +1,94 @@ +import {AssignmentPageLayout} from '@/widgets/assignment-page-layout'; +import AssignmentListContainer from '../select-assignment/ui/AssignmentListContainer'; +import ListRow from '@/shared/ui/list-row/ListRow'; +import {useCourseFilter} from '@/features/course/filter-course'; +import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'; +import {courseQueries} from '@/entities/course/api/courseQueries'; +import {useAssignmentList} from '@/features/assignment/filter-assignmnet/lib/useAssignmentList'; +import {assignmentMutations} from '@/entities/assignment/api/assignmentMutations'; +import {assignmentQueries} from '@/entities/assignment/api/assignmentQueries'; +import AssignmentManageActionsBar from './ui/AssignmentManageActionsBar'; +import AddIcon from '@/assets/svg/addIcon.svg?react'; +import {Link} from 'react-router-dom'; +import {buttonStyles} from '@/shared/ui/button/button-styles'; + +const AssignmentManagePage = () => { + const {data: courseList} = useQuery(courseQueries.getAllCourses()); + const {courseOptions, handleCourseSelect, selectedCourseId} = useCourseFilter( + courseList?.response.courses ?? [] + ); + const assignmentList = useAssignmentList(selectedCourseId); + const queryClient = useQueryClient(); + + // 문제 삭제 뮤테이션 + const {mutate: deleteAssignment} = useMutation({ + ...assignmentMutations.deleteAssignment, + onSuccess: () => { + queryClient.invalidateQueries({ + queryKey: assignmentQueries.getAllAssignments().queryKey, + }); + queryClient.invalidateQueries({ + queryKey: assignmentQueries.getAssignmentsByCourse( + selectedCourseId ?? 0 + ).queryKey, + }); + alert('문제가 성공적으로 삭제되었습니다.'); + }, + onError: (error) => { + console.error('문제 삭제 실패', error); + alert('문제 삭제에 실패했습니다. 다시 시도해주세요.'); + }, + }); + + // 문제 삭제 핸들러 + const onDeleteAssignment = (id: number) => { + if ( + window.confirm( + '문제를 삭제하시겠습니까? 삭제된 문제는 복구할 수 없습니다.' + ) + ) { + deleteAssignment(id); + } + }; + + return ( + + ( + + } + /> + )} + /> + + + 문제 추가 + + + } + onCancel={() => {}} + onConfirm={() => {}} + /> + ); +}; + +export default AssignmentManagePage; diff --git a/src/pages/manage-assignment/ui/AssignmentManageActionsBar.tsx b/src/pages/manage-assignment/ui/AssignmentManageActionsBar.tsx new file mode 100644 index 0000000..e1f4815 --- /dev/null +++ b/src/pages/manage-assignment/ui/AssignmentManageActionsBar.tsx @@ -0,0 +1,38 @@ +import EditIcon from '@/assets/svg/editIcon.svg?react'; +import DeleteIcon from '@/assets/svg/deleteIcon.svg?react'; +import {useNavigate} from 'react-router-dom'; + +interface AssignmentManageActionsBarProps { + id: number; + onDelete: (id: number) => void; +} + +const AssignmentManageActionsBar = ({ + id, + onDelete, +}: AssignmentManageActionsBarProps) => { + const navigate = useNavigate(); + + const handleOnEdit = () => { + navigate(`/admin/assignments/${id}`); + }; + + const handleOnDelete = () => { + onDelete(id); + }; + + return ( +
e.stopPropagation()}> + + +
+ ); +}; + +export default AssignmentManageActionsBar; diff --git a/src/pages/select-assignment/AssignmentSelectPage.tsx b/src/pages/select-assignment/AssignmentSelectPage.tsx index b84b174..38538d9 100644 --- a/src/pages/select-assignment/AssignmentSelectPage.tsx +++ b/src/pages/select-assignment/AssignmentSelectPage.tsx @@ -1,35 +1,51 @@ import AssignmentListContainer from './ui/AssignmentListContainer'; import {useState} from 'react'; -import { - response, - courseOptionsResponse, -} from '@/shared/mocks/assignmentSelectResponse'; import {useCourseFilter} from '@/features/course/filter-course/lib/useCourseFilter'; import {AssignmentPageLayout} from '@/widgets/assignment-page-layout'; import ListRow from '@/shared/ui/list-row/ListRow'; +import {useQuery} from '@tanstack/react-query'; +import {courseQueries} from '@/entities/course/api/courseQueries'; +import useUnitStore from '@/entities/unit/model/useUnitStore'; +import {useLocation, useNavigate} from 'react-router-dom'; +import type {Assignment} from '@/entities/assignment/model/types'; +import {useAssignmentList} from '@/features/assignment/filter-assignmnet/lib/useAssignmentList'; const AssignmentSelectPage = () => { - const {courses} = courseOptionsResponse.response; // /courses/my API 응답 모킹 - const [selectedAssignments, setSelectedAssignments] = useState([]); // 선택된 문제 ID 목록 - - const {courseOptions, handleCourseSelect} = useCourseFilter(courses); - - // 문제 목록 /courses/{courseId}/assignments API 응답 모킹 - const assignmentList = response.response.courses.flatMap( - (course) => course.assignments + const navigate = useNavigate(); + const location = useLocation(); + const {data: courseList} = useQuery(courseQueries.getAllCourses()); + const {setAssignments, assignments: currentSelectedAssignments} = + useUnitStore(); + const [selectedAssignments, setSelectedAssignments] = useState( + currentSelectedAssignments ?? [] ); + const {courseOptions, handleCourseSelect, selectedCourseId} = useCourseFilter( + courseList?.response.courses ?? [] + ); + + const assignmentList = useAssignmentList(selectedCourseId); // 문제 선택 핸들러 - const handleAssignmentSelect = (assignmentId: number) => { + const handleAssignmentSelect = (assignment: Assignment) => { setSelectedAssignments((prev) => { - if (prev.includes(assignmentId)) { - return prev.filter((id) => id !== assignmentId); // 선택 해제 - } else { - return [...prev, assignmentId]; // 선택 추가 + if (prev.some((a) => a.id === assignment.id)) { + return prev.filter((a) => a.id !== assignment.id); } + return [...prev, assignment]; }); }; + // 이전 페이지로 돌아가기 + const returnToPreviousPage = () => { + navigate(location.state?.backPath ?? -1); + }; + + // 등록 핸들러 + const handleConfirm = () => { + setAssignments(selectedAssignments); + returnToPreviousPage(); + }; + return ( { renderItem={(assignment) => ( a.id === assignment.id)} /> )} /> } - onCancel={() => {}} - onConfirm={() => {}} + onCancel={() => { + returnToPreviousPage(); + }} + onConfirm={handleConfirm} /> ); }; diff --git a/src/pages/select-assignment/ui/AssignmentListContainer.tsx b/src/pages/select-assignment/ui/AssignmentListContainer.tsx index 94eb164..ea09b9a 100644 --- a/src/pages/select-assignment/ui/AssignmentListContainer.tsx +++ b/src/pages/select-assignment/ui/AssignmentListContainer.tsx @@ -1,12 +1,14 @@ -import type {AssignmentSelectCourse} from '@/entities/course/model/types'; +import type {Assignment} from '@/entities/assignment/model/types'; +import type {AssignmentCourse} from '@/entities/course/model/types'; +import type {MouseEvent, ReactNode} from 'react'; -type T = AssignmentSelectCourse['assignments'][number]; +type T = AssignmentCourse['assignments'][number]; interface AssignmentListContainerProps { items: T[]; - renderItem: (item: T) => React.ReactNode; + renderItem: (item: T) => ReactNode; title: string; - onSelect: (id: number) => void; + onSelect?: (item: Assignment) => void; } const AssignmentListContainer = ({ @@ -15,16 +17,16 @@ const AssignmentListContainer = ({ renderItem, title, }: AssignmentListContainerProps) => { - const handleSelect = (id: number, event: React.MouseEvent) => { + const handleSelect = (item: Assignment, event: MouseEvent) => { event.stopPropagation(); - onSelect(id); + onSelect?.(item); }; return (

{title}

    {items.map((item) => ( -
  • handleSelect(item.id, e)} key={item.id}> +
  • handleSelect(item, e)} key={item.id}> {renderItem(item)}
    • ))} diff --git a/src/pages/unit-editor/UnitEditorPage.tsx b/src/pages/unit-editor/UnitEditorPage.tsx index 1e632b9..0f0f942 100644 --- a/src/pages/unit-editor/UnitEditorPage.tsx +++ b/src/pages/unit-editor/UnitEditorPage.tsx @@ -3,30 +3,50 @@ import {UnitForm} from './ui/UnitForm'; import {useMutation, useQuery, useQueryClient} from '@tanstack/react-query'; import {unitQueries} from '@/entities/unit/api/unitQueries'; import {useParams} from 'react-router-dom'; -import {useEffect, useState} from 'react'; +import {useState} from 'react'; import type {Mode} from './model/types'; import {unitMutations} from '@/entities/unit/api/unitMutations'; import type {TUnitFormSchema} from '@/entities/unit/model/types'; import {EmptyState} from '@/shared/ui/EmptyState'; import SurfaceCard from '@/shared/ui/SurfaceCard'; +import useUnitStore from '@/entities/unit/model/useUnitStore'; const UnitEditorPage = () => { const {id} = useParams(); // 강의 ID const courseId = Number(id); - const [mode, setMode] = useState('idle'); + + const { + resetStore, + title: storedTitle, + assignments: storedAssignments, + } = useUnitStore(); + const {data} = useQuery(unitQueries.getUnitList(courseId)); + const initialMode = + data === undefined ? null : data.unitCount === 0 ? 'creating' : 'editing'; + + const [activeMode, setActiveMode] = useState(null); const [selectedUnitId, setSelectedUnitId] = useState(null); - const [currentIndex, setCurrentIndex] = useState(1); - const {data: unitList} = useQuery(unitQueries.getUnitList(courseId)); - const {data: unit} = useQuery(unitQueries.getUnitDetails(selectedUnitId)); - - useEffect(() => { - if (unitList && unitList?.response.count !== 0 && mode === 'idle') { - setSelectedUnitId(unitList.response.units[0].id); - setMode('editing'); // 편집 모드 - } else if (unitList?.response.count === 0 && mode === 'idle') { - setMode('creating'); // 생성 모드 + + const hasOngoingCreation = storedTitle !== '' || storedAssignments.length > 0; + const currentMode: Mode | null = + activeMode ?? (hasOngoingCreation ? 'creating' : initialMode); + const currentUnitId = + currentMode === 'creating' + ? null + : (selectedUnitId ?? data?.firstUnitId ?? null); + + // 현재 단원 인덱스 계산 + const currentIndex = (() => { + if (currentMode === 'creating') { + return (data?.unitCount ?? 0) + 1; // 항상 마지막 + 1 } - }, [unitList, mode]); + const index = data?.unitList?.findIndex((u) => u.id === currentUnitId); + return index !== undefined && index >= 0 ? index + 1 : 1; + })(); + + const {data: unitDetail} = useQuery( + unitQueries.getUnitDetails(currentUnitId) + ); const queryClient = useQueryClient(); const invalidateUnitList = () => { @@ -42,7 +62,8 @@ const UnitEditorPage = () => { // 단원 목록 갱신 invalidateUnitList(); setSelectedUnitId(data.response.id); - setMode('editing'); // 생성 후 편집 모드로 전환 + setActiveMode('editing'); // 생성 후 편집 모드로 전환 + resetStore(); // 단원 폼 초기화 alert('새 단원이 성공적으로 생성되었습니다.'); }, onError: (error) => { @@ -69,8 +90,8 @@ const UnitEditorPage = () => { ...unitMutations.deleteUnit, onSuccess: () => { invalidateUnitList(); - setMode('idle'); // 삭제 후 대기 모드로 전환 setSelectedUnitId(null); // 선택된 단원 초기화 + setActiveMode('creating'); alert('단원이 성공적으로 삭제되었습니다.'); }, onError: (error) => { @@ -82,19 +103,18 @@ const UnitEditorPage = () => { // 단원 선택 핸들러 const onUnitClick = (id: number) => { setSelectedUnitId(id); - setMode('editing'); // 편집 모드로 전환 + setActiveMode('editing'); // 편집 모드로 전환 }; // 단원 추가 핸들러 const onAddNewUnit = () => { setSelectedUnitId(null); - setCurrentIndex(unitList ? unitList.response.count + 1 : 1); // 새 단원의 인덱스 설정 - setMode('creating'); // 생성 모드로 전환 + setActiveMode('creating'); // 생성 모드로 전환 }; // 단원 생성 핸들러 - const onCreateUnit = (unit: TUnitFormSchema) => { - addUnit({courseId: courseId, unit}); + const onCreateUnit = (unitForm: TUnitFormSchema) => { + addUnit({courseId, unitForm}); }; // 단원 업데이트 핸들러 @@ -119,10 +139,9 @@ const UnitEditorPage = () => { {/* 단원 목차 섹션 */} setCurrentIndex(index)} - selectedUnitId={selectedUnitId} + selectedUnitId={currentUnitId} onAddNewUnit={onAddNewUnit} /> @@ -130,9 +149,9 @@ const UnitEditorPage = () => { {/* 단원 폼 섹션 */} void; onUpdateUnit: (unitId: number, unit: TUnitFormSchema) => void; onDeleteUnit: (unitId: number) => void; diff --git a/src/pages/unit-editor/ui/UnitForm.tsx b/src/pages/unit-editor/ui/UnitForm.tsx index 66cbec5..3301156 100644 --- a/src/pages/unit-editor/ui/UnitForm.tsx +++ b/src/pages/unit-editor/ui/UnitForm.tsx @@ -7,11 +7,10 @@ import {zodResolver} from '@hookform/resolvers/zod'; import {type UnitFormProps} from '../model/types'; import AddIcon from '@/assets/svg/addIcon.svg?react'; import {EmptyState} from '@/shared/ui/EmptyState'; -// import {useState} from 'react'; -import { - unitFormSchema, - type TUnitFormSchema, -} from '@/entities/unit/model/types'; +import {useLocation, useNavigate} from 'react-router-dom'; +import useUnitStore from '@/entities/unit/model/useUnitStore'; +import {unitFormSchema} from '@/entities/unit/model/schemas'; +import type {TUnitFormSchema} from '@/entities/unit/model/types'; export const UnitForm = ({ unit, @@ -21,22 +20,38 @@ export const UnitForm = ({ onUpdateUnit, onDeleteUnit, }: UnitFormProps) => { - // const [assignmentIds, setAssignmentIds] = useState([]); + const location = useLocation(); + const navigate = useNavigate(); + const { + storeFormData, + resetStore, + title: storedTitle, + releaseDate: storedReleaseDate, + dueDate: storedDueDate, + assignments: storedAssignments, + } = useUnitStore(); + + const currentAssignmentList = + mode === 'editing' ? (unit?.assignments ?? []) : storedAssignments; + + const assignmentListKey = + mode === 'editing' ? `edit-${unit?.id}` : 'creating-assignments'; const { register, handleSubmit, reset, + getValues, formState: {errors, isSubmitting}, } = useForm({ resolver: zodResolver(unitFormSchema), values: mode === 'creating' ? { - title: '', - releaseDate: '', - dueDate: '', - assignmentIds: [], + title: storedTitle, + releaseDate: storedReleaseDate, + dueDate: storedDueDate, + assignmentIds: storedAssignments.map((a) => a.id), } : { title: unit?.title || '', @@ -46,7 +61,7 @@ export const UnitForm = ({ }); // 단원 생성/업데이트 핸들러 - const onSubmit = async (data: TUnitFormSchema) => { + const onSubmit = (data: TUnitFormSchema) => { if (mode === 'editing' && unit) { onUpdateUnit(unit.id, data); return; @@ -64,9 +79,21 @@ export const UnitForm = ({ // 단원 편집 취소 핸들러 const handleCancel = () => { + if (mode === 'creating') resetStore(); reset(); }; + // 문제 선택 페이지로 이동 핸들러 + const handleAssignmentSelect = () => { + const {title, releaseDate, dueDate} = getValues(); + storeFormData(title, releaseDate, dueDate); + navigate('/admin/assignments/select', { + state: { + backPath: location.pathname, + }, + }); + }; + return (
    {/* 단원 편집 폼 */} @@ -124,17 +151,25 @@ export const UnitForm = ({

    문제 등록

    {/* 드래그 앤 드롭 가능한 문제 리스트 */} - {!unit || unit.assignmentCount === 0 ? ( + {currentAssignmentList.length > 0 ? ( + + ) : ( 등록된 문제가 없습니다. - ) : ( - )} {/* 문제 연결 버튼 */}
    - @@ -150,7 +185,7 @@ export const UnitForm = ({ diff --git a/src/pages/unit-editor/ui/UnitList.tsx b/src/pages/unit-editor/ui/UnitList.tsx index dab86a7..19ab700 100644 --- a/src/pages/unit-editor/ui/UnitList.tsx +++ b/src/pages/unit-editor/ui/UnitList.tsx @@ -1,14 +1,13 @@ import ArrowrightIcon from '@/assets/svg/arrowrightIcon.svg?react'; -import type {AllUnitsResponse} from '@/entities/course/model/types'; import Badge from '@/shared/ui/badge/Badge'; import Button from '@/shared/ui/button/Button'; import AddIcon from '@/assets/svg/addIcon.svg?react'; +import type {Unit} from '@/entities/unit/model/types'; interface UnitListProps { - unitList: AllUnitsResponse['response']['units'] | undefined; + unitList: Pick[] | undefined; onUnitClick: (id: number) => void; selectedUnitId?: number | null; - onChangeIndex: (index: number) => void; onAddNewUnit?: () => void; } @@ -16,15 +15,11 @@ export const UnitList = ({ unitList, onUnitClick, selectedUnitId, - onChangeIndex, + onAddNewUnit, }: UnitListProps) => { const handleSelectUnit = (id: number) => { onUnitClick(id); - - // 선택된 단원의 인덱스 찾기 - const index = unitList?.findIndex((unit) => unit.id === id) ?? 0; - onChangeIndex(index + 1); }; return ( diff --git a/src/shared/lib/course.ts b/src/shared/lib/course.ts index d4eb59c..f966bdb 100644 --- a/src/shared/lib/course.ts +++ b/src/shared/lib/course.ts @@ -1,5 +1,5 @@ import type {Unit} from '@/entities/course/model/types'; -import type {SemesterCode} from '@/shared/model/common'; +import type {SemesterCode} from '@/shared/model/type'; const SEMESTER_MAP: Record = { FIRST: '1', diff --git a/src/shared/model/index.ts b/src/shared/model/index.ts index 7ec0c87..0c66885 100644 --- a/src/shared/model/index.ts +++ b/src/shared/model/index.ts @@ -1 +1,2 @@ -export type {ApiResponse, UserType} from './common'; +export type {ApiResponse, UserType} from './type'; +export {apiResponseSchema} from './schemas'; diff --git a/src/shared/model/schemas.ts b/src/shared/model/schemas.ts new file mode 100644 index 0000000..8aa6f72 --- /dev/null +++ b/src/shared/model/schemas.ts @@ -0,0 +1,29 @@ +import {z} from 'zod'; + +export const apiResponseSchema = (dataSchema: T) => + z.object({success: z.boolean(), response: dataSchema}); + +export const errorResponseSchema = apiResponseSchema( + z.object({ + errorCode: z.string(), + errorMessage: z.string(), + errors: z.object({ + additionalProp1: z.string(), + additionalProp2: z.string(), + additionalProp3: z.string(), + }), + }) +); + +export const semesterCodeSchema = z.enum([ + 'FIRST', + 'SECOND', + 'SUMMER', + 'WINTER', +]); + +export const submissionStatusSchema = z.enum([ + 'NOT_SUBMITTED', + 'CORRECT', + 'INCORRECT', +]); diff --git a/src/shared/model/common.ts b/src/shared/model/type.ts similarity index 85% rename from src/shared/model/common.ts rename to src/shared/model/type.ts index 9842ae5..3047837 100644 --- a/src/shared/model/common.ts +++ b/src/shared/model/type.ts @@ -8,7 +8,5 @@ export interface ApiResponse { } export type UserType = 'admin' | 'student' | 'guest'; - -// 학기 및 제출 상태 상수 타입 정의 export type SemesterCode = 'FIRST' | 'SECOND' | 'SUMMER' | 'WINTER'; export type SubmissionStatus = 'NOT_SUBMITTED' | 'CORRECT' | 'INCORRECT'; diff --git a/src/shared/ui/Layout.tsx b/src/shared/ui/Layout.tsx index bf302a7..45913e5 100644 --- a/src/shared/ui/Layout.tsx +++ b/src/shared/ui/Layout.tsx @@ -9,7 +9,7 @@ const Layout = () => { const showHeader = !noHeaderPages.includes(pathname); return ( -
    +
    {showHeader && (
    diff --git a/src/shared/ui/button/Button.tsx b/src/shared/ui/button/Button.tsx index b9320f2..5e62c0c 100644 --- a/src/shared/ui/button/Button.tsx +++ b/src/shared/ui/button/Button.tsx @@ -6,7 +6,7 @@ interface ButtonProps extends ButtonVariants { className?: string; type?: 'button' | 'submit'; disabled?: boolean; - formID?: string; + form?: string; onClick?: () => void; onMouseEnter?: () => void; onMouseLeave?: () => void; @@ -17,7 +17,7 @@ const Button = ({ onClick, type = 'button', disabled = false, - formID, + form, className, ...props }: ButtonProps) => { @@ -26,7 +26,7 @@ const Button = ({ type={type} onClick={onClick} disabled={disabled} - form={formID} + form={form} className={twMerge(buttonStyles(props), className)}> {children} diff --git a/src/shared/ui/list-row/ListRow.tsx b/src/shared/ui/list-row/ListRow.tsx index 91316f0..f81b247 100644 --- a/src/shared/ui/list-row/ListRow.tsx +++ b/src/shared/ui/list-row/ListRow.tsx @@ -1,10 +1,11 @@ import {ListRowStyles, type ListRowVariants} from './list-row-styles'; +import type {ReactNode} from 'react'; interface ListRowProps extends ListRowVariants { selected?: boolean; - leftIcon?: React.ReactNode; + leftIcon?: ReactNode; title: string; - rightIcon?: React.ReactNode; + rightIcon?: ReactNode; className?: string; } diff --git a/src/shared/ui/list-row/list-row-styles.ts b/src/shared/ui/list-row/list-row-styles.ts index 5b4135f..aea2286 100644 --- a/src/shared/ui/list-row/list-row-styles.ts +++ b/src/shared/ui/list-row/list-row-styles.ts @@ -1,7 +1,7 @@ import {tv, type VariantProps} from 'tailwind-variants'; export const ListRowStyles = tv({ - base: 'cursor-pointer bg-background w-full flex items-center rounded-[9px] pl-4.5 pr-7.5 py-4 gap-4 border', + base: 'bg-background w-full flex items-center rounded-[9px] pl-4.5 pr-7.5 py-4 gap-4 border', variants: { selected: { true: 'border-primary',