From 6a76e1aee9328c8d5430a9076846f6bec1de1441 Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Thu, 19 Sep 2024 00:47:55 +0900
Subject: [PATCH 01/45] =?UTF-8?q?#309=20feat:=20=EC=95=88=EB=82=B4=20?=
 =?UTF-8?q?=EB=A9=94=EC=9D=BC=20=EB=8F=99=EC=9D=98=20=EC=B9=B8=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PageComponents/RegisterPage.style.js      | 25 +++++++++++++++++++
 .../PageComponents/RegisterSecond.jsx         | 22 +++++++++++++++-
 .../PageComponents/RegisterSecond.jsx         | 22 +++++++++++++++-
 3 files changed, 67 insertions(+), 2 deletions(-)

diff --git a/src/pages/RegisterPage/PageComponents/RegisterPage.style.js b/src/pages/RegisterPage/PageComponents/RegisterPage.style.js
index 00558e92..0b37ffc1 100644
--- a/src/pages/RegisterPage/PageComponents/RegisterPage.style.js
+++ b/src/pages/RegisterPage/PageComponents/RegisterPage.style.js
@@ -141,3 +141,28 @@ export const MainButton = styled.button`
     color: #f2f2f2;
   }
 `;
+
+export const Callout = styled.div`
+  display: flex;
+  align-items: center;
+  border: none;
+  border-radius: 8px;
+  background-color: #f8f8f8;
+  padding: 14px 18px;
+  width: 100%;
+  font-size: 14px;
+  color: #000;
+  outline: none;
+  transition: border-color 0.3s ease;
+  box-sizing: border-box;
+  gap: 10px;
+
+  &::placeholder {
+    color: #aaa;
+  }
+`;
+
+export const CheckBox = styled.input`
+  width: 18px;
+  height: 18px;
+`;
diff --git a/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx b/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx
index 1c26d7f3..f10f0d95 100644
--- a/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx
+++ b/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx
@@ -47,6 +47,7 @@ const RegisterSecond = () => {
     useRecoilState(minCompletionTimes);
   const [eventSchedules, setEventSchedules] = useRecoilState(eventScheduleList);
   const [eventAddress, setEventAddress] = useState('');
+  const [isChecked, setIsChecked] = useState(false);
 
   const navigate = useNavigate();
   const resetAllStates = useResetAllStates();
@@ -68,6 +69,10 @@ const RegisterSecond = () => {
     setMinCompletionTimesValue(value);
   };
 
+  const handleCheckboxChange = (event) => {
+    setIsChecked(event.target.checked);
+  };
+
   const handleDownload = async (e) => {
     e.preventDefault();
     try {
@@ -140,6 +145,8 @@ const RegisterSecond = () => {
       completionTimes: minCompletionTimesValue,
       eventSchedules: formatSchedules(eventSchedules),
       eventUrl: eventAddress,
+      alarmRequest: isChecked,
+      alarmResponse: isChecked,
     };
 
     formData.append('eventDetail', JSON.stringify(event));
@@ -152,11 +159,12 @@ const RegisterSecond = () => {
           'Content-Type': 'multipart/form-data',
         },
       });
-      setShowModal(true);
+      alert('행사가 등록되었습니다!');
     } catch (error) {
       alert('행사가 제대로 등록되지 않았습니다.');
       navigate('/register');
     } finally {
+      setShowModal(true);
       setStep(1);
       resetAllStates();
     }
@@ -244,6 +252,18 @@ const RegisterSecond = () => {
               />
             </S.ContentWrapper>
 
+            <S.ContentWrapper>
+              <S.MainTitle>안내 메일 발송 여부</S.MainTitle>
+              <S.Callout>
+                <S.CheckBox
+                  type="checkbox"
+                  checked={isChecked}
+                  onChange={handleCheckboxChange}
+                />
+                <S.SubTitle>안내 메일 발송에 동의합니다.</S.SubTitle>
+              </S.Callout>
+            </S.ContentWrapper>
+
             <S.ButtonWrapper>
               <Button
                 label="이전"
diff --git a/src/pages/registerPage/PageComponents/RegisterSecond.jsx b/src/pages/registerPage/PageComponents/RegisterSecond.jsx
index 1c26d7f3..f10f0d95 100644
--- a/src/pages/registerPage/PageComponents/RegisterSecond.jsx
+++ b/src/pages/registerPage/PageComponents/RegisterSecond.jsx
@@ -47,6 +47,7 @@ const RegisterSecond = () => {
     useRecoilState(minCompletionTimes);
   const [eventSchedules, setEventSchedules] = useRecoilState(eventScheduleList);
   const [eventAddress, setEventAddress] = useState('');
+  const [isChecked, setIsChecked] = useState(false);
 
   const navigate = useNavigate();
   const resetAllStates = useResetAllStates();
@@ -68,6 +69,10 @@ const RegisterSecond = () => {
     setMinCompletionTimesValue(value);
   };
 
+  const handleCheckboxChange = (event) => {
+    setIsChecked(event.target.checked);
+  };
+
   const handleDownload = async (e) => {
     e.preventDefault();
     try {
@@ -140,6 +145,8 @@ const RegisterSecond = () => {
       completionTimes: minCompletionTimesValue,
       eventSchedules: formatSchedules(eventSchedules),
       eventUrl: eventAddress,
+      alarmRequest: isChecked,
+      alarmResponse: isChecked,
     };
 
     formData.append('eventDetail', JSON.stringify(event));
@@ -152,11 +159,12 @@ const RegisterSecond = () => {
           'Content-Type': 'multipart/form-data',
         },
       });
-      setShowModal(true);
+      alert('행사가 등록되었습니다!');
     } catch (error) {
       alert('행사가 제대로 등록되지 않았습니다.');
       navigate('/register');
     } finally {
+      setShowModal(true);
       setStep(1);
       resetAllStates();
     }
@@ -244,6 +252,18 @@ const RegisterSecond = () => {
               />
             </S.ContentWrapper>
 
+            <S.ContentWrapper>
+              <S.MainTitle>안내 메일 발송 여부</S.MainTitle>
+              <S.Callout>
+                <S.CheckBox
+                  type="checkbox"
+                  checked={isChecked}
+                  onChange={handleCheckboxChange}
+                />
+                <S.SubTitle>안내 메일 발송에 동의합니다.</S.SubTitle>
+              </S.Callout>
+            </S.ContentWrapper>
+
             <S.ButtonWrapper>
               <Button
                 label="이전"

From eb524c63e0264e03aa8ef077a0aa225327d62a80 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 01:37:18 +0900
Subject: [PATCH 02/45] =?UTF-8?q?#311=20fix:=20=ED=8F=89=EA=B7=A0=20?=
 =?UTF-8?q?=EC=B0=B8=EC=84=9D=20=EC=9D=B8=EC=9B=90=20API=20=EC=97=B0?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DashboardPage/DashboardPage.jsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/DashboardPage/DashboardPage.jsx b/src/pages/DashboardPage/DashboardPage.jsx
index cc77fefa..9aa228a3 100644
--- a/src/pages/DashboardPage/DashboardPage.jsx
+++ b/src/pages/DashboardPage/DashboardPage.jsx
@@ -145,6 +145,7 @@ export default function DashboardPage() {
       if (scheduleEndDateTime < now) {
         completedSessionsCount += 1;
       }
+
       return {
         date: schedule.eventDate,
         startTime: schedule.eventStartTime,
@@ -401,7 +402,8 @@ export default function DashboardPage() {
                 </S.ProgressDescription>
               </S.ProgressText>
               <S.ProgressNumber>
-                <em>{averageAttendance}</em> / {parsedEvents.totalParticipants}
+                <em>{eventDetail.averageAttendees}</em>
+                {` / ${eventDetail.totalAttendees}`}
               </S.ProgressNumber>
             </S.ProgressBox>
 

From a9c41e8bdad8f9f5820cc29e1aa6f1b8b3b28d5a Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 01:40:27 +0900
Subject: [PATCH 03/45] =?UTF-8?q?#311=20fix:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20API?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DashboardPage/DashboardPage.jsx | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardPage.jsx b/src/pages/DashboardPage/DashboardPage.jsx
index 9aa228a3..12fd0cec 100644
--- a/src/pages/DashboardPage/DashboardPage.jsx
+++ b/src/pages/DashboardPage/DashboardPage.jsx
@@ -259,11 +259,13 @@ export default function DashboardPage() {
                     </S.EventTarget>
                   </S.EventTypeWrapper>
                   <S.EventDateWrapper>
-                    {parsedEvents.schedules.map((schedule, index) => (
-                      <S.EventDate key={index}>
-                        {`• ${schedule.date} (${schedule.startTime} - ${schedule.endTime})`}
-                      </S.EventDate>
-                    ))}
+                    {eventDetail.eventSchedules.map(
+                      ({ eventScheduleId, eventDate, startTime, endTime }) => (
+                        <S.EventDate key={eventScheduleId}>
+                          {`• ${eventDate} (${startTime} - ${endTime})`}
+                        </S.EventDate>
+                      ),
+                    )}
                   </S.EventDateWrapper>
                 </S.ContentInfoWrapper>
               </S.ContentBox>

From db35aa325d6c479d78e35529ba7c4fa8a433b871 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 01:57:21 +0900
Subject: [PATCH 04/45] =?UTF-8?q?#311=20fix:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EB=93=B1=EB=A1=9D=20=EB=A9=94?=
 =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/event.js                         |  4 +--
 src/pages/DashboardPage/DashboardPage.jsx | 34 +++++++++++------------
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/apis/event.js b/src/apis/event.js
index 4a0dd6e7..edf15fb3 100644
--- a/src/apis/event.js
+++ b/src/apis/event.js
@@ -12,8 +12,8 @@ export const deleteEvent = async (eventId) => {
   return data;
 };
 
-export const postEventManager = async (eventId, body) => {
-  const { data } = await axiosInstance.post(
+export const putEventManager = async (eventId, body) => {
+  const { data } = await axiosInstance.put(
     `/api/v1/events/manger/${eventId}`,
     body,
   );
diff --git a/src/pages/DashboardPage/DashboardPage.jsx b/src/pages/DashboardPage/DashboardPage.jsx
index 12fd0cec..7e2caeb3 100644
--- a/src/pages/DashboardPage/DashboardPage.jsx
+++ b/src/pages/DashboardPage/DashboardPage.jsx
@@ -5,7 +5,7 @@ import { Button, Sidebar, TopNavigation } from '@/components';
 import { eventIDState } from '@/recoil/atoms/state';
 import { useRecoilValue } from 'recoil';
 import { Link, useNavigate } from 'react-router-dom';
-import { deleteEvent, getEventDetail, postEventManager } from '@/apis';
+import { deleteEvent, getEventDetail, putEventManager } from '@/apis';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 
 export default function DashboardPage() {
@@ -46,21 +46,19 @@ export default function DashboardPage() {
       },
     });
 
-  const {
-    mutate: postEventManagerMutate,
-    isPending: isPostEventManagerPending,
-  } = useMutation({
-    mutationKey: ['postEventManager', eventId],
-    mutationFn: (body) => postEventManager(eventId, body),
-    onSuccess: () => {
-      queryClient.invalidateQueries(['getEventDetail']);
-      setIsEditing(false);
-      alert('연락처가 성공적으로 등록되었습니다.');
-    },
-    onError: () => {
-      alert('연락처 등록에 실패했습니다. 다시 시도해 주세요.');
-    },
-  });
+  const { mutate: putEventManagerMutate, isPending: isPutEventManagerPending } =
+    useMutation({
+      mutationKey: ['putEventManager', eventId],
+      mutationFn: (body) => putEventManager(eventId, body),
+      onSuccess: () => {
+        queryClient.invalidateQueries(['getEventDetail']);
+        setIsEditing(false);
+        alert('연락처가 성공적으로 등록되었습니다.');
+      },
+      onError: () => {
+        alert('연락처 등록에 실패했습니다. 다시 시도해 주세요.');
+      },
+    });
 
   const handleEventDeleteButtonClick = () => {
     const isConfirmed = window.confirm('행사를 완전히 삭제하시겠습니까?');
@@ -92,7 +90,7 @@ export default function DashboardPage() {
     setEmailError(!isEmailValid);
 
     if (isEditing && isNameValid && isPhoneValid && isEmailValid) {
-      postEventManagerMutate({
+      putEventManagerMutate({
         manager: {
           managerName: contacts.name,
           managerPhoneNumber: contacts.phone,
@@ -280,7 +278,7 @@ export default function DashboardPage() {
                   </S.ContactTextWrapper>
                   <S.AddContactButton
                     type="button"
-                    disabled={isPostEventManagerPending}
+                    disabled={isPutEventManagerPending}
                     onClick={handleAddContactButtonClick}
                   >
                     {isEditing

From c613d921c5e87295ba78de791bf78c2c939ba398 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 02:01:49 +0900
Subject: [PATCH 05/45] =?UTF-8?q?#311=20fix:=20=EC=9D=B4=EB=A9=94=EC=9D=BC?=
 =?UTF-8?q?=20=EC=98=88=EC=95=BD=20=EB=B0=9C=EC=86=A1=20=EC=BF=BC=EB=A6=AC?=
 =?UTF-8?q?=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx  | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index d16c0875..1395b1f2 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -19,6 +19,11 @@ export default function DashboardEmailPage() {
       try {
         const response = await axiosInstance.get(
           `/api/v1/events/mail/content/${eventId}`,
+          {
+            params: {
+              mailType: 'REMIND',
+            },
+          },
         );
         if (response.status === 200) {
           setEmailContent(response.data.content);

From 7c3230d5f7bdc1c621825cd480d8616e9a6cf402 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 02:05:52 +0900
Subject: [PATCH 06/45] =?UTF-8?q?#311=20fix:=20=EC=84=A4=EB=AC=B8=20?=
 =?UTF-8?q?=EC=A1=B0=EC=82=AC=20=EB=A7=81=ED=81=AC=20=EB=B0=9C=EC=86=A1=20?=
 =?UTF-8?q?API=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardSurveyPage/DashboardSurveyPage.jsx              | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
index 2d477c88..a609c6ff 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
@@ -30,10 +30,7 @@ export default function DashboardSurveyPage() {
 
     try {
       const response = await axiosInstance.put(
-        `/api/v1/events/survey/${eventId}`,
-        {
-          surveyUrl: surveyUrl,
-        },
+        `/api/v1/events/survey/${eventId}?surveyUrl=${surveyUrl}`,
       );
 
       if (response.status === 200) {

From 56642b0b343f6440c6f022ba5a7dc536e613b14b Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 02:19:39 +0900
Subject: [PATCH 07/45] =?UTF-8?q?#311=20fix:=20=EC=B6=9C=EC=84=9D=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4=20=ED=83=80?=
 =?UTF-8?q?=EC=9D=B4=ED=8B=80=20=EC=95=88=EB=9C=A8=EA=B3=A0,=20=EC=99=B8?=
 =?UTF-8?q?=EB=B6=80=EC=9D=B8=20=ED=96=89=EC=82=AC=EC=9E=84=EC=97=90?=
 =?UTF-8?q?=EB=8F=84=20=ED=95=99=EB=B2=88=20=EC=9E=85=EB=A0=A5=ED=95=B4?=
 =?UTF-8?q?=EC=95=BC=ED=95=98=EB=8A=94=20=EC=9D=B4=EC=8A=88=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AttendanceStudentIdPage.jsx               |  6 +----
 .../DashboardEmailPage/DashboardEmailPage.jsx | 22 ++++++-------------
 2 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
index 7efc30e0..d937178b 100644
--- a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
+++ b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
@@ -112,13 +112,9 @@ const AttendanceStudentIdPage = () => {
   };
 
   useEffect(() => {
-    console.log('USER_ID:', USER_ID);
-    console.log('EVENT_ID:', EVENT_ID);
     const fetchEventDetails = async () => {
       try {
-        const response = await axiosInstance.get(
-          `/api/v1/events/${USER_ID}/${EVENT_ID}`,
-        );
+        const response = await axiosInstance.get(`/api/v1/events/${EVENT_ID}`);
         const eventData = response.data;
         setEventTitle(eventData.eventTitle);
         setEventTarget(eventData.eventTarget);
diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index 1395b1f2..fe09c711 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -38,14 +38,11 @@ export default function DashboardEmailPage() {
     fetchEmailContent();
   }, [eventId]);
 
-  const handleInputChange = (e) => {
-    const newValue = e.target.value;
-    setSurveyUrl(newValue);
-    if (newValue !== '') {
-      setIsModified(true);
-    } else {
-      setIsModified(false);
-    }
+  const handleTextareaChange = (e) => {
+    const newEmailContent = e.target.value;
+
+    setEmailContent(newEmailContent);
+    setIsModified(newEmailContent !== '');
   };
 
   // 저장하기 버튼
@@ -56,7 +53,7 @@ export default function DashboardEmailPage() {
 
     try {
       const response = await axiosInstance.put(
-        `/api/v1/events/mail/content/{mailId}`,
+        `/api/v1/events/mail/content/${eventId}`,
       );
 
       if (response.status === 200) {
@@ -85,11 +82,6 @@ export default function DashboardEmailPage() {
             <Button
               label={isSaving ? '저장 중...' : '저장하기'}
               onClick={handleSaveButtonClick}
-              disabled={!isModified || isSaving}
-              style={{
-                backgroundColor: isModified ? '#007bff' : '#ccc',
-                cursor: isModified ? 'pointer' : 'not-allowed',
-              }}
             />
           </S.ButtonContainer>
         </S.TopContainer>
@@ -109,7 +101,7 @@ export default function DashboardEmailPage() {
             <Textarea
               placeholder="행사 안내 메일 내용을 작성해 주세요."
               value={emailContent}
-              onChange={(e) => setEmailContent(e.target.value)}
+              onChange={handleTextareaChange}
               height="300px"
             />
           )}

From f160a06196ea450c64029f6361302d70703f2dba Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Thu, 19 Sep 2024 02:48:23 +0900
Subject: [PATCH 08/45] =?UTF-8?q?#311=20fix:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EC=B6=9C=EC=84=9D=20=EB=AA=85=EB=8B=A8=20=ED=99=95=EC=9D=B8=20?=
 =?UTF-8?q?API=20=EC=9D=BC=EB=B6=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/attendance.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/apis/attendance.js b/src/apis/attendance.js
index 8f1e0e99..f0f1c8c0 100644
--- a/src/apis/attendance.js
+++ b/src/apis/attendance.js
@@ -1,16 +1,16 @@
 import { axiosInstance } from '@/axios';
 
-export const getAttendanceList = async (userId, eventId) => {
+export const getAttendanceList = async (eventId) => {
   const { data } = await axiosInstance.get(
-    `/api/v1/attendance/list/${userId}/${eventId}`,
+    `/api/v1/events/attendanceList/${eventId}`,
   );
 
   return data;
 };
 
-export const updateAttendanceList = async (userId, eventId, body) => {
+export const updateAttendanceList = async (eventId, body) => {
   const { data } = await axiosInstance.put(
-    `/api/v1/attendance/list/${userId}/${eventId}`,
+    `/api/v1/attendance/list/${eventId}`,
     body,
   );
 

From 19e4b0c813b6e8e2923365f60d56003cfcc99f01 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 14:33:25 +0900
Subject: [PATCH 09/45] =?UTF-8?q?#313=20[FIX]=20API=20path=20=EB=82=B4=20?=
 =?UTF-8?q?=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/event.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/apis/event.js b/src/apis/event.js
index edf15fb3..7131cfb0 100644
--- a/src/apis/event.js
+++ b/src/apis/event.js
@@ -14,7 +14,7 @@ export const deleteEvent = async (eventId) => {
 
 export const putEventManager = async (eventId, body) => {
   const { data } = await axiosInstance.put(
-    `/api/v1/events/manger/${eventId}`,
+    `/api/v1/events/manager/${eventId}`,
     body,
   );
 

From 2024111460011f07097530ce7263dd041439b7ee Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 15:23:00 +0900
Subject: [PATCH 10/45] =?UTF-8?q?#315=20feat:=20=EC=9D=B4=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=20=EB=B0=9C=EC=86=A1=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EB=93=A4=20UI=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardEmailPage/DashboardEmailPage.jsx | 46 ++++++++++++-------
 .../DashboardSurveyPage.jsx                   | 17 ++++---
 2 files changed, 37 insertions(+), 26 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index fe09c711..12e57739 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import { PageLayout } from '@/Layout';
 import * as S from './DashboardEmailPage.style';
-import { Sidebar, Button, TopNavigation, Textarea } from '@/components';
+import { Sidebar, Button, TopNavigation, Textarea, Input } from '@/components';
 import { useRecoilValue } from 'recoil';
 import { eventDetail, eventIDState } from '@/recoil/atoms/state';
 import { axiosInstance } from '@/axios';
@@ -77,34 +77,46 @@ export default function DashboardEmailPage() {
     >
       <S.DashboardEmailPage>
         <S.TopContainer>
-          <S.Title>리마인드 메일 발송</S.Title>
+          <S.Content>
+            <S.Title>리마인드 메일 발송</S.Title>
+            <S.ContentDesc>
+              <em>행사 시작 24시간 전</em>에 참석자들에게 발송 될&nbsp;
+              <em>행사 안내 메일 내용</em>을 수정해 주세요.
+            </S.ContentDesc>
+          </S.Content>
           <S.ButtonContainer>
             <Button
               label={isSaving ? '저장 중...' : '저장하기'}
               onClick={handleSaveButtonClick}
+              disabled={!isModified || isSaving}
+              style={{
+                backgroundColor: isModified ? '#007bff' : '#ccc',
+                cursor: isModified ? 'pointer' : 'not-allowed',
+              }}
             />
           </S.ButtonContainer>
         </S.TopContainer>
 
         <S.ContentContainer>
           <S.Content>
-            <S.ContentTitle>리마인드 메일 내용 수정</S.ContentTitle>
-            <S.ContentDesc>
-              <em>행사 시작 24시간 전</em>에 참석자들에게 발송 될&nbsp;
-              <em>행사 안내 메일 내용</em>을 수정해 주세요.
-            </S.ContentDesc>
+            <S.ContentTitle>메일 제목</S.ContentTitle>
+            <Input placeholder="행사 안내 메일 제목을 작성해 주세요." />
           </S.Content>
 
-          {isLoading ? (
-            <p>로딩 중...</p>
-          ) : (
-            <Textarea
-              placeholder="행사 안내 메일 내용을 작성해 주세요."
-              value={emailContent}
-              onChange={handleTextareaChange}
-              height="300px"
-            />
-          )}
+          <S.Content>
+            <S.ContentTitle>메일 내용</S.ContentTitle>
+
+            {isLoading ? (
+              <p>로딩 중...</p>
+            ) : (
+              <Textarea
+                placeholder="행사 안내 메일 내용을 작성해 주세요."
+                value={emailContent}
+                onChange={handleTextareaChange}
+                height="300px"
+              />
+            )}
+          </S.Content>
         </S.ContentContainer>
       </S.DashboardEmailPage>
     </PageLayout>
diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
index a609c6ff..f80becea 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
@@ -54,7 +54,14 @@ export default function DashboardSurveyPage() {
     >
       <S.DashboardSurveyPage>
         <S.TopContainer>
-          <S.Title>설문 조사 링크 발송</S.Title>
+          <S.Content>
+            <S.Title>WISE 설문 조사 링크 발송</S.Title>
+            <S.ContentDesc>
+              <em>행사 종료 1시간 후</em> 참석자들에게 발송 될&nbsp;
+              <em>설문조사 링크</em>를 등록해 주세요. <br /> 링크가 등록되지
+              않으면, 행사 등록 시 입력한 WISE 링크로 대신 발송됩니다.
+            </S.ContentDesc>
+          </S.Content>
           <S.ButtonContainer>
             <Button
               label={isSaving ? '저장 중...' : '저장하기'}
@@ -69,14 +76,6 @@ export default function DashboardSurveyPage() {
         </S.TopContainer>
 
         <S.ContentContainer>
-          <S.Content>
-            <S.ContentTitle>WISE 설문 조사 링크 등록</S.ContentTitle>
-            <S.ContentDesc>
-              <em>행사 종료 1시간 후</em> 참석자들에게 발송 될&nbsp;
-              <em>설문조사 링크</em>를 등록해 주세요. <br /> 링크가 등록되지
-              않으면, 행사 등록 시 입력한 WISE 링크로 대신 발송됩니다.
-            </S.ContentDesc>
-          </S.Content>
           <Input
             placeholder="https://wise.sookmyung.ac.kr/ko/module/eco/@poll/write/4625/0"
             value={surveyUrl}

From 026f0cb6f5cd7c336e9d1aa6f3848d8bcdbb7e1e Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 15:35:11 +0900
Subject: [PATCH 11/45] =?UTF-8?q?#315=20design:=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=86=92=EC=9D=B4=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/Button/Button.style.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Button/Button.style.jsx b/src/components/Button/Button.style.jsx
index abbf710a..55f6261f 100644
--- a/src/components/Button/Button.style.jsx
+++ b/src/components/Button/Button.style.jsx
@@ -7,6 +7,7 @@ export const Button = styled.button`
   align-items: center;
   border-radius: 8px;
   padding: 13px 22px;
+  height: 45px;
   background: ${(props) => props.backgroundColor};
   color: ${(props) => props.textColor};
   font-size: 16px;

From 372016c419f8570d8c9baf6b37f6db0e5be70977 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 16:17:53 +0900
Subject: [PATCH 12/45] =?UTF-8?q?#315=20feat:=20=EC=84=A4=EB=AC=B8?=
 =?UTF-8?q?=EC=A1=B0=EC=82=AC=20=EB=A7=81=ED=81=AC=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?API=20=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardSurveyPage.jsx                   | 43 ++++++++++++++-----
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
index f80becea..aa271c3c 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
@@ -1,4 +1,4 @@
-import { useState } from 'react';
+import { useEffect, useState } from 'react';
 import { PageLayout } from '@/Layout';
 import * as S from './DashboardSurveyPage.style';
 import { Sidebar, Button, TopNavigation, Input } from '@/components';
@@ -12,17 +12,28 @@ export default function DashboardSurveyPage() {
   const [isModified, setIsModified] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
 
-  const handleInputChange = (e) => {
-    const newValue = e.target.value;
-    setSurveyUrl(newValue);
+  // 설문조사 링크 가져오기
+  useEffect(() => {
+    const getSurveyUrl = async () => {
+      try {
+        const response = await axiosInstance.get(
+          `/api/v1/events/survey/${eventId}`,
+        );
 
-    if (newValue !== '') {
-      setIsModified(true);
-    } else {
-      setIsModified(false);
-    }
-  };
+        if (response.status === 200 && response.data) {
+          setSurveyUrl(response.data);
+        } else {
+          console.error(response);
+        }
+      } catch (error) {
+        console.error('설문 조사 링크를 불러오는 중 오류 발생:', error);
+      }
+    };
+
+    getSurveyUrl();
+  }, [eventId]);
 
+  // 설문조사 링크 수정
   const handleSaveButtonClick = async () => {
     if (!isModified) return;
 
@@ -47,6 +58,18 @@ export default function DashboardSurveyPage() {
     }
   };
 
+  // 저장하기 버튼
+  const handleInputChange = (e) => {
+    const newValue = e.target.value;
+    setSurveyUrl(newValue);
+
+    if (newValue !== '') {
+      setIsModified(true);
+    } else {
+      setIsModified(false);
+    }
+  };
+
   return (
     <PageLayout
       topNavigation={<TopNavigation eventTitle={eventDetail.eventTitle} />}

From aa3464fc9001b03616fd9d4f11bd00aa2b667d6c Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 16:52:48 +0900
Subject: [PATCH 13/45] =?UTF-8?q?#315=20feat:=20=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EC=A0=9C=EB=AA=A9=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20API?=
 =?UTF-8?q?=20=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardEmailPage/DashboardEmailPage.jsx         | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index 12e57739..8477876a 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -8,9 +8,9 @@ import { axiosInstance } from '@/axios';
 
 export default function DashboardEmailPage() {
   const eventId = useRecoilValue(eventIDState) || eventDetail.id;
-  const [surveyUrl, setSurveyUrl] = useState('');
   const [isModified, setIsModified] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
+  const [emailTitle, setEmailTitle] = useState('');
   const [emailContent, setEmailContent] = useState('');
   const [isLoading, setIsLoading] = useState(true);
 
@@ -26,7 +26,9 @@ export default function DashboardEmailPage() {
           },
         );
         if (response.status === 200) {
-          setEmailContent(response.data.content);
+          setEmailContent(response.data.mailContent);
+          setEmailTitle(response.data.mailTitle);
+          console.log(response);
         }
       } catch (error) {
         console.error('이메일 내용 불러오기 실패:', error);
@@ -100,7 +102,10 @@ export default function DashboardEmailPage() {
         <S.ContentContainer>
           <S.Content>
             <S.ContentTitle>메일 제목</S.ContentTitle>
-            <Input placeholder="행사 안내 메일 제목을 작성해 주세요." />
+            <Input
+              placeholder="행사 안내 메일 제목을 작성해 주세요."
+              value={emailTitle}
+            />
           </S.Content>
 
           <S.Content>

From d5f50f7ce2572e8b220be3753d6a07d2dba13fbb Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 17:09:07 +0900
Subject: [PATCH 14/45] =?UTF-8?q?#315=20design:=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EB=B0=98=EC=9D=91=ED=98=95=20=EC=A0=81=EC=9A=A9=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20UI?=
 =?UTF-8?q?=20=EC=9E=AC=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Button/Button.style.jsx        |  9 +++++--
 .../DashboardEmailPage/DashboardEmailPage.jsx | 15 ++++++-----
 .../DashboardSurveyPage.jsx                   | 27 ++++++++++---------
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/components/Button/Button.style.jsx b/src/components/Button/Button.style.jsx
index 55f6261f..51c38b66 100644
--- a/src/components/Button/Button.style.jsx
+++ b/src/components/Button/Button.style.jsx
@@ -13,8 +13,13 @@ export const Button = styled.button`
   font-size: 16px;
   font-weight: 600;
 
-  @media (max-width: ${BREAKPOINTS[0]}px) {
+  @media (max-width: ${BREAKPOINTS[1]}px) {
     padding: 10px 18px;
-    font-size: 14px;
+    height: 35px;
+    font-size: 12px;
+  }
+  @media (max-width: ${BREAKPOINTS[0]}px) {
+    padding: 6px 10px;
+    height: 30px;
   }
 `;
diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index 8477876a..dc8489be 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -79,13 +79,7 @@ export default function DashboardEmailPage() {
     >
       <S.DashboardEmailPage>
         <S.TopContainer>
-          <S.Content>
-            <S.Title>리마인드 메일 발송</S.Title>
-            <S.ContentDesc>
-              <em>행사 시작 24시간 전</em>에 참석자들에게 발송 될&nbsp;
-              <em>행사 안내 메일 내용</em>을 수정해 주세요.
-            </S.ContentDesc>
-          </S.Content>
+          <S.Title>리마인드 메일 발송</S.Title>
           <S.ButtonContainer>
             <Button
               label={isSaving ? '저장 중...' : '저장하기'}
@@ -100,6 +94,13 @@ export default function DashboardEmailPage() {
         </S.TopContainer>
 
         <S.ContentContainer>
+          <S.Content>
+            <S.ContentTitle>리마인드 메일 내용 수정</S.ContentTitle>
+            <S.ContentDesc>
+              <em>행사 시작 24시간 전</em>에 참석자들에게 발송 될&nbsp;
+              <em>행사 안내 메일 내용</em>을 수정해 주세요.
+            </S.ContentDesc>
+          </S.Content>
           <S.Content>
             <S.ContentTitle>메일 제목</S.ContentTitle>
             <Input
diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
index aa271c3c..3f1538f3 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
@@ -77,14 +77,7 @@ export default function DashboardSurveyPage() {
     >
       <S.DashboardSurveyPage>
         <S.TopContainer>
-          <S.Content>
-            <S.Title>WISE 설문 조사 링크 발송</S.Title>
-            <S.ContentDesc>
-              <em>행사 종료 1시간 후</em> 참석자들에게 발송 될&nbsp;
-              <em>설문조사 링크</em>를 등록해 주세요. <br /> 링크가 등록되지
-              않으면, 행사 등록 시 입력한 WISE 링크로 대신 발송됩니다.
-            </S.ContentDesc>
-          </S.Content>
+          <S.Title>WISE 설문 조사 링크 발송</S.Title>
           <S.ButtonContainer>
             <Button
               label={isSaving ? '저장 중...' : '저장하기'}
@@ -99,11 +92,19 @@ export default function DashboardSurveyPage() {
         </S.TopContainer>
 
         <S.ContentContainer>
-          <Input
-            placeholder="https://wise.sookmyung.ac.kr/ko/module/eco/@poll/write/4625/0"
-            value={surveyUrl}
-            onChange={handleInputChange}
-          />
+          <S.Content>
+            <S.ContentTitle>WISE 설문 조사 링크 등록</S.ContentTitle>
+            <S.ContentDesc>
+              <em>행사 종료 1시간 후</em> 참석자들에게 발송 될&nbsp;
+              <em>설문조사 링크</em>를 등록해 주세요. <br /> 링크가 등록되지
+              않으면, 행사 등록 시 입력한 WISE 링크로 대신 발송됩니다.
+            </S.ContentDesc>
+            <Input
+              placeholder="https://wise.sookmyung.ac.kr/ko/module/eco/@poll/write/4625/0"
+              value={surveyUrl}
+              onChange={handleInputChange}
+            />
+          </S.Content>
         </S.ContentContainer>
       </S.DashboardSurveyPage>
     </PageLayout>

From e4c46208418f17dc541540661e553a6e180c1a1a Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 17:15:13 +0900
Subject: [PATCH 15/45] =?UTF-8?q?#315=20feat:=20=EC=9D=B4=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=20=EC=88=98=EC=A0=95=ED=95=98=EB=8A=94=20=ED=95=A8?=
 =?UTF-8?q?=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardEmailPage/DashboardEmailPage.jsx | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index dc8489be..6f07dd8a 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -15,7 +15,7 @@ export default function DashboardEmailPage() {
   const [isLoading, setIsLoading] = useState(true);
 
   useEffect(() => {
-    const fetchEmailContent = async () => {
+    const getEmailContent = async () => {
       try {
         const response = await axiosInstance.get(
           `/api/v1/events/mail/content/${eventId}`,
@@ -37,14 +37,21 @@ export default function DashboardEmailPage() {
       }
     };
 
-    fetchEmailContent();
+    getEmailContent();
   }, [eventId]);
 
+  // 메일 제목 수정 핸들러
+  const handleTitleChange = (e) => {
+    const newEmailTitle = e.target.value;
+    setEmailTitle(newEmailTitle);
+    setIsModified(newEmailTitle !== '' || emailContent !== '');
+  };
+
+  // 메일 내용 수정 핸들러
   const handleTextareaChange = (e) => {
     const newEmailContent = e.target.value;
-
     setEmailContent(newEmailContent);
-    setIsModified(newEmailContent !== '');
+    setIsModified(newEmailContent !== '' || emailTitle !== '');
   };
 
   // 저장하기 버튼
@@ -56,6 +63,10 @@ export default function DashboardEmailPage() {
     try {
       const response = await axiosInstance.put(
         `/api/v1/events/mail/content/${eventId}`,
+        {
+          mailTitle: emailTitle,
+          mailContent: emailContent,
+        },
       );
 
       if (response.status === 200) {
@@ -106,6 +117,7 @@ export default function DashboardEmailPage() {
             <Input
               placeholder="행사 안내 메일 제목을 작성해 주세요."
               value={emailTitle}
+              onChange={handleTitleChange}
             />
           </S.Content>
 

From 1c25dfec6e6b0927164f64f0787326f6648ef616 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 18:05:01 +0900
Subject: [PATCH 16/45] =?UTF-8?q?#292=20fix:=20=EC=B0=B8=EC=84=9D=EC=9E=90?=
 =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=82=B4?=
 =?UTF-8?q?=20=EB=AC=B8=EC=A0=9C=EB=90=98=EB=8A=94=20=EC=98=A4=EB=A5=98=20?=
 =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardAttendeePage.jsx                 | 187 ++++++++++--------
 1 file changed, 102 insertions(+), 85 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index 978e7e91..fba5b7ed 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -56,6 +56,12 @@ export default function DashboardAttendeePage() {
     queryFn: () => getAttendanceList(eventId),
   });
 
+  useEffect(() => {
+    if (attendanceList) {
+      console.log('Attendance List:', attendanceList);
+    }
+  }, [attendanceList]);
+
   const {
     mutate: updateAttendanceListMutate,
     isPending: isUpdateAttendanceListPending,
@@ -72,44 +78,47 @@ export default function DashboardAttendeePage() {
   });
 
   useEffect(() => {
-    if (eventDetail === undefined) {
+    if (!eventDetail) {
       return;
     }
 
     setEventTitle(eventDetail.eventTitle);
     setEventTarget(eventDetail.eventTarget);
 
-    const parsedSessions = eventDetail.eventSchedules.map(
-      (schedule, index) => ({
+    const parsedSessions = eventDetail.eventSchedules.map((schedule, index) => {
+      const attendanceList = schedule.attendanceListResponseDtos || [];
+      return {
         tab: index + 1,
         date: `${schedule.eventDate.substring(5, 7)}/${schedule.eventDate.substring(8, 10)}`,
-        attendanceList: schedule.attendanceListResponseDtos.sort((a, b) =>
-          a.studentName.localeCompare(b.studentName),
+        attendanceList: attendanceList.sort((a, b) =>
+          a.attendeeName.localeCompare(b.attendeeName),
         ),
-      }),
-    );
+      };
+    });
+
     setSessions(parsedSessions);
 
     const attendeesData = {};
 
     parsedSessions.forEach((session) => {
       attendeesData[session.tab] = session.attendanceList.map((student) => ({
-        id: student.id,
-        major: student.major,
-        name: student.studentName,
+        id: student.attendeeId,
+        major: student.attendeeAffiliation,
+        name: student.attendeeName,
         number: student.studentNumber,
-        year: student.year || '-',
-        phoneNumber: student.phoneNumber || '-',
-        email: student.email || '-',
+        year: '-',
+        phoneNumber: student.attendeePhoneNumber || '-',
+        email: student.attendeeEmail || '-',
         attendance: student.attendance,
       }));
     });
+
     setSessionAttendees(attendeesData);
 
     if (parsedSessions.length > 0) {
       const initialAttendees = attendeesData[1];
       setAttendees(initialAttendees);
-      setFilteredAttendees(initialAttendees); // 초기 필터된 참석자 리스트 설정
+      setFilteredAttendees(initialAttendees);
       setSessionAttendees((prev) => ({
         ...prev,
         [1]: initialAttendees,
@@ -225,78 +234,86 @@ export default function DashboardAttendeePage() {
       sideBar={<Sidebar />}
     >
       <S.DashboardAttendee>
-        <S.TopContainer>
-          <S.Title>참석자 관리</S.Title>
-          <S.ButtonContainer>
-            <SlimButton
-              onClick={handleSendEmail}
-              label={
-                <>
-                  <FaRegEnvelope /> 출석 명단 메일로 전송
-                </>
-              }
-            />
-            <SlimButton
-              onClick={handleDownload}
-              label={
-                <>
-                  <FaPaperclip /> 출석 명단 다운로드
-                </>
-              }
-            />
-          </S.ButtonContainer>
-        </S.TopContainer>
-
-        <S.TabEditWrapper>
-          <S.TabContainer>
-            {sessions.map((session) => (
-              <TabMenu
-                key={session.tab}
-                label={`${session.tab}회 (${session.date})`}
-                active={activeTab === session.tab}
-                onClick={() => {
-                  setActiveTab(session.tab);
-                  const sortedAttendees = [
-                    ...sessionAttendees[session.tab],
-                  ].sort((a, b) => a.name.localeCompare(b.name));
-                  setAttendees(sortedAttendees);
-                  setFilteredAttendees(sortedAttendees); // 필터된 리스트도 업데이트
-                }}
+        {isAttendanceListPending ? (
+          <div>Loading Attendance List...</div>
+        ) : isAttendanceListError ? (
+          <div>Error loading attendance list. Please try again.</div>
+        ) : (
+          <>
+            <S.TopContainer>
+              <S.Title>참석자 관리</S.Title>
+              <S.ButtonContainer>
+                <SlimButton
+                  onClick={handleSendEmail}
+                  label={
+                    <>
+                      <FaRegEnvelope /> 출석 명단 메일로 전송
+                    </>
+                  }
+                />
+                <SlimButton
+                  onClick={handleDownload}
+                  label={
+                    <>
+                      <FaPaperclip /> 출석 명단 다운로드
+                    </>
+                  }
+                />
+              </S.ButtonContainer>
+            </S.TopContainer>
+
+            <S.TabEditWrapper>
+              <S.TabContainer>
+                {sessions.map((session) => (
+                  <TabMenu
+                    key={session.tab}
+                    label={`${session.tab}회 (${session.date})`}
+                    active={activeTab === session.tab}
+                    onClick={() => {
+                      setActiveTab(session.tab);
+                      const sortedAttendees = [
+                        ...sessionAttendees[session.tab],
+                      ].sort((a, b) => a.name.localeCompare(b.name));
+                      setAttendees(sortedAttendees);
+                      setFilteredAttendees(sortedAttendees);
+                    }}
+                  />
+                ))}
+              </S.TabContainer>
+              <S.EditMode
+                type="button"
+                disabled={isUpdateAttendanceListPending}
+                active={editMode}
+                onClick={handleEditModeToggle}
+              >
+                {editMode ? '저장하기' : '출석 여부 수정하기'}
+              </S.EditMode>
+            </S.TabEditWrapper>
+
+            <S.SearchRateContainer>
+              <S.RateWrapper>
+                <S.RateTitle>참석률</S.RateTitle>
+                <S.Attendee>
+                  {attendees.filter((attendee) => attendee.attendance).length} /{' '}
+                  {attendees.length}
+                </S.Attendee>
+              </S.RateWrapper>
+              <Search
+                onSearch={setSearchQuery}
+                placeholder="이름, 학번, 이메일, 전화번호로 검색"
               />
-            ))}
-          </S.TabContainer>
-          <S.EditMode
-            type="button"
-            disabled={isUpdateAttendanceListPending}
-            active={editMode}
-            onClick={handleEditModeToggle}
-          >
-            {editMode ? '저장하기' : '출석 여부 수정하기'}
-          </S.EditMode>
-        </S.TabEditWrapper>
-
-        <S.SearchRateContainer>
-          <S.RateWrapper>
-            <S.RateTitle>참석률</S.RateTitle>
-            <S.Attendee>
-              {attendees.filter((attendee) => attendee.attendance).length} /{' '}
-              {attendees.length}
-            </S.Attendee>
-          </S.RateWrapper>
-          <Search
-            onSearch={setSearchQuery}
-            placeholder="이름, 학번, 이메일, 전화번호로 검색"
-          />
-        </S.SearchRateContainer>
-
-        <AttendeeTable
-          attendees={filteredAttendees} // 필터된 참석자 리스트를 전달
-          editMode={editMode}
-          sortData={sortData}
-          handleAttendanceChange={handleAttendanceChange}
-          sortConfig={sortConfig}
-          showStudentInfo={eventTarget === 'INTERNAL'}
-        />
+            </S.SearchRateContainer>
+
+            <AttendeeTable
+              attendees={filteredAttendees}
+              editMode={editMode}
+              sortData={sortData}
+              handleAttendanceChange={handleAttendanceChange}
+              sortConfig={sortConfig}
+              showStudentInfo={eventTarget === 'INTERNAL'}
+            />
+          </>
+        )}
       </S.DashboardAttendee>
     </PageLayout>
   );

From 624a7803817211d2f4f39a4551db1d83b272a970 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 21:07:47 +0900
Subject: [PATCH 17/45] =?UTF-8?q?#292=20feat:=20=EC=B0=B8=EC=84=9D?=
 =?UTF-8?q?=EC=9E=90=20=EC=A0=95=EB=B3=B4=20=EA=B0=80=EC=A0=B8=EC=98=A4?=
 =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardAttendeePage.jsx                 | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index fba5b7ed..463049b5 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -153,6 +153,52 @@ export default function DashboardAttendeePage() {
     }));
   };
 
+  // 참석자 정보 가져오기
+  useEffect(() => {
+    if (attendanceList) {
+      const parsedSessions = attendanceList.map((session, index) => {
+        const attendanceListResponseDtos =
+          session.attendanceListResponseDtos || [];
+        return {
+          tab: index + 1,
+          date: `${session.eventDate.substring(5, 7)}/${session.eventDate.substring(8, 10)}`,
+          attendanceList: attendanceListResponseDtos.sort((a, b) =>
+            a.attendeeName.localeCompare(b.attendeeName),
+          ),
+        };
+      });
+
+      setSessions(parsedSessions);
+
+      const attendeesData = {};
+
+      parsedSessions.forEach((session) => {
+        attendeesData[session.tab] = session.attendanceList.map((student) => ({
+          id: student.attendeeId,
+          major: student.attendeeAffiliation,
+          name: student.attendeeName,
+          number: student.studentNumber,
+          year: '-',
+          phoneNumber: student.attendeePhoneNumber || '-',
+          email: student.attendeeEmail || '-',
+          attendance: student.attendance,
+        }));
+      });
+
+      setSessionAttendees(attendeesData);
+
+      if (parsedSessions.length > 0) {
+        const initialAttendees = attendeesData[1];
+        setAttendees(initialAttendees);
+        setFilteredAttendees(initialAttendees);
+        setSessionAttendees((prev) => ({
+          ...prev,
+          [1]: initialAttendees,
+        }));
+      }
+    }
+  }, [attendanceList]);
+
   // 출석 여부 수정
   const handleEditModeToggle = async () => {
     if (editMode) {

From 9807b0495e8c6c22b5d133c5102282d2aea4b209 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 21:41:14 +0900
Subject: [PATCH 18/45] =?UTF-8?q?#318=20refactor:=20=EA=B2=80=EC=83=89?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=ED=8C=8C=EC=9D=BC=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardAttendeePage/AttendeeSearch.js   | 41 ++++++++++
 .../DashboardAttendeePage.jsx                 | 81 +++++++++----------
 2 files changed, 78 insertions(+), 44 deletions(-)
 create mode 100644 src/pages/DashboardPage/DashboardAttendeePage/AttendeeSearch.js

diff --git a/src/pages/DashboardPage/DashboardAttendeePage/AttendeeSearch.js b/src/pages/DashboardPage/DashboardAttendeePage/AttendeeSearch.js
new file mode 100644
index 00000000..440e6e11
--- /dev/null
+++ b/src/pages/DashboardPage/DashboardAttendeePage/AttendeeSearch.js
@@ -0,0 +1,41 @@
+import { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { Search } from '@/components';
+
+function AttendeeSearch({
+  attendees,
+  searchQuery,
+  setSearchQuery,
+  setFilteredAttendees,
+}) {
+  useEffect(() => {
+    const filtered = attendees.filter((attendee) => {
+      const searchLower = searchQuery.toLowerCase();
+      return (
+        attendee.name.toLowerCase().includes(searchLower) ||
+        (attendee.number
+          ? String(attendee.number).toLowerCase().includes(searchLower)
+          : false) ||
+        attendee.email.toLowerCase().includes(searchLower) ||
+        attendee.phoneNumber.toLowerCase().includes(searchLower)
+      );
+    });
+    setFilteredAttendees(filtered);
+  }, [searchQuery, attendees, setFilteredAttendees]);
+
+  return (
+    <Search
+      onSearch={setSearchQuery}
+      placeholder="이름, 학번, 이메일, 전화번호로 검색"
+    />
+  );
+}
+
+AttendeeSearch.propTypes = {
+  attendees: PropTypes.array.isRequired,
+  searchQuery: PropTypes.string.isRequired,
+  setSearchQuery: PropTypes.func.isRequired,
+  setFilteredAttendees: PropTypes.func.isRequired,
+};
+
+export default AttendeeSearch;
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index 463049b5..7361881e 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -19,6 +19,7 @@ import {
   updateAttendanceList,
 } from '@/apis';
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
+import AttendeeSearch from './AttendeeSearch';
 
 export default function DashboardAttendeePage() {
   const [eventTitle, setEventTitle] = useState('');
@@ -126,33 +127,6 @@ export default function DashboardAttendeePage() {
     }
   }, [eventDetail]);
 
-  // 참석자 검색
-  useEffect(() => {
-    const filtered = attendees.filter((attendee) => {
-      const searchLower = searchQuery.toLowerCase();
-      return (
-        attendee.name.toLowerCase().includes(searchLower) ||
-        (attendee.number
-          ? String(attendee.number).toLowerCase().includes(searchLower)
-          : false) ||
-        attendee.email.toLowerCase().includes(searchLower) ||
-        attendee.phoneNumber.toLowerCase().includes(searchLower)
-      );
-    });
-    setFilteredAttendees(filtered);
-  }, [searchQuery, attendees]);
-
-  const handleAttendanceChange = (index, value) => {
-    const updatedAttendees = [...attendees];
-    updatedAttendees[index].attendance = value === '출석';
-    setAttendees(updatedAttendees);
-
-    setSessionAttendees((prev) => ({
-      ...prev,
-      [activeTab]: updatedAttendees,
-    }));
-  };
-
   // 참석자 정보 가져오기
   useEffect(() => {
     if (attendanceList) {
@@ -199,20 +173,6 @@ export default function DashboardAttendeePage() {
     }
   }, [attendanceList]);
 
-  // 출석 여부 수정
-  const handleEditModeToggle = async () => {
-    if (editMode) {
-      updateAttendanceListMutate({
-        attendanceList: attendees.map(({ id, attendance }) => ({
-          studentInfoId: id,
-          attendance: attendance,
-        })),
-      });
-    }
-
-    setEditMode((prevEditMode) => !prevEditMode);
-  };
-
   // 데이터 정렬
   const sortData = (key) => {
     let direction = 'asc';
@@ -244,6 +204,36 @@ export default function DashboardAttendeePage() {
     }
   };
 
+  // 참석 여부 수정
+  const handleAttendanceChange = (attendeeId, value) => {
+    const updatedAttendees = attendees.map((attendee) =>
+      attendee.id === attendeeId
+        ? { ...attendee, attendance: value === '출석' }
+        : attendee,
+    );
+
+    setAttendees(updatedAttendees);
+
+    setSessionAttendees((prev) => ({
+      ...prev,
+      [activeTab]: updatedAttendees,
+    }));
+  };
+
+  const handleEditModeToggle = async () => {
+    if (editMode) {
+      updateAttendanceListMutate({
+        attendanceList: attendees.map(({ id, attendance }) => ({
+          studentInfoId: id,
+          attendance: attendance,
+        })),
+      });
+    }
+
+    setEditMode((prevEditMode) => !prevEditMode);
+  };
+
+  // 다운로드
   const handleDownload = async () => {
     try {
       const response = await axiosInstance.get(
@@ -344,9 +334,12 @@ export default function DashboardAttendeePage() {
                   {attendees.length}
                 </S.Attendee>
               </S.RateWrapper>
-              <Search
-                onSearch={setSearchQuery}
-                placeholder="이름, 학번, 이메일, 전화번호로 검색"
+
+              <AttendeeSearch
+                attendees={attendees}
+                searchQuery={searchQuery}
+                setSearchQuery={setSearchQuery}
+                setFilteredAttendees={setFilteredAttendees}
               />
             </S.SearchRateContainer>
 

From 1e99df024994460c707953db15ed2055f77a9412 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Fri, 20 Sep 2024 21:54:57 +0900
Subject: [PATCH 19/45] =?UTF-8?q?#318=20feat:=20=ED=85=8C=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=94=EC=97=90=20=EC=B6=9C=EC=84=9D=20=EC=8B=9C=EA=B0=84=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/AttendeeTable.jsx         | 18 ++++++++++++++----
 .../DashboardAttendeePage.jsx                  |  1 -
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/components/Table/AttendeeTable.jsx b/src/components/Table/AttendeeTable.jsx
index a9b25f1a..2db4c3b1 100644
--- a/src/components/Table/AttendeeTable.jsx
+++ b/src/components/Table/AttendeeTable.jsx
@@ -21,6 +21,15 @@ const AttendeeTable = ({
     return <FaArrowDownShortWide />;
   };
 
+  // 시간 형식 HH:MM
+  const formatAttendTime = (time) => {
+    if (!time) return '-';
+    const date = new Date(time);
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${hours}:${minutes}`;
+  };
+
   return (
     <S.TableContainer>
       <S.Table>
@@ -55,9 +64,10 @@ const AttendeeTable = ({
               휴대폰 번호
               <SortIcon columnKey="phoneNumber" />
             </S.TableHeader>
-            <S.TableHeader onClick={() => sortData('email')}>
-              이메일 주소
-              <SortIcon columnKey="email" />
+            {/* 출석 시간 열 추가 */}
+            <S.TableHeader onClick={() => sortData('attendTime')}>
+              출석 시간
+              <SortIcon columnKey="attendTime" />
             </S.TableHeader>
             <S.TableHeader></S.TableHeader>
           </tr>
@@ -92,7 +102,7 @@ const AttendeeTable = ({
                 </>
               )}
               <S.TableData>{data.phoneNumber}</S.TableData>
-              <S.TableData>{data.email}</S.TableData>
+              <S.TableData>{formatAttendTime(data.attendTime)}</S.TableData>
               <S.TableData>
                 <BsEye />
               </S.TableData>
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index 7361881e..c6241e23 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -11,7 +11,6 @@ import {
   TopNavigation,
   TabMenu,
   SlimButton,
-  Search,
 } from '@/components';
 import {
   getAttendanceList,

From e11e3c9b5454c627a27aaf8d5da3bde5bd3045c5 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sat, 21 Sep 2024 22:12:12 +0900
Subject: [PATCH 20/45] =?UTF-8?q?#272=20fix:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20=EB=93=B1=EB=A1=9D=20=ED=9B=84?=
 =?UTF-8?q?=20=EC=9D=B4=EB=8F=99=ED=95=98=EB=8A=94=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=ED=8E=98=EC=9D=B4=EC=A7=80=20path=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/DashboardPage/DashboardPage.jsx                   | 2 +-
 src/pages/RegisterPage/PageComponents/RegisterCompleted.jsx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardPage.jsx b/src/pages/DashboardPage/DashboardPage.jsx
index 7e2caeb3..c92a5a0e 100644
--- a/src/pages/DashboardPage/DashboardPage.jsx
+++ b/src/pages/DashboardPage/DashboardPage.jsx
@@ -39,7 +39,7 @@ export default function DashboardPage() {
       mutationFn: () => deleteEvent(eventId),
       onSuccess: () => {
         alert('행사가 삭제되었습니다. 목록 페이지로 이동합니다.');
-        navigate('/event');
+        navigate('/events');
       },
       onError: () => {
         alert('행사 삭제에 실패했습니다. 다시 시도해 주세요.');
diff --git a/src/pages/RegisterPage/PageComponents/RegisterCompleted.jsx b/src/pages/RegisterPage/PageComponents/RegisterCompleted.jsx
index bd5cf1af..47a043fe 100644
--- a/src/pages/RegisterPage/PageComponents/RegisterCompleted.jsx
+++ b/src/pages/RegisterPage/PageComponents/RegisterCompleted.jsx
@@ -42,7 +42,7 @@ const RegisterCompletedModal = ({ eventTitle, eventScheduleList }) => {
               backgroundColor="#F2F2F2"
               textColor="#323232"
               onClick={() => {
-                nav('/event', { replace: true });
+                nav('/events', { replace: true });
               }}
             />
           </S.ButtonWrapper>

From 792a2920ff9b59b3b08c59432d36c0a772989faa Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sat, 21 Sep 2024 22:55:43 +0900
Subject: [PATCH 21/45] =?UTF-8?q?#272=20fix:=20=EC=82=AC=EC=9D=B4=EB=93=9C?=
 =?UTF-8?q?=EB=B0=94=20=ED=99=94=EB=A9=B4=EC=97=90=20=EA=B3=A0=EC=A0=95(?=
 =?UTF-8?q?=EC=BB=A8=ED=85=90=EC=B8=A0=20=EB=B6=80=EB=B6=84=EB=A7=8C=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EA=B0=80=EB=8A=A5=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Layout/PageLayout.jsx                     | 20 ++++++++++++++++++-
 src/components/Sidebar/Sidebar.style.jsx      |  4 ++--
 .../DashboardAttendeePage.style.jsx           |  1 -
 .../DashboardEmailPage.style.jsx              |  1 -
 .../DashboardInfoPage.style.jsx               |  1 -
 .../DashboardPage/DashboardPage.style.jsx     |  2 +-
 .../DashboardStatisticPage.style.jsx          |  1 -
 .../DashboardSurveyPage.style.jsx             |  1 -
 .../PageComponents/RegisterPage.style.js      |  1 -
 9 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Layout/PageLayout.jsx b/src/Layout/PageLayout.jsx
index 49fff2fa..fc6fe5c9 100644
--- a/src/Layout/PageLayout.jsx
+++ b/src/Layout/PageLayout.jsx
@@ -1,6 +1,8 @@
 import React from 'react';
 import styled from 'styled-components';
 
+import { BREAKPOINTS } from '@/styles';
+
 const Inner = styled.div`
   display: ${({ hasSideBar }) =>
     hasSideBar === undefined ? undefined : 'flex'};
@@ -13,13 +15,29 @@ const SideBarLayout = styled.div`
   }
 `;
 
+const Contents = styled.div`
+  --top-navigation-height: 57px;
+
+  overflow-y: auto;
+  display: flex;
+  width: 100%;
+  height: calc(100vh - var(--top-navigation-height));
+
+  @media (max-width: ${BREAKPOINTS[1]}px) {
+    --top-navigation-height: 55px;
+  }
+  @media (max-width: ${BREAKPOINTS[0]}px) {
+    --top-navigation-height: 54px;
+  }
+`;
+
 export default function PageLayout({ topNavigation, sideBar, children }) {
   return (
     <div>
       {topNavigation}
       <Inner hasSideBar={sideBar !== undefined}>
         <SideBarLayout>{sideBar}</SideBarLayout>
-        {children}
+        <Contents>{children}</Contents>
       </Inner>
     </div>
   );
diff --git a/src/components/Sidebar/Sidebar.style.jsx b/src/components/Sidebar/Sidebar.style.jsx
index 1e81525f..3c4c8a60 100644
--- a/src/components/Sidebar/Sidebar.style.jsx
+++ b/src/components/Sidebar/Sidebar.style.jsx
@@ -9,8 +9,8 @@ export const Sidebar = styled.div`
   flex-shrink: 0;
   padding-top: 35px;
   min-width: 180px;
-  height: 100vh;
-
+  border-right: 1px solid #ebedf0;
+  height: 100%;
   /* @media (max-width: ${BREAKPOINTS[0]}px) {
     display: none;
   } */
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx
index 829edd4c..79e42b1e 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx
@@ -5,7 +5,6 @@ export const DashboardAttendee = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  border-left: 1px solid #ebedf0;
   padding: 50px;
   gap: 10px;
 
diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx
index f279b10b..5f683047 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx
@@ -5,7 +5,6 @@ export const DashboardEmailPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  border-left: 1px solid #ebedf0;
   padding: 50px;
   gap: 10px;
 
diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx
index 759f9558..44b5cbcd 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx
@@ -4,7 +4,6 @@ import { BREAKPOINTS } from '@/styles';
 
 export const DashboardInfo = styled.div`
   flex-grow: 1;
-  border-left: 1px solid #ebedf0;
   padding: 50px;
 
   @media (max-width: ${BREAKPOINTS[0]}px) {
diff --git a/src/pages/DashboardPage/DashboardPage.style.jsx b/src/pages/DashboardPage/DashboardPage.style.jsx
index b780f087..65ae5f14 100644
--- a/src/pages/DashboardPage/DashboardPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardPage.style.jsx
@@ -7,7 +7,7 @@ export const DashboardPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  border-left: 1px solid #ebedf0;
+
   padding: 50px;
   gap: 12px;
 
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx
index e6986ffa..fcad3835 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx
@@ -5,7 +5,6 @@ export const DetailStatisticsPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  border-left: 1px solid #ebedf0;
   padding: 50px;
   gap: 12px;
 
diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx
index 4cb8ac98..20c3f2ea 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx
@@ -5,7 +5,6 @@ export const DashboardSurveyPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-  border-left: 1px solid #ebedf0;
   padding: 50px;
   gap: 10px;
 
diff --git a/src/pages/RegisterPage/PageComponents/RegisterPage.style.js b/src/pages/RegisterPage/PageComponents/RegisterPage.style.js
index 0b37ffc1..6a75dbca 100644
--- a/src/pages/RegisterPage/PageComponents/RegisterPage.style.js
+++ b/src/pages/RegisterPage/PageComponents/RegisterPage.style.js
@@ -6,7 +6,6 @@ export const RegisterPage = styled.div`
   flex-direction: column;
   padding: 50px;
   width: 100%;
-  border-left: 1px solid #ebedf0;
 
   @media (max-width: ${BREAKPOINTS[0]}px) {
     padding: 20px;

From c977997e405c3c868352debccc6f4df29cbb5bdc Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sat, 21 Sep 2024 23:59:22 +0900
Subject: [PATCH 22/45] =?UTF-8?q?#272=20fix:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=ED=96=89=EC=82=AC=20=ED=83=80=EC=9E=85=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=84=A0=ED=83=9D=ED=95=B4?=
 =?UTF-8?q?=EB=8F=84=20=ED=99=9C=EC=84=B1=ED=99=94=20=EC=95=88=EB=90=98?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EventTypeCard/index.js         |  1 -
 .../EventTypeRadioGroup.jsx}                  | 18 ++++++-------
 .../EventTypeRadioGroup.style.js}             |  0
 src/components/EventTypeRadioGroup/index.js   |  1 +
 src/components/index.js                       |  2 +-
 .../DashboardInfoPage/DashboardInfoPage.jsx   | 25 +++++++------------
 .../PageComponents/RegisterFirst.jsx          | 11 +++++---
 7 files changed, 25 insertions(+), 33 deletions(-)
 delete mode 100644 src/components/EventTypeCard/index.js
 rename src/components/{EventTypeCard/EventTypeCard.jsx => EventTypeRadioGroup/EventTypeRadioGroup.jsx} (58%)
 rename src/components/{EventTypeCard/EventTypeCard.style.js => EventTypeRadioGroup/EventTypeRadioGroup.style.js} (100%)
 create mode 100644 src/components/EventTypeRadioGroup/index.js

diff --git a/src/components/EventTypeCard/index.js b/src/components/EventTypeCard/index.js
deleted file mode 100644
index 35c975f1..00000000
--- a/src/components/EventTypeCard/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { default as EventTypeCard } from './EventTypeCard';
diff --git a/src/components/EventTypeCard/EventTypeCard.jsx b/src/components/EventTypeRadioGroup/EventTypeRadioGroup.jsx
similarity index 58%
rename from src/components/EventTypeCard/EventTypeCard.jsx
rename to src/components/EventTypeRadioGroup/EventTypeRadioGroup.jsx
index ee9d2a9d..5267b8f6 100644
--- a/src/components/EventTypeCard/EventTypeCard.jsx
+++ b/src/components/EventTypeRadioGroup/EventTypeRadioGroup.jsx
@@ -1,15 +1,11 @@
-import { eventTypeState } from '@/recoil/atoms/state';
-import { useRecoilState } from 'recoil';
-import * as S from './EventTypeCard.style';
-
-const EventTypeCard = ({ handleEventType }) => {
-  const [eventType, setEventType] = useRecoilState(eventTypeState);
+import * as S from './EventTypeRadioGroup.style';
 
+const EventTypeRadioGroup = ({ value, onChange }) => {
   return (
     <S.FlexWrapper style={{ flexWrap: 'wrap' }}>
       <S.ChoiceBox
-        onClick={() => handleEventType('ONLINE')}
-        isSelected={eventType === 'ONLINE'}
+        onClick={() => onChange('ONLINE')}
+        isSelected={value === 'ONLINE'}
       >
         <S.TitleWrapper>
           <S.Category>온라인 행사</S.Category>
@@ -19,8 +15,8 @@ const EventTypeCard = ({ handleEventType }) => {
       </S.ChoiceBox>
 
       <S.ChoiceBox
-        onClick={() => handleEventType('OFFLINE')}
-        isSelected={eventType === 'OFFLINE'}
+        onClick={() => onChange('OFFLINE')}
+        isSelected={value === 'OFFLINE'}
       >
         <S.TitleWrapper>
           <S.Category>오프라인 행사</S.Category>
@@ -32,4 +28,4 @@ const EventTypeCard = ({ handleEventType }) => {
   );
 };
 
-export default EventTypeCard;
+export default EventTypeRadioGroup;
diff --git a/src/components/EventTypeCard/EventTypeCard.style.js b/src/components/EventTypeRadioGroup/EventTypeRadioGroup.style.js
similarity index 100%
rename from src/components/EventTypeCard/EventTypeCard.style.js
rename to src/components/EventTypeRadioGroup/EventTypeRadioGroup.style.js
diff --git a/src/components/EventTypeRadioGroup/index.js b/src/components/EventTypeRadioGroup/index.js
new file mode 100644
index 00000000..1c35c1ae
--- /dev/null
+++ b/src/components/EventTypeRadioGroup/index.js
@@ -0,0 +1 @@
+export { default as EventTypeRadioGroup } from './EventTypeRadioGroup';
diff --git a/src/components/index.js b/src/components/index.js
index 115d3148..f0bb23f6 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -8,7 +8,7 @@ export * from './Dropdown';
 export * from './EventCard';
 export * from './EventScheduleItem';
 export * from './EventTargetOption';
-export * from './EventTypeCard';
+export * from './EventTypeRadioGroup';
 export * from './Input';
 export * from './Textarea';
 export * from './TopNavigation';
diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
index f84c7b62..bcd3a90c 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
@@ -7,7 +7,7 @@ import {
   Input,
   Textarea,
   TopNavigation,
-  EventTypeCard,
+  EventTypeRadioGroup,
   UploadBox,
   EventScheduleList,
   EventTargetOption,
@@ -197,6 +197,10 @@ export default function DashboardInfoPage() {
     });
   };
 
+  const handleEventTypeRadioGroupChange = (eventType) => {
+    setEventType(eventType);
+  };
+
   const handleImageUpload = (event) => {
     const file = event.target.files[0];
     if (file) {
@@ -259,22 +263,11 @@ export default function DashboardInfoPage() {
 
           <S.Content>
             <S.ContentTitle>온라인/오프라인 여부</S.ContentTitle>
-            <S.ToggleContainer>
-              <S.ToggleButton
-                active={eventType === 'ONLINE'}
-                onClick={() => setEventType('ONLINE')}
-              >
-                온라인
-              </S.ToggleButton>
-              <S.ToggleButton
-                active={eventType === 'OFFLINE'}
-                onClick={() => setEventType('OFFLINE')}
-              >
-                오프라인
-              </S.ToggleButton>
-            </S.ToggleContainer>
             <S.EventTypeCardWrapper>
-              <EventTypeCard handleEventType={setEventType} />
+              <EventTypeRadioGroup
+                value={eventType}
+                onChange={handleEventTypeRadioGroupChange}
+              />
             </S.EventTypeCardWrapper>
           </S.Content>
 
diff --git a/src/pages/RegisterPage/PageComponents/RegisterFirst.jsx b/src/pages/RegisterPage/PageComponents/RegisterFirst.jsx
index 96544452..0eff58ab 100644
--- a/src/pages/RegisterPage/PageComponents/RegisterFirst.jsx
+++ b/src/pages/RegisterPage/PageComponents/RegisterFirst.jsx
@@ -6,15 +6,15 @@ import {
 } from '@/recoil/atoms/state';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 import BlueButton from '../RegisterComponents/Button/BlueButton';
-import { EventTypeCard, EventTargetOption, Button } from '@/components';
+import { EventTypeRadioGroup, EventTargetOption, Button } from '@/components';
 
 const RegisterFirst = () => {
   const Step = useSetRecoilState(RegisterStep);
   const [eventType, setEventType] = useRecoilState(eventTypeState);
   const [eventTarget, setEventTarget] = useRecoilState(eventTargetState);
 
-  const handleEventType = (status) => {
-    setEventType(status);
+  const handleEventTypeRadioGroupChange = (eventType) => {
+    setEventType(eventType);
   };
 
   const stepUp = () => {
@@ -39,7 +39,10 @@ const RegisterFirst = () => {
                   다른 라이브 스트리밍 플랫폼을 활용하여 행사를 진행합니다.
                 </S.SubTitle>
               </S.TitleWrapper>
-              <EventTypeCard handleEventType={handleEventType} />
+              <EventTypeRadioGroup
+                value={eventType}
+                onChange={handleEventTypeRadioGroupChange}
+              />
             </S.ContentWrapper>
           </S.ContentBox>
         </S.RegisterCategory>

From 6a3752ba819be29f36aa657550207a4eea181e39 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 00:20:01 +0900
Subject: [PATCH 23/45] =?UTF-8?q?#272=20fix:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EB=82=B4=20=EC=BB=A4=EB=B2=84=20=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EB=B6=88=EB=9F=AC=EC=98=A4=EB=8A=94=20API=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadBox/UploadBox.jsx            | 15 ++++++++++++---
 .../DashboardInfoPage/DashboardInfoPage.jsx       |  5 ++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/components/UploadBox/UploadBox.jsx b/src/components/UploadBox/UploadBox.jsx
index 354c76c0..f927efed 100644
--- a/src/components/UploadBox/UploadBox.jsx
+++ b/src/components/UploadBox/UploadBox.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import * as S from './UploadBox.style';
 import FileButton from '../../pages/RegisterPage/RegisterComponents/Button/FileButton';
 
@@ -24,13 +24,15 @@ const FileInfo = ({ uploadedInfo }) => {
       >
         <S.PreviewLabel onClick={handlePreviewClick}>미리보기</S.PreviewLabel>
       </S.PreviewBox>
-      <FileButton content={uploadedInfo.name} type={'white'} />
+      {uploadedInfo.name !== null && (
+        <FileButton content={uploadedInfo.name} type={'white'} />
+      )}
     </S.PreviewWrapper>
   );
 };
 
 // UploadBox 컴포넌트
-const UploadBox = ({ accept, onFileUpload }) => {
+const UploadBox = ({ defaultImageUrl, accept, onFileUpload }) => {
   const [isActive, setActive] = useState(false);
   const [uploadedInfo, setUploadedInfo] = useState(null);
 
@@ -64,6 +66,13 @@ const UploadBox = ({ accept, onFileUpload }) => {
     setFileInfo(file);
   };
 
+  useEffect(() => {
+    setUploadedInfo({
+      name: '',
+      previewURL: defaultImageUrl,
+    });
+  }, [defaultImageUrl]);
+
   return (
     <S.StyledLabel
       className={`preview${isActive ? ' active' : ''}`}
diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
index bcd3a90c..07a25c27 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
@@ -50,6 +50,9 @@ export default function DashboardInfoPage() {
   } = useQuery({
     queryKey: ['getEventDetail', eventId],
     queryFn: () => getEventDetail(eventId),
+    onSuccess: ({ eventImage }) => {
+      setEventImage(eventImage);
+    },
   });
 
   const {
@@ -303,7 +306,7 @@ export default function DashboardInfoPage() {
                 사진은 PNG, JPG, JPEG 파일만 가능 합니다.
               </S.ContentDesc>
               <UploadBox
-                imageUrl={eventImage}
+                defaultImageUrl={eventImage}
                 onImageUpload={handleImageUpload}
               />
             </S.ContentDescWrapper>

From 4b09a7b6adeff6acf7fa6347b8f4dd77424b1ff9 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 00:46:26 +0900
Subject: [PATCH 24/45] =?UTF-8?q?#272=20fix:=20=EC=B6=9C=EC=84=9D=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20=EB=B0=8F=20=EC=84=9C=EB=AA=85API=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

---
 .../AttendanceSignPage/AttendanceSignPage.jsx              | 6 +-----
 .../AttendanceStudentIdPage/AttendanceStudentIdPage.jsx    | 7 +++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/pages/AttendancePage/AttendanceSignPage/AttendanceSignPage.jsx b/src/pages/AttendancePage/AttendanceSignPage/AttendanceSignPage.jsx
index 12f38921..fe11ac85 100644
--- a/src/pages/AttendancePage/AttendanceSignPage/AttendanceSignPage.jsx
+++ b/src/pages/AttendancePage/AttendanceSignPage/AttendanceSignPage.jsx
@@ -5,7 +5,6 @@ import SignatureCanvas from 'react-signature-canvas';
 import { useState, useRef, useEffect } from 'react';
 import { postAttendanceSign } from '@/services';
 import { useSessionStorages } from '@/hooks';
-import { USER_ID } from '@/constants';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { axiosInstance } from '@/axios';
 import { FiRotateCcw } from 'react-icons/fi';
@@ -36,7 +35,6 @@ const AttendanceSignPage = () => {
     console.log(studentInfo);
     await postAttendanceSign(
       {
-        userId: USER_ID,
         eventId: EVENT_ID,
         studentInfoId,
       },
@@ -71,9 +69,7 @@ const AttendanceSignPage = () => {
   useEffect(() => {
     const fetchEventDetails = async () => {
       try {
-        const response = await axiosInstance.get(
-          `/api/v1/events/${USER_ID}/${EVENT_ID}`,
-        );
+        const response = await axiosInstance.get(`/api/v1/events/${EVENT_ID}`);
         const eventData = response.data;
         setEventTitle(eventData.eventTitle);
         setEventTarget(eventData.eventTarget);
diff --git a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
index d937178b..483a0b99 100644
--- a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
+++ b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
@@ -1,7 +1,6 @@
 import { useEffect, useState } from 'react';
 import * as S from './AttendanceStudentIdPage.style';
 import { AttendanceHeader, Modal } from '@/components';
-import { USER_ID } from '@/constants';
 import { useSessionStorages } from '@/hooks';
 import { axiosInstance } from '@/axios';
 import { useNavigate } from 'react-router-dom';
@@ -37,8 +36,8 @@ const AttendanceStudentIdPage = () => {
   const getAttendanceCheck = async (params) => {
     const url =
       eventTarget === 'INTERNAL'
-        ? `/api/v1/attendance/check/studentNumber/${USER_ID}/${EVENT_ID}`
-        : `/api/v1/attendance/check/phoneNumber/${USER_ID}/${EVENT_ID}`;
+        ? `/api/v1/attendance/check/studentNumber/${EVENT_ID}`
+        : `/api/v1/attendance/check/phoneNumber/${EVENT_ID}`;
 
     console.log('API 호출 URL:', url);
     console.log('API 호출 파라미터:', {
@@ -138,7 +137,7 @@ const AttendanceStudentIdPage = () => {
     };
 
     fetchEventDetails();
-  }, [EVENT_ID, USER_ID]);
+  }, [EVENT_ID]);
 
   return (
     <S.AttendanceStudentIdPage>

From 22fd29009fbd40471ac854c633e026acd55e467a Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 01:41:44 +0900
Subject: [PATCH 25/45] =?UTF-8?q?#272=20fix:=20=EB=8C=80=EC=8B=9C=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9C=20=EB=82=B4=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=93=A4?=
 =?UTF-8?q?=EC=97=90=20=ED=96=89=EC=82=AC=20=ED=83=80=EC=9D=B4=ED=8B=80=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EC=98=A4=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardEmailPage/DashboardEmailPage.jsx | 21 ++++++++++++++-
 .../DashboardStatisticPage.jsx                | 27 ++++++++++++++++++-
 .../DashboardSurveyPage.jsx                   | 23 ++++++++++++++--
 3 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index 6f07dd8a..f291b92f 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -3,8 +3,10 @@ import { PageLayout } from '@/Layout';
 import * as S from './DashboardEmailPage.style';
 import { Sidebar, Button, TopNavigation, Textarea, Input } from '@/components';
 import { useRecoilValue } from 'recoil';
-import { eventDetail, eventIDState } from '@/recoil/atoms/state';
+import { eventIDState } from '@/recoil/atoms/state';
 import { axiosInstance } from '@/axios';
+import { getEventDetail } from '@/apis';
+import { useQuery } from '@tanstack/react-query';
 
 export default function DashboardEmailPage() {
   const eventId = useRecoilValue(eventIDState) || eventDetail.id;
@@ -14,6 +16,15 @@ export default function DashboardEmailPage() {
   const [emailContent, setEmailContent] = useState('');
   const [isLoading, setIsLoading] = useState(true);
 
+  const {
+    data: eventDetail,
+    isPending,
+    isError,
+  } = useQuery({
+    queryKey: ['getEventDetail', eventId],
+    queryFn: () => getEventDetail(eventId),
+  });
+
   useEffect(() => {
     const getEmailContent = async () => {
       try {
@@ -83,6 +94,14 @@ export default function DashboardEmailPage() {
     }
   };
 
+  if (isPending) {
+    return <div>Loading...</div>;
+  }
+
+  if (isError) {
+    return null;
+  }
+
   return (
     <PageLayout
       topNavigation={<TopNavigation eventTitle={eventDetail.eventTitle} />}
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
index 0b4d49c1..db5de557 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
@@ -5,14 +5,39 @@ import MajorChart from './MajorChart';
 import YearChart from './YearChart';
 import CompletionChart from './CompletionChart';
 import { ATTENDEE_LIST } from './attendee';
+import { eventIDState } from '@/recoil/atoms/state';
+import { getEventDetail } from '@/apis';
+import { useQuery } from '@tanstack/react-query';
+import { useRecoilValue } from 'recoil';
 
 const DetailStatisticsPage = () => {
+  const eventId = useRecoilValue(eventIDState);
   const startDate = ATTENDEE_LIST[0].eventDates[0];
   const endDate =
     ATTENDEE_LIST[0].eventDates[ATTENDEE_LIST[0].eventDates.length - 1];
 
+  const {
+    data: eventDetail,
+    isPending,
+    isError,
+  } = useQuery({
+    queryKey: ['getEventDetail', eventId],
+    queryFn: () => getEventDetail(eventId),
+  });
+
+  if (isPending) {
+    return <div>Loading...</div>;
+  }
+
+  if (isError) {
+    return null;
+  }
+
   return (
-    <PageLayout topNavigation={<TopNavigation />} sideBar={<Sidebar />}>
+    <PageLayout
+      topNavigation={<TopNavigation eventTitle={eventDetail.eventTitle} />}
+      sideBar={<Sidebar />}
+    >
       <S.DetailStatisticsPage>
         <S.TopContainer>
           <S.Title>세부 통계</S.Title>
diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
index 3f1538f3..34c2c13d 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
@@ -3,15 +3,26 @@ import { PageLayout } from '@/Layout';
 import * as S from './DashboardSurveyPage.style';
 import { Sidebar, Button, TopNavigation, Input } from '@/components';
 import { useRecoilValue } from 'recoil';
-import { eventDetail, eventIDState } from '@/recoil/atoms/state';
+import { eventIDState } from '@/recoil/atoms/state';
 import { axiosInstance } from '@/axios';
+import { getEventDetail } from '@/apis';
+import { useQuery } from '@tanstack/react-query';
 
 export default function DashboardSurveyPage() {
-  const eventId = useRecoilValue(eventIDState) || eventDetail.id;
+  const eventId = useRecoilValue(eventIDState);
   const [surveyUrl, setSurveyUrl] = useState('');
   const [isModified, setIsModified] = useState(false);
   const [isSaving, setIsSaving] = useState(false);
 
+  const {
+    data: eventDetail,
+    isPending,
+    isError,
+  } = useQuery({
+    queryKey: ['getEventDetail', eventId],
+    queryFn: () => getEventDetail(eventId),
+  });
+
   // 설문조사 링크 가져오기
   useEffect(() => {
     const getSurveyUrl = async () => {
@@ -70,6 +81,14 @@ export default function DashboardSurveyPage() {
     }
   };
 
+  if (isPending) {
+    return <div>Loading...</div>;
+  }
+
+  if (isError) {
+    return null;
+  }
+
   return (
     <PageLayout
       topNavigation={<TopNavigation eventTitle={eventDetail.eventTitle} />}

From bbaab611d2e42b3d69d6e87a3f23d6c4f4b50b34 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 01:43:05 +0900
Subject: [PATCH 26/45] =?UTF-8?q?#272=20fix:=20=EC=B0=B8=EC=84=9D=EC=9E=90?=
 =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=82=B4?=
 =?UTF-8?q?=20=EB=88=88=20=EC=95=84=EC=9D=B4=EC=BD=98=20=EC=A3=BC=EC=84=9D?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/AttendeeTable.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/AttendeeTable.jsx b/src/components/Table/AttendeeTable.jsx
index 2db4c3b1..5abcba44 100644
--- a/src/components/Table/AttendeeTable.jsx
+++ b/src/components/Table/AttendeeTable.jsx
@@ -69,7 +69,7 @@ const AttendeeTable = ({
               출석 시간
               <SortIcon columnKey="attendTime" />
             </S.TableHeader>
-            <S.TableHeader></S.TableHeader>
+            {/* <S.TableHeader></S.TableHeader> */}
           </tr>
         </thead>
         <tbody>
@@ -103,9 +103,9 @@ const AttendeeTable = ({
               )}
               <S.TableData>{data.phoneNumber}</S.TableData>
               <S.TableData>{formatAttendTime(data.attendTime)}</S.TableData>
-              <S.TableData>
+              {/* <S.TableData>
                 <BsEye />
-              </S.TableData>
+              </S.TableData> */}
             </tr>
           ))}
         </tbody>

From b9bf6fa408cc6fd490ef41ef9021f0a08d0e2c93 Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Sun, 22 Sep 2024 13:45:39 +0900
Subject: [PATCH 27/45] =?UTF-8?q?#320=20feat:=20=EB=A6=AC=EB=94=94?=
 =?UTF-8?q?=EB=A0=89=EC=85=98=20=EC=A3=BC=EC=86=8C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/services/privateRoute/PrivateRoute.jsx | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/services/privateRoute/PrivateRoute.jsx b/src/services/privateRoute/PrivateRoute.jsx
index b71d93ec..88724f5a 100644
--- a/src/services/privateRoute/PrivateRoute.jsx
+++ b/src/services/privateRoute/PrivateRoute.jsx
@@ -1,19 +1,16 @@
 import React from 'react';
-import { Navigate } from 'react-router-dom';
+import { useLocation } from 'react-router-dom';
 
 function PrivateRoute({ component: Component, ...rest }) {
-  const isAuthenticated = !!sessionStorage.getItem('accessToken');
+  const isAuthenticated = sessionStorage.getItem('accessToken');
+  const location = useLocation();
 
-  return isAuthenticated ? (
-    <Component {...rest} />
-  ) : (
-    <Navigate
-      to={{
-        pathname: '/',
-        state: { from: rest.location },
-      }}
-    />
-  );
+  if (isAuthenticated) {
+    return <Component {...rest} />;
+  } else {
+    window.location.href = `${process.env.REACT_APP_GOOGLE_OAUTH_BASE_URL}/o/oauth2/auth?client_id=${process.env.REACT_APP_GOOGLE_OAUTH_CLIENT_ID}&redirect_uri=${process.env.REACT_APP_CLIENT_BASE_URL}/loading&response_type=code&scope=https://www.googleapis.com/auth/userinfo.email https://www.googleapis.com/auth/userinfo.profile`;
+    return null;
+  }
 }
 
 export default PrivateRoute;

From c616382cb0107df47fb9ecb2b9cf2c77bf49b271 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 14:40:47 +0900
Subject: [PATCH 28/45] =?UTF-8?q?#272=20fix:=20=EC=84=9C=EB=AA=85=20API=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

---
 .../DashboardInfoPage/DashboardInfoPage.jsx   | 45 +++++++++++++++++--
 .../DashboardPage/DashboardPage.style.jsx     |  1 -
 .../Dropdown/CompletionDropdown.jsx           |  4 +-
 .../attendanceService/attendanceService.js    | 11 ++---
 4 files changed, 47 insertions(+), 14 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
index 07a25c27..048eb277 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
@@ -12,11 +12,13 @@ import {
   EventScheduleList,
   EventTargetOption,
 } from '@/components';
+import { minCompletionTimes } from '@/recoil/atoms/state';
 import { USER_ID } from '@/constants';
-import { useRecoilValue } from 'recoil';
+import { useRecoilValue, useRecoilState } from 'recoil';
 import { eventIDState } from '@/recoil/atoms/state';
 import { PageLayout } from '@/Layout';
 import { getEventDetail, updateEventDetail } from '@/apis';
+import CompletionDropdown from '@/pages/RegisterPage/RegisterComponents/Dropdown/CompletionDropdown';
 
 export default function DashboardInfoPage() {
   const [eventType, setEventType] = useState('OFFLINE');
@@ -24,6 +26,9 @@ export default function DashboardInfoPage() {
   const [eventTitle, setEventTitle] = useState('');
   const [eventDescription, setEventDescription] = useState('');
   const [eventImage, setEventImage] = useState('');
+  const [eventUrlAddress, setEventUrlAddress] = useState('');
+  const [minCompletionTimesValue, setMinCompletionTimesValue] =
+    useRecoilState(minCompletionTimes);
   const [eventSchedules, setEventSchedules] = useState([
     {
       eventDate: new Date(),
@@ -34,6 +39,15 @@ export default function DashboardInfoPage() {
   const [isChanged, setIsChanged] = useState(false);
   const eventId = useRecoilValue(eventIDState);
 
+  const dropdownItems = eventSchedules.map((_, index) => ({
+    label: `${index + 1}회`,
+    value: index + 1,
+  }));
+
+  const handleSelect = (value) => {
+    setMinCompletionTimesValue(value);
+  };
+
   const initialState = useRef({
     eventType,
     eventTarget,
@@ -41,6 +55,7 @@ export default function DashboardInfoPage() {
     eventDescription,
     eventImage,
     eventSchedules,
+    completionTimes: minCompletionTimesValue,
   });
 
   const {
@@ -50,8 +65,9 @@ export default function DashboardInfoPage() {
   } = useQuery({
     queryKey: ['getEventDetail', eventId],
     queryFn: () => getEventDetail(eventId),
-    onSuccess: ({ eventImage }) => {
+    onSuccess: ({ eventImage, eventUrl }) => {
       setEventImage(eventImage);
+      setEventUrlAddress(eventUrl);
     },
   });
 
@@ -60,7 +76,7 @@ export default function DashboardInfoPage() {
     isPending: isUpdateEventDetailPending,
   } = useMutation({
     mutationKey: ['updateEventDetail', eventId],
-    mutationFn: (body) => updateEventDetail(USER_ID, eventId, body),
+    mutationFn: (body) => updateEventDetail(eventId, body),
     onSuccess: () => {
       alert('행사 정보가 성공적으로 저장되었습니다.');
       setIsChanged(false); // 저장 후 변경 사항을 초기화
@@ -188,7 +204,7 @@ export default function DashboardInfoPage() {
       eventId,
       eventTitle,
       eventDetail: eventDescription,
-      eventImage,
+      // eventImage,
       eventType: eventType ? 'OFFLINE' : 'ONLINE',
       eventTarget: eventTarget === 'EXTERNAL' ? 'EXTERNAL' : 'INTERNAL',
       eventSchedules: eventSchedules.map((schedule) => ({
@@ -206,6 +222,7 @@ export default function DashboardInfoPage() {
 
   const handleImageUpload = (event) => {
     const file = event.target.files[0];
+
     if (file) {
       const filePath = URL.createObjectURL(file);
       setEventImage(filePath);
@@ -311,6 +328,26 @@ export default function DashboardInfoPage() {
               />
             </S.ContentDescWrapper>
           </S.Content>
+
+          <S.Content>
+            <S.ContentTitle>행사 이수 기준</S.ContentTitle>
+            <CompletionDropdown
+              defaultItem={{
+                value: eventDetail.completionTimes,
+              }}
+              items={dropdownItems}
+              onSelect={handleSelect}
+            />
+          </S.Content>
+
+          <S.Content>
+            <S.ContentTitle>WISE 주소</S.ContentTitle>
+            <Input
+              placeholder="등록하실 행사의 WISE 주소를 입력해주세요."
+              value={eventUrlAddress}
+              onChange={(e) => setEventUrlAddress(e.target.value)}
+            />
+          </S.Content>
         </S.ContentContainer>
       </S.DashboardInfo>
     </PageLayout>
diff --git a/src/pages/DashboardPage/DashboardPage.style.jsx b/src/pages/DashboardPage/DashboardPage.style.jsx
index 65ae5f14..3d8e2fb3 100644
--- a/src/pages/DashboardPage/DashboardPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardPage.style.jsx
@@ -7,7 +7,6 @@ export const DashboardPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
-
   padding: 50px;
   gap: 12px;
 
diff --git a/src/pages/RegisterPage/RegisterComponents/Dropdown/CompletionDropdown.jsx b/src/pages/RegisterPage/RegisterComponents/Dropdown/CompletionDropdown.jsx
index 06ff44c9..6de3d256 100644
--- a/src/pages/RegisterPage/RegisterComponents/Dropdown/CompletionDropdown.jsx
+++ b/src/pages/RegisterPage/RegisterComponents/Dropdown/CompletionDropdown.jsx
@@ -2,9 +2,9 @@ import * as S from './CompletionDropdown.style';
 import React, { useCallback, useEffect, useState } from 'react';
 import { BiChevronDown } from 'react-icons/bi';
 
-const CompletionDropdown = ({ items, onSelect }) => {
+const CompletionDropdown = ({ defaultItem, items, onSelect }) => {
   const [isActive, setIsActive] = useState(false);
-  const [selectedItem, setSelectedItem] = useState(null);
+  const [selectedItem, setSelectedItem] = useState(defaultItem || null);
 
   const onActiveToggle = useCallback(() => {
     setIsActive((prev) => !prev);
diff --git a/src/services/attendanceService/attendanceService.js b/src/services/attendanceService/attendanceService.js
index 134a5b00..df57073b 100644
--- a/src/services/attendanceService/attendanceService.js
+++ b/src/services/attendanceService/attendanceService.js
@@ -1,8 +1,8 @@
 import { axiosInstance } from '../../axios';
 
-export const getAttendanceCheck = async ({ userId, eventId }, params) => {
+export const getAttendanceCheck = async ({ eventId }, params) => {
   const { data } = await axiosInstance.get(
-    `/api/v1/attendance/check/${userId}/${eventId}`,
+    `/api/v1/attendance/check/${eventId}`,
     {
       params,
     },
@@ -11,12 +11,9 @@ export const getAttendanceCheck = async ({ userId, eventId }, params) => {
   return data;
 };
 
-export const postAttendanceSign = async (
-  { userId, eventId, studentInfoId },
-  body,
-) => {
+export const postAttendanceSign = async ({ eventId, studentInfoId }, body) => {
   await axiosInstance.post(
-    `/api/v1/attendance/sign/${userId}/${eventId}/${studentInfoId}`,
+    `/api/v1/attendance/sign/${eventId}/${studentInfoId}`,
     body,
     {
       headers: {

From 796c49999c856d3b91d82e85874eaf31f9fc5394 Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Sun, 22 Sep 2024 14:52:44 +0900
Subject: [PATCH 29/45] =?UTF-8?q?#324=20design:=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EB=B0=95=EC=8A=A4=20=EB=94=94=EC=9E=90=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadBox/UploadBox.jsx      | 39 ++++++++++++---------
 src/components/UploadBox/UploadBox.style.js |  7 +++-
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/components/UploadBox/UploadBox.jsx b/src/components/UploadBox/UploadBox.jsx
index 354c76c0..0f936dc5 100644
--- a/src/components/UploadBox/UploadBox.jsx
+++ b/src/components/UploadBox/UploadBox.jsx
@@ -1,8 +1,5 @@
 import React, { useState } from 'react';
 import * as S from './UploadBox.style';
-import FileButton from '../../pages/RegisterPage/RegisterComponents/Button/FileButton';
-
-//미리보기 선택 시 전체 프리뷰 기능 미구현
 
 // FileInfo 컴포넌트
 const FileInfo = ({ uploadedInfo }) => {
@@ -15,16 +12,21 @@ const FileInfo = ({ uploadedInfo }) => {
 
   return (
     <S.PreviewWrapper>
-      <S.PreviewBox
-        style={{
-          backgroundImage: `url(${uploadedInfo.previewURL})`,
-          backgroundSize: 'cover',
-          backgroundPosition: 'center',
-        }}
-      >
-        <S.PreviewLabel onClick={handlePreviewClick}>미리보기</S.PreviewLabel>
-      </S.PreviewBox>
-      <FileButton content={uploadedInfo.name} type={'white'} />
+      {uploadedInfo.previewURL ? (
+        <S.PreviewBox
+          style={{
+            backgroundImage: `url(${uploadedInfo.previewURL})`,
+            backgroundSize: 'cover',
+            backgroundPosition: 'center',
+          }}
+        >
+          <S.PreviewLabel onClick={handlePreviewClick}>미리보기</S.PreviewLabel>
+        </S.PreviewBox>
+      ) : (
+        <S.NoPreviewMsg>
+          엑셀 파일은 미리보기를 제공하지 않습니다.
+        </S.NoPreviewMsg>
+      )}
     </S.PreviewWrapper>
   );
 };
@@ -41,9 +43,14 @@ const UploadBox = ({ accept, onFileUpload }) => {
   };
 
   const setFileInfo = (file) => {
-    const name = file.name;
-    const previewURL = URL.createObjectURL(file);
-    setUploadedInfo({ name, previewURL });
+    let previewURL = null;
+
+    // 이미지 파일만 미리보기 URL 생성
+    if (file.type.startsWith('image/')) {
+      previewURL = URL.createObjectURL(file);
+    }
+
+    setUploadedInfo({ previewURL });
     if (onFileUpload) {
       onFileUpload(file);
     }
diff --git a/src/components/UploadBox/UploadBox.style.js b/src/components/UploadBox/UploadBox.style.js
index dfa3fda7..94ed2660 100644
--- a/src/components/UploadBox/UploadBox.style.js
+++ b/src/components/UploadBox/UploadBox.style.js
@@ -46,7 +46,8 @@ export const PreviewWrapper = styled.div`
   height: 100%;
   width: 100%;
   align-items: end;
-  justify-content: space-between;
+  justify-content: center;
+  align-items: center;
 `;
 
 export const PreviewBox = styled.div`
@@ -58,6 +59,10 @@ export const PreviewBox = styled.div`
   height: 100%;
 `;
 
+export const NoPreviewMsg = styled.div`
+  font-size: 18px;
+`;
+
 export const PreviewLabel = styled.button`
   display: flex;
   justify-content: center;

From d3e5a73fd3b31e0ee6bc3a24d0843a1ad2a2e7bd Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 15:13:43 +0900
Subject: [PATCH 30/45] =?UTF-8?q?#233=20fix:=20=EC=B6=9C=EC=84=9D=20?=
 =?UTF-8?q?=EB=AA=85=EB=8B=A8=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EB=82=B4?=
 =?UTF-8?q?=EC=97=90=20=EC=B6=9C=EC=84=9D=20=EC=8B=9C=EA=B0=84=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/Table/AttendeeTable.jsx           | 16 +++++++++-------
 .../DashboardAttendeePage.jsx                    |  2 ++
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/components/Table/AttendeeTable.jsx b/src/components/Table/AttendeeTable.jsx
index 5abcba44..d0437f20 100644
--- a/src/components/Table/AttendeeTable.jsx
+++ b/src/components/Table/AttendeeTable.jsx
@@ -6,6 +6,7 @@ import {
 } from 'react-icons/fa6';
 import { BsEye } from 'react-icons/bs';
 import { Dropdown } from '@/components';
+import { format } from 'date-fns';
 
 const AttendeeTable = ({
   attendees,
@@ -54,10 +55,10 @@ const AttendeeTable = ({
                   학번
                   <SortIcon columnKey="number" />
                 </S.TableHeader>
-                <S.TableHeader onClick={() => sortData('year')}>
+                {/* <S.TableHeader onClick={() => sortData('year')}>
                   학년
                   <SortIcon columnKey="year" />
-                </S.TableHeader>
+                </S.TableHeader> */}
               </>
             )}
             <S.TableHeader onClick={() => sortData('phoneNumber')}>
@@ -98,14 +99,15 @@ const AttendeeTable = ({
               {showStudentInfo && (
                 <>
                   <S.TableData>{data.number}</S.TableData>
-                  <S.TableData>{data.year}</S.TableData>
+                  {/* <S.TableData>{data.year}</S.TableData> */}
                 </>
               )}
               <S.TableData>{data.phoneNumber}</S.TableData>
-              <S.TableData>{formatAttendTime(data.attendTime)}</S.TableData>
-              {/* <S.TableData>
-                <BsEye />
-              </S.TableData> */}
+              <S.TableData>
+                {data.attendTime === null
+                  ? '-'
+                  : format(new Date(data.attendTime), 'HH:mm')}
+              </S.TableData>
             </tr>
           ))}
         </tbody>
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index c6241e23..8eff54b0 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -110,6 +110,7 @@ export default function DashboardAttendeePage() {
         phoneNumber: student.attendeePhoneNumber || '-',
         email: student.attendeeEmail || '-',
         attendance: student.attendance,
+        attendTime: student.attendTime,
       }));
     });
 
@@ -155,6 +156,7 @@ export default function DashboardAttendeePage() {
           phoneNumber: student.attendeePhoneNumber || '-',
           email: student.attendeeEmail || '-',
           attendance: student.attendance,
+          attendTime: student.attendTime,
         }));
       });
 

From a2f7f604a2f578333615b3f4a5c8b91a93a39883 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 15:34:35 +0900
Subject: [PATCH 31/45] =?UTF-8?q?#233=20fix:=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=20=ED=95=98=EB=8B=A8=20=EC=97=AC=EB=B0=B1=20=EC=88=98=EC=A0=95?=
 =?UTF-8?q?=20=EB=B0=8F=20=EC=B6=9C=EC=84=9D=EC=97=AC=EB=B6=80=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=93=9C=EB=A1=AD=EB=8B=A4=EC=9A=B4=20=EC=8A=A4?=
 =?UTF-8?q?=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/Dropdown/Dropdown.style.jsx                      | 1 +
 src/components/Table/Table.style.jsx                            | 1 -
 .../DashboardAttendeePage/DashboardAttendeePage.jsx             | 2 +-
 .../DashboardAttendeePage/DashboardAttendeePage.style.jsx       | 1 +
 .../DashboardEmailPage/DashboardEmailPage.style.jsx             | 1 +
 .../DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx | 2 +-
 src/pages/DashboardPage/DashboardPage.style.jsx                 | 1 +
 .../DashboardStatisticPage/DashboardStatisticPage.style.jsx     | 1 +
 .../DashboardSurveyPage/DashboardSurveyPage.style.jsx           | 1 +
 9 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/Dropdown/Dropdown.style.jsx b/src/components/Dropdown/Dropdown.style.jsx
index 7e75dd02..db19d00a 100644
--- a/src/components/Dropdown/Dropdown.style.jsx
+++ b/src/components/Dropdown/Dropdown.style.jsx
@@ -3,6 +3,7 @@ import styled from 'styled-components';
 export const Dropdown = styled.div`
   position: relative;
   display: inline-block;
+  overflow: visible;
 `;
 
 export const DropdownButton = styled.button`
diff --git a/src/components/Table/Table.style.jsx b/src/components/Table/Table.style.jsx
index 5c1ff78d..aaa6002a 100644
--- a/src/components/Table/Table.style.jsx
+++ b/src/components/Table/Table.style.jsx
@@ -35,7 +35,6 @@ export const TableData = styled.td`
   font-size: 14px;
   color: #555;
   white-space: nowrap;
-  overflow: hidden;
 
   &:first-child {
     text-align: left;
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index 8eff54b0..5a31cda5 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -238,7 +238,7 @@ export default function DashboardAttendeePage() {
   const handleDownload = async () => {
     try {
       const response = await axiosInstance.get(
-        `/api/v1/events/attendance/list/${eventId}`,
+        `/api/v1/attendance/list/${eventId}`,
         { responseType: 'blob' },
       );
 
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx
index 79e42b1e..9debb81d 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.style.jsx
@@ -5,6 +5,7 @@ export const DashboardAttendee = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  height: fit-content;
   padding: 50px;
   gap: 10px;
 
diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx
index 5f683047..0b8501ef 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.style.jsx
@@ -5,6 +5,7 @@ export const DashboardEmailPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  height: fit-content;
   padding: 50px;
   gap: 10px;
 
diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx
index 44b5cbcd..883f58ea 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.style.jsx
@@ -3,7 +3,7 @@ import 'react-datepicker/dist/react-datepicker.css';
 import { BREAKPOINTS } from '@/styles';
 
 export const DashboardInfo = styled.div`
-  flex-grow: 1;
+  height: fit-content;
   padding: 50px;
 
   @media (max-width: ${BREAKPOINTS[0]}px) {
diff --git a/src/pages/DashboardPage/DashboardPage.style.jsx b/src/pages/DashboardPage/DashboardPage.style.jsx
index 3d8e2fb3..14d6957f 100644
--- a/src/pages/DashboardPage/DashboardPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardPage.style.jsx
@@ -7,6 +7,7 @@ export const DashboardPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  height: fit-content;
   padding: 50px;
   gap: 12px;
 
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx
index fcad3835..63706dd2 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.style.jsx
@@ -5,6 +5,7 @@ export const DetailStatisticsPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  height: fit-content;
   padding: 50px;
   gap: 12px;
 
diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx
index 20c3f2ea..a55d7999 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.style.jsx
@@ -5,6 +5,7 @@ export const DashboardSurveyPage = styled.div`
   display: flex;
   flex-direction: column;
   flex-grow: 1;
+  height: fit-content;
   padding: 50px;
   gap: 10px;
 

From 0e905b3a46651c3ca25e4a4b74fd833cee4f72c1 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 15:47:41 +0900
Subject: [PATCH 32/45] =?UTF-8?q?#233=20fix:=20=ED=96=89=EC=82=AC=EB=B3=84?=
 =?UTF-8?q?=20=ED=86=B5=EA=B3=84=EA=B3=84=20API=20=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/event.js                             |  8 ++++++
 .../CompletionChart.jsx                       |  4 +--
 .../DashboardStatisticPage.jsx                | 25 +++++++++++++------
 .../DashboardStatisticPage/MajorChart.jsx     | 18 ++++++-------
 .../DashboardStatisticPage/YearChart.jsx      | 20 +++++++--------
 5 files changed, 46 insertions(+), 29 deletions(-)

diff --git a/src/apis/event.js b/src/apis/event.js
index 7131cfb0..ee934dcc 100644
--- a/src/apis/event.js
+++ b/src/apis/event.js
@@ -26,3 +26,11 @@ export const updateEventDetail = async (eventId, body) => {
 
   return data;
 };
+
+export const getEventStatistic = async (eventId) => {
+  const { data } = await axiosInstance.get(
+    `/api/v1/events/statistic/${eventId}`,
+  );
+
+  return data;
+};
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
index 17ac904e..60516f9c 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
@@ -5,8 +5,8 @@ import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
-const CompletionChart = () => {
-  const totalStudents = ATTENDEE_LIST[0].eventRatioDetailResponseDtos.length;
+const CompletionChart = ({ attendeeList }) => {
+  const totalStudents = attendeeList.eventRatioDetailResponseDtos.length;
   const completedStudents =
     ATTENDEE_LIST[0].eventRatioDetailResponseDtos.filter(
       (student) => student.completion,
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
index db5de557..89eec1d7 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
@@ -6,7 +6,7 @@ import YearChart from './YearChart';
 import CompletionChart from './CompletionChart';
 import { ATTENDEE_LIST } from './attendee';
 import { eventIDState } from '@/recoil/atoms/state';
-import { getEventDetail } from '@/apis';
+import { getEventDetail, getEventStatistic } from '@/apis';
 import { useQuery } from '@tanstack/react-query';
 import { useRecoilValue } from 'recoil';
 
@@ -18,18 +18,27 @@ const DetailStatisticsPage = () => {
 
   const {
     data: eventDetail,
-    isPending,
-    isError,
+    isPending: isEventDetailPending,
+    isError: isEventDetailError,
   } = useQuery({
     queryKey: ['getEventDetail', eventId],
     queryFn: () => getEventDetail(eventId),
   });
 
-  if (isPending) {
+  const {
+    data: eventStatistic,
+    isPending: isEventStatisticPending,
+    isError: isEventStatisticError,
+  } = useQuery({
+    queryKey: ['getEventStatistic', eventId],
+    queryFn: () => getEventStatistic(eventId),
+  });
+
+  if (isEventDetailPending || isEventStatisticPending) {
     return <div>Loading...</div>;
   }
 
-  if (isError) {
+  if (isEventDetailError || isEventStatisticError) {
     return null;
   }
 
@@ -50,21 +59,21 @@ const DetailStatisticsPage = () => {
           <S.ChartWrapper>
             <S.ChartTitle>전공별 참석 비율</S.ChartTitle>
             <S.Chart>
-              <MajorChart />
+              <MajorChart attendeeList={eventStatistic} />
             </S.Chart>
           </S.ChartWrapper>
 
           <S.ChartWrapper>
             <S.ChartTitle>학번별 참석 비율</S.ChartTitle>
             <S.Chart>
-              <YearChart />
+              <YearChart attendeeList={eventStatistic} />
             </S.Chart>
           </S.ChartWrapper>
 
           <S.ChartWrapper>
             <S.ChartTitle>전체 학생 중 이수 비율</S.ChartTitle>
             <S.Chart>
-              <CompletionChart />
+              <CompletionChart attendeeList={eventStatistic} />
             </S.Chart>
           </S.ChartWrapper>
         </S.ContentContainer>
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
index 3edc627f..6fd46cd2 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
@@ -5,19 +5,19 @@ import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
-const MajorChart = () => {
+const MajorChart = ({ attendeeList }) => {
   const majorAttendance = {};
   let totalCompletedStudentsByMajor = 0;
 
-  ATTENDEE_LIST[0].eventRatioDetailResponseDtos.forEach((student) => {
-    if (student.completion) {
-      totalCompletedStudentsByMajor++;
-      if (majorAttendance[student.studentMajor]) {
-        majorAttendance[student.studentMajor]++;
-      } else {
-        majorAttendance[student.studentMajor] = 1;
-      }
+  attendeeList.eventRatioDetailResponseDtos.forEach((student) => {
+    // if (student.completion) {
+    totalCompletedStudentsByMajor++;
+    if (majorAttendance[student.studentMajor]) {
+      majorAttendance[student.studentMajor]++;
+    } else {
+      majorAttendance[student.studentMajor] = 1;
     }
+    // }
   });
 
   const sortedMajorAttendance = Object.entries(majorAttendance).sort(
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
index cd7c0896..7121b01b 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
@@ -5,20 +5,20 @@ import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
-const YearChart = () => {
+const YearChart = ({ attendeeList }) => {
   const yearAttendance = {};
   let totalCompletedStudentsByYear = 0;
 
-  ATTENDEE_LIST[0].eventRatioDetailResponseDtos.forEach((student) => {
-    if (student.completion) {
-      totalCompletedStudentsByYear++;
-      const year = String(student.studentNumber).substring(0, 2);
-      if (yearAttendance[year]) {
-        yearAttendance[year]++;
-      } else {
-        yearAttendance[year] = 1;
-      }
+  attendeeList.eventRatioDetailResponseDtos.forEach((student) => {
+    // if (student.completion) {
+    totalCompletedStudentsByYear++;
+    const year = String(student.studentNumber).substring(0, 2);
+    if (yearAttendance[year]) {
+      yearAttendance[year]++;
+    } else {
+      yearAttendance[year] = 1;
     }
+    // }
   });
 
   const sortedYearAttendance = Object.entries(yearAttendance).sort(

From 5847bcdf4af175554e164bc1d4038e522a894192 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 15:50:11 +0900
Subject: [PATCH 33/45] =?UTF-8?q?#233=20fix:=20=ED=96=89=EC=82=AC=EB=B3=84?=
 =?UTF-8?q?=20=ED=86=B5=EA=B3=84=20=EB=82=B4=20=EB=82=A0=EC=A7=9C=20API=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardStatisticPage/DashboardStatisticPage.jsx           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
index 89eec1d7..8e5c8e52 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
@@ -51,7 +51,7 @@ const DetailStatisticsPage = () => {
         <S.TopContainer>
           <S.Title>세부 통계</S.Title>
           <S.EventDate>
-            {startDate} ~ {endDate}
+            {`${eventStatistic.eventDates[0]} ~ ${eventStatistic.eventDates[eventStatistic.eventDates.length - 1]}`}
           </S.EventDate>
         </S.TopContainer>
 

From 4c432653dfc03dcc6002fb157c333b20c2b23bd2 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 22:18:27 +0900
Subject: [PATCH 34/45] =?UTF-8?q?#326=20fix:=20=EC=B0=B8=EC=84=9D=EC=9E=90?=
 =?UTF-8?q?=20=EB=AA=85=EB=8B=A8,=20=EB=A6=AC=EB=A7=88=EC=9D=B8=EB=93=9C?=
 =?UTF-8?q?=20=EB=A9=94=EC=9D=BC=20api=20path=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/attendance.js                                |  4 +---
 .../DashboardEmailPage/DashboardEmailPage.jsx         | 11 ++++-------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/apis/attendance.js b/src/apis/attendance.js
index f0f1c8c0..e5e2b655 100644
--- a/src/apis/attendance.js
+++ b/src/apis/attendance.js
@@ -1,9 +1,7 @@
 import { axiosInstance } from '@/axios';
 
 export const getAttendanceList = async (eventId) => {
-  const { data } = await axiosInstance.get(
-    `/api/v1/events/attendanceList/${eventId}`,
-  );
+  const { data } = await axiosInstance.get(`/api/v1/attendancelist/${eventId}`);
 
   return data;
 };
diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index f291b92f..2fb3c55d 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -28,14 +28,11 @@ export default function DashboardEmailPage() {
   useEffect(() => {
     const getEmailContent = async () => {
       try {
-        const response = await axiosInstance.get(
-          `/api/v1/events/mail/content/${eventId}`,
-          {
-            params: {
-              mailType: 'REMIND',
-            },
+        const response = await axiosInstance.get(`/api/v1/mail/${eventId}`, {
+          params: {
+            mailType: 'REMIND',
           },
-        );
+        });
         if (response.status === 200) {
           setEmailContent(response.data.mailContent);
           setEmailTitle(response.data.mailTitle);

From 4935ff37265502a127731856110437cf3a7a3f44 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 22:29:32 +0900
Subject: [PATCH 35/45] =?UTF-8?q?#326=20fix:=20=EB=8C=80=EC=8B=9C=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9C=20=EB=82=B4=20=EC=82=AC=EC=9D=B4=EB=93=9C=EB=B0=94=20?=
 =?UTF-8?q?=EC=98=B5=EC=85=98=EB=AA=85=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Sidebar/Sidebar.jsx                          | 4 ++--
 .../DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Sidebar/Sidebar.jsx b/src/components/Sidebar/Sidebar.jsx
index 897749fd..804b6396 100644
--- a/src/components/Sidebar/Sidebar.jsx
+++ b/src/components/Sidebar/Sidebar.jsx
@@ -24,12 +24,12 @@ const menuItems = [
   {
     to: '/events/dashboard/email',
     icon: <FaEnvelopeCircleCheck />,
-    text: '이메일 예약 발송',
+    text: '행사 안내 메일',
   },
   {
     to: '/events/dashboard/survey',
     icon: <FaClipboardList />,
-    text: '설문 조사 링크 발송',
+    text: '설문조사 안내 메일',
   },
   {
     to: '/events/dashboard/attendee',
diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
index 048eb277..03005eac 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
@@ -270,16 +270,16 @@ export default function DashboardInfoPage() {
             />
           </S.Content>
 
-          <S.Content>
+          {/* 행사 일정 수정이 안되는 관계로 임시 주석 처리 */}
+          {/* <S.Content>
             <S.ContentTitle>행사 기간</S.ContentTitle>
-            {/* 행사 일정 컴포넌트 적용 */}
             <EventScheduleList
               eventSchedules={eventSchedules}
               handleScheduleChange={handleScheduleChange}
               handleAddSchedule={handleAddSchedule}
               handleDeleteSchedule={handleDeleteSchedule}
             />
-          </S.Content>
+          </S.Content> */}
 
           <S.Content>
             <S.ContentTitle>온라인/오프라인 여부</S.ContentTitle>

From c643ed954b80bc5e4d3c72637c727ecd214111fc Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 22:45:44 +0900
Subject: [PATCH 36/45] =?UTF-8?q?#326=20remove:=20=ED=96=89=EC=82=AC=20?=
 =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=A0=95=EB=B3=B4=20=EB=82=B4=20wise=20?=
 =?UTF-8?q?=EC=A3=BC=EC=86=8C=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardInfoPage/DashboardInfoPage.jsx              | 9 ---------
 src/pages/DashboardPage/DashboardPage.jsx                | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
index 03005eac..7c0edebf 100644
--- a/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
+++ b/src/pages/DashboardPage/DashboardInfoPage/DashboardInfoPage.jsx
@@ -339,15 +339,6 @@ export default function DashboardInfoPage() {
               onSelect={handleSelect}
             />
           </S.Content>
-
-          <S.Content>
-            <S.ContentTitle>WISE 주소</S.ContentTitle>
-            <Input
-              placeholder="등록하실 행사의 WISE 주소를 입력해주세요."
-              value={eventUrlAddress}
-              onChange={(e) => setEventUrlAddress(e.target.value)}
-            />
-          </S.Content>
         </S.ContentContainer>
       </S.DashboardInfo>
     </PageLayout>
diff --git a/src/pages/DashboardPage/DashboardPage.jsx b/src/pages/DashboardPage/DashboardPage.jsx
index c92a5a0e..d922e9b0 100644
--- a/src/pages/DashboardPage/DashboardPage.jsx
+++ b/src/pages/DashboardPage/DashboardPage.jsx
@@ -167,7 +167,7 @@ export default function DashboardPage() {
     const parsedEvent = {
       title: eventDetail.eventTitle,
       detail: eventDetail.eventDetail,
-      image: eventDetail.eventImage,
+      image: eventDetail.eventImage || 'img/logo-background.svg',
       schedules,
       totalSessions: eventDetail.eventSchedules.length,
       // totalParticipants,

From 260690a62157d471409b4eb0a8f35a846a0b062f Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Sun, 22 Sep 2024 23:15:52 +0900
Subject: [PATCH 37/45] =?UTF-8?q?#326=20feat:=20=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EC=95=88=EB=82=B4=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B6=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DashboardEmailPage/DashboardEmailPage.jsx       | 13 ++++++++++++-
 .../DashboardSurveyPage/DashboardSurveyPage.jsx     |  3 +--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
index 2fb3c55d..03c80729 100644
--- a/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
+++ b/src/pages/DashboardPage/DashboardEmailPage/DashboardEmailPage.jsx
@@ -122,12 +122,23 @@ export default function DashboardEmailPage() {
 
         <S.ContentContainer>
           <S.Content>
-            <S.ContentTitle>리마인드 메일 내용 수정</S.ContentTitle>
+            <S.ContentTitle>행사 안내 메일 발송</S.ContentTitle>
             <S.ContentDesc>
               <em>행사 시작 24시간 전</em>에 참석자들에게 발송 될&nbsp;
               <em>행사 안내 메일 내용</em>을 수정해 주세요.
+              <br />
+              행사 담당자에게도 참석자들에게 발송된 메일과 <em>동일한 내용</em>
+              의 메일이 발송됩니다.
             </S.ContentDesc>
           </S.Content>
+          <S.Content>
+            <S.ContentTitle>행사 안내 메일 링크</S.ContentTitle>
+            <Input
+              placeholder="행사 안내 링크를 입력해 주세요."
+              // value={emailTitle}
+              // onChange={handleTitleChange}
+            />
+          </S.Content>
           <S.Content>
             <S.ContentTitle>메일 제목</S.ContentTitle>
             <Input
diff --git a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
index 34c2c13d..0ddc8910 100644
--- a/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
+++ b/src/pages/DashboardPage/DashboardSurveyPage/DashboardSurveyPage.jsx
@@ -115,8 +115,7 @@ export default function DashboardSurveyPage() {
             <S.ContentTitle>WISE 설문 조사 링크 등록</S.ContentTitle>
             <S.ContentDesc>
               <em>행사 종료 1시간 후</em> 참석자들에게 발송 될&nbsp;
-              <em>설문조사 링크</em>를 등록해 주세요. <br /> 링크가 등록되지
-              않으면, 행사 등록 시 입력한 WISE 링크로 대신 발송됩니다.
+              <em>설문조사 링크</em>를 등록해 주세요.
             </S.ContentDesc>
             <Input
               placeholder="https://wise.sookmyung.ac.kr/ko/module/eco/@poll/write/4625/0"

From c639d37f042112f2af9b2b05b2e379efe629234f Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Mon, 23 Sep 2024 00:13:39 +0900
Subject: [PATCH 38/45] =?UTF-8?q?#328=20feat:=20=EC=9C=A0=EC=A0=80=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83/=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=ED=83=88=ED=87=B4=20=EC=8B=9C=EB=A5=BC=20=EC=9C=84=ED=95=9C=20?=
 =?UTF-8?q?=EB=93=9C=EB=9E=8D=EB=8B=A4=EC=9A=B4=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UserDropdown/UserDropdown.jsx  | 33 +++++++++++++++
 .../UserDropdown/UserDropdown.style.js        | 41 +++++++++++++++++++
 src/components/UserDropdown/index.js          |  1 +
 3 files changed, 75 insertions(+)
 create mode 100644 src/components/UserDropdown/UserDropdown.jsx
 create mode 100644 src/components/UserDropdown/UserDropdown.style.js
 create mode 100644 src/components/UserDropdown/index.js

diff --git a/src/components/UserDropdown/UserDropdown.jsx b/src/components/UserDropdown/UserDropdown.jsx
new file mode 100644
index 00000000..ffa31134
--- /dev/null
+++ b/src/components/UserDropdown/UserDropdown.jsx
@@ -0,0 +1,33 @@
+// 유저 정보 클릭 시 나오는 드랍다운으로 재사용 X
+
+import { axiosInstance } from '@/axios';
+import * as S from './UserDropdown.style';
+import { useNavigate } from 'react-router-dom';
+
+const UserDropdown = () => {
+  const nav = useNavigate();
+
+  const handleLogout = async () => {
+    try {
+      await axiosInstance.get(`/api/v1/logout`);
+      sessionStorage.clear();
+      alert('로그아웃이 완료되었습니다.');
+    } catch (error) {
+      console.log(error);
+    } finally {
+      nav('/');
+      window.location.reload();
+    }
+  };
+
+  return (
+    <S.Dropdown>
+      <S.DropdownContent>
+        <S.DropdownItem onClick={() => handleLogout()}>로그아웃</S.DropdownItem>
+        <S.DropdownItem>회원 탈퇴</S.DropdownItem>
+      </S.DropdownContent>
+    </S.Dropdown>
+  );
+};
+
+export default UserDropdown;
diff --git a/src/components/UserDropdown/UserDropdown.style.js b/src/components/UserDropdown/UserDropdown.style.js
new file mode 100644
index 00000000..9bda4b98
--- /dev/null
+++ b/src/components/UserDropdown/UserDropdown.style.js
@@ -0,0 +1,41 @@
+import styled from 'styled-components';
+
+export const Dropdown = styled.div`
+  position: relative;
+  display: inline-block;
+  transform: translate(-75px, 10px);
+`;
+
+export const DropdownContent = styled.ul`
+  display: flex;
+  flex-direction: column;
+  position: absolute;
+  z-index: 1000;
+  top: 100%;
+  left: 0;
+  margin: 8px 0 0;
+  border: 1px solid var(--blue-4, #accdff);
+  border-radius: 7px;
+  background: #f4f8ff;
+  padding: 4px;
+  min-width: max-content;
+  box-shadow: 4px 4px 4px 0px rgba(0, 0, 0, 0.1);
+  list-style: none;
+`;
+
+export const DropdownItem = styled.li`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  padding: 10px 16px;
+  border-radius: 4px;
+
+  font-size: 14px;
+  color: #323232;
+  cursor: pointer;
+
+  &:hover {
+    background: var(--blue-4, #accdff);
+  }
+`;
diff --git a/src/components/UserDropdown/index.js b/src/components/UserDropdown/index.js
new file mode 100644
index 00000000..a1a00ee7
--- /dev/null
+++ b/src/components/UserDropdown/index.js
@@ -0,0 +1 @@
+export { default as UserDropdown } from './UserDropdown';

From d9ad6350bdeae1d6a9530a3471515e6c3202f347 Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Mon, 23 Sep 2024 00:14:25 +0900
Subject: [PATCH 39/45] =?UTF-8?q?#328=20feat:=20=ED=81=B4=EB=A6=AD=20?=
 =?UTF-8?q?=EC=8B=9C=20=EB=93=9C=EB=9E=8D=EB=8B=A4=EC=9A=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopNavigation/TopNavigation.jsx | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/components/TopNavigation/TopNavigation.jsx b/src/components/TopNavigation/TopNavigation.jsx
index 14b79b96..e8c3f7b4 100644
--- a/src/components/TopNavigation/TopNavigation.jsx
+++ b/src/components/TopNavigation/TopNavigation.jsx
@@ -2,16 +2,16 @@ import { useEffect, useState } from 'react';
 import * as S from './TopNavigation.style';
 import { useLocation, useNavigate } from 'react-router-dom';
 import { FaBars, FaCircleUser } from 'react-icons/fa6';
-import { Sidebar, SlimButton } from '@/components';
+import { Sidebar, SlimButton, UserDropdown } from '@/components';
 import { BREAKPOINTS } from '@/styles';
 import { axiosInstance } from '@/axios';
 
 export default function TopNavigation({ eventTitle } = {}) {
   const name = sessionStorage.getItem('name');
-  const USER_ID = sessionStorage.getItem('id');
   const nav = useNavigate();
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
   const [isLoggedIn, setIsLoggedIn] = useState(false);
+  const [isDropdownOpen, setIsDropdownOpen] = useState(false);
 
   const location = useLocation();
 
@@ -31,6 +31,10 @@ export default function TopNavigation({ eventTitle } = {}) {
     setIsSidebarOpen(!isSidebarOpen);
   };
 
+  const handleUserControl = () => {
+    setIsDropdownOpen(!isDropdownOpen);
+  };
+
   useEffect(() => {
     const handleResizeOrScroll = () => {
       if (window.innerWidth > BREAKPOINTS[0] || window.scrollY > 0) {
@@ -97,7 +101,12 @@ export default function TopNavigation({ eventTitle } = {}) {
       </S.LogoMenuWrapper>
       <S.ProfileMenuWrapper>
         {isLoggedIn ? (
-          <b onClick={() => handleLogout()}>{name}</b>
+          <>
+            <div onClick={handleUserControl}>
+              {name}
+              {isDropdownOpen && <UserDropdown />}
+            </div>
+          </>
         ) : (
           <SlimButton label={'로그인'} onClick={handleLoginClick} />
         )}

From db9fc04d51ccf025aebe24c8ba86dbad35305cac Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Mon, 23 Sep 2024 00:15:30 +0900
Subject: [PATCH 40/45] =?UTF-8?q?#328=20feat:=20=EC=9C=A0=EC=A0=80=20?=
 =?UTF-8?q?=EB=93=9C=EB=9E=8D=EB=8B=A4=EC=9A=B4=20=EC=9D=B8=EB=8D=B1?=
 =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/index.js b/src/components/index.js
index 115d3148..b19775e8 100644
--- a/src/components/index.js
+++ b/src/components/index.js
@@ -21,3 +21,4 @@ export * from './GraphBox';
 export * from './Search';
 export * from './Scheduler';
 export * from './UploadBox';
+export * from './UserDropdown';

From fc3610cda3e911a4163d8c5080447cdcfb8f887b Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Mon, 23 Sep 2024 00:25:46 +0900
Subject: [PATCH 41/45] =?UTF-8?q?#321=20modify:=20API=20=EC=8A=A4=ED=8E=99?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=20+=20=EC=98=A8=EB=9D=BC=EC=9D=B8=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=8B=9C=20=EC=B5=9C=EC=86=8C=20=EC=9D=B4?=
 =?UTF-8?q?=EC=88=98=20=EA=B8=B0=EC=A4=80=20=EC=9D=B8=ED=92=8B=20=EA=B5=AC?=
 =?UTF-8?q?=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PageComponents/RegisterSecond.jsx         | 54 +++++++------------
 1 file changed, 18 insertions(+), 36 deletions(-)

diff --git a/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx b/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx
index f10f0d95..9f7ba549 100644
--- a/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx
+++ b/src/pages/RegisterPage/PageComponents/RegisterSecond.jsx
@@ -46,8 +46,6 @@ const RegisterSecond = () => {
   const [minCompletionTimesValue, setMinCompletionTimesValue] =
     useRecoilState(minCompletionTimes);
   const [eventSchedules, setEventSchedules] = useRecoilState(eventScheduleList);
-  const [eventAddress, setEventAddress] = useState('');
-  const [isChecked, setIsChecked] = useState(false);
 
   const navigate = useNavigate();
   const resetAllStates = useResetAllStates();
@@ -69,10 +67,6 @@ const RegisterSecond = () => {
     setMinCompletionTimesValue(value);
   };
 
-  const handleCheckboxChange = (event) => {
-    setIsChecked(event.target.checked);
-  };
-
   const handleDownload = async (e) => {
     e.preventDefault();
     try {
@@ -137,19 +131,16 @@ const RegisterSecond = () => {
     e.preventDefault();
     const formData = new FormData();
 
-    const event = {
+    const eventDetail = {
       eventType,
       eventTarget,
       eventTitle: eventTitleValue,
       eventDetail: eventDetailValue,
       completionTimes: minCompletionTimesValue,
       eventSchedules: formatSchedules(eventSchedules),
-      eventUrl: eventAddress,
-      alarmRequest: isChecked,
-      alarmResponse: isChecked,
     };
 
-    formData.append('eventDetail', JSON.stringify(event));
+    formData.append('eventDetail', JSON.stringify(eventDetail));
     formData.append('eventImage', eventImageValue);
     formData.append('attendanceListFile', attendanceListFileValue);
 
@@ -164,9 +155,9 @@ const RegisterSecond = () => {
       alert('행사가 제대로 등록되지 않았습니다.');
       navigate('/register');
     } finally {
-      setShowModal(true);
       setStep(1);
       resetAllStates();
+      navigate('/events');
     }
   };
 
@@ -237,31 +228,22 @@ const RegisterSecond = () => {
 
             <S.ContentWrapper>
               <S.MainTitle>행사 이수 기준</S.MainTitle>
-              <CompletionDropdown
-                items={dropdownItems}
-                onSelect={handleSelect}
-              />
-            </S.ContentWrapper>
-
-            <S.ContentWrapper>
-              <S.MainTitle>WISE 주소</S.MainTitle>
-              <Input
-                placeholder="등록하실 행사의 WISE 주소를 입력해주세요."
-                value={eventAddress}
-                onChange={(e) => setEventAddress(e.target.value)}
-              />
-            </S.ContentWrapper>
-
-            <S.ContentWrapper>
-              <S.MainTitle>안내 메일 발송 여부</S.MainTitle>
-              <S.Callout>
-                <S.CheckBox
-                  type="checkbox"
-                  checked={isChecked}
-                  onChange={handleCheckboxChange}
+              {eventType == 'OFFLINE' ? (
+                <CompletionDropdown
+                  items={dropdownItems}
+                  onSelect={handleSelect}
                 />
-                <S.SubTitle>안내 메일 발송에 동의합니다.</S.SubTitle>
-              </S.Callout>
+              ) : (
+                <>
+                  <Input
+                    type="number"
+                    placeholder={
+                      '행사 이수를 위한 최소 시간을 분 단위로 입력해주세요. (ex. 30, 60 ... )'
+                    }
+                    onChange={(e) => handleSelect(e.target.value)}
+                  />
+                </>
+              )}
             </S.ContentWrapper>
 
             <S.ButtonWrapper>

From 68344f9b6a660dbb38bf01b2e70e33fd7ef98475 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Mon, 23 Sep 2024 00:57:01 +0900
Subject: [PATCH 42/45] =?UTF-8?q?#326=20fix:=20=EC=B6=9C=EC=84=9D=EC=B2=B4?=
 =?UTF-8?q?=ED=81=AC=20API=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AttendanceStudentIdPage/AttendanceStudentIdPage.jsx   | 8 ++++----
 src/services/attendanceService/attendanceService.js       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
index 483a0b99..b581b1e0 100644
--- a/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
+++ b/src/pages/AttendancePage/AttendanceStudentIdPage/AttendanceStudentIdPage.jsx
@@ -79,10 +79,10 @@ const AttendanceStudentIdPage = () => {
           setIsModalOpen(true);
         } else {
           const parsedStudent = {
-            studentName: data.studentName || data[0].studentName,
-            studentNumber: data.studentNumber || data[0].studentNumber,
-            studentInfoId: data.studentInfoId || data[0].studentInfoId,
-            major: data.major || data[0].major,
+            studentName: data.attendeeName,
+            studentNumber: data.studentNumber,
+            studentInfoId: data.attendeeId,
+            major: data.attendeeAffiliation,
           };
 
           setAttendanceCheck(data);
diff --git a/src/services/attendanceService/attendanceService.js b/src/services/attendanceService/attendanceService.js
index df57073b..e3587c52 100644
--- a/src/services/attendanceService/attendanceService.js
+++ b/src/services/attendanceService/attendanceService.js
@@ -13,7 +13,7 @@ export const getAttendanceCheck = async ({ eventId }, params) => {
 
 export const postAttendanceSign = async ({ eventId, studentInfoId }, body) => {
   await axiosInstance.post(
-    `/api/v1/attendance/sign/${eventId}/${studentInfoId}`,
+    `/api/v1/attendance/check/sign/${eventId}/${studentInfoId}`,
     body,
     {
       headers: {

From ca023431a9c05589d25a1e428655f242f382054f Mon Sep 17 00:00:00 2001
From: Jeonghyun <limithyunii@gmail.com>
Date: Mon, 23 Sep 2024 00:57:43 +0900
Subject: [PATCH 43/45] =?UTF-8?q?#331=20fix:=20=EC=B6=9C=EC=84=9D=20?=
 =?UTF-8?q?=EB=B2=84=ED=8A=BC=20=EB=B0=94=EB=A1=9C=20=EA=B0=80=EA=B8=B0=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=9D=B4=EB=B2=A4=ED=8A=B8=20id=20=EC=A0=84?=
 =?UTF-8?q?=EB=8B=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/EventCard/EventCard.jsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/EventCard/EventCard.jsx b/src/components/EventCard/EventCard.jsx
index d97c12f7..d8bf90e9 100644
--- a/src/components/EventCard/EventCard.jsx
+++ b/src/components/EventCard/EventCard.jsx
@@ -15,6 +15,7 @@ const EventCard = ({ id, title, poster, startDate, endDate }) => {
 
   const attendanceCheck = (event) => {
     event.stopPropagation();
+    setContent(id);
     navigate('/attendance/student-id');
   };
 

From b9757901fe4936a5353ddf120dcb68a41bf32f91 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Mon, 23 Sep 2024 01:00:39 +0900
Subject: [PATCH 44/45] =?UTF-8?q?#326=20fix:=20=ED=86=B5=EA=B3=84=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20API=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompletionChart.jsx                       |   5 +-
 .../DashboardStatisticPage.jsx                |   4 -
 .../DashboardStatisticPage/MajorChart.jsx     |  19 ++--
 .../DashboardStatisticPage/YearChart.jsx      |  19 ++--
 .../DashboardStatisticPage/attendee.js        | 107 ------------------
 5 files changed, 20 insertions(+), 134 deletions(-)
 delete mode 100644 src/pages/DashboardPage/DashboardStatisticPage/attendee.js

diff --git a/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
index 60516f9c..6bb15a57 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/CompletionChart.jsx
@@ -1,14 +1,13 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
-import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
 const CompletionChart = ({ attendeeList }) => {
-  const totalStudents = attendeeList.eventRatioDetailResponseDtos.length;
+  const totalStudents = attendeeList.eventStatisticDetailResponseDtos.length;
   const completedStudents =
-    ATTENDEE_LIST[0].eventRatioDetailResponseDtos.filter(
+    attendeeList.eventStatisticDetailResponseDtos.filter(
       (student) => student.completion,
     ).length;
 
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
index 8e5c8e52..ea9cbcaf 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/DashboardStatisticPage.jsx
@@ -4,7 +4,6 @@ import { Sidebar, TopNavigation } from '@/components';
 import MajorChart from './MajorChart';
 import YearChart from './YearChart';
 import CompletionChart from './CompletionChart';
-import { ATTENDEE_LIST } from './attendee';
 import { eventIDState } from '@/recoil/atoms/state';
 import { getEventDetail, getEventStatistic } from '@/apis';
 import { useQuery } from '@tanstack/react-query';
@@ -12,9 +11,6 @@ import { useRecoilValue } from 'recoil';
 
 const DetailStatisticsPage = () => {
   const eventId = useRecoilValue(eventIDState);
-  const startDate = ATTENDEE_LIST[0].eventDates[0];
-  const endDate =
-    ATTENDEE_LIST[0].eventDates[ATTENDEE_LIST[0].eventDates.length - 1];
 
   const {
     data: eventDetail,
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
index 6fd46cd2..0963e368 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/MajorChart.jsx
@@ -1,7 +1,6 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
-import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
@@ -9,15 +8,15 @@ const MajorChart = ({ attendeeList }) => {
   const majorAttendance = {};
   let totalCompletedStudentsByMajor = 0;
 
-  attendeeList.eventRatioDetailResponseDtos.forEach((student) => {
-    // if (student.completion) {
-    totalCompletedStudentsByMajor++;
-    if (majorAttendance[student.studentMajor]) {
-      majorAttendance[student.studentMajor]++;
-    } else {
-      majorAttendance[student.studentMajor] = 1;
+  attendeeList.eventStatisticDetailResponseDtos.forEach((student) => {
+    if (student.completion) {
+      totalCompletedStudentsByMajor++;
+      if (majorAttendance[student.studentMajor]) {
+        majorAttendance[student.studentMajor]++;
+      } else {
+        majorAttendance[student.studentMajor] = 1;
+      }
     }
-    // }
   });
 
   const sortedMajorAttendance = Object.entries(majorAttendance).sort(
@@ -91,7 +90,7 @@ const MajorChart = ({ attendeeList }) => {
 
             if (label === '기타') {
               const etcStudents =
-                ATTENDEE_LIST[0].eventRatioDetailResponseDtos.length -
+                attendeeList.eventRatioDetailResponseDtos.length -
                 totalCompletedStudentsByMajor;
               return `${etcStudents}명`;
             } else if (majorAttendance[label]) {
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx b/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
index 7121b01b..2f798fc0 100644
--- a/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
+++ b/src/pages/DashboardPage/DashboardStatisticPage/YearChart.jsx
@@ -1,7 +1,6 @@
 import { Doughnut } from 'react-chartjs-2';
 import { Chart as ChartJS, ArcElement, Tooltip, Legend } from 'chart.js';
 import ChartDataLabels from 'chartjs-plugin-datalabels';
-import { ATTENDEE_LIST } from './attendee';
 
 ChartJS.register(ArcElement, Tooltip, Legend, ChartDataLabels);
 
@@ -9,16 +8,16 @@ const YearChart = ({ attendeeList }) => {
   const yearAttendance = {};
   let totalCompletedStudentsByYear = 0;
 
-  attendeeList.eventRatioDetailResponseDtos.forEach((student) => {
-    // if (student.completion) {
-    totalCompletedStudentsByYear++;
-    const year = String(student.studentNumber).substring(0, 2);
-    if (yearAttendance[year]) {
-      yearAttendance[year]++;
-    } else {
-      yearAttendance[year] = 1;
+  attendeeList.eventStatisticDetailResponseDtos.forEach((student) => {
+    if (student.completion) {
+      totalCompletedStudentsByYear++;
+      const year = String(student.studentNumber).substring(0, 2);
+      if (yearAttendance[year]) {
+        yearAttendance[year]++;
+      } else {
+        yearAttendance[year] = 1;
+      }
     }
-    // }
   });
 
   const sortedYearAttendance = Object.entries(yearAttendance).sort(
diff --git a/src/pages/DashboardPage/DashboardStatisticPage/attendee.js b/src/pages/DashboardPage/DashboardStatisticPage/attendee.js
deleted file mode 100644
index 772957fe..00000000
--- a/src/pages/DashboardPage/DashboardStatisticPage/attendee.js
+++ /dev/null
@@ -1,107 +0,0 @@
-export const ATTENDEE_LIST = [
-  {
-    eventDates: ['2024-09-01', '2024-09-15', '2024-09-20'],
-    eventRatioDetailResponseDtos: [
-      {
-        studentNumber: 2110423,
-        studentMajor: '컴퓨터과학전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2110923,
-        studentMajor: '컴퓨터과학전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2012345,
-        studentMajor: '소프트웨어융합전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2012456,
-        studentMajor: '경영학과',
-        completion: false,
-      },
-      {
-        studentNumber: 2210456,
-        studentMajor: '경영학과',
-        completion: true,
-      },
-      {
-        studentNumber: 2210657,
-        studentMajor: '경영학과',
-        completion: false,
-      },
-      {
-        studentNumber: 2310758,
-        studentMajor: '경영학과',
-        completion: true,
-      },
-      {
-        studentNumber: 2310859,
-        studentMajor: '경영학과',
-        completion: false,
-      },
-      {
-        studentNumber: 2410950,
-        studentMajor: '경영학과',
-        completion: true,
-      },
-      {
-        studentNumber: 2411051,
-        studentMajor: '컴퓨터과학전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2111152,
-        studentMajor: '컴퓨터과학전공',
-        completion: false,
-      },
-      {
-        studentNumber: 2211253,
-        studentMajor: '컴퓨터과학전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2311354,
-        studentMajor: '소프트웨어융합전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2011455,
-        studentMajor: '컴퓨터과학전공',
-        completion: true,
-      },
-      {
-        studentNumber: 2011556,
-        studentMajor: '통계학과',
-        completion: false,
-      },
-      {
-        studentNumber: 2111657,
-        studentMajor: '통계학과',
-        completion: true,
-      },
-      {
-        studentNumber: 2211758,
-        studentMajor: '수학과',
-        completion: true,
-      },
-      {
-        studentNumber: 2311859,
-        studentMajor: '수학과',
-        completion: false,
-      },
-      {
-        studentNumber: 2411950,
-        studentMajor: '경제햑과',
-        completion: true,
-      },
-      {
-        studentNumber: 2112051,
-        studentMajor: '경제햑과',
-        completion: true,
-      },
-    ],
-  },
-];

From b9244b8a65ab418ea0df2bdc292c6f4b32c213b7 Mon Sep 17 00:00:00 2001
From: "misung.dev" <misung.dev@gmail.com>
Date: Mon, 23 Sep 2024 01:13:51 +0900
Subject: [PATCH 45/45] =?UTF-8?q?#326=20fix:=20=EC=B6=9C=EC=84=9D=EC=97=AC?=
 =?UTF-8?q?=EB=B6=80=20=EC=88=98=EC=A0=95=20api=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/attendance.js                                          | 2 +-
 .../DashboardAttendeePage/DashboardAttendeePage.jsx             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/apis/attendance.js b/src/apis/attendance.js
index e5e2b655..38a64e67 100644
--- a/src/apis/attendance.js
+++ b/src/apis/attendance.js
@@ -8,7 +8,7 @@ export const getAttendanceList = async (eventId) => {
 
 export const updateAttendanceList = async (eventId, body) => {
   const { data } = await axiosInstance.put(
-    `/api/v1/attendance/list/${eventId}`,
+    `/api/v1/attendance/manage/${eventId}`,
     body,
   );
 
diff --git a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
index 5a31cda5..200f7963 100644
--- a/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
+++ b/src/pages/DashboardPage/DashboardAttendeePage/DashboardAttendeePage.jsx
@@ -238,7 +238,7 @@ export default function DashboardAttendeePage() {
   const handleDownload = async () => {
     try {
       const response = await axiosInstance.get(
-        `/api/v1/attendance/list/${eventId}`,
+        `/api/v1/attendancelist/${eventId}`,
         { responseType: 'blob' },
       );