From 789640bb032c910d5d86471ea23dc05a8c79aeb4 Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 10:57:25 +0900
Subject: [PATCH 01/29] =?UTF-8?q?chore=20::=20=EC=A3=BC=EB=A7=90=EA=B8=89?=
 =?UTF-8?q?=EC=8B=9D=20=EC=9C=A0=EC=A0=80=20=EC=A0=84=EC=B2=B4=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0=20api?=
 =?UTF-8?q?=20url=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/weekend-meals/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apis/weekend-meals/index.ts b/src/apis/weekend-meals/index.ts
index ceeb50e..14accea 100644
--- a/src/apis/weekend-meals/index.ts
+++ b/src/apis/weekend-meals/index.ts
@@ -13,7 +13,7 @@ export const GetAllMeals = () => {
   return useQuery<GetAllMealsType[]>({
     queryKey: [],
     queryFn: async () => {
-      const { data } = await instance.get(`${router}/hey`);
+      const { data } = await instance.get(`${router}/application-list`);
       return data;
     },
   });

From 02a7ee6b1ac99498f43b4476636c2b542b7328ea Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 10:57:44 +0900
Subject: [PATCH 02/29] =?UTF-8?q?chore=20::=20=EC=A3=BC=EB=A7=90=EA=B8=89?=
 =?UTF-8?q?=EC=8B=9D=20=EB=AA=A8=EB=8B=AC=20=EA=B8=B0=EA=B0=84=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/modal/weekendmealModal.tsx | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/components/modal/weekendmealModal.tsx b/src/components/modal/weekendmealModal.tsx
index 8c6fa1f..982e32c 100644
--- a/src/components/modal/weekendmealModal.tsx
+++ b/src/components/modal/weekendmealModal.tsx
@@ -65,6 +65,17 @@ export const WeekendMealModal = ({
     setMonth(data);
   };
 
+  useEffect(() => {
+    if (!weekendMealInfo?.[0]?.data || !weekendMealInfo?.[1]?.data) return;
+    const { start, end } = weekendMealInfo[0].data;
+    const { month } = weekendMealInfo[1].data;
+    if (start && end) {
+      setEndData(end);
+      setStartData(start);
+      setMonth(month);
+    }
+  }, [weekendMealInfo?.[0]?.data, weekendMealInfo?.[1]?.data]);
+
   const handleDateChange = (date: any) => {
     selectedDate.selectDate(date);
     if (isStartOpen) {

From c002923cfe9d0ae73b203a1a9fc31dc5e6063225 Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 10:58:07 +0900
Subject: [PATCH 03/29] =?UTF-8?q?chore=20::=20=EC=A3=BC=EC=84=9D=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/modal/weekendmealModal.tsx | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/components/modal/weekendmealModal.tsx b/src/components/modal/weekendmealModal.tsx
index 982e32c..61c590a 100644
--- a/src/components/modal/weekendmealModal.tsx
+++ b/src/components/modal/weekendmealModal.tsx
@@ -103,12 +103,6 @@ export const WeekendMealModal = ({
     };
   }, []);
 
-  // useEffect(() => {
-  //   setEndData(weekendMealInfo[0].data?.end!);
-  //   setStartData(weekendMealInfo[0].data?.start!);
-  //   setMonth(weekendMealInfo[1].data?.month!);
-  // }, [weekendMealInfo]);
-
   return (
     <S.ModalWrap>
       <S.ModalStyle>

From e48300d25e95395f657d2e0aa34eef4e6f2028cc Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 15:03:34 +0900
Subject: [PATCH 04/29] =?UTF-8?q?feat=20::=20=EC=B6=9C=EC=84=9D=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20api=20=EC=97=B0=EB=8F=99=20=EB=B0=8F=20=EB=B2=84?=
 =?UTF-8?q?=EA=B7=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx                               | 3 ++-
 src/apis/index.ts                         | 2 +-
 src/components/helpmenu/index.tsx         | 2 +-
 src/components/mainRouterButton/index.tsx | 8 ++++----
 src/pages/notice/detail/index.tsx         | 1 +
 src/router/router.tsx                     | 2 +-
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 11dec4c..88e1b66 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,4 +1,4 @@
-import { RouterProvider } from 'react-router-dom';
+import { RouterProvider, useNavigate } from 'react-router-dom';
 import { Router } from './router/router';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { GlobalStyle, theme } from './styles/theme';
@@ -7,6 +7,7 @@ import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
 import 'react-toastify/dist/ReactToastify.css';
 import Toast from './components/toast';
 import * as ChannelService from '@channel.io/channel-web-sdk-loader';
+import { useEffect } from 'react';
 
 const queryClient = new QueryClient({
   defaultOptions: {
diff --git a/src/apis/index.ts b/src/apis/index.ts
index 6802f59..ccabf9e 100644
--- a/src/apis/index.ts
+++ b/src/apis/index.ts
@@ -55,7 +55,7 @@ instance.interceptors.response.use(
               cookie.set('refresh_token', data.refresh_token);
             })
             .catch(() => {
-              window.location.href = 'login';
+              window.location.href = '/';
             });
         } catch (refreshError) {
           return Promise.reject(refreshError);
diff --git a/src/components/helpmenu/index.tsx b/src/components/helpmenu/index.tsx
index f6f14d6..b28d8fb 100644
--- a/src/components/helpmenu/index.tsx
+++ b/src/components/helpmenu/index.tsx
@@ -17,7 +17,7 @@ const HelfMenu = () => {
     cookie.remove('access_token');
     cookie.remove('refresh_token');
     localStorage.clear();
-    navigate('/login');
+    navigate('/');
   };
 
   return (
diff --git a/src/components/mainRouterButton/index.tsx b/src/components/mainRouterButton/index.tsx
index 7271e55..d643d31 100644
--- a/src/components/mainRouterButton/index.tsx
+++ b/src/components/mainRouterButton/index.tsx
@@ -52,7 +52,7 @@ const MainRouterButton = () => {
     },
     {
       img: classAttendance,
-      text: '학급 출석',
+      text: '학급 관리',
       router: '/classManage',
     },
     // {
@@ -62,17 +62,17 @@ const MainRouterButton = () => {
     // },
     {
       img: changeTeacher,
-      text: '자습감독 변경',
+      text: '자습감독',
       router: '/self-study',
     },
     {
       img: academicCalendar,
-      text: '학사 일정 변경',
+      text: '학사일정 관리',
       router: '/schedule',
     },
     {
       img: timetableChange,
-      text: '시간표 변경',
+      text: '시간표 관리',
       router: '/timetable',
     },
     {
diff --git a/src/pages/notice/detail/index.tsx b/src/pages/notice/detail/index.tsx
index 3f8b982..c40382b 100644
--- a/src/pages/notice/detail/index.tsx
+++ b/src/pages/notice/detail/index.tsx
@@ -73,6 +73,7 @@ const NoticeDetail = () => {
               { id: noticeId },
               {
                 onSuccess: () => {
+                  router('/notice');
                   showToast({
                     type: 'success',
                     message: '공지가 삭제되었습니다.',
diff --git a/src/router/router.tsx b/src/router/router.tsx
index d42f4fd..ece8671 100644
--- a/src/router/router.tsx
+++ b/src/router/router.tsx
@@ -33,7 +33,7 @@ export const Router = createBrowserRouter([
         element: <NotFound />,
       },
       {
-        path: 'login',
+        path: '',
         element: <Login />,
       },
       {

From 9e68c4d928eb93c383444f122fbf3fadd54ca242 Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 15:55:10 +0900
Subject: [PATCH 05/29] =?UTF-8?q?feat=20::=20=EA=B3=B5=EC=A7=80=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/notice/index.ts          |  9 ++++
 src/apis/type.ts                  |  6 +++
 src/pages/notice/detail/index.tsx | 75 ++++++++++++++++++++++++++++---
 3 files changed, 83 insertions(+), 7 deletions(-)

diff --git a/src/apis/notice/index.ts b/src/apis/notice/index.ts
index 8c19bd2..eaacace 100644
--- a/src/apis/notice/index.ts
+++ b/src/apis/notice/index.ts
@@ -1,6 +1,7 @@
 import { useQuery } from '@tanstack/react-query';
 import { instance } from '@/apis';
 import {
+  EditNotice,
   NoticeDetailType,
   SimpleNoticeType,
   UploadNoticeType,
@@ -46,3 +47,11 @@ export const useDeleteNotice = () => {
     },
   });
 };
+
+export const useEditNotice = () => {
+  return useMutation<void, Error, EditNotice>({
+    mutationFn: async (param) => {
+      await instance.patch(`${router}/modify`, param);
+    },
+  });
+};
diff --git a/src/apis/type.ts b/src/apis/type.ts
index 0c82ec8..712cd22 100644
--- a/src/apis/type.ts
+++ b/src/apis/type.ts
@@ -15,6 +15,12 @@ export interface SelectedDaySelfStudTeacher {
   teacher: string;
 }
 
+export interface EditNotice {
+  id: string;
+  title: string;
+  content: string;
+}
+
 export interface TodayMealsType {
   date: string;
   meal_list: {
diff --git a/src/pages/notice/detail/index.tsx b/src/pages/notice/detail/index.tsx
index 3f8b982..40a2a7b 100644
--- a/src/pages/notice/detail/index.tsx
+++ b/src/pages/notice/detail/index.tsx
@@ -1,28 +1,67 @@
 import React, { useEffect, useState } from 'react';
 import { Layout } from '@/components/layout';
 import nextSvg from '@/assets/svg/next.svg';
-import { useNavigate, useParams } from 'react-router-dom';
-import { DetailNotice, useDeleteNotice } from '@/apis/notice';
+import { useNavigate, useNavigation, useParams } from 'react-router-dom';
+import { DetailNotice, useDeleteNotice, useEditNotice } from '@/apis/notice';
 import * as S from '../style';
 import BottomButtonWrap from '@/components/Button/bottom';
 import Modal from '@/components/modal';
 import { showToast } from '@/components/toast';
+import Input from '@/components/input';
+import { Textarea } from '@/components/input/textarea';
 
 const NoticeDetail = () => {
   const params = useParams();
+  const router = useNavigate();
   const noticeId = params.detail || '';
   const { data: GetDetailNotice } = DetailNotice(noticeId);
   const { mutate: DeleteNotice } = useDeleteNotice();
   const [deleteNotice, setDeleteNotice] = useState<boolean>(false);
   const [name, setName] = useState<string>('');
+  const [edit, setEdit] = useState<boolean>(false);
+  const { mutate: ModifyNotice } = useEditNotice();
   useEffect(() => {
     const storedName = localStorage.getItem('name');
     if (storedName) {
       setName(storedName);
     }
   }, []);
+  const [data, setData] = useState({
+    id: noticeId,
+    title: GetDetailNotice?.title,
+    content: GetDetailNotice?.content,
+  });
 
-  const router = useNavigate();
+  useEffect(() => {
+    setData({
+      id: noticeId,
+      title: GetDetailNotice?.title,
+      content: GetDetailNotice?.content,
+    });
+  }, [GetDetailNotice]);
+
+  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const { name, value } = e.target;
+    setData((prevData) => ({
+      ...prevData,
+      [name]: value,
+    }));
+  };
+
+  const Modify = () => {
+    ModifyNotice(data, {
+      onSuccess: () => {
+        window.location.reload();
+      },
+      onError: () => {
+        setEdit(false);
+        showToast({
+          type: 'error',
+          message: '공지 수정에 실패하였습니다',
+        });
+      },
+    });
+  };
   return (
     <Layout
       now={
@@ -37,7 +76,18 @@ const NoticeDetail = () => {
           <img src={nextSvg} alt="" /> <span>{GetDetailNotice?.title}</span>
         </>
       }
-      title={GetDetailNotice?.title}
+      title={
+        edit ? (
+          <Input
+            widthtype="login"
+            onChange={handleChange}
+            name="title"
+            value={data.title}
+          />
+        ) : (
+          GetDetailNotice?.title
+        )
+      }
       right={
         <S.NoticeDetailRight>
           <S.NoticeDetailRightText>
@@ -49,12 +99,23 @@ const NoticeDetail = () => {
         </S.NoticeDetailRight>
       }
     >
-      <S.NoticeDetailContent>{GetDetailNotice?.content}</S.NoticeDetailContent>
+      <S.NoticeDetailContent>
+        {edit ? (
+          <Textarea
+            onChange={handleChange}
+            name="content"
+            value={data.content}
+            placeholder=""
+          />
+        ) : (
+          GetDetailNotice?.content
+        )}
+      </S.NoticeDetailContent>
       {GetDetailNotice?.teacher === name && (
         <BottomButtonWrap
           second
-          firstContent="수정"
-          firstOnclick={() => {}}
+          firstContent={edit ? '완료' : '수정'}
+          firstOnclick={edit ? () => Modify() : () => setEdit(true)}
           firstSize="standard"
           firstType="black"
           secondContent="삭제"

From 7e9ad016d5c2b60625b7f0d097b8e1e49a9a2406 Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 21:47:35 +0900
Subject: [PATCH 06/29] =?UTF-8?q?chore=20::=20router=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mainRouterButton/index.tsx | 24 +++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/mainRouterButton/index.tsx b/src/components/mainRouterButton/index.tsx
index d643d31..86aef47 100644
--- a/src/components/mainRouterButton/index.tsx
+++ b/src/components/mainRouterButton/index.tsx
@@ -20,11 +20,6 @@ interface MainRouterButtonType {
 }
 const MainRouterButton = () => {
   const mainRouterButtonArray: MainRouterButtonType[] = [
-    {
-      img: classMoveImg,
-      text: '교실이동',
-      router: '/classMove',
-    },
     {
       img: outingAllow,
       text: '외출 수락',
@@ -40,6 +35,11 @@ const MainRouterButton = () => {
       text: '이전 외출 기록',
       router: '/previousList',
     },
+    {
+      img: classMoveImg,
+      text: '교실이동',
+      router: '/classMove',
+    },
     {
       img: weekendMeals,
       text: '주말 급식 신청',
@@ -65,21 +65,21 @@ const MainRouterButton = () => {
       text: '자습감독',
       router: '/self-study',
     },
+    {
+      img: selfStudyImg,
+      text: '자습시간 출결',
+      router: '/attendanceCheck',
+    },
     {
       img: academicCalendar,
-      text: '학사일정 관리',
+      text: '학사일정',
       router: '/schedule',
     },
     {
       img: timetableChange,
-      text: '시간표 관리',
+      text: '시간표',
       router: '/timetable',
     },
-    {
-      img: selfStudyImg,
-      text: '자습시간 출결',
-      router: '/attendanceCheck',
-    },
   ];
 
   return (

From a117f977da1a75e1ffd9cb7408ee97da2cbde34b Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 21:48:43 +0900
Subject: [PATCH 07/29] =?UTF-8?q?feat=20::=20=EB=8D=B0=EC=9D=B4=ED=84=B0?=
 =?UTF-8?q?=20=EC=97=86=EC=9D=84=EC=8B=9C=20=EB=AC=B8=EA=B5=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/RequestClass.tsx       | 32 +++++++++++++++++++++-----------
 src/pages/moveClass.tsx          | 24 ++++++++++++++----------
 src/pages/outList/index.tsx      | 30 +++++++++++++++++++-----------
 src/pages/previousList/index.tsx |  3 ++-
 4 files changed, 56 insertions(+), 33 deletions(-)

diff --git a/src/pages/RequestClass.tsx b/src/pages/RequestClass.tsx
index fe7c8b8..e7f93f3 100644
--- a/src/pages/RequestClass.tsx
+++ b/src/pages/RequestClass.tsx
@@ -48,6 +48,12 @@ const RequestClass = () => {
       setModal(false);
       ReGetRequestChange();
     },
+    onError: () => {
+      showToast({
+        type: 'error',
+        message: `교실이동 ${state === 'NO' ? '거절' : '수락'}에 실패하였습니다`,
+      });
+    },
   });
 
   const handleFloorChange = (selectedOption: number | string) => {
@@ -80,17 +86,21 @@ const RequestClass = () => {
       >
         <SubTitle>교실 이동 신청한 학생</SubTitle>
         <Wrap>
-          {GetRequestChange?.map((item) => (
-            <ClassMoveList
-              onClick={() =>
-                handleAcceptListClick(item.user_id, item.user_name)
-              }
-              name={getStudentString(item)}
-              preClass={item.move}
-              nextClass={item.classroom_name}
-              moveTime={`${item.start}교시 ~ ${item.end}교시`}
-            />
-          ))}
+          {GetRequestChange?.length ? (
+            GetRequestChange?.map((item) => (
+              <ClassMoveList
+                onClick={() =>
+                  handleAcceptListClick(item.user_id, item.user_name)
+                }
+                name={getStudentString(item)}
+                preClass={item.move}
+                nextClass={item.classroom_name}
+                moveTime={`${item.start}교시 ~ ${item.end}교시`}
+              />
+            ))
+          ) : (
+            <p>교실이동 신청학생이 없습니다</p>
+          )}
         </Wrap>
       </Layout>
       <BottomButtonWrap
diff --git a/src/pages/moveClass.tsx b/src/pages/moveClass.tsx
index 8b8375d..a985157 100644
--- a/src/pages/moveClass.tsx
+++ b/src/pages/moveClass.tsx
@@ -52,16 +52,20 @@ const MoveClass = () => {
     >
       <SubTitle>교실 이동 중인 학생</SubTitle>
       <Wrap>
-        {ChangingClass?.map((item) => (
-          <ClassMoveList
-            notSelect
-            onClick={() => {}}
-            name={getStudentString(item)}
-            preClass={item.move}
-            nextClass={item.classroom_name}
-            moveTime={`${item.start}교시 ~ ${item.end}교시`}
-          />
-        ))}
+        {ChangingClass?.length ? (
+          ChangingClass?.map((item) => (
+            <ClassMoveList
+              notSelect
+              onClick={() => {}}
+              name={getStudentString(item)}
+              preClass={item.move}
+              nextClass={item.classroom_name}
+              moveTime={`${item.start}교시 ~ ${item.end}교시`}
+            />
+          ))
+        ) : (
+          <p>교실 이동중인 학생이 없습니다</p>
+        )}
       </Wrap>
     </Layout>
   );
diff --git a/src/pages/outList/index.tsx b/src/pages/outList/index.tsx
index 493cbd5..5fd6294 100644
--- a/src/pages/outList/index.tsx
+++ b/src/pages/outList/index.tsx
@@ -81,8 +81,9 @@ const OutList = () => {
           오늘 {currentMenu === 'application' ? '외출' : '조기귀가'}한 학생
         </S.SemiTitle>
         <S.OutListContainer>
-          {currentMenu === 'application'
-            ? OutListFloorData?.map((item, index) => (
+          {currentMenu === 'application' ? (
+            OutListFloorData?.length ? (
+              OutListFloorData?.map((item, index) => (
                 <OutAcceptList
                   key={index}
                   name={item.user_name}
@@ -91,15 +92,22 @@ const OutList = () => {
                   onClick={() => handleAcceptListClick(item.id, item.user_name)}
                 />
               ))
-            : earlyreturnListData?.map((item) => (
-                <OutAcceptList
-                  key={item.class_num}
-                  name={item.user_name}
-                  content={item.reason}
-                  date={item.start}
-                  onClick={() => {}}
-                />
-              ))}
+            ) : (
+              <p>외출자 목록이 없습니다</p>
+            )
+          ) : earlyreturnListData?.length ? (
+            earlyreturnListData?.map((item) => (
+              <OutAcceptList
+                key={item.class_num}
+                name={item.user_name}
+                content={item.reason}
+                date={item.start}
+                onClick={() => {}}
+              />
+            ))
+          ) : (
+            <p>조기귀가 목록이 없습니다</p>
+          )}
         </S.OutListContainer>
       </Layout>
       {currentMenu === 'application' && (
diff --git a/src/pages/previousList/index.tsx b/src/pages/previousList/index.tsx
index edc675c..fbcc23c 100644
--- a/src/pages/previousList/index.tsx
+++ b/src/pages/previousList/index.tsx
@@ -8,7 +8,7 @@ import { styled } from 'styled-components';
 
 const PreviousList = () => {
   const [searchTerm, setSearchTerm] = useState('');
-  const { data: GetCount } = AllList();
+  const { data: GetCount, isLoading: Loading } = AllList();
 
   const handleSearchChange = ({
     text,
@@ -43,6 +43,7 @@ const PreviousList = () => {
       }
     >
       <ContentWrap>
+        {Loading && <p>로딩중~</p>}
         {filteredStudents?.map((item) => (
           <StoryList
             id={item.id}

From 643958230c85569d35ae28f6a55271b31fcc89ce Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 21:49:28 +0900
Subject: [PATCH 08/29] =?UTF-8?q?chore=20::=20router=20=ED=85=8D=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/schedule/index.tsx   | 2 +-
 src/pages/self-study/index.tsx | 4 ++--
 src/pages/titmetable/index.tsx | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/schedule/index.tsx b/src/pages/schedule/index.tsx
index dde47ce..d29cbcb 100644
--- a/src/pages/schedule/index.tsx
+++ b/src/pages/schedule/index.tsx
@@ -3,7 +3,7 @@ import { Layout } from '@/components/layout';
 
 const Schedule = () => {
   return (
-    <Layout now="학사 일정 변경" title="학사 일정 변경">
+    <Layout now="학사 일정" title="학사 일정">
       <Calendar type="schedule" />
     </Layout>
   );
diff --git a/src/pages/self-study/index.tsx b/src/pages/self-study/index.tsx
index c645377..069f7f6 100644
--- a/src/pages/self-study/index.tsx
+++ b/src/pages/self-study/index.tsx
@@ -8,8 +8,8 @@ const SelfStudy = () => {
   const { data: Today } = TodaySelfStudy();
   return (
     <Layout
-      now="자습감독 변경"
-      title="자습감독 변경"
+      now="자습감독"
+      title="자습감독"
       right={
         Today?.length !== 0 ? (
           Today?.map((item) => (
diff --git a/src/pages/titmetable/index.tsx b/src/pages/titmetable/index.tsx
index e433bec..a130996 100644
--- a/src/pages/titmetable/index.tsx
+++ b/src/pages/titmetable/index.tsx
@@ -27,8 +27,8 @@ export const TimeTable = () => {
 
   return (
     <Layout
-      now="시간표 변경"
-      title="시간표 변경"
+      now="시간표"
+      title="시간표"
       right={
         <>
           <Dropdown

From b678f51c2af05480e4d41f287cd5afec0e18712f Mon Sep 17 00:00:00 2001
From: hyuna <hyuna_0525@dsm.hs.kr>
Date: Thu, 31 Oct 2024 21:49:48 +0900
Subject: [PATCH 09/29] =?UTF-8?q?chore=20::=20=EA=B3=B5=EC=A7=80=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=A6=AC=ED=8C=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/notice/detail/index.tsx | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/pages/notice/detail/index.tsx b/src/pages/notice/detail/index.tsx
index 62ee019..2264e88 100644
--- a/src/pages/notice/detail/index.tsx
+++ b/src/pages/notice/detail/index.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { TextareaHTMLAttributes, useEffect, useState } from 'react';
 import { Layout } from '@/components/layout';
 import nextSvg from '@/assets/svg/next.svg';
 import { useNavigate, useNavigation, useParams } from 'react-router-dom';
@@ -14,7 +14,8 @@ const NoticeDetail = () => {
   const params = useParams();
   const router = useNavigate();
   const noticeId = params.detail || '';
-  const { data: GetDetailNotice } = DetailNotice(noticeId);
+  const { data: GetDetailNotice, refetch: ReGetDetailNotice } =
+    DetailNotice(noticeId);
   const { mutate: DeleteNotice } = useDeleteNotice();
   const [deleteNotice, setDeleteNotice] = useState<boolean>(false);
   const [name, setName] = useState<string>('');
@@ -51,7 +52,12 @@ const NoticeDetail = () => {
   const Modify = () => {
     ModifyNotice(data, {
       onSuccess: () => {
-        window.location.reload();
+        setEdit(false);
+        showToast({
+          type: 'error',
+          message: '공지 수정에 성공하였습니다',
+        });
+        ReGetDetailNotice();
       },
       onError: () => {
         setEdit(false);

From 386bb178098b1be1d53a8d2c8da079704cd20720 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:18:47 +0900
Subject: [PATCH 10/29] =?UTF-8?q?feat=20::=20=EC=9E=90=EC=8A=B5=EA=B0=90?=
 =?UTF-8?q?=EB=8F=85=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dropdown/status.tsx | 33 +++++------
 src/components/list/class.tsx      | 92 +++++++++++++++++++++---------
 src/pages/selfStudyCheck/index.tsx | 32 ++++++++++-
 3 files changed, 113 insertions(+), 44 deletions(-)

diff --git a/src/components/dropdown/status.tsx b/src/components/dropdown/status.tsx
index 10f3130..695ce2b 100644
--- a/src/components/dropdown/status.tsx
+++ b/src/components/dropdown/status.tsx
@@ -7,13 +7,15 @@ import arrowLeft from '@/assets/svg/statusArrowLeft.svg';
 interface StatusDropProps {
   status: string;
   onChange: (newState: string) => Promise<void>;
-  type?: 'NO';
+  type?: 'HOMEROOM' | 'ATTENDANCE';
 }
 
 const StatusDrop = ({ status, onChange, type }: StatusDropProps) => {
   const [isDropdownVisible, setIsDropdownVisible] = useState<boolean>(false);
   const [selectedOption, setSelectedOption] = useState<string>(status);
   const dropdownRef = useRef<HTMLDivElement>(null);
+  const homeroomStatus = ['출석', '현체', '귀가', '취업', '자퇴'];
+  const attendanceStatus = ['출석', '이동', '외출', '귀가', '현체', '무단'];
 
   useEffect(() => {
     setSelectedOption(status);
@@ -51,6 +53,8 @@ const StatusDrop = ({ status, onChange, type }: StatusDropProps) => {
         return 'GO_OUT';
       case '이동':
         return 'MOVEMENT';
+      case '무단':
+        return 'DISALLOWED';
       default:
         return '';
     }
@@ -73,6 +77,7 @@ const StatusDrop = ({ status, onChange, type }: StatusDropProps) => {
       case '취업':
         return theme.color.main[500];
       case '자퇴':
+      case '무단':
         return theme.color.error[500];
       case '외출':
       case '이동':
@@ -97,21 +102,17 @@ const StatusDrop = ({ status, onChange, type }: StatusDropProps) => {
       </DropdownButton>
       {isDropdownVisible && (
         <DropdownMenu>
-          <DropdownItem onClick={() => handleOptionClick('출석')}>
-            출석
-          </DropdownItem>
-          <DropdownItem onClick={() => handleOptionClick('현체')}>
-            현체
-          </DropdownItem>
-          <DropdownItem onClick={() => handleOptionClick('귀가')}>
-            귀가
-          </DropdownItem>
-          <DropdownItem onClick={() => handleOptionClick('취업')}>
-            취업
-          </DropdownItem>
-          <DropdownItem onClick={() => handleOptionClick('자퇴')}>
-            자퇴
-          </DropdownItem>
+          {type === 'ATTENDANCE'
+            ? attendanceStatus.map((item) => (
+                <DropdownItem onClick={() => handleOptionClick(item)}>
+                  {item}
+                </DropdownItem>
+              ))
+            : homeroomStatus.map((item) => (
+                <DropdownItem onClick={() => handleOptionClick(item)}>
+                  {item}
+                </DropdownItem>
+              ))}
         </DropdownMenu>
       )}
     </DropdownContainer>
diff --git a/src/components/list/class.tsx b/src/components/list/class.tsx
index 1692977..6139bd5 100644
--- a/src/components/list/class.tsx
+++ b/src/components/list/class.tsx
@@ -14,11 +14,12 @@ interface ClassListProp {
   name: string;
   status6: Status;
   id: string;
-  self?: boolean;
+  self?: 'attendance' | 'club';
   status7?: Status;
   status8?: Status;
   status9?: Status;
   status10?: Status;
+  refetchStatus: () => void;
 }
 
 const ClassList = ({
@@ -31,9 +32,10 @@ const ClassList = ({
   status8 = 'ATTENDANCE',
   status9 = 'ATTENDANCE',
   self,
+  refetchStatus,
 }: ClassListProp) => {
   const { mutate: ChangeMutate } = ChangeStudentStatus();
-  const { mutate: AlltimeChange } = useChangeAttendanceStatus();
+  const { mutateAsync: AlltimeChange } = useChangeAttendanceStatus();
   const [statuses, setStatuses] = useState<Status[]>([
     status6,
     status7,
@@ -43,26 +45,30 @@ const ClassList = ({
   ]);
 
   const updateStatus = async (newStatus: Status, index: number) => {
-    const updatedStatuses = [...statuses];
-    updatedStatuses[index] = newStatus;
-
+    const updatedStatuses = statuses.map((status, i) =>
+      i >= index ? newStatus : status,
+    );
     setStatuses(updatedStatuses);
 
     if (self) {
       const newModifiedStudents = [
         { user_id: id, status_list: updatedStatuses },
       ];
-      try {
-        await AlltimeChange(newModifiedStudents);
-        showToast({ type: 'success', message: '상태가 변경되었습니다.' });
-      } catch (error) {
-        showToast({ type: 'error', message: '상태 변경에 실패했습니다.' });
-      }
+      await AlltimeChange(newModifiedStudents, {
+        onSuccess: () => {
+          showToast({ type: 'success', message: '상태가 변경되었습니다.' });
+          refetchStatus();
+        },
+        onError: () => {
+          showToast({ type: 'error', message: '상태 변경에 실패했습니다.' });
+        },
+      });
     } else {
       const newModifiedStudents = [{ user_id: id, status_type: newStatus }];
       ChangeMutate(newModifiedStudents, {
         onSuccess: () => {
           showToast({ type: 'success', message: '상태가 변경되었습니다.' });
+          refetchStatus();
         },
         onError: () => {
           showToast({ type: 'error', message: '상태 변경에 실패했습니다.' });
@@ -77,21 +83,43 @@ const ClassList = ({
         <div>{number}</div>
         <div>{name}</div>
       </Title>
-      <StatusDrop
-        status={useChangeStatusName(statuses[0])}
-        onChange={(newStatus) => updateStatus(newStatus as Status, 0)}
-      />
-      {self && (
-        <>
-          {[1, 2, 3, 4].map((index) => (
-            <StatusDrop
-              key={index}
-              status={useChangeStatusName(statuses[index])}
-              onChange={(newStatus) => updateStatus(newStatus as Status, index)}
-            />
-          ))}
-        </>
-      )}
+      <DropdownWrap type={self}>
+        {!self && (
+          <StatusDrop
+            status={useChangeStatusName(statuses[0])}
+            onChange={(newStatus) => updateStatus(newStatus as Status, 0)}
+            type={self ? 'ATTENDANCE' : 'HOMEROOM'}
+          />
+        )}
+        {self === 'club' && (
+          <>
+            {[0, 1, 2, 3, 4].map((index) => (
+              <StatusDrop
+                key={index}
+                status={useChangeStatusName(statuses[index])}
+                onChange={(newStatus) =>
+                  updateStatus(newStatus as Status, index)
+                }
+                type="ATTENDANCE"
+              />
+            ))}
+          </>
+        )}
+        {self === 'attendance' && (
+          <>
+            {[2, 3, 4].map((index) => (
+              <StatusDrop
+                key={index}
+                status={useChangeStatusName(statuses[index])}
+                onChange={(newStatus) =>
+                  updateStatus(newStatus as Status, index)
+                }
+                type="ATTENDANCE"
+              />
+            ))}
+          </>
+        )}
+      </DropdownWrap>
     </ListWrap>
   );
 };
@@ -110,6 +138,18 @@ const ListWrap = styled.div`
   align-items: center;
   padding: 16px 20px;
   background-color: ${theme.color.main[50]};
+
   border-radius: 12px;
   min-width: fit-content;
 `;
+
+const DropdownWrap = styled.div<{ type?: 'attendance' | 'club' }>`
+  display: flex;
+  justify-content: space-between;
+  width: ${(props) =>
+    props.type === 'club'
+      ? '800px'
+      : props.type === 'attendance'
+        ? '440px'
+        : ''};
+`;
diff --git a/src/pages/selfStudyCheck/index.tsx b/src/pages/selfStudyCheck/index.tsx
index 6266d20..47e8486 100644
--- a/src/pages/selfStudyCheck/index.tsx
+++ b/src/pages/selfStudyCheck/index.tsx
@@ -9,6 +9,7 @@ import { useState } from 'react';
 import { styled } from 'styled-components';
 
 export const SelfStudyCheck = () => {
+  const period = ['8교시', '9교시', '10교시'];
   const [selectedGrade, setSelectedGrade] = useState<number>(1);
   const [selectedClass, setSelectedClass] = useState<number>(1);
   const { data: attendanceData } = useGetAttendanceStatus(
@@ -43,8 +44,18 @@ export const SelfStudyCheck = () => {
       }
     >
       <Content>
+        <TitleContainer>
+          <PeriodText>목요일</PeriodText>
+          <PeriodMap>
+            {period.map((item) => (
+              <PeriodText>{item}</PeriodText>
+            ))}
+          </PeriodMap>
+        </TitleContainer>
+
         {attendanceData?.map((item) => (
           <ClassList
+            refetchStatus={() => {}}
             key={item.id}
             name={item.user_name}
             number={setStudentNum(item)}
@@ -54,7 +65,7 @@ export const SelfStudyCheck = () => {
             status8={item.status8}
             status9={item.status9}
             status10={item.status10}
-            self
+            self="attendance"
           />
         ))}
       </Content>
@@ -63,8 +74,25 @@ export const SelfStudyCheck = () => {
 };
 
 const Content = styled.div`
-  background-color: ${theme.color.main[50]};
   display: flex;
   flex-direction: column;
   gap: 12px;
 `;
+
+const TitleContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`;
+
+const PeriodMap = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  gap: 120px;
+  padding: 16px 20px;
+`;
+
+const PeriodText = styled.p`
+  font-size: ${theme.font.heading[3].size};
+  font-weight: ${theme.font.heading[3].fontweight};
+`;

From 998699659db938ffdd05be59490ad301eafec878 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:18:59 +0900
Subject: [PATCH 11/29] =?UTF-8?q?chore=20::=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/tab/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/tab/index.tsx b/src/components/tab/index.tsx
index 33ffc25..3aa9e6d 100644
--- a/src/components/tab/index.tsx
+++ b/src/components/tab/index.tsx
@@ -7,7 +7,7 @@ interface TabbarProps {
   onTabPress: (tab: string) => void;
 }
 
-const Tabbar: React.FC<TabbarProps> = ({ selectedTab, onTabPress }) => {
+const Tabbar = ({ selectedTab, onTabPress }: TabbarProps) => {
   const translateX = useRef(0);
 
   useEffect(() => {

From ae82a75c0db215a8ac4fcc73a32a68edd980968c Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:19:29 +0900
Subject: [PATCH 12/29] =?UTF-8?q?chore=20::=20index=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/menu/style.ts | 2 +-
 src/pages/notice/index.tsx   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/components/menu/style.ts b/src/components/menu/style.ts
index b40c65d..f41e1a8 100644
--- a/src/components/menu/style.ts
+++ b/src/components/menu/style.ts
@@ -12,7 +12,7 @@ export const MenuWrap = styled.div`
   top: 0;
   right: 0;
   background-color: ${theme.color.normal.white};
-  z-index: 1;
+  z-index: 2;
 
   &.open {
     animation: slidein 0.5s forwards;
diff --git a/src/pages/notice/index.tsx b/src/pages/notice/index.tsx
index b7b0dda..622fdf8 100644
--- a/src/pages/notice/index.tsx
+++ b/src/pages/notice/index.tsx
@@ -56,8 +56,9 @@ const NoticePage = () => {
           </S.NoticeTopRight>
         </S.NoticeWrap>
         <div>
-          {filteredNotices.map((notice: SimpleNoticeType) => (
+          {filteredNotices.map((notice: SimpleNoticeType, index) => (
             <NoticeList
+              index={index + 1}
               key={notice.id}
               id={notice.id}
               teacher={notice.teacher}

From 3a5599c1e3a82aa23b0cfec6e13457c402fd0b6f Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:20:02 +0900
Subject: [PATCH 13/29] =?UTF-8?q?chore=20::=20=EA=B5=90=EC=8B=A4=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99=20=EC=9D=B4=EC=8A=88=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/RequestClass.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/RequestClass.tsx b/src/pages/RequestClass.tsx
index e7f93f3..3bcff90 100644
--- a/src/pages/RequestClass.tsx
+++ b/src/pages/RequestClass.tsx
@@ -116,6 +116,7 @@ const RequestClass = () => {
         secondContent="수락"
         secondSize="standard"
         secondOnclick={() => {
+          setState('OK');
           setModal(true);
         }}
         secondType="main"

From 1436c6cacd001ba696b12b116d15df62e9cc1d3f Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:20:25 +0900
Subject: [PATCH 14/29] =?UTF-8?q?chore=20::=20=EC=8B=9C=EA=B0=84=ED=91=9C?=
 =?UTF-8?q?=20=EB=93=9C=EB=A1=AD=EB=8B=A4=EC=9A=B4=20=EC=98=B5=EC=85=98=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/titmetable/index.tsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/titmetable/index.tsx b/src/pages/titmetable/index.tsx
index a130996..12ceac7 100644
--- a/src/pages/titmetable/index.tsx
+++ b/src/pages/titmetable/index.tsx
@@ -3,7 +3,7 @@ import Dropdown from '@/components/dropdown';
 import { Layout } from '@/components/layout';
 import { DayTimeTable } from '@/components/timetable';
 import { theme } from '@/styles/theme';
-import { Class_numOption, GradeOption } from '@/utils/dropdown';
+import { NotAllClassOption, NotAllGradeOption } from '@/utils/dropdown';
 import { useState } from 'react';
 import { styled } from 'styled-components';
 
@@ -32,12 +32,12 @@ export const TimeTable = () => {
       right={
         <>
           <Dropdown
-            options={GradeOption}
+            options={NotAllGradeOption}
             value={selectedGrade}
             changeHandler={handleGradeChange}
           />
           <Dropdown
-            options={Class_numOption}
+            options={NotAllClassOption}
             value={selectedClass}
             changeHandler={handleClassChange}
           />

From 0308a8b1a2586ef58759e3c7d3db8e90ebdb7a1e Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:20:46 +0900
Subject: [PATCH 15/29] =?UTF-8?q?chore=20::=20key=20=EB=B0=8F=20refetch=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/classManage/index.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/pages/classManage/index.tsx b/src/pages/classManage/index.tsx
index 0b3db29..e21d28a 100644
--- a/src/pages/classManage/index.tsx
+++ b/src/pages/classManage/index.tsx
@@ -17,10 +17,6 @@ const ClassManage = () => {
     selectedClass,
   );
 
-  useEffect(() => {
-    ReGetClassStatus();
-  }, [selectedClass, selectedGrade]);
-
   const handleGrade = (option: string | number) => {
     setSelectedGrade(Number(option));
   };
@@ -54,10 +50,12 @@ const ClassManage = () => {
       <ContentWrap>
         {GetStudentStatus?.students?.map((item) => (
           <ClassList
+            key={item.user_id}
             id={item.user_id}
             name={item.name}
             number={setStudentNum(item)}
             status6={item.status}
+            refetchStatus={ReGetClassStatus}
           />
         ))}
       </ContentWrap>

From e693ea65d8d9772afecb880e7dd05ca7ae20f52c Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Sat, 2 Nov 2024 23:37:37 +0900
Subject: [PATCH 16/29] =?UTF-8?q?chore=20::=20=EB=A6=AC=EB=B7=B0=20?=
 =?UTF-8?q?=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dropdown/status.tsx | 14 ++++++++++----
 src/pages/selfStudyCheck/index.tsx |  6 +++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/dropdown/status.tsx b/src/components/dropdown/status.tsx
index 695ce2b..b40034e 100644
--- a/src/components/dropdown/status.tsx
+++ b/src/components/dropdown/status.tsx
@@ -103,13 +103,19 @@ const StatusDrop = ({ status, onChange, type }: StatusDropProps) => {
       {isDropdownVisible && (
         <DropdownMenu>
           {type === 'ATTENDANCE'
-            ? attendanceStatus.map((item) => (
-                <DropdownItem onClick={() => handleOptionClick(item)}>
+            ? attendanceStatus.map((item, index) => (
+                <DropdownItem
+                  key={`attendance-${item}-${index}`}
+                  onClick={() => handleOptionClick(item)}
+                >
                   {item}
                 </DropdownItem>
               ))
-            : homeroomStatus.map((item) => (
-                <DropdownItem onClick={() => handleOptionClick(item)}>
+            : homeroomStatus.map((item, index) => (
+                <DropdownItem
+                  key={`homeroom-${item}-${index}`}
+                  onClick={() => handleOptionClick(item)}
+                >
                   {item}
                 </DropdownItem>
               ))}
diff --git a/src/pages/selfStudyCheck/index.tsx b/src/pages/selfStudyCheck/index.tsx
index 47e8486..d871bc8 100644
--- a/src/pages/selfStudyCheck/index.tsx
+++ b/src/pages/selfStudyCheck/index.tsx
@@ -47,8 +47,8 @@ export const SelfStudyCheck = () => {
         <TitleContainer>
           <PeriodText>목요일</PeriodText>
           <PeriodMap>
-            {period.map((item) => (
-              <PeriodText>{item}</PeriodText>
+            {period.map((item, index) => (
+              <PeriodText key={index}>{item}</PeriodText>
             ))}
           </PeriodMap>
         </TitleContainer>
@@ -88,7 +88,7 @@ const TitleContainer = styled.div`
 const PeriodMap = styled.div`
   display: flex;
   justify-content: flex-end;
-  gap: 120px;
+  gap: clamp(60px, 10vw, 120px);
   padding: 16px 20px;
 `;
 

From 0742855801e118a82f2c38fc7ae7744a19824304 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:26:06 +0900
Subject: [PATCH 17/29] =?UTF-8?q?feat=20::=20=EC=A0=84=EA=B3=B5=EB=8F=99?=
 =?UTF-8?q?=EC=95=84=EB=A6=AC=20=EB=A9=A4=EB=B2=84=20=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/attendance/index.ts | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/apis/attendance/index.ts b/src/apis/attendance/index.ts
index c8e41b1..76ced58 100644
--- a/src/apis/attendance/index.ts
+++ b/src/apis/attendance/index.ts
@@ -1,6 +1,6 @@
 import { useMutation, useQuery } from '@tanstack/react-query';
 import { instance } from '..';
-import { ChangeAttendance, attendanceType } from '../type';
+import { AttendanceType, ChangeAttendance, attendanceType } from '../type';
 
 const router = '/attendance';
 
@@ -23,3 +23,15 @@ export const useChangeAttendanceStatus = () => {
     },
   });
 };
+
+export const useGetClubMemberList = (club: string) => {
+  return useQuery({
+    queryKey: ['useGetClubMemberList', club],
+    queryFn: async () => {
+      const { data } = await instance.get<attendanceType[]>(
+        `${router}/total-time/club?club=${club}`,
+      );
+      return data;
+    },
+  });
+};

From cfcf3ae1efd746464c6b6cdf9ba26aafe6e533bd Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:26:37 +0900
Subject: [PATCH 18/29] =?UTF-8?q?chore=20::=20=EB=93=9C=EB=A1=AD=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95=20?=
 =?UTF-8?q?=EB=B0=8F=20=EB=A9=94=EC=9D=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20?=
 =?UTF-8?q?=EC=A0=84=EA=B3=B5=EB=8F=99=EC=95=84=EB=A6=AC=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/dropdown/style.ts          |  9 +++++++--
 src/components/mainRouterButton/index.tsx | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/components/dropdown/style.ts b/src/components/dropdown/style.ts
index 37b469d..cf68cdd 100644
--- a/src/components/dropdown/style.ts
+++ b/src/components/dropdown/style.ts
@@ -10,7 +10,9 @@ export const DropdownClickContainer = styled.div<DropdownClickProp>`
   position: absolute;
   flex-direction: column;
   top: 120%;
-  width: 140px;
+  width: 100%;
+  max-height: 250px;
+  overflow-y: auto;
   border-radius: 12px;
   background-color: ${theme.color.normal.white};
   box-shadow: 0px 4px 4px 0px rgba(0, 0, 0, 0.25);
@@ -28,6 +30,7 @@ export const DropdownClick = styled.div<DropdownClickProp>`
   border-radius: 12px;
   background-color: ${theme.color.normal.white};
   border: 1px solid ${theme.color.normal.white};
+  width: 100%;
 
   &:hover {
     background-color: ${theme.color.main[50]};
@@ -36,11 +39,13 @@ export const DropdownClick = styled.div<DropdownClickProp>`
 
 export const DropdownTitle = styled.div`
   position: relative;
-  width: 140px;
+  min-width: 140px;
   height: 49px;
   border: 2px solid ${theme.color.gray[300]};
   border-radius: 12px;
   box-sizing: border-box;
+  padding: 0 8px;
+  gap: 12px;
 
   display: flex;
   align-items: center;
diff --git a/src/components/mainRouterButton/index.tsx b/src/components/mainRouterButton/index.tsx
index 86aef47..058f45f 100644
--- a/src/components/mainRouterButton/index.tsx
+++ b/src/components/mainRouterButton/index.tsx
@@ -55,11 +55,11 @@ const MainRouterButton = () => {
       text: '학급 관리',
       router: '/classManage',
     },
-    // {
-    //   img: clubManagement,
-    //   text: '전공 동아리 관리',
-    //   router: '/club',
-    // },
+    {
+      img: clubManagement,
+      text: '전공 동아리 관리',
+      router: '/club',
+    },
     {
       img: changeTeacher,
       text: '자습감독',

From 9b6a2f9d86177a1d90718e778852255454ebd49b Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:26:53 +0900
Subject: [PATCH 19/29] =?UTF-8?q?feat=20::=20=EC=A0=84=EA=B3=B5=EB=8F=99?=
 =?UTF-8?q?=EC=95=84=EB=A6=AC=20=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dropdown.ts | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/utils/dropdown.ts b/src/utils/dropdown.ts
index acc1eb8..e7c711e 100644
--- a/src/utils/dropdown.ts
+++ b/src/utils/dropdown.ts
@@ -35,3 +35,25 @@ export interface Option {
   value: number;
   label: string | number;
 }
+
+export const clubOptions = [
+  { value: '자습', label: '3-1교실(자습)' },
+  { value: '대동여지도', label: '세미나실 2-1(대동여지도)' },
+  { value: 'DMS', label: '세미나실 2-2(DMS)' },
+  { value: 'gram', label: '세미나실 2-3(gram)' },
+  { value: 'Liear', label: '세미나실 2-4(Liear)' },
+  { value: 'gram-2', label: '3-2교실(gram)' },
+  { value: 'EXIT', label: '소개1실(EXIT)' },
+  { value: 'Lift', label: '소개2실(Lift)' },
+  { value: 'DMS-2', label: '소개 3실(DMS 3학년)' },
+  { value: '자습', label: '2-1교실(자습)' },
+  { value: 'Log', label: '세미나실 3-1(Log)' },
+  { value: '은하', label: '세미나실 3-2(은하)' },
+  { value: 'PiCK', label: '세미나실 3-3(PiCK)' },
+  { value: 'DLC', label: '보안 1실(DLC)' },
+  { value: 'info', label: '보안 2실(info)' },
+  { value: 'TeamQSS', label: '세미나실 4-1(TeamQSS)' },
+  { value: 'NoNamed', label: '세미나실 4-2(NoNamed)' },
+  { value: 'Modeep', label: '세미나실 4-3(Modeep)' },
+  { value: '자습', label: '1-1교실(자습)' },
+];

From e8b974756f965b35e306e20ff3d4792f6032eb13 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:27:11 +0900
Subject: [PATCH 20/29] =?UTF-8?q?feat=20::=20=EC=A0=84=EA=B3=B5=EB=8F=99?=
 =?UTF-8?q?=EC=95=84=EB=A6=AC=20=EB=9D=BC=EC=9A=B0=ED=84=B0=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/router.tsx | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/router/router.tsx b/src/router/router.tsx
index ece8671..1bedca4 100644
--- a/src/router/router.tsx
+++ b/src/router/router.tsx
@@ -19,6 +19,7 @@ import { TimeTable } from '@/pages/titmetable';
 import { SelfStudyCheck } from '@/pages/selfStudyCheck';
 import Main from '@/pages/Main';
 import Login from '@/pages/login';
+import ClubPage from '@/pages/club';
 
 export const Router = createBrowserRouter([
   {
@@ -123,6 +124,10 @@ export const Router = createBrowserRouter([
         path: 'attendanceCheck',
         element: <SelfStudyCheck />,
       },
+      {
+        path: 'club',
+        element: <ClubPage />,
+      },
     ],
   },
 ]);

From 318f19abf3c2aac12afd48530c2bf16857e8c307 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:27:56 +0900
Subject: [PATCH 21/29] =?UTF-8?q?feat=20::=20=EC=A0=84=EA=B3=B5=EB=8F=99?=
 =?UTF-8?q?=EC=95=84=EB=A6=AC=20=EC=B6=9C=EA=B2=B0=20=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/club/index.tsx | 49 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 src/pages/club/index.tsx

diff --git a/src/pages/club/index.tsx b/src/pages/club/index.tsx
new file mode 100644
index 0000000..382f260
--- /dev/null
+++ b/src/pages/club/index.tsx
@@ -0,0 +1,49 @@
+import { useGetClubMemberList } from '@/apis/attendance';
+import Dropdown from '@/components/dropdown';
+import { Layout } from '@/components/layout';
+import ClassList from '@/components/list/class';
+import { getWeekDay } from '@/utils/date';
+import { clubOptions } from '@/utils/dropdown';
+import { setStudentNum } from '@/utils/utils';
+import { useState } from 'react';
+
+const ClubPage = () => {
+  const [selectedClub, setSelectedClub] = useState<string>('대동여지도');
+  const { data: ClubMember } = useGetClubMemberList(selectedClub);
+
+  const handleClubChange = (selectedOption: number | string) => {
+    setSelectedClub(String(selectedOption));
+  };
+
+  return (
+    <Layout
+      now="전공동아리"
+      title="전공동아리"
+      right={
+        <Dropdown
+          options={clubOptions}
+          value={selectedClub}
+          changeHandler={handleClubChange}
+        />
+      }
+    >
+      {ClubMember?.map((item) => (
+        <ClassList
+          refetchStatus={() => {}}
+          key={item.id}
+          name={item.user_name}
+          number={setStudentNum(item)}
+          id={item.id}
+          status6={item.status6}
+          status7={item.status7}
+          status8={item.status8}
+          status9={item.status9}
+          status10={item.status10}
+          self={getWeekDay() === '금' ? 'club' : 'attendance'}
+        />
+      ))}
+    </Layout>
+  );
+};
+
+export default ClubPage;

From e428b96440c27778ac15f78393ff08916d0017c8 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:28:12 +0900
Subject: [PATCH 22/29] =?UTF-8?q?chore=20::=20=EC=B6=9C=EA=B2=B0=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/classManage/index.tsx    | 6 +++---
 src/pages/selfStudyCheck/index.tsx | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/classManage/index.tsx b/src/pages/classManage/index.tsx
index e21d28a..ec4cf98 100644
--- a/src/pages/classManage/index.tsx
+++ b/src/pages/classManage/index.tsx
@@ -6,7 +6,7 @@ import { theme } from '@/styles/theme';
 import styled from 'styled-components';
 import { GetClassStatus } from '@/apis/status';
 import { setStudentNum } from '@/utils/utils';
-import { Class_numOption, GradeOption } from '@/utils/dropdown';
+import { NotAllClassOption, NotAllGradeOption } from '@/utils/dropdown';
 
 const ClassManage = () => {
   const [selectedGrade, setSelectedGrade] = useState<number>(1);
@@ -32,12 +32,12 @@ const ClassManage = () => {
       right={
         <>
           <Dropdown
-            options={GradeOption}
+            options={NotAllGradeOption}
             value={selectedGrade}
             changeHandler={handleGrade}
           />
           <Dropdown
-            options={Class_numOption}
+            options={NotAllClassOption}
             value={selectedClass}
             changeHandler={handleClass}
           />
diff --git a/src/pages/selfStudyCheck/index.tsx b/src/pages/selfStudyCheck/index.tsx
index d871bc8..ffe8712 100644
--- a/src/pages/selfStudyCheck/index.tsx
+++ b/src/pages/selfStudyCheck/index.tsx
@@ -26,8 +26,8 @@ export const SelfStudyCheck = () => {
   };
   return (
     <Layout
-      now="출석체크"
-      title="출석체크"
+      now="자습시간 출결"
+      title="자습시간 출결"
       right={
         <>
           <Dropdown

From 7c1fb54ce1bed44fd6eeef9b2d09b5124d2f77c4 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:46:27 +0900
Subject: [PATCH 23/29] =?UTF-8?q?chore=20::=20=EC=B6=9C=EA=B2=B0=20?=
 =?UTF-8?q?=ED=83=80=EC=9E=85=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/utils.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 7c5f26f..07eaba9 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -68,6 +68,10 @@ export const useChangeStatusName = (status: string) => {
       return '자퇴';
     case 'GO_OUT':
       return '외출';
+    case 'MOVEMENT':
+      return '이동';
+    case 'DISALLOWED':
+      return '무단';
     default:
       return '';
   }

From 7d7bc6a9579ef09672154a098ed9bec8ec1aa633 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:46:45 +0900
Subject: [PATCH 24/29] =?UTF-8?q?chore=20::=20=ED=83=80=EC=9E=84=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/timetable/index.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/timetable/index.tsx b/src/components/timetable/index.tsx
index 4bb429d..ce9a7e4 100644
--- a/src/components/timetable/index.tsx
+++ b/src/components/timetable/index.tsx
@@ -54,7 +54,7 @@ export const DayTimeTable = ({
   };
 
   const handleKeyDown = async (
-    event: React.KeyboardEvent<HTMLInputElement>,
+    event: React.KeyboardEvent<HTMLTextAreaElement>,
   ) => {
     if (event.key === 'Enter') {
       onClickBtn();
@@ -87,10 +87,17 @@ const Subject = styled.td`
   border: 1px solid ${theme.color.gray[100]};
 `;
 
-const SubjectInput = styled.input`
-  width: 100%;
-  height: 100%;
+const SubjectInput = styled.textarea`
+  display: table-cell;
   font-size: ${theme.font.heading[3].size};
   font-weight: ${theme.font.heading[3].fontweight};
   outline: none;
+  resize: none;
+  text-align: center;
+  padding-left: 5;
+  padding-right: 50;
+  padding-bottom: 50;
+  padding-top: 50;
+  word-break: break-all;
+  width: 100%;
 `;

From 48fca1a10f6d0bcc41a49485edcc24debb5b9c7e Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 11:47:01 +0900
Subject: [PATCH 25/29] =?UTF-8?q?chore=20::=20=ED=83=80=EC=9E=84=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/titmetable/index.tsx | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/pages/titmetable/index.tsx b/src/pages/titmetable/index.tsx
index 12ceac7..e9e8d93 100644
--- a/src/pages/titmetable/index.tsx
+++ b/src/pages/titmetable/index.tsx
@@ -8,7 +8,7 @@ import { useState } from 'react';
 import { styled } from 'styled-components';
 
 export const TimeTable = () => {
-  const days = ['', '월요일', '화요일', '수요일', '목요일', '금요일'];
+  const days = ['월요일', '화요일', '수요일', '목요일', '금요일'];
   const period = [1, 2, 3, 4, 5, 6, 7];
   const [selectedGrade, setSelectedGrade] = useState<number>(1);
   const [selectedClass, setSelectedClass] = useState<number>(1);
@@ -47,6 +47,10 @@ export const TimeTable = () => {
       <TimeTableTable>
         <thead>
           <tr style={{ display: 'flex', height: 80 }}>
+            <FirstTable>
+              <p>요일</p>
+              교시
+            </FirstTable>
             {days.map((item) => (
               <Days key={item}>{item}</Days>
             ))}
@@ -60,13 +64,16 @@ export const TimeTable = () => {
             ))}
           </tr>
           {GetTimeTableData?.map((item, index) => (
-            <DayTimeTable
-              key={index}
-              data={item.timetables}
-              dayIndex={index}
-              selectedClass={selectedClass}
-              selectedGrade={selectedGrade}
-            />
+            <>
+              <p>{item.date}</p>
+              <DayTimeTable
+                key={index}
+                data={item.timetables}
+                dayIndex={index}
+                selectedClass={selectedClass}
+                selectedGrade={selectedGrade}
+              />
+            </>
           ))}
         </Tr>
       </TimeTableTable>
@@ -102,3 +109,13 @@ const Period = styled.td`
   border: 1px solid ${theme.color.gray[100]};
   color: ${theme.color.main[500]};
 `;
+
+const FirstTable = styled.td`
+  width: 240px;
+  text-align: left;
+  background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg"><line x1="0" y1="0" x2="100%" y2="100%" stroke="gray" /></svg>');
+  & > p {
+    text-align: right;
+  }
+  padding: 4px 40px;
+`;

From 2b83c702b08e7a5a941b531a1fee53438aac05d8 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 12:02:09 +0900
Subject: [PATCH 26/29] =?UTF-8?q?feat=20::=20=EC=B8=B5=EB=B3=84=20?=
 =?UTF-8?q?=EC=A0=84=EA=B3=B5=EB=8F=99=EC=95=84=EB=A6=AC=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/club/index.tsx | 48 ++++++++++++++++++++++++++++++++++------
 src/utils/dropdown.ts    | 19 +++++++++++++---
 2 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/src/pages/club/index.tsx b/src/pages/club/index.tsx
index 382f260..6293400 100644
--- a/src/pages/club/index.tsx
+++ b/src/pages/club/index.tsx
@@ -1,30 +1,64 @@
+import { useState } from 'react';
 import { useGetClubMemberList } from '@/apis/attendance';
 import Dropdown from '@/components/dropdown';
 import { Layout } from '@/components/layout';
 import ClassList from '@/components/list/class';
 import { getWeekDay } from '@/utils/date';
-import { clubOptions } from '@/utils/dropdown';
 import { setStudentNum } from '@/utils/utils';
-import { useState } from 'react';
+import {
+  NotAllFloorOption,
+  SecondClub,
+  ThirdClub,
+  fourthClub,
+} from '@/utils/dropdown';
+
+const getClubsByFloor = (floor: number) => {
+  switch (floor) {
+    case 2:
+      return SecondClub;
+    case 3:
+      return ThirdClub;
+    case 4:
+      return fourthClub;
+    default:
+      return [];
+  }
+};
 
 const ClubPage = () => {
   const [selectedClub, setSelectedClub] = useState<string>('대동여지도');
+  const [selectedFloor, setSelectedFloor] = useState<number>(2);
   const { data: ClubMember } = useGetClubMemberList(selectedClub);
 
   const handleClubChange = (selectedOption: number | string) => {
     setSelectedClub(String(selectedOption));
   };
 
+  const handleFloorChange = (selectedOption: number | string) => {
+    setSelectedFloor(Number(selectedOption));
+    const clubs = getClubsByFloor(Number(selectedOption));
+    if (clubs.length > 0) {
+      setSelectedClub(clubs[0].value);
+    }
+  };
+
   return (
     <Layout
       now="전공동아리"
       title="전공동아리"
       right={
-        <Dropdown
-          options={clubOptions}
-          value={selectedClub}
-          changeHandler={handleClubChange}
-        />
+        <>
+          <Dropdown
+            options={NotAllFloorOption}
+            value={selectedFloor}
+            changeHandler={handleFloorChange}
+          />
+          <Dropdown
+            options={getClubsByFloor(selectedFloor)}
+            value={selectedClub}
+            changeHandler={handleClubChange}
+          />
+        </>
       }
     >
       {ClubMember?.map((item) => (
diff --git a/src/utils/dropdown.ts b/src/utils/dropdown.ts
index e7c711e..f6070de 100644
--- a/src/utils/dropdown.ts
+++ b/src/utils/dropdown.ts
@@ -18,6 +18,12 @@ export const FloorOption = [
   { label: '전체', value: 5 },
 ];
 
+export const NotAllFloorOption = [
+  { label: '2층', value: 2 },
+  { label: '3층', value: 3 },
+  { label: '4층', value: 4 },
+];
+
 export const NotAllGradeOption = [
   { label: '1학년', value: 1 },
   { label: '2학년', value: 2 },
@@ -36,8 +42,7 @@ export interface Option {
   label: string | number;
 }
 
-export const clubOptions = [
-  { value: '자습', label: '3-1교실(자습)' },
+export const SecondClub = [
   { value: '대동여지도', label: '세미나실 2-1(대동여지도)' },
   { value: 'DMS', label: '세미나실 2-2(DMS)' },
   { value: 'gram', label: '세미나실 2-3(gram)' },
@@ -46,14 +51,22 @@ export const clubOptions = [
   { value: 'EXIT', label: '소개1실(EXIT)' },
   { value: 'Lift', label: '소개2실(Lift)' },
   { value: 'DMS-2', label: '소개 3실(DMS 3학년)' },
-  { value: '자습', label: '2-1교실(자습)' },
+  { value: '자습', label: '3-1교실(자습)' },
+];
+
+export const ThirdClub = [
   { value: 'Log', label: '세미나실 3-1(Log)' },
   { value: '은하', label: '세미나실 3-2(은하)' },
   { value: 'PiCK', label: '세미나실 3-3(PiCK)' },
   { value: 'DLC', label: '보안 1실(DLC)' },
   { value: 'info', label: '보안 2실(info)' },
+  { value: '자습', label: '2-1교실(자습)' },
+];
+export const fourthClub = [
   { value: 'TeamQSS', label: '세미나실 4-1(TeamQSS)' },
   { value: 'NoNamed', label: '세미나실 4-2(NoNamed)' },
   { value: 'Modeep', label: '세미나실 4-3(Modeep)' },
   { value: '자습', label: '1-1교실(자습)' },
 ];
+
+export const ClubList = [...SecondClub, ...ThirdClub, ...fourthClub];

From 189deb6d0a29d83dc8dfdde6e5054b43a7b9aa6d Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 12:25:37 +0900
Subject: [PATCH 27/29] =?UTF-8?q?chore=20::=20=EB=A9=94=EC=9D=B8=20?=
 =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/mainRouterButton/style.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/mainRouterButton/style.ts b/src/components/mainRouterButton/style.ts
index af6ce5e..ffa10a6 100644
--- a/src/components/mainRouterButton/style.ts
+++ b/src/components/mainRouterButton/style.ts
@@ -8,6 +8,7 @@ export const MainRouterButtonContainer = styled(Link)`
   flex-direction: column;
   align-items: center;
   gap: 8px;
+  width: 100px;
 `;
 
 export const MainRouterImgContainer = styled.div`
@@ -31,8 +32,7 @@ export const MainRouterText = styled.p`
   font-size: ${theme.font.subTitle[2].size};
   font-weight: ${theme.font.subTitle[2].fontweight};
   color: ${theme.color.normal.black};
-  padding: 0;
-  margin: 0;
+  white-space: nowrap;
 `;
 
 export const MainRouterFlexbox = styled.div`

From d92682ebfc9e267e554d50c69f5d62d483e002f0 Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 12:25:58 +0900
Subject: [PATCH 28/29] =?UTF-8?q?chore=20::=20=EC=A0=84=EA=B3=B5=EB=8F=99?=
 =?UTF-8?q?=EC=95=84=EB=A6=AC=20=EB=B0=8F=20=EC=B6=9C=EC=84=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/club/index.tsx           | 38 ++++++++++++++++++++++++++++++
 src/pages/selfStudyCheck/index.tsx |  3 ++-
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/src/pages/club/index.tsx b/src/pages/club/index.tsx
index 6293400..618774e 100644
--- a/src/pages/club/index.tsx
+++ b/src/pages/club/index.tsx
@@ -11,6 +11,8 @@ import {
   ThirdClub,
   fourthClub,
 } from '@/utils/dropdown';
+import { styled } from 'styled-components';
+import { theme } from '@/styles/theme';
 
 const getClubsByFloor = (floor: number) => {
   switch (floor) {
@@ -29,6 +31,8 @@ const ClubPage = () => {
   const [selectedClub, setSelectedClub] = useState<string>('대동여지도');
   const [selectedFloor, setSelectedFloor] = useState<number>(2);
   const { data: ClubMember } = useGetClubMemberList(selectedClub);
+  const period = ['8교시', '9교시', '10교시'];
+  const allperiod = ['6교시', '7교시', '8교시', '9교시', '10교시'];
 
   const handleClubChange = (selectedOption: number | string) => {
     setSelectedClub(String(selectedOption));
@@ -61,6 +65,16 @@ const ClubPage = () => {
         </>
       }
     >
+      <TitleContainer>
+        <PeriodText>{getWeekDay()}요일</PeriodText>
+        <PeriodMap>
+          {getWeekDay() === '금'
+            ? allperiod.map((item) => (
+                <PeriodText key={item}>{item}</PeriodText>
+              ))
+            : period.map((item) => <PeriodText key={item}>{item}</PeriodText>)}
+        </PeriodMap>
+      </TitleContainer>
       {ClubMember?.map((item) => (
         <ClassList
           refetchStatus={() => {}}
@@ -81,3 +95,27 @@ const ClubPage = () => {
 };
 
 export default ClubPage;
+
+const Content = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+`;
+
+const TitleContainer = styled.div`
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+`;
+
+const PeriodMap = styled.div`
+  display: flex;
+  justify-content: flex-end;
+  gap: clamp(60px, 10vw, 120px);
+  padding: 16px 20px;
+`;
+
+const PeriodText = styled.p`
+  font-size: ${theme.font.heading[3].size};
+  font-weight: ${theme.font.heading[3].fontweight};
+`;
diff --git a/src/pages/selfStudyCheck/index.tsx b/src/pages/selfStudyCheck/index.tsx
index ffe8712..4f6c101 100644
--- a/src/pages/selfStudyCheck/index.tsx
+++ b/src/pages/selfStudyCheck/index.tsx
@@ -3,6 +3,7 @@ import Dropdown from '@/components/dropdown';
 import { Layout } from '@/components/layout';
 import ClassList from '@/components/list/class';
 import { theme } from '@/styles/theme';
+import { getWeekDay } from '@/utils/date';
 import { NotAllClassOption, NotAllGradeOption } from '@/utils/dropdown';
 import { setStudentNum } from '@/utils/utils';
 import { useState } from 'react';
@@ -45,7 +46,7 @@ export const SelfStudyCheck = () => {
     >
       <Content>
         <TitleContainer>
-          <PeriodText>목요일</PeriodText>
+          <PeriodText>{getWeekDay()}요일</PeriodText>
           <PeriodMap>
             {period.map((item, index) => (
               <PeriodText key={index}>{item}</PeriodText>

From 97b1cd65bc3fd711c3e5664a9a55f349dae2ef9b Mon Sep 17 00:00:00 2001
From: hyuna <phyunaa0525@gmail.com>
Date: Mon, 4 Nov 2024 14:23:04 +0900
Subject: [PATCH 29/29] =?UTF-8?q?feat=20::=20cicd=EA=B5=AC=EC=B6=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/git-push.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .github/workflows/git-push.yml

diff --git a/.github/workflows/git-push.yml b/.github/workflows/git-push.yml
new file mode 100644
index 0000000..e7d6564
--- /dev/null
+++ b/.github/workflows/git-push.yml
@@ -0,0 +1,30 @@
+name: git push into another repo to deploy to vercel
+
+on:
+  push:
+    branches: [main]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: pandoc/latex
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install mustache (to update the date)
+        run: apk add ruby && gem install mustache
+      - name: creates output
+        run: sh ./build.sh
+      - name: Pushes to another repository
+        id: push_directory
+        uses: cpina/github-action-push-to-another-repository@main
+        env:
+          API_TOKEN_GITHUB: ${{ secrets.PiCK_GITHUB_KEY }}
+        with:
+          source-directory: 'output'
+          destination-github-username: DSM-PICK
+          destination-repository-name: PiCK2024_FRONT_v2
+          user-email: ${{ secrets.PiCK_ACCOUNT_EMAIL }}
+          commit-message: ${{ github.event.commits[0].message }}
+          target-branch: main
+      - name: Test get variable exported by push-to-another-repository
+        run: echo $DESTINATION_CLONED_DIRECTORY