Skip to content

[Fix] Header 구조 #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Imggaggu merged 2 commits into from
May 23, 2025
Merged

[Fix] Header 구조 #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5023b16
[Fix] admin header 구조
Imggaggu May 23, 2025
bf2422e
Merge pull request #182 from pirogramming/frontend_admin_sj
Imggaggu May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frontend/src/api/adminassignment.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@ export const fetchStudentInfo = (studentId) =>

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

// 과제 상태 수정 (PUT)
export const updateAssignmentStatus = (userId, assignmentId, status) =>
api.put(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, {
api.put(`/admin/users/${userId}/assignments/${assignmentId}/submission`, {
status,
});

// 과제 상태 등록 (POST)
export const submitAssignmentStatus = (userId, assignmentId, status) =>
api.post(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, {
api.post(`/admin/users/${userId}/assignments/${assignmentId}/submission`, {
status,
});
8 changes: 4 additions & 4 deletions frontend/src/api/adminattendance.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const getStudentBasicInfo = async (studentId) => {
// 학생 출석 전체 데이터 조회 (특정 날짜와 차수 포함)
export const getStudentAttendance = async (studentId) => {
try {
const res = await api.get(`/api/attendance/${studentId}`);
const res = await api.get(`/attendance/${studentId}`);
return res.data;
} catch (error) {
console.error("학생 출석 정보 불러오기 실패:", error);
Expand All @@ -52,7 +52,7 @@ export const getStudentAttendance = async (studentId) => {
// 특정 출석 기록 조회
export const getAttendanceDetail = async (userId, attendanceId) => {
try {
const res = await api.get(`/api/admin/users/${userId}/attendance/${attendanceId}`);
const res = await api.get(`/admin/users/${userId}/attendance/${attendanceId}`);
return res.data;
} catch (error) {
console.error("출석 상세 조회 실패:", error);
Expand All @@ -63,7 +63,7 @@ export const getAttendanceDetail = async (userId, attendanceId) => {
// 출석 상태 변경
export const updateAttendanceStatus = async (userId, attendanceId, status) => {
try {
const res = await api.put(`/api/admin/users/${userId}/attendance/${attendanceId}/status`, { status });
const res = await api.put(`/admin/users/${userId}/attendance/${attendanceId}/status`, { status });
return res.data;
} catch (error) {
console.error("출석 상태 변경 실패:", error);
Expand All @@ -74,7 +74,7 @@ export const updateAttendanceStatus = async (userId, attendanceId, status) => {
// 출석 기록 삭제
export const deleteAttendanceRecord = async (userId, attendanceId) => {
try {
await api.delete(`/api/admin/users/${userId}/attendance/${attendanceId}`);
await api.delete(`/admin/users/${userId}/attendance/${attendanceId}`);
} catch (error) {
console.error("출석 기록 삭제 실패:", error);
throw error;
Expand Down
5 changes: 4 additions & 1 deletion frontend/src/components/AdminStudentHeader.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,10 @@ const AdminStudentHeader = ({ studentName = "default", onBack }) => {
/>
</button>

<h1 className="header-title">{studentName} 출석</h1>
<h1 className="header-title">
{studentName}
{subtitle && ` ${subtitle}`}
</h1>

<button
className="icon-button"
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/pages/admin/AdminStudentAssignment.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
updateAssignmentStatus,
fetchStudentInfo,
fetchStudentAssignments,
} from "../../api/adminassignemnt";
} from "../../api/adminassignment";

const AdminStudentAssignment = () => {
const { studentId, week } = useParams();
Expand Down Expand Up @@ -95,9 +95,8 @@ const AdminStudentAssignment = () => {
return (
<div className={styles.container}>
<AdminStudentHeader
studentName={`${studentInfo?.name || "이름 없음"} ${
selectedWeekLabel ? `- ${selectedWeekLabel}` : ""
}`}
studentName={studentInfo?.name || "이름 없음"}
subtitle={selectedWeekLabel ? `- ${selectedWeekLabel}` : ""}
onBack={() => window.history.back()}
/>

Expand Down
1 change: 1 addition & 0 deletions frontend/src/pages/admin/AdminStudentAttendance.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ const AdminStudentAttendance = () => {
{/*헤더 */}
<AdminStudentHeader
studentName={studentInfo?.name || "이름 없음"}
subtitle="출석"
onBack={() => window.history.back()}
/>

Expand Down