Merge branch 'develop'

DSM-PICK · Aug 1, 2024 · 8e5c84b · 8e5c84b
2 parents 422dfb2 + 895f18c
commit 8e5c84b
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 99 deletions.
diff --git a/package.json b/package.json
@@ -5,7 +5,7 @@
   "scripts": {
     "dev": "next dev -H 0.0.0.0",
     "build": "next build",
-    "start": "next start",
+    "start": "next dev -H 0.0.0.0",
     "lint": "next lint"
   },
   "dependencies": {

diff --git a/src/apis/index.ts b/src/apis/index.ts
@@ -1,6 +1,5 @@
 import axios, { AxiosError } from "axios";
 import { cookie } from "@/utils/auth";
-import { useRouter } from "next/navigation";
 
 const BASEURL = process.env.NEXT_PUBLIC_API_KEY;
 
@@ -38,40 +37,30 @@ refreshInstance.interceptors.request.use(
 
 instance.interceptors.response.use(
   (response) => response,
-  async (error: AxiosError<AxiosError>) => {
+  async (error: AxiosError) => {
     if (axios.isAxiosError(error) && error.response) {
-      const { status } = error.response.data;
+      const { status } = error.response;
       if (status === 401) {
         const refreshToken = cookie.get("refresh_token");
         if (refreshToken) {
           try {
-            const res = await axios.put(
-              `${BASEURL}/refresh`,
-              {},
-              {
+            await axios
+              .put(`${BASEURL}/admin/refresh`, null, {
                 headers: {
-                  "X-Refresh-Token": `Bearer ${refreshToken}`,
+                  "X-Refresh-Token": `${refreshToken}`,
                 },
-              }
-            );
-            const { data } = res.data;
-            const accessToken = data.accessToken;
-            cookie.set("access_token", accessToken);
-            if (error.config) {
-              error.config.headers.Authorization = `Bearer ${accessToken}`;
-              return axios.request(error.config);
-            }
-          } catch {
-            throw error;
+              })
+              .then((response) => {
+                const data = response.data;
+                cookie.set("access_token", data.access_token);
+                cookie.set("refresh_token", data.refresh_token);
+              });
+          } catch (refreshError) {
+            return Promise.reject(refreshError);
           }
-        } else {
-          throw error;
         }
-      } else {
-        throw error;
       }
-    } else {
-      throw error;
     }
+    return Promise.reject(error);
   }
 );
diff --git a/src/apis/notice/index.ts b/src/apis/notice/index.ts
@@ -7,28 +7,24 @@ interface Getnotice {
   title: string;
   create_at: string;
   teacher: string;
-  grade: number[];
 }
 
 interface DetailNoticeType {
   title: string;
   content: string;
   create_at: string;
   teacher: string;
-  grade: number[];
 }
 
 interface post {
   title: string;
   content: string;
-  grade: number[];
 }
 
 interface ModifyProp {
   id: string;
   title: string;
   content: string;
-  grade: number[];
 }
 
 export const GetNoticeList = () => {

diff --git a/src/app/components/common/list/after/check/page.tsx b/src/app/components/common/list/after/check/page.tsx
@@ -58,7 +58,9 @@ const CheckList: React.FC<State> = ({
 
   const handleChange = (index: number, newState: string) => {
     const newStatusList = [...statusList];
-    newStatusList[index] = newState;
+    for (let i = index; i < newStatusList.length; i++) {
+      newStatusList[index] = newState;
+    }
     setStatusList(newStatusList);
   };
 

diff --git a/src/app/components/common/list/notice/page.tsx b/src/app/components/common/list/notice/page.tsx
@@ -6,17 +6,10 @@ interface NoticeProp {
   title: string;
   teacher: string;
   createAt: string;
-  grade: string;
   id: string;
 }
 
-const NoticeList: React.FC<NoticeProp> = ({
-  title,
-  teacher,
-  createAt,
-  grade,
-  id,
-}) => {
+const NoticeList: React.FC<NoticeProp> = ({ title, teacher, createAt, id }) => {
   const router = useRouter();
 
   const MoveDetail = () => {
@@ -31,8 +24,7 @@ const NoticeList: React.FC<NoticeProp> = ({
       <div className=" max-w-96 overflow-hidden whitespace-nowrap text-overflow-ellipsis">
         {title}
       </div>
-      <div className=" flex justify-between w-76">
-        <div>{grade}</div>
+      <div className=" flex gap-7">
         <div>{teacher}</div>
         <div>{createAt}</div>
       </div>

diff --git a/src/app/components/common/modal/schedule/page.tsx b/src/app/components/common/modal/schedule/page.tsx
@@ -41,7 +41,6 @@ const PostSchedule: React.FC<ModalProps> = ({ onCancel, initialDate }) => {
         event_name: scheduleData.event_name,
         date: formattedDate,
       };
-      setScheduleData(newScheduleData);
       await addScheduleMutate(newScheduleData, {
         onSuccess: () => {
           location.reload();

diff --git a/src/app/login/page.tsx b/src/app/login/page.tsx
@@ -1,6 +1,5 @@
 "use client";
 import { NextPage } from "next";
-import { QueryClient } from "react-query";
 import Input from "../components/common/input";
 import Button from "../components/common/Button";
 import Picklogo from "../../assets/img/Icon/pickname.svg";
@@ -28,6 +27,7 @@ const Login: NextPage = () => {
   const handleChange = ({ text, name }: ChangeProps) => {
     setData({ ...data, [name]: text });
   };
+
   const handleKeyDown = (event: React.KeyboardEvent<HTMLInputElement>) => {
     if (event.key === "Enter") {
       onClickBtn();
@@ -39,7 +39,7 @@ const Login: NextPage = () => {
 
   const onClickBtn = async () => {
     try {
-      const result = await loginMutate(data, {
+      await loginMutate(data, {
         onSuccess: (res) => {
           const accessToken = res.access_token;
           const refreshToken = res.refresh_token;

diff --git a/src/app/main/page.tsx b/src/app/main/page.tsx
@@ -147,7 +147,7 @@ const Main = () => {
                   href="outList"
                   img={outStudent}
                   number={data?.out}
-                  buttonChildren="외출 중인 학생 보기"
+                  buttonChildren="외출/조기귀가 중인 학생 보기"
                   color="primary"
                   contentChildren="현재 외출중인 "
                 />

diff --git a/src/app/notice/[id]/page.tsx b/src/app/notice/[id]/page.tsx
@@ -14,7 +14,6 @@ interface DetailNoticeType {
   content: string;
   create_at: string;
   teacher: string;
-  grade: number[];
 }
 
 const DetailNotice: NextPage = () => {
@@ -40,7 +39,7 @@ const DetailNotice: NextPage = () => {
 
   const deleteNotice = async () => {
     try {
-      const result = await delelteMutate(
+      await delelteMutate(
         { id: id },
         {
           onSuccess: () => {
@@ -87,14 +86,6 @@ const DetailNotice: NextPage = () => {
                 작성자
                 <div className=" text-neutral-400">{data?.teacher} 선생님</div>
               </div>
-              <div className=" flex text-Button-L gap-2">
-                학년
-                <div className=" text-neutral-400">
-                  {data?.grade.map((grade, index) => (
-                    <span key={index}>{`${Grade([grade])}학년 `}</span>
-                  ))}
-                </div>
-              </div>
             </div>
             <div className=" flex flex-col gap-7">
               <div className=" text-heading5 text-neutral-100">

diff --git a/src/app/notice/modify/[id]/page.tsx b/src/app/notice/modify/[id]/page.tsx
@@ -19,15 +19,13 @@ interface DetailNoticeType {
   content: string;
   create_at: string;
   teacher: string;
-  grade: number[];
 }
 
 const ModifyNotice = () => {
   const router = useRouter();
   const [title, setTitle] = useState("");
   const [content, setContent] = useState("");
   const [selectedGrade, setSelectedGrade] = useState<number>(1);
-  const { mutate: DetailDataMutate } = DetailNoticeData();
   const [data, setData] = useState<DetailNoticeType>();
   const { mutate: modifyMutate } = ModifyNoticeData();
 
@@ -36,32 +34,14 @@ const ModifyNotice = () => {
   const idParam = param.get("id");
 
   const id = idParam ? idParam : "";
+  const { data: DetailDataMutate } = DetailNoticeData(id);
 
   useEffect(() => {
-    getData();
+    setData(data);
+    setTitle(DetailDataMutate?.title || "");
+    setContent(DetailDataMutate?.content || "");
   }, []);
 
-  const getData = async () => {
-    try {
-      const result = await DetailDataMutate(
-        { id: id },
-        {
-          onSuccess: (data) => {
-            setData(data);
-            setTitle(data.title);
-            setContent(data.content);
-            setSelectedGrade(data.grade[0]);
-          },
-          onError: (error) => {
-            console.log(`${error.message} : 에러가 발생했습니다`);
-          },
-        }
-      );
-    } catch (error) {
-      console.log(error);
-    }
-  };
-
   const handleTitleChange = ({ text, name }: ChangeProps) => {
     setTitle(text);
   };
@@ -76,11 +56,10 @@ const ModifyNotice = () => {
 
   const handleSubmit = async () => {
     try {
-      const result = await modifyMutate({
+      await modifyMutate({
         id: id,
         title: title,
         content: content,
-        grade: [selectedGrade],
       });
       alert("공지가 수정되었습니다");
       router.back();
@@ -116,10 +95,6 @@ const ModifyNotice = () => {
                     name="title"
                   />
                 </div>
-                <div>
-                  학년
-                  <SelectGrade onSelect={handleGradeSelect} />
-                </div>
               </div>
             </div>
           </div>

diff --git a/src/app/notice/page.tsx b/src/app/notice/page.tsx
@@ -13,7 +13,6 @@ interface GetnoticeList {
   title: string;
   create_at: string;
   teacher: string;
-  grade: number[];
 }
 
 const Notice = () => {
@@ -46,7 +45,6 @@ const Notice = () => {
         <div className=" flex text-sub-title2-M px-14 justify-between">
           <div className=" text-sub-title2-M">제목</div>
           <div className=" flex gap-20">
-            <div>학년</div>
             <div>작성자</div>
             <div>작성일</div>
           </div>
@@ -59,7 +57,6 @@ const Notice = () => {
               id={item.id}
               createAt={item.create_at}
               teacher={`${item.teacher} 선생님`}
-              grade={`${Grade(item.grade)}학년`}
             />
           ))}
         </div>

diff --git a/src/app/notice/write/page.tsx b/src/app/notice/write/page.tsx
@@ -19,7 +19,6 @@ const WriteNotice = () => {
   const { mutate: uploadNotice } = PostNotice();
   const [title, setTitle] = useState("");
   const [content, setContent] = useState("");
-  const [selectedGrade, setSelectedGrade] = useState<number>(1);
 
   const ColorType = () => {
     if (title === "" || content === "") {
@@ -30,8 +29,8 @@ const WriteNotice = () => {
   const post = async () => {
     if (ColorType() === "primary") {
       try {
-        const result = await uploadNotice(
-          { title, content, grade: [selectedGrade] },
+        await uploadNotice(
+          { title, content },
           {
             onSuccess: () => {
               nav.push("/notice");
@@ -83,10 +82,6 @@ const WriteNotice = () => {
                     name="title"
                   />
                 </div>
-                <div>
-                  학년
-                  <SelectGrade onSelect={setSelectedGrade} />
-                </div>
               </div>
             </div>
           </div>

diff --git a/src/app/selfStudyCheck/page.tsx b/src/app/selfStudyCheck/page.tsx
@@ -35,7 +35,7 @@ const SelfStudyCheck = () => {
   const [saveModal, setSaveModal] = useState<boolean>(false);
   const { mutate: ChangeMutate } = CheckStatus();
   const { mutate: CheckMutate } = ClassStudentCheck();
-  const { selectedStudents, selectedStudentName, handleAcceptListClick } =
+  const { selectedStudentName, handleAcceptListClick } =
     useAcceptListSelection();
 
   const handleSaveModalConfirm = async () => {

diff --git a/src/hook/apiError.ts b/src/hook/apiError.ts
@@ -14,9 +14,7 @@ const ApiError = () => {
     alert("400 잘못된 요청입니다");
   };
 
-  const handle401: ErrorHandler = () => {
-    router.push("login");
-  };
+  const handle401: ErrorHandler = () => {};
 
   const handle403: ErrorHandler = () => {
     alert("403 권한이 없습니다");