Merge pull request #47 from INU-Software-Design/feature/student-record-page

⬆️ update : 배포

Author: JaeHyun10-03

next.config.mjs

@@ -1,6 +1,14 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
   reactStrictMode: false,
+  webpack: (config) => {
+    config.module.rules.push({
+      test: /\.svg$/,
+      use: ["@svgr/webpack"],
+    });
+
+    return config;
+  },
 };
 
 export default nextConfig;

package-lock.json

@@ -11,6 +11,7 @@
   },
   "dependencies": {
     "@fullcalendar/react": "^6.1.17",
+    "@svgr/webpack": "^8.1.0",
     "@tailwindcss/postcss": "^4.0.17",
     "axios": "^1.8.3",
     "dayjs": "^1.11.13",

package.json

@@ -28,7 +28,7 @@ export default function CounselContent() {
     teacher: teacher?.name || "",
     content: "",
     isPublic: true,
-    nextPlan: ""
+    nextPlan: "",
   });
 
   useEffect(() => {
@@ -58,7 +58,7 @@ export default function CounselContent() {
 
   useEffect(() => {
     if (teacher?.name) {
-      setForm(prev => ({ ...prev, teacher: teacher.name }));
+      setForm((prev) => ({ ...prev, teacher: teacher.name }));
     }
   }, [teacher?.name]);
 
@@ -71,7 +71,7 @@ export default function CounselContent() {
       teacher: teacher?.name || "",
       content: "",
       isPublic: true,
-      nextPlan: ""
+      nextPlan: "",
     });
   };
 
@@ -87,7 +87,7 @@ export default function CounselContent() {
         teacher: counsel.teacher,
         content: counsel.content,
         isPublic: counsel.isPublic,
-        nextPlan: counsel.nextPlan
+        nextPlan: counsel.nextPlan,
       });
     }
   };
@@ -103,14 +103,7 @@ export default function CounselContent() {
     e.preventDefault();
     setConsultingData((prev) => [...prev, { ...form, id: nextId++ }]);
     try {
-      await PostCounsel(
-        studentId,
-        reverseCategoryMap[form.category] ?? form.category,
-        form.content,
-        form.nextPlan,
-        form.dateTime,
-        !sendAsPrivate
-      );
+      await PostCounsel(studentId, reverseCategoryMap[form.category] ?? form.category, form.content, form.nextPlan, form.dateTime, !sendAsPrivate);
     } catch (error) {
       console.error(" 실패", error);
       alert(error);
@@ -121,27 +114,16 @@ export default function CounselContent() {
       teacher: teacher?.name || "",
       content: "",
       isPublic: true,
-      nextPlan: ""
+      nextPlan: "",
     });
   };
 
   const handleEdit = async (e: React.FormEvent): Promise<void> => {
     e.preventDefault();
     if (selectedCounselId === null) return;
-    setConsultingData((prev) =>
-      prev.map((c) =>
-        c.id === selectedCounselId ? { ...c, ...form } : c
-      )
-    );
+    setConsultingData((prev) => prev.map((c) => (c.id === selectedCounselId ? { ...c, ...form } : c)));
     try {
-      await PutCounsel(
-        selectedCounselId,
-        reverseCategoryMap[form.category] ?? form.category,
-        form.content,
-        form.nextPlan,
-        form.dateTime,
-        !sendAsPrivate
-      );
+      await PutCounsel(selectedCounselId, reverseCategoryMap[form.category] ?? form.category, form.content, form.nextPlan, form.dateTime, !sendAsPrivate);
     } catch (error) {
       console.error(" 실패", error);
       alert(error);
@@ -179,12 +161,7 @@ export default function CounselContent() {
     <div className="w-full h-full border border-[#a9a9a9] p-4">
       <div className="flex flex-col md:flex-row gap-4">
         <div className="flex-1 min-w-[320px] flex justify-center items-center">
-          <CounselCalendar
-            events={events}
-            selectedDate={selectedDate}
-            handleDateClick={handleDateClick}
-            handleEventClick={handleEventClick}
-          />
+          <CounselCalendar events={events} selectedDate={selectedDate} handleDateClick={handleDateClick} handleEventClick={handleEventClick} />
         </div>
         <div className={`flex-[2] border rounded-md p-4 flex flex-col justify-between relative ${form.isPublic ? "" : "pointer-events-none"}`}>
           <CounselForm
@@ -216,12 +193,7 @@ export default function CounselContent() {
               })} 상담 이력`
             : "상담이력"}
         </div>
-        <CounselHistoryList
-          dailyHistory={dailyHistory}
-          selectedCounselId={selectedCounselId}
-          setSelectedCounselId={setSelectedCounselId}
-          setForm={setForm}
-        />
+        <CounselHistoryList dailyHistory={dailyHistory} selectedCounselId={selectedCounselId} setSelectedCounselId={setSelectedCounselId} setForm={setForm} />
       </div>
     </div>
   );

public/assets/images/logo.png

@@ -1,7 +1,6 @@
 import React, { ReactNode, useMemo, useCallback } from "react";
 import Image from "next/image";
 import { useRouter } from "next/router";
-import logo from "@/assets/images/logo.png";
 import AlertIcon from "@/assets/icons/AlertIcon";
 
 export const Header = ({ children }: { children: ReactNode }) => {
@@ -46,15 +45,16 @@ export const Header = ({ children }: { children: ReactNode }) => {
     <header>
       <div className="flex items-center w-full h-18 bg-white border-b border-gray-400">
         <Image
-          src={logo}
+          src={"/assets/images/logo.png"}
           alt="로고"
-          height={64}
+          width={71}
+          height={48}
           onClick={() => {
             router.push("/");
           }}
-          className="cursor-pointer"
+          className="cursor-pointer mx-8 my-auto"
         />
-        <div className="flex items-center gap-16 ml-4">{menuElements}</div>
+        <div className="flex items-center h-[72px] gap-16 ml-4">{menuElements}</div>
         <div
           className="flex justify-center items-center ml-auto mr-8"
           onClick={() => {

public/assets/images/logo.svg

@@ -14,10 +14,13 @@ export default function Modal({ name, onClose }: ModalProps) {
     const token = localStorage.getItem("accessToken");
     const getFeedback = async () => {
       try {
-         await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_DOMAIN}`, {
+        const res = await axios.get(`${process.env.NEXT_PUBLIC_BACKEND_DOMAIN}`, {
           headers: { Authorization: `Bearer ${token}` },
         });
-       
+        const data = res.data;
+        console.log(data);
+        // 초기 피드백 데이터를 여기서 넣고 싶으면:
+        // setFeedback(data.feedback);
       } catch (err) {
         console.error(err);
       }
@@ -43,4 +46,4 @@ export default function Modal({ name, onClose }: ModalProps) {
       </div>
     </div>
   );
-}
+}

src/components/counsel/counselContent.tsx

@@ -18,8 +18,8 @@ const Login = () => {
   const handleLogin = async (e: React.MouseEvent<HTMLButtonElement>): Promise<void> => {
     e.preventDefault();
     if (!userId || !password) {
-        alert('아이디와 비밀번호를 모두 입력해주세요.');
-        return;
+      alert("아이디와 비밀번호를 모두 입력해주세요.");
+      return;
     }
 
     try {
@@ -35,16 +35,16 @@ const Login = () => {
 
       router.push("/student-record");
     } catch (error) {
-        console.error("로그인 실패", error);
-        alert(error);
-        alert('이메일 혹은 비밀번호가 틀립니다. 다시 시도해주세요.');
+      console.error("로그인 실패", error);
+      alert(error);
+      alert("이메일 혹은 비밀번호가 틀립니다. 다시 시도해주세요.");
     }
   };
 
   return (
     <div className="w-full h-[100vh] flex justify-center items-center">
       <div className="flex w-full h-auto max-w-[500px] flex-col items-center jsutify-center">
-        <Image className="flex" src={"/assets/images/logo.svg"} alt="logo" width={380} height={190}></Image>
+        <Image className="flex" src={"/assets/images/logo.png"} alt="logo" width={300} height={190}></Image>
         <div id="inputCont" className="flex flex-col align-start mt-[32px] w-[76%]">
           <div id="id" className="mb-[32px]">
             <p className="mb-[8px] text-[20px] leading-[23px] text-center text-[#333333] flex items-center font-[NanumGothic]">아이디</p>