Skip to content

Commit c0ae005

Browse files
authored
Merge pull request #183 from pirogramming/main
[Fix] Header 구조
2 parents 407c2e9 + bf2422e commit c0ae005

5 files changed

Lines changed: 14 additions & 11 deletions

File tree

frontend/src/api/adminassignment.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ export const fetchStudentInfo = (studentId) =>
77

88
// 주차별 과제 데이터 불러오기
99
export const fetchStudentAssignments = (userId) =>
10-
api.get(`/api/assignment/${userId}`); // ← 수정됨
10+
api.get(`/assignment/${userId}`); // ← 수정됨
1111

1212
// 과제 상태 수정 (PUT)
1313
export const updateAssignmentStatus = (userId, assignmentId, status) =>
14-
api.put(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, {
14+
api.put(`/admin/users/${userId}/assignments/${assignmentId}/submission`, {
1515
status,
1616
});
1717

1818
// 과제 상태 등록 (POST)
1919
export const submitAssignmentStatus = (userId, assignmentId, status) =>
20-
api.post(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, {
20+
api.post(`/admin/users/${userId}/assignments/${assignmentId}/submission`, {
2121
status,
2222
});

frontend/src/api/adminattendance.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const getStudentBasicInfo = async (studentId) => {
4141
// 학생 출석 전체 데이터 조회 (특정 날짜와 차수 포함)
4242
export const getStudentAttendance = async (studentId) => {
4343
try {
44-
const res = await api.get(`/api/attendance/${studentId}`);
44+
const res = await api.get(`/attendance/${studentId}`);
4545
return res.data;
4646
} catch (error) {
4747
console.error("학생 출석 정보 불러오기 실패:", error);
@@ -52,7 +52,7 @@ export const getStudentAttendance = async (studentId) => {
5252
// 특정 출석 기록 조회
5353
export const getAttendanceDetail = async (userId, attendanceId) => {
5454
try {
55-
const res = await api.get(`/api/admin/users/${userId}/attendance/${attendanceId}`);
55+
const res = await api.get(`/admin/users/${userId}/attendance/${attendanceId}`);
5656
return res.data;
5757
} catch (error) {
5858
console.error("출석 상세 조회 실패:", error);
@@ -63,7 +63,7 @@ export const getAttendanceDetail = async (userId, attendanceId) => {
6363
// 출석 상태 변경
6464
export const updateAttendanceStatus = async (userId, attendanceId, status) => {
6565
try {
66-
const res = await api.put(`/api/admin/users/${userId}/attendance/${attendanceId}/status`, { status });
66+
const res = await api.put(`/admin/users/${userId}/attendance/${attendanceId}/status`, { status });
6767
return res.data;
6868
} catch (error) {
6969
console.error("출석 상태 변경 실패:", error);
@@ -74,7 +74,7 @@ export const updateAttendanceStatus = async (userId, attendanceId, status) => {
7474
// 출석 기록 삭제
7575
export const deleteAttendanceRecord = async (userId, attendanceId) => {
7676
try {
77-
await api.delete(`/api/admin/users/${userId}/attendance/${attendanceId}`);
77+
await api.delete(`/admin/users/${userId}/attendance/${attendanceId}`);
7878
} catch (error) {
7979
console.error("출석 기록 삭제 실패:", error);
8080
throw error;

frontend/src/components/AdminStudentHeader.jsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,10 @@ const AdminStudentHeader = ({ studentName = "default", onBack }) => {
1717
/>
1818
</button>
1919

20-
<h1 className="header-title">{studentName} 출석</h1>
20+
<h1 className="header-title">
21+
{studentName}
22+
{subtitle && ` ${subtitle}`}
23+
</h1>
2124

2225
<button
2326
className="icon-button"

frontend/src/pages/admin/AdminStudentAssignment.jsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,8 @@ const AdminStudentAssignment = () => {
9595
return (
9696
<div className={styles.container}>
9797
<AdminStudentHeader
98-
studentName={`${studentInfo?.name || "이름 없음"} ${
99-
selectedWeekLabel ? `- ${selectedWeekLabel}` : ""
100-
}`}
98+
studentName={studentInfo?.name || "이름 없음"}
99+
subtitle={selectedWeekLabel ? `- ${selectedWeekLabel}` : ""}
101100
onBack={() => window.history.back()}
102101
/>
103102

frontend/src/pages/admin/AdminStudentAttendance.jsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ const AdminStudentAttendance = () => {
112112
{/*헤더 */}
113113
<AdminStudentHeader
114114
studentName={studentInfo?.name || "이름 없음"}
115+
subtitle="출석"
115116
onBack={() => window.history.back()}
116117
/>
117118

0 commit comments

Comments
 (0)