merge

Author: Imggaggu

backend/pirocheck/src/main/java/backend/pirocheck/User/filter/SessionCheckFilter.java

@@ -18,9 +18,10 @@ protected void doFilterInternal(HttpServletRequest request,
             throws ServletException, IOException {
 
         String path = request.getRequestURI();
+        String method = request.getMethod();
 
-        // 로그인/로그아웃 요청은 세션 체크 제외
-        if (path.startsWith("/api/login") || path.startsWith("/api/logout")) {
+        // CORS preflight 요청(OPTIONS) 또는 로그인/로그아웃 요청은 세션 체크 제외
+        if ("OPTIONS".equals(method) || path.startsWith("/api/login") || path.startsWith("/api/logout")) {
             filterChain.doFilter(request, response); // 다음 필터나 컨트롤러로 넘기는 명령어
             return; // 세션 검사 안함
         }

frontend/src/api/api.js

@@ -2,10 +2,8 @@ import axios from "axios";
 
 const api = axios.create({
   baseURL: "http://api.pirocheck.org:8080/api",
-
   // 수정 필요한지 재검 필요함
   // "http://api.pirocheck.org:8080/api"
-
   withCredentials: true,
 });
 

frontend/src/api/assignment.js

@@ -25,7 +25,7 @@ export const submitAssignmentStatus = async (userId, assignmentId, status) => {
 };
 
 export const updateAssignmentStatus = async (userId, assignmentId, status) => {
-  return api.put(`/api/admin/users/${userId}/assignments/${assignmentId}/submission`, {
+  return api.put(`/admin/users/${userId}/assignments/${assignmentId}/submission`, {
     status,
   });
 };

frontend/src/api/students.js

@@ -4,6 +4,7 @@ export const getStudentsByName = async (name) => {
   const res = await api.get(`/admin/managestudent`, {
     params: { name },
   });
+  console.log("💬 getStudentsByName 응답:", res.data);
   return res.data; // [{ id: ..., name: ... }]
 };
 

frontend/src/components/Header.jsx

@@ -50,9 +50,7 @@ const Header = () => {
             height={30}
           />
         </button>
-      ) : (
-        <div style={{ width: "30px" }} />
-      )}
+      ) : null}
       {showRightMagageStudent ? (
         <button
           className="icon-button"

frontend/src/components/componentsCss/Header.css

@@ -5,9 +5,10 @@
   display: flex;
   align-items: center;
   width: 390px;
-  justify-content: space-between;
+  justify-content: flex-start;
   padding: 1rem;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+  gap: 100px;
+  box-shadow: 0 2px 4px #0003;
   margin: 10px;
 }
 

frontend/src/pages/admin/AdminStudentAssignment.jsx

@@ -143,4 +143,4 @@ const handleSave = async (taskId, status) => {
   );
 };
 
-export default AdminStudentAssignment;
+export default AdminStudentAssignment;

frontend/src/pages/admin/AttendanceCode.jsx

@@ -1,11 +1,33 @@
-import { useState } from "react";
 import api from "../../api/api";
 import Header from "../../components/Header";
 import style from "./AttendanceCode.module.css";
+import { useState, useEffect } from "react";
 
 const AttendanceCode = () => {
   const [code, setCode] = useState("");
 
+  useEffect(() => {
+    const expireIfNeeded = async () => {
+      try {
+        const res = await api.get("admin/attendance/active-code");
+        const activeCode = res.data.data.code;
+
+        await api.put("admin/attendance/expire", null, {
+          params: { code: activeCode },
+        });
+
+        console.log("기존 출석코드 자동 만료됨");
+      } catch (error) {
+        if (error.response?.status !== 404) {
+          alert(
+            "초기화 중 오류: " + (error.response?.data?.message || "서버 오류")
+          );
+        }
+      }
+    };
+
+    expireIfNeeded();
+  }, []);
   // 출석코드 생성
   const generateCode = async () => {
     try {

frontend/src/pages/admin/DetailManageStudent.jsx

@@ -6,33 +6,51 @@ import { getStudentDetail } from "../../api/students";
 
 const DetailManageStudent = () => {
   const { studentId } = useParams();
+  const numericId = Number(studentId);
   const [student, setStudent] = useState(null);
 
   useEffect(() => {
     const fetchStudent = async () => {
       try {
-        const data = await getStudentDetail(studentId);
+        const data = await getStudentDetail(numericId);
         setStudent(data);
       } catch (err) {
         console.error("학생 상세 정보 불러오기 실패:", err);
       }
     };
 
     fetchStudent();
-  }, [studentId]);
+  }, [numericId]);
 
   if (!student) return <div>loading...</div>;
 
+  console.log("studentId from URL:", studentId);
+  console.log("numericId:", numericId);
+
   return (
     <div className={style.managestudent_wrapper}>
       <Header />
       <div className={style.under_header}>
         <div className={style.student_card}>
-          <h2>{student.name}</h2>
-          <p>잔여 보증금: {student.deposit}원</p>
-          <p>보증금 방어권: {student.defence}</p>
+          <h2 className={style.student_name}>{student.name}</h2>
+          <div className={style.deposit_container}>
+            <p>
+              잔여 보증금: <p>{student.deposit}원</p>
+            </p>
+          </div>
+          <div className={style.defence_container}>
+            <p>
+              보증금 방어권: <p>{student.defence}</p>
+            </p>
+          </div>
         </div>
-
+        <button
+          key={student.id || index}
+          className={style.attendance_btn}
+          onClick={() => navigate(`/admin/attendance/${student.id}`)}
+        >
+          출석 관리 <span>&gt;</span>
+        </button>
         <div className={style.assignment_list}>
           {student.assignmentTitles.map((title, idx) => (
             <button key={idx} className={style.assignment_button}>

frontend/src/pages/admin/DetailManageStudent.module.css

@@ -9,3 +9,37 @@
   flex-direction: column;
   align-items: center;
 }
+.student_card {
+  display: flex;
+  background: #49ff24;
+  flex-direction: column;
+  border-radius: 9px;
+  padding: 15px 20px;
+  width: 300px;
+  height: 150px;
+  justify-content: space-around;
+}
+.student_name {
+  font-size: 25px;
+  font-weight: 700;
+}
+.deposit_container,
+.defence_container {
+  display: flex;
+  justify-content: space-between;
+  font-size: 20px;
+  font-weight: 500;
+}
+.attendance_btn {
+  border: 1px solid #49ff24;
+  border-radius: 9px;
+  width: 300px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  background-color: #333;
+  color: #49ff24;
+  padding: 15px;
+  text-align: left;
+}