From fe2b50fc624e036254fa59d113e0b03ab4c345ed Mon Sep 17 00:00:00 2001
From: irenee-14 <ireneee145@gmail.com>
Date: Fri, 6 Sep 2024 12:05:11 +0900
Subject: [PATCH 01/14] =?UTF-8?q?Fix:=20=EC=A7=84=ED=96=89=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C=20=EC=95=84=EC=A0=A0=EB=8B=A4=20=EB=B3=B4=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EC=98=A4=EB=A5=98=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

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

diff --git a/pages/agenda/index.tsx b/pages/agenda/index.tsx
index b7e59c827..9da685f1b 100644
--- a/pages/agenda/index.tsx
+++ b/pages/agenda/index.tsx
@@ -15,6 +15,8 @@ const Agenda: NextPage = () => {
   const { PagaNationElementProps, content: historyData } =
     usePageNation<AgendaDataProps>({
       url: '/history',
+      size: 10,
+      isReady: showCurrent === 'history',
     });
 
   const { data: currentData } = useFetchGet<AgendaDataProps[]>({
@@ -22,6 +24,7 @@ const Agenda: NextPage = () => {
   });
   const { data: openData } = useFetchGet<AgendaDataProps[]>({ url: '/open' });
 
+  console.log('historyData', historyData);
   return (
     <div className={styles.agendaPageContainer}>
       <AgendaTitle />
@@ -30,7 +33,7 @@ const Agenda: NextPage = () => {
           <h2>AGENDA LIST</h2>
           <div>
             <button
-              className={`${listStyles.agendaListStatus} 
+              className={`${listStyles.agendaListStatus}
                 ${showCurrent === 'open' ? listStyles.selectedStatus : ''}`}
               name='ongoing'
               onClick={() => setShowCurrent('open')}
@@ -39,7 +42,7 @@ const Agenda: NextPage = () => {
             </button>
             {' | '}
             <button
-              className={`${listStyles.agendaListStatus} 
+              className={`${listStyles.agendaListStatus}
             ${showCurrent === 'current' ? listStyles.selectedStatus : ''}`}
               name='closed'
               onClick={() => setShowCurrent('current')}
@@ -48,7 +51,7 @@ const Agenda: NextPage = () => {
             </button>
             {' | '}
             <button
-              className={`${listStyles.agendaListStatus} 
+              className={`${listStyles.agendaListStatus}
               ${showCurrent === 'history' ? listStyles.selectedStatus : ''}`}
               name='closed'
               onClick={() => setShowCurrent('history')}

From c2267792694d3777e65da795d2bcbcddb62923a6 Mon Sep 17 00:00:00 2001
From: irenee-14 <ireneee145@gmail.com>
Date: Fri, 6 Sep 2024 12:12:50 +0900
Subject: [PATCH 02/14] =?UTF-8?q?Fix:=20=ED=8C=80=EC=A0=9C=ED=95=9C=201?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD,=20admin=EC=9D=BC=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=20=EC=98=A4=EB=8A=98=20=EC=9D=B4=EC=A0=84=20=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=20=EC=84=A4=EC=A0=95=20=EA=B0=80=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/agenda/Form/AgendaForm.tsx       | 17 +++++++++++------
 components/agenda/Form/SubmitAgendaForm.tsx |  3 ---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/components/agenda/Form/AgendaForm.tsx b/components/agenda/Form/AgendaForm.tsx
index 0952cdb71..cf2644a4c 100644
--- a/components/agenda/Form/AgendaForm.tsx
+++ b/components/agenda/Form/AgendaForm.tsx
@@ -32,7 +32,7 @@ const AgendaForm = ({
   const { openModal } = useModal();
   const setSnackBar = useSetRecoilState(toastState);
   const router = useRouter();
-  const minDistance = 10;
+  const minDistance = 1;
   // 날짜 초기화
   const today = new Date();
   const tommorrow = new Date(); // 기준값으로 사용
@@ -66,6 +66,7 @@ const AgendaForm = ({
     isEdit ? data.agendaMaxPeople === 1 : false
   );
 
+  // team limit
   const handleChange = (
     event: Event,
     newValue: number | number[],
@@ -80,13 +81,15 @@ const AgendaForm = ({
         setTeamLimit([clamped, clamped + minDistance]);
       } else {
         const clamped = Math.max(newValue[1], minDistance);
-        if (clamped - minDistance < newValue[0]) setTeamLimit([2, 12]);
+        if (clamped - minDistance < newValue[0]) setTeamLimit([2, 10]);
         else setTeamLimit([clamped - minDistance, clamped]);
       }
     } else {
       setTeamLimit(newValue as number[]);
     }
   };
+
+  // people limit
   const handleChangePeople = (
     event: Event,
     newValue: number | number[],
@@ -97,10 +100,11 @@ const AgendaForm = ({
     }
     setPeopleLimit(newValue as number[]);
   };
+
   const handleRecruitEnd = (e: React.ChangeEvent<HTMLInputElement>) => {
     if (!e.target.value) return;
     const newEnd = new Date(e.target.value);
-    console.log(newEnd);
+
     checkWarn(newEnd, 0);
     setRecruitEnd(new Date(e.target.value));
   };
@@ -125,13 +129,14 @@ const AgendaForm = ({
   function checkWarn(newDate: Date, index: number) {
     const newWarning = [...dateWarn];
     const DateValues = [recruitEnd, dateRange[0], dateRange[1]];
+
     DateValues[index] = newDate;
     tommorrow.setHours(0);
     tommorrow.setMinutes(0);
     tommorrow.setSeconds(0);
     tommorrow.setMilliseconds(0);
     // 모집마감일 오류
-    if (DateValues[0].getTime() < tommorrow.getTime()) {
+    if (!isAdmin && DateValues[0].getTime() < tommorrow.getTime()) {
       newWarning[0] = '내일 이후의 날짜를 선택해주세요';
     } else if (
       DateValues[0].getTime() > DateValues[1].getTime() ||
@@ -142,7 +147,7 @@ const AgendaForm = ({
       newWarning[0] = '';
     }
     // 대회 기간 시작일 오류
-    if (DateValues[1].getTime() < tommorrow.getTime()) {
+    if (!isAdmin && DateValues[1].getTime() < tommorrow.getTime()) {
       newWarning[1] = '내일 이후의 날짜를 선택해주세요';
     } else if (DateValues[1].getTime() > DateValues[2].getTime()) {
       newWarning[1] = '종료일보다 시작일이 뒤에 있습니다.';
@@ -152,7 +157,7 @@ const AgendaForm = ({
       newWarning[1] = '';
     }
     // 대회 기간 종료일 오류
-    if (DateValues[2].getTime() < tommorrow.getTime()) {
+    if (!isAdmin && DateValues[2].getTime() < tommorrow.getTime()) {
       newWarning[2] = '내일 이후의 날짜를 선택해주세요.';
     } else if (DateValues[2].getTime() < DateValues[1].getTime()) {
       newWarning[2] = '시작일보다 이전 날짜입니다.';
diff --git a/components/agenda/Form/SubmitAgendaForm.tsx b/components/agenda/Form/SubmitAgendaForm.tsx
index 3320d3b3a..8ae22f312 100644
--- a/components/agenda/Form/SubmitAgendaForm.tsx
+++ b/components/agenda/Form/SubmitAgendaForm.tsx
@@ -6,7 +6,6 @@ function agendadataToMsg(data: FormData, isEdit: boolean) {
   let msg = '';
   msg += '행사 제목 : ' + data.get('agendaTitle') + '\n';
   msg += '타입: ';
-  console.log(msg);
   msg += data.get('agendaIsRanking') === 'true' ? '대회\n' : '행사\n';
   msg += '행사 내용 : ' + data.get('agendaContent') + '\n';
   msg +=
@@ -29,7 +28,6 @@ function agendadataToMsg(data: FormData, isEdit: boolean) {
         ' ~ ' +
         data.get('agendaMaxPeople') +
         '\n';
-  console.log(msg);
   msg += '개최지 : ' + data.get('agendaLocation') + '\n';
   msg += '포스터 : ';
   msg +=
@@ -147,7 +145,6 @@ const SubmitAgendaForm = async (
           if (res.status === 204 || res.status === 200)
             onProceed && onProceed();
           if (!isEdit) {
-            console.log(res.data.agendaKey);
             router.push(`/agenda/detail?agenda_key=${res.data.agendaKey}`);
           }
         })

From 5e653c4d49746ec575a59ef393081a79c38d83dc Mon Sep 17 00:00:00 2001
From: Lee Jeong Ron <83465749+JeongRon@users.noreply.github.com>
Date: Fri, 6 Sep 2024 12:45:01 +0900
Subject: [PATCH 03/14] =?UTF-8?q?Feat:=20=EB=A1=9C=EB=94=A9=20circle=20UI?=
 =?UTF-8?q?=20=EC=A0=9C=EC=9E=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agendaDetail/tabs/AgendaAnnouncements.tsx |  7 +++--
 .../agendaDetail/tabs/ParticipantTeamList.tsx |  6 ++++-
 components/agenda/utils/AgendaLoading.tsx     |  6 ++++-
 styles/agenda/utils/AgendaLoading.module.scss | 27 +++++++++++++++++--
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx b/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx
index a8283b873..80f1ba125 100644
--- a/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx
+++ b/components/agenda/agendaDetail/tabs/AgendaAnnouncements.tsx
@@ -18,9 +18,12 @@ export default function AgendaAnnouncements() {
   });
 
   if (!agendaKey || !content) {
-    return <AgendaLoading />;
+    return (
+      <div className={styles.emptyContainer}>
+        <AgendaLoading />
+      </div>
+    );
   }
-
   return (
     <>
       {content && content.length > 0 ? (
diff --git a/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx b/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx
index 61676c904..0f6213006 100644
--- a/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx
+++ b/components/agenda/agendaDetail/tabs/ParticipantTeamList.tsx
@@ -37,7 +37,11 @@ export default function ParticipantTeamList({
   const confirmedTeamsCount = confirmedTeams ? confirmedTeams.length : 0;
 
   if (!agendaKey || !openTeams || !confirmedTeams) {
-    return <AgendaLoading />;
+    return (
+      <div className={styles.participantsContainer}>
+        <AgendaLoading />
+      </div>
+    );
   }
   return (
     <>
diff --git a/components/agenda/utils/AgendaLoading.tsx b/components/agenda/utils/AgendaLoading.tsx
index a5b7147ec..b5da4a36a 100644
--- a/components/agenda/utils/AgendaLoading.tsx
+++ b/components/agenda/utils/AgendaLoading.tsx
@@ -1,7 +1,11 @@
 import styles from 'styles/agenda/utils/AgendaLoading.module.scss';
 
 const AgendaLoading = () => {
-  return <div className={styles.container}>Lodaing...</div>;
+  return (
+    <div className={styles.loadingContainer}>
+      <div className={styles.loadingCircle} />
+    </div>
+  );
 };
 
 export default AgendaLoading;
diff --git a/styles/agenda/utils/AgendaLoading.module.scss b/styles/agenda/utils/AgendaLoading.module.scss
index be7601a82..6fd4d82dd 100644
--- a/styles/agenda/utils/AgendaLoading.module.scss
+++ b/styles/agenda/utils/AgendaLoading.module.scss
@@ -1,5 +1,28 @@
 @import 'styles/agenda/common.scss';
 
-.contianer {
-  @include container(1);
+@keyframes Rotate {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.loadingContainer {
+  width: 100%;
+  height: 100%;
+}
+
+.loadingCircle {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: 3rem;
+  height: 3rem;
+  border: 0.3rem solid rgb(167, 167, 167);
+  border-top-color: transparent;
+  border-left-color: transparent;
+  border-radius: 50%;
+  animation: Rotate 0.8s infinite linear;
 }

From 3b1ca3d71ebc9f7bef79c58fef08a0c3703a2776 Mon Sep 17 00:00:00 2001
From: irenee-14 <ireneee145@gmail.com>
Date: Fri, 6 Sep 2024 13:28:16 +0900
Subject: [PATCH 04/14] =?UTF-8?q?Feat:=20=EB=8C=80=ED=9A=8C=20=EC=A1=B0?=
 =?UTF-8?q?=EA=B1=B4=20=EC=83=81=EC=84=B8=EC=A0=95=EB=B3=B4=EC=97=90=20?=
 =?UTF-8?q?=ED=8F=AC=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/agenda/agendaDetail/TabContent.tsx |  4 +-
 .../agendaDetail/tabs/AgendaDescription.tsx   | 57 +++++++++++++------
 constants/agenda/agendaDetail/agendaTabs.ts   |  1 -
 .../agendaDetail/AgendaDetail.module.scss     |  2 +-
 .../tabs/AgendaConditions.module.scss         |  1 -
 .../tabs/AgendaDescription.module.scss        | 36 +++++++++++-
 6 files changed, 74 insertions(+), 27 deletions(-)

diff --git a/components/agenda/agendaDetail/TabContent.tsx b/components/agenda/agendaDetail/TabContent.tsx
index 133241cba..9ec55b7f9 100644
--- a/components/agenda/agendaDetail/TabContent.tsx
+++ b/components/agenda/agendaDetail/TabContent.tsx
@@ -1,6 +1,5 @@
 import { TabContentProps } from 'types/agenda/button/tabButtonTypes';
 import AgendaAnnouncements from 'components/agenda/agendaDetail/tabs/AgendaAnnouncements';
-import AgendaConditions from 'components/agenda/agendaDetail/tabs/AgendaConditions';
 import AgendaDescription from 'components/agenda/agendaDetail/tabs/AgendaDescription';
 import AgendaParticipants from 'components/agenda/agendaDetail/tabs/AgendaParticipants';
 import AgendaPoster from 'components/agenda/agendaDetail/tabs/AgendaPoster';
@@ -27,8 +26,7 @@ export default function TabContent({
         return <AgendaParticipants agendaData={agendaData} myTeam={myTeam} />;
       case tabs.NOTIFICATIONS:
         return <AgendaAnnouncements />;
-      case tabs.CONDITIONS:
-        return <AgendaConditions agendaData={agendaData} />;
+
       case tabs.POSTER:
         return (
           <div className={styles.flex}>
diff --git a/components/agenda/agendaDetail/tabs/AgendaDescription.tsx b/components/agenda/agendaDetail/tabs/AgendaDescription.tsx
index 837118090..9080fede9 100644
--- a/components/agenda/agendaDetail/tabs/AgendaDescription.tsx
+++ b/components/agenda/agendaDetail/tabs/AgendaDescription.tsx
@@ -2,6 +2,7 @@ import { AgendaProps } from 'types/agenda/agendaDetail/agendaTypes';
 import { formatDate } from 'utils/agenda/formatDate';
 import AgendaTags from 'components/agenda/utils/AgendaTags';
 import styles from 'styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss';
+
 export default function AgendaDescription({ agendaData }: AgendaProps) {
   const {
     agendaContent,
@@ -10,32 +11,52 @@ export default function AgendaDescription({ agendaData }: AgendaProps) {
     agendaEndTime,
     isOfficial,
     agendaisRanking,
+    agendaMinPeople,
+    agendaMaxPeople,
+    agendaMinTeam,
+    agendaMaxTeam,
   } = agendaData;
 
+  const teamPeople =
+    agendaMinPeople === agendaMaxPeople
+      ? `개인`
+      : `${agendaMinPeople} ~ ${agendaMaxPeople}명`;
+
+  const additionalInfo = [
+    { label: '모집 팀', value: `${agendaMinTeam}팀 ~ ${agendaMaxTeam}팀` },
+    { label: '팀 인원', value: teamPeople },
+    { label: '시상 여부', value: agendaisRanking ? '시상 있음' : '시상 없음' },
+    { label: '공식대회 여부', value: isOfficial ? '공식대회' : '비공식대회' },
+  ];
+
   return (
-    <>
-      <div className={styles.descriptionContainer}>
-        <div className={styles.descriptionTitle}>대회 정보</div>
-        {AgendaTags(agendaData)}
-        <div className={styles.descriptionWarp}>
+    <div className={styles.descriptionContainer}>
+      <div className={styles.descriptionTitle}>대회 정보</div>
+      {AgendaTags(agendaData)}
+      <div className={styles.descriptionWarp}>
+        <div className={styles.midContainer}>
           <div className={styles.descriptionItem}>
-            <h3>설명</h3> {agendaContent}
+            <h3>모집 완료 기간</h3>
+            <span>{formatDate(agendaDeadLine)}</span>
           </div>
           <div className={styles.descriptionItem}>
-            <h3>모집 완료 기간</h3> ~ {formatDate(agendaDeadLine)}
-          </div>
-          <div className={styles.descriptionItem}>
-            <h3>이벤트 기간</h3>{' '}
-            {`${formatDate(agendaStartTime)} ~ ${formatDate(agendaEndTime)}`}
-          </div>
-          <div className={styles.descriptionItem}>
-            <h3>시상 여부</h3> {agendaisRanking ? '시상 있음' : '시상 없음'}
-          </div>
-          <div className={styles.descriptionItem}>
-            <h3>공식대회 여부</h3> {isOfficial ? '공식대회' : '비공식대회'}
+            <h3>이벤트 기간</h3>
+            <div className={styles.dateContainer}>
+              <p>{formatDate(agendaStartTime)}</p>
+              <p>{`~ ${formatDate(agendaEndTime)}`}</p>
+            </div>
           </div>
         </div>
       </div>
-    </>
+      <div className={styles.midContainer}>
+        {additionalInfo.map((item, index) => (
+          <div key={index} className={styles.rowDescriptionItem}>
+            <p className={styles.boldText}>{item.label}</p>
+            {' : '}
+            {item.value}
+          </div>
+        ))}
+      </div>
+    </div>
   );
 }
diff --git a/constants/agenda/agendaDetail/agendaTabs.ts b/constants/agenda/agendaDetail/agendaTabs.ts
index b8c70ab61..4e0de6c61 100644
--- a/constants/agenda/agendaDetail/agendaTabs.ts
+++ b/constants/agenda/agendaDetail/agendaTabs.ts
@@ -2,7 +2,6 @@ export const TABS = {
   DESCRIPTION: '대회설명',
   PARTICIPANTS: '참여자',
   NOTIFICATIONS: '공지',
-  CONDITIONS: '조건',
   POSTER: '포스터',
 } as const;
 
diff --git a/styles/agenda/agendaDetail/AgendaDetail.module.scss b/styles/agenda/agendaDetail/AgendaDetail.module.scss
index 9923e035f..e91672a22 100644
--- a/styles/agenda/agendaDetail/AgendaDetail.module.scss
+++ b/styles/agenda/agendaDetail/AgendaDetail.module.scss
@@ -10,7 +10,7 @@
   @include pageContainer;
   max-width: 100%;
   height: 100%;
-  padding: 0 5rem;
+  padding: 0 2rem;
 }
 .headWrapper {
   // @include gridHidden(web);
diff --git a/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss b/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
index 135db8ef9..37d8b76b9 100644
--- a/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
+++ b/styles/agenda/agendaDetail/tabs/AgendaConditions.module.scss
@@ -34,7 +34,6 @@
 
 .conditionItem {
   display: flex;
-  // flex-direction: column;
   gap: 0.5rem;
   flex: 1;
 
diff --git a/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss b/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss
index 961bd267b..99ee8c820 100644
--- a/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss
+++ b/styles/agenda/agendaDetail/tabs/AgendaDescription.module.scss
@@ -5,11 +5,10 @@
   display: flex;
   width: 100vw;
   flex: 1 0 0;
-
   flex-direction: column;
   padding: 1.5rem !important;
   margin: 0;
-  gap: 1.2rem;
+  gap: 1.8rem;
   align-items: flex-start;
   justify-content: flex-start;
   overflow-y: auto;
@@ -34,15 +33,46 @@
   display: flex;
   width: 100%;
   flex-direction: column;
-  gap: 1rem;
+  gap: 2rem;
 }
 
 .descriptionItem {
   display: flex;
   flex-direction: column;
   gap: 0.5rem;
+
   h3 {
     margin: 0;
     @include text('tab');
   }
 }
+
+.midContainer {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.rowDescriptionItem {
+  display: flex;
+  gap: 0.5rem;
+  @include text('default');
+  p {
+    margin: 0;
+    @include text('tab');
+  }
+}
+
+.dateContainer {
+  display: flex;
+  flex-direction: flex-start;
+  gap: 0.5rem;
+
+  @include text('default');
+  p {
+    margin: 0;
+  }
+  @media screen and (max-width: 481px) {
+    flex-direction: column;
+  }
+}

From cd81e134666243bfc86a9eab820860b6a8300b79 Mon Sep 17 00:00:00 2001
From: irenee-14 <ireneee145@gmail.com>
Date: Fri, 6 Sep 2024 13:58:00 +0900
Subject: [PATCH 05/14] =?UTF-8?q?Feat:=20host=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=20=EA=B5=AC=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/agenda/detail/host/index.tsx            | 60 +++++++++++++++----
 .../pages/agendakey/host/host.module.scss     | 47 +++++++++++++++
 2 files changed, 96 insertions(+), 11 deletions(-)
 create mode 100644 styles/agenda/pages/agendakey/host/host.module.scss

diff --git a/pages/agenda/detail/host/index.tsx b/pages/agenda/detail/host/index.tsx
index 4d6d7810b..db42ba343 100644
--- a/pages/agenda/detail/host/index.tsx
+++ b/pages/agenda/detail/host/index.tsx
@@ -10,7 +10,7 @@ import { useAgendaInfo } from 'hooks/agenda/useAgendaInfo';
 import useAgendaKey from 'hooks/agenda/useAgendaKey';
 import useFetchRequest from 'hooks/agenda/useFetchRequest';
 import { useUser } from 'hooks/takgu/Layout/useUser';
-import styles from 'styles/agenda/pages/agendakey/host/modify.module.scss';
+import styles from 'styles/agenda/pages/agendakey/host/host.module.scss';
 
 const ModifyAgenda = () => {
   const router = useRouter();
@@ -46,7 +46,7 @@ const ModifyAgenda = () => {
       setSnackbar({
         toastName: `status error`,
         severity: 'error',
-        message: `🔥 행사 모집중 상태에서만 확정이 가능합니다. 🔥`,
+        message: `🔥 행사 모집 중 상태에서만 확정이 가능합니다. 🔥`,
         clicked: true,
       });
     }
@@ -62,7 +62,7 @@ const ModifyAgenda = () => {
       setSnackbar({
         toastName: `status error`,
         severity: 'error',
-        message: `🔥 행사 모집중 상태에서만 취소가 가능합니다. 🔥`,
+        message: `🔥 행사 모집 중 상태에서만 취소가 가능합니다. 🔥`,
         clicked: true,
       });
     }
@@ -78,7 +78,7 @@ const ModifyAgenda = () => {
       setSnackbar({
         toastName: `status error`,
         severity: 'error',
-        message: `🔥 행사가 진행중인 상태에서만 종료가 가능합니다. 🔥`,
+        message: `🔥 행사가 진행 중인 상태에서만 종료가 가능합니다. 🔥`,
         clicked: true,
       });
     }
@@ -93,7 +93,7 @@ const ModifyAgenda = () => {
       setSnackbar({
         toastName: `status error`,
         severity: 'error',
-        message: `🔥 행사가 진행중인 상태에서만 종료가 가능합니다. 🔥`,
+        message: `🔥 행사가 진행 중인 상태에서만 종료가 가능합니다. 🔥`,
         clicked: true,
       });
     }
@@ -114,12 +114,50 @@ const ModifyAgenda = () => {
   return (
     <>
       <div className={styles.container}>
-        <UploadBtn text='공지사항 추가하기' onClick={newAnnouncement} />
-        <UploadBtn text='참가인원 및 진행 확정' onClick={confirmAgenda} />
-        <UploadBtn text='행사 취소하기' onClick={cancelAgenda} />
-
-        <UploadBtn text='행사 종료하기' onClick={resultAgenda} />
-        <UploadBtn text='상 입력 후 종료하기' onClick={resultFormAgenda} />
+        <div className={styles.warp}>
+          <div className={styles.contentWarp}>
+            <div className={styles.title}>공지사항 관리</div>
+            <div className={styles.description}>
+              공지사항 등록시 참가자들에게 slack 알림이 갑니다.
+            </div>
+            <div className={styles.buttonWarp}>
+              <UploadBtn text='공지사항 추가하기' onClick={newAnnouncement} />
+            </div>
+          </div>
+          <div className={styles.contentWarp}>
+            <div className={styles.title}>행사 확정</div>
+            <div className={styles.description}>
+              조건을 만족하고, 팀이 모두 확정되었을 때 행사를 확정할 수
+              있습니다.
+              <br />
+            </div>
+            <div className={styles.buttonWarp}>
+              <UploadBtn text='참가인원 및 진행 확정' onClick={confirmAgenda} />
+            </div>
+          </div>
+          <div className={styles.contentWarp}>
+            <div className={styles.title}>행사 취소</div>
+            <div className={styles.description}>
+              행사가 모집 중인 상태에서만 행사를 취소할 수 있습니다.
+            </div>
+            <div className={styles.buttonWarp}>
+              <UploadBtn text='행사 취소하기' onClick={cancelAgenda} />
+            </div>
+          </div>
+          <div className={styles.contentWarp}>
+            <div className={styles.title}>행사 종료</div>
+            <div className={styles.description}>
+              행사가 진행 중인 상태에서만 행사를 종료할 수 있습니다.
+            </div>
+            <div className={styles.buttonWarp}>
+              <UploadBtn text='행사 종료하기' onClick={resultAgenda} />
+              <UploadBtn
+                text='상 입력 후 종료하기'
+                onClick={resultFormAgenda}
+              />
+            </div>
+          </div>
+        </div>
       </div>
     </>
   );
diff --git a/styles/agenda/pages/agendakey/host/host.module.scss b/styles/agenda/pages/agendakey/host/host.module.scss
new file mode 100644
index 000000000..a8c91b7db
--- /dev/null
+++ b/styles/agenda/pages/agendakey/host/host.module.scss
@@ -0,0 +1,47 @@
+@import 'styles/agenda/common.scss';
+
+.container {
+  @include container(1);
+  display: flex;
+  width: 80%;
+
+  padding: 3rem;
+  margin: 2rem;
+  text-align: left;
+  gap: 3rem;
+  justify-content: flex-start;
+}
+
+.title {
+  @include text('tab');
+  justify-content: flex-start;
+}
+
+.warp {
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+  gap: 2rem;
+}
+.description {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  @include text('description');
+}
+
+.contentWarp {
+  display: flex;
+  flex-direction: column;
+  gap: 0.6rem;
+  justify-content: space-between;
+}
+
+.buttonWarp {
+  display: flex;
+  flex-direction: row;
+  gap: 1rem;
+  @media screen and (max-width: 480px) {
+    flex-direction: column;
+  }
+}

From d58e2a6835830686ea375bc8b948502c25b9833d Mon Sep 17 00:00:00 2001
From: irenee-14 <ireneee145@gmail.com>
Date: Fri, 6 Sep 2024 14:42:19 +0900
Subject: [PATCH 06/14] =?UTF-8?q?Style:=20=EB=A1=9C=EB=94=A9=20=EC=BB=B4?=
 =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EC=A4=91=EC=95=99=EC=A0=95?=
 =?UTF-8?q?=EB=A0=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/agenda/utils/AgendaLoading.module.scss | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/styles/agenda/utils/AgendaLoading.module.scss b/styles/agenda/utils/AgendaLoading.module.scss
index 6fd4d82dd..8fd09130d 100644
--- a/styles/agenda/utils/AgendaLoading.module.scss
+++ b/styles/agenda/utils/AgendaLoading.module.scss
@@ -10,8 +10,10 @@
 }
 
 .loadingContainer {
+  display: flex;
   width: 100%;
   height: 100%;
+  justify-content: center;
 }
 
 .loadingCircle {

From 236a922e83e5e52a8ae579f24d590943d7ca16ca Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:21:11 +0900
Subject: [PATCH 07/14] =?UTF-8?q?chore:=20console.log=20=EC=A7=80=EC=9B=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/agenda/Form/TicketForm.tsx | 1 -
 hooks/useAxiosWithToast.ts            | 1 -
 pages/agenda/index.tsx                | 1 -
 3 files changed, 3 deletions(-)

diff --git a/components/agenda/Form/TicketForm.tsx b/components/agenda/Form/TicketForm.tsx
index 3498e6fa5..377093cf9 100644
--- a/components/agenda/Form/TicketForm.tsx
+++ b/components/agenda/Form/TicketForm.tsx
@@ -30,7 +30,6 @@ const TicketForm = ({ stringKey }: userFormProps) => {
 
     jsonData.issuedFromKey = selectedAgendaKey;
 
-    console.log('data', jsonData);
     sendRequest(
       'POST',
       'admin/ticket',
diff --git a/hooks/useAxiosWithToast.ts b/hooks/useAxiosWithToast.ts
index 16e7b0f7a..b7cdda4cd 100644
--- a/hooks/useAxiosWithToast.ts
+++ b/hooks/useAxiosWithToast.ts
@@ -31,7 +31,6 @@ export default function useAxiosWithToast(instance: AxiosInstance) {
     if (!errorDataMessage) {
       errorDataMessage = error.message;
     }
-    console.log(error);
     setSnackbar({
       toastName: `response error`,
       severity: 'error',
diff --git a/pages/agenda/index.tsx b/pages/agenda/index.tsx
index 9da685f1b..1abb8dc6e 100644
--- a/pages/agenda/index.tsx
+++ b/pages/agenda/index.tsx
@@ -24,7 +24,6 @@ const Agenda: NextPage = () => {
   });
   const { data: openData } = useFetchGet<AgendaDataProps[]>({ url: '/open' });
 
-  console.log('historyData', historyData);
   return (
     <div className={styles.agendaPageContainer}>
       <AgendaTitle />

From 70bdafa2c236bf4e34157afbd966947e11231566 Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 15:36:01 +0900
Subject: [PATCH 08/14] =?UTF-8?q?chore:=20=EC=8A=A4=EB=82=B5=EB=B0=94?=
 =?UTF-8?q?=EB=A1=9C=20=EB=8C=80=EC=B2=B4=ED=95=9C=20console.log=20?=
 =?UTF-8?q?=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/agenda/Form/TicketForm.tsx         | 10 +++++++++-
 components/agenda/agendaDetail/AgendaInfo.tsx | 11 -----------
 pages/agenda/detail/host/result.tsx           | 13 +++++--------
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/components/agenda/Form/TicketForm.tsx b/components/agenda/Form/TicketForm.tsx
index 377093cf9..f2092536c 100644
--- a/components/agenda/Form/TicketForm.tsx
+++ b/components/agenda/Form/TicketForm.tsx
@@ -1,4 +1,6 @@
 import { useState } from 'react';
+import { useSetRecoilState } from 'recoil';
+import { toastState } from 'utils/recoil/toast';
 import AgendaSelect from 'components/agenda/Input/AgendaSelect';
 import { useModal } from 'components/agenda/modal/useModal';
 import useFetchGet from 'hooks/agenda/useFetchGet';
@@ -18,6 +20,7 @@ const TicketForm = ({ stringKey }: userFormProps) => {
   const handleSelectChange = (e: { target: { value: any } }) => {
     setSelectedAgendaKey(e.target.value);
   };
+  const setSnackbar = useSetRecoilState(toastState);
 
   const handleSubmit = async (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
@@ -39,7 +42,12 @@ const TicketForm = ({ stringKey }: userFormProps) => {
         closeModal();
       },
       (error: string) => {
-        console.error(error);
+        setSnackbar({
+          toastName: `response error`,
+          severity: 'error',
+          message: `🔥 ${error} 🔥`,
+          clicked: true,
+        });
       }
     );
   };
diff --git a/components/agenda/agendaDetail/AgendaInfo.tsx b/components/agenda/agendaDetail/AgendaInfo.tsx
index 1dcbe4a7a..80ed47c3f 100644
--- a/components/agenda/agendaDetail/AgendaInfo.tsx
+++ b/components/agenda/agendaDetail/AgendaInfo.tsx
@@ -66,17 +66,9 @@ export default function AgendaInfo({
             { agenda_key: agendaKey, teamKey: newTeamKey },
             () => {
               window.location.reload();
-            },
-            (err) => {
-              console.log('개인 확정에 실패했습니다.', err);
             }
           );
-        } else {
-          console.log('개인 팀키를 찾지 못했습니다.');
         }
-      },
-      (err) => {
-        console.log('개인 참여에 실패했습니다.', err);
       }
     );
   };
@@ -94,9 +86,6 @@ export default function AgendaInfo({
       },
       () => {
         window.location.reload();
-      },
-      (err) => {
-        console.log('등록취소에 실패했습니다.', err);
       }
     );
   };
diff --git a/pages/agenda/detail/host/result.tsx b/pages/agenda/detail/host/result.tsx
index b7ca95f42..29a03ea51 100644
--- a/pages/agenda/detail/host/result.tsx
+++ b/pages/agenda/detail/host/result.tsx
@@ -1,5 +1,4 @@
 //주최자 결과입력 페이지
-import { useRouter } from 'next/router';
 import { useState } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { ParticipantProps } from 'types/agenda/agendaDetail/tabs/participantTypes';
@@ -27,7 +26,7 @@ function checkAwardSubmitable(awardList: AwardListProps[]) {
     if (awardInfo.teams.length === 0) {
       throw new Error(awardInfo.award + '상에 팀이 없습니다.');
     }
-    awardInfo.teams.forEach((team, idx) => {
+    awardInfo.teams.forEach((team) => {
       if (awardedTeams[team]) {
         throw new Error(
           '한 팀이 여러 상을 받을 수 없습니다.' +
@@ -81,7 +80,6 @@ function awardlistToString(awardList: AwardListProps[]) {
 }
 
 const SubmitAgendaResult = () => {
-  const router = useRouter();
   const [awardList, setAwardList] = useState<AwardListProps[]>([
     { award: '참가상', teams: [] },
   ]);
@@ -113,7 +111,7 @@ const SubmitAgendaResult = () => {
       setSnackbar({
         toastName: `bad request`,
         severity: 'error',
-        message: `🔥 ${error.message} 🔥`,
+        message: `🔥 ${error?.message} 🔥`,
         clicked: true,
       });
       return;
@@ -125,10 +123,9 @@ const SubmitAgendaResult = () => {
       title: '결과 제출 전 확인',
       description: msg + '\n결과를 제출하시겠습니까?',
       onProceed: () => {
-        instanceInAgenda
-          .patch(`/confirm?agenda_key=${agenda_key}`, { awards: Data })
-          .then((res) => console.log(res))
-          .catch((err) => console.log(err));
+        instanceInAgenda.patch(`/confirm?agenda_key=${agenda_key}`, {
+          awards: Data,
+        });
         closeModal();
       },
     });

From 83287d77cc6e3e5a22986ea4c621535a4553ca26 Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 17:03:45 +0900
Subject: [PATCH 09/14] =?UTF-8?q?fix:=20=EC=95=84=EC=A0=A0=EB=8B=A4?=
 =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=83=81=ED=83=9C=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EB=B6=88=EB=B6=84=EB=AA=85=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/agenda/Home/AgendaDeadLine.tsx     | 58 ++++++++++++++-----
 components/agenda/Home/AgendaList.tsx         | 25 +++++++-
 pages/agenda/index.tsx                        | 10 +++-
 styles/agenda/Home/AgendaDeadLine.module.scss | 14 ++++-
 styles/agenda/common.scss                     |  6 +-
 5 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/components/agenda/Home/AgendaDeadLine.tsx b/components/agenda/Home/AgendaDeadLine.tsx
index 0efd1da90..1c6293f3a 100644
--- a/components/agenda/Home/AgendaDeadLine.tsx
+++ b/components/agenda/Home/AgendaDeadLine.tsx
@@ -1,30 +1,60 @@
-import React from 'react';
+import { AgendaStatus } from 'constants/agenda/agenda';
 import styles from 'styles/agenda/Home/AgendaDeadLine.module.scss';
 
 interface deadLineProps {
   deadLine: string | Date;
+  status: AgendaStatus;
+  start?: string | Date;
+  end?: string | Date;
 }
 
-const AgendaDeadLine = ({ deadLine }: deadLineProps) => {
+const AgendaDeadLine = ({ deadLine, status, start, end }: deadLineProps) => {
   const currentDate = new Date();
   const deadLineDate = new Date(deadLine);
+  const startDate = new Date(start || '');
+  const endDate = new Date(end || '');
 
   const timeDiff = deadLineDate.getTime() - currentDate.getTime();
-  let daysLeft;
+  let daysLeft: number | string = 'DAY';
 
-  if (timeDiff == 0) daysLeft = 'Day';
-  else if (timeDiff > 0) daysLeft = Math.ceil(timeDiff / (1000 * 60 * 60 * 24));
+  if (timeDiff > 0) daysLeft = Math.ceil(timeDiff / (1000 * 60 * 60 * 24));
 
-  if (timeDiff >= 0) {
-    return (
-      <div className={styles.agendaItemDeadLineBox}>
-        <div className={styles.agendaDeadLineText}>모집마감</div>
-        <div className={styles.agendaDeadLine}>D-{daysLeft}</div>
-      </div>
-    );
-  }
+  // 컨펌인 상태 구분
+  let curr;
+  if (!start || !end) curr = 'error';
+  else if (currentDate >= startDate && currentDate <= endDate) curr = '진행중';
+  else if (currentDate < startDate) curr = '진행예정';
+  else curr = '진행완료';
 
-  return null;
+  switch (status) {
+    case 'FINISH':
+      return (
+        <div className={`${styles.agendaItemDeadLineBox} ${styles.finished}`}>
+          <div className={styles.agendaDeadLineText}>종료</div>
+        </div>
+      );
+    case 'CONFIRM':
+      return (
+        <div className={`${styles.agendaItemDeadLineBox} ${styles.confirm}`}>
+          <div className={styles.agendaDeadLineText}>{curr}</div>
+        </div>
+      );
+    case 'CANCEL':
+      return (
+        <div className={`${styles.agendaItemDeadLineBox} ${styles.cancel}`}>
+          <div className={styles.agendaDeadLineText}>취소</div>
+        </div>
+      );
+    default:
+      if (timeDiff >= 0) {
+        return (
+          <div className={styles.agendaItemDeadLineBox}>
+            <div className={styles.agendaDeadLineText}>모집마감</div>
+            <div className={styles.agendaDeadLine}>D-{daysLeft}</div>
+          </div>
+        );
+      } else return null;
+  }
 };
 
 export default AgendaDeadLine;
diff --git a/components/agenda/Home/AgendaList.tsx b/components/agenda/Home/AgendaList.tsx
index 105f06102..9e0b2fbe4 100644
--- a/components/agenda/Home/AgendaList.tsx
+++ b/components/agenda/Home/AgendaList.tsx
@@ -1,11 +1,18 @@
 import { useRouter } from 'next/router';
 import React, { useState } from 'react';
 import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes';
+import { AgendaStatus } from 'constants/agenda/agenda';
 import AgendaDeadLine from 'components/agenda/Home/AgendaDeadLine';
 import AgendaInfo from 'components/agenda/Home/AgendaInfo';
 import styles from 'styles/agenda/Home/AgendaList.module.scss';
 
-const AgendaList = ({ agendaList }: { agendaList: AgendaDataProps[] }) => {
+const AgendaList = ({
+  agendaList,
+  status,
+}: {
+  agendaList: AgendaDataProps[];
+  status: AgendaStatus;
+}) => {
   const [selectedItem, setSelectedItem] = useState<number | null>(0);
 
   return (
@@ -18,6 +25,7 @@ const AgendaList = ({ agendaList }: { agendaList: AgendaDataProps[] }) => {
             <div className={styles.agendaListItemContainer}>
               {agendaList.map((agendaInfo, idx) => {
                 agendaInfo.idx = idx;
+                agendaInfo.agendaStatus = status;
                 return (
                   <AgendaListItem
                     agendaInfo={agendaInfo}
@@ -57,6 +65,7 @@ const AgendaListItem = ({
 }) => {
   const router = useRouter();
   const href = `/agenda/detail?agenda_key=${agendaInfo.agendaKey}`;
+  console.log(agendaInfo.agendaStatus);
   return (
     <button
       className={`${styles.agendaListItemBtn} ${
@@ -87,7 +96,19 @@ const AgendaListItem = ({
     >
       <AgendaInfo agendaInfo={agendaInfo} idx={idx} />
       <div className={`${type === 'list' && styles.show}`}>
-        <AgendaDeadLine deadLine={agendaInfo.agendaDeadLine} />
+        {agendaInfo.agendaStatus === 'CONFIRM' ? (
+          <AgendaDeadLine
+            deadLine={agendaInfo.agendaDeadLine}
+            status={agendaInfo.agendaStatus}
+            start={agendaInfo.agendaStartTime}
+            end={agendaInfo.agendaEndTime}
+          />
+        ) : (
+          <AgendaDeadLine
+            deadLine={agendaInfo.agendaDeadLine}
+            status={agendaInfo.agendaStatus}
+          />
+        )}
       </div>
     </button>
   );
diff --git a/pages/agenda/index.tsx b/pages/agenda/index.tsx
index 1abb8dc6e..393b0e712 100644
--- a/pages/agenda/index.tsx
+++ b/pages/agenda/index.tsx
@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 import { AgendaDataProps } from 'types/agenda/agendaDetail/agendaTypes';
 import type { NextPage } from 'next';
+import { AgendaStatus } from 'constants/agenda/agenda';
 import AgendaList from 'components/agenda/Home/AgendaList';
 import AgendaTitle from 'components/agenda/Home/AgendaTitle';
 import PageNation from 'components/Pagination';
@@ -23,7 +24,6 @@ const Agenda: NextPage = () => {
     url: '/confirm',
   });
   const { data: openData } = useFetchGet<AgendaDataProps[]>({ url: '/open' });
-
   return (
     <div className={styles.agendaPageContainer}>
       <AgendaTitle />
@@ -65,10 +65,16 @@ const Agenda: NextPage = () => {
             agendaList={
               showCurrent === 'open' ? openData || [] : currentData || []
             }
+            status={
+              showCurrent === 'open' ? AgendaStatus.OPEN : AgendaStatus.CONFIRM
+            }
           />
         ) : (
           <>
-            <AgendaList agendaList={historyData || []} />
+            <AgendaList
+              agendaList={historyData || []}
+              status={AgendaStatus.FINISH}
+            />
             <PageNation {...PagaNationElementProps} />
           </>
         )}
diff --git a/styles/agenda/Home/AgendaDeadLine.module.scss b/styles/agenda/Home/AgendaDeadLine.module.scss
index 35f74d960..0c8122143 100644
--- a/styles/agenda/Home/AgendaDeadLine.module.scss
+++ b/styles/agenda/Home/AgendaDeadLine.module.scss
@@ -8,7 +8,7 @@
   width: 4rem;
   height: 4rem;
   flex-direction: column;
-  background: $bg-color-deadline-red;
+  background-color: $bg-color-deadline-open;
   border-radius: $radius-circle;
   justify-content: center;
   gap: 0.2rem;
@@ -23,3 +23,15 @@
     color: var(--color-text-reverse);
   }
 }
+
+.confirm {
+  background-color: $bg-color-deadline-confirm !important;
+}
+
+.finished {
+  background-color: $bg-color-deadline-finish !important;
+}
+
+.cancel {
+  background-color: $bg-color-deadline-cancel !important;
+}
diff --git a/styles/agenda/common.scss b/styles/agenda/common.scss
index 0d987b143..667906cbb 100644
--- a/styles/agenda/common.scss
+++ b/styles/agenda/common.scss
@@ -31,7 +31,11 @@ $color-tag-end: #717171;
 $color-placeholder: #b4a5b5;
 
 // deadline bg color
-$bg-color-deadline-red: rgba(255, 75, 75, 0.8);
+$bg-color-deadline-open: rgba(255, 75, 75, 0.8);
+$bg-color-deadline-confirm: rgba(170, 41, 235, 0.8);
+$bg-color-deadline-finish: rgba(102, 58, 142, 0.8);
+$bg-color-deadline-cancel: rgba(18, 18, 18, 0.8);
+
 $agenda-list-bg: linear-gradient(180deg, #fff 65px, rgba(0, 0, 0, 0) 100%),
   url('/image/agenda/42.jpg') lightgray 50% / cover no-repeat;
 

From f46f89b06195c87e14cf1ecd568ae4c92fd361cc Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:25:27 +0900
Subject: [PATCH 10/14] =?UTF-8?q?fix:=20safari:=20=EB=A1=9C=EA=B3=A0=20?=
 =?UTF-8?q?=EC=84=A0=ED=83=9D=EC=A7=80=20=EB=84=93=EC=9D=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/agenda/Layout/Header.module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/styles/agenda/Layout/Header.module.scss b/styles/agenda/Layout/Header.module.scss
index 61c249a8b..f7a29a649 100644
--- a/styles/agenda/Layout/Header.module.scss
+++ b/styles/agenda/Layout/Header.module.scss
@@ -25,6 +25,7 @@
 .logo {
   width: 7rem;
   height: min-content;
+  max-height: 3.5rem;
   padding: 0;
   margin: 0;
   fill: var(--color-text);

From b1fcfd6659fdcc53692282be9696ba135c04089d Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:25:54 +0900
Subject: [PATCH 11/14] =?UTF-8?q?fix:=20safari:=20=EC=95=84=EC=A0=A0?=
 =?UTF-8?q?=EB=8B=A4=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EA=B9=A8=EC=A7=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/agenda/Home/Agenda.module.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/styles/agenda/Home/Agenda.module.scss b/styles/agenda/Home/Agenda.module.scss
index 508f0f6d5..226baf57c 100644
--- a/styles/agenda/Home/Agenda.module.scss
+++ b/styles/agenda/Home/Agenda.module.scss
@@ -16,6 +16,7 @@
   top: -1rem;
   display: flex !important;
   width: 100%;
+  min-width: fit-content;
   flex-direction: column;
   padding: 1rem 0;
   margin: 0;

From 8f9db4a57a1f8afaad3d8450407f9256ad3b8662 Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:42:05 +0900
Subject: [PATCH 12/14] =?UTF-8?q?fix:=20safari:=20=EB=B3=BC=EB=93=9C?=
 =?UTF-8?q?=EC=B2=B4=20=EC=9D=B4=EC=83=81=ED=95=98=EA=B2=8C=20=EB=93=A4?=
 =?UTF-8?q?=EC=96=B4=EA=B0=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 styles/agenda/Layout/Layout.module.scss  | 7 +++----
 styles/agenda/Layout/MenuBar.module.scss | 1 +
 styles/agenda/common.scss                | 4 ----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/styles/agenda/Layout/Layout.module.scss b/styles/agenda/Layout/Layout.module.scss
index 64246b756..ba0d5c09f 100644
--- a/styles/agenda/Layout/Layout.module.scss
+++ b/styles/agenda/Layout/Layout.module.scss
@@ -3,18 +3,17 @@
 .background {
   position: fixed;
   top: 0;
-  z-index: -1;
+  left: 0;
+  z-index: -1001;
   display: flex;
   width: 150vw;
   min-width: 380px;
-  height: 150vh;
+  height: 100%;
   flex-direction: column;
   background: var(--color-bg);
   background-attachment: fixed;
   background-position: center;
-  background-size: cover;
 }
-
 .app {
   @include app;
 }
diff --git a/styles/agenda/Layout/MenuBar.module.scss b/styles/agenda/Layout/MenuBar.module.scss
index c869b7155..8a5c24370 100644
--- a/styles/agenda/Layout/MenuBar.module.scss
+++ b/styles/agenda/Layout/MenuBar.module.scss
@@ -23,6 +23,7 @@
 
 .bg {
   position: fixed;
+  top: 0;
   z-index: 1998;
   width: 100vw;
   height: 100vh;
diff --git a/styles/agenda/common.scss b/styles/agenda/common.scss
index 667906cbb..5787e4643 100644
--- a/styles/agenda/common.scss
+++ b/styles/agenda/common.scss
@@ -101,7 +101,6 @@ $font-size-xs: 0.8rem; // $small-font
 @mixin logoText($size, $color) {
   font-family: $font-logo;
   font-size: $size;
-  font-weight: 500;
   color: $color;
   text-align: center;
   letter-spacing: 0.1rem;
@@ -142,18 +141,15 @@ $font-size-xs: 0.8rem; // $small-font
     // 인원수 표시하는 부분
     font-family: $font-inter;
     font-size: $font-size-xxl;
-    font-weight: 100;
     text-align: center;
   } @else if ($type == 'main-menu') {
     // navbar 메뉴
     font-family: $font-menu;
     font-size: $font-size-xl;
-    font-weight: 400;
   } @else if ($type == 'sub-menu') {
     // navbar 서브메뉴
     font-family: $font-menu;
     font-size: $font-size-l;
-    font-weight: 300;
   } @else if ($type == 'title') {
     // 아젠다,팀 타이틀
     font-family: $font-text-bold;

From 4f2505a13fa7fbaa10b1687199f29946414fa32e Mon Sep 17 00:00:00 2001
From: Kimmy Haecho <118002501+siwolee@users.noreply.github.com>
Date: Fri, 6 Sep 2024 19:50:45 +0900
Subject: [PATCH 13/14] fix: safari: text weight and color

---
 styles/color-theme.css |  8 ++++----
 styles/globals.css     | 28 ++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/styles/color-theme.css b/styles/color-theme.css
index 3c4422d1a..ad9565aee 100644
--- a/styles/color-theme.css
+++ b/styles/color-theme.css
@@ -43,8 +43,8 @@
 html[data-theme='light'] {
   --color-bg: var(--bg-light);
   --color-header: var(--header-bg-light);
-  --color-text: var(--text-light);
-  --color-text-reverse: var(--text-dark);
+  --color-text: var(--color-light);
+  --color-text-reverse: var(--color-dark);
   --default-border: var(--border-light);
   --highlight-border: var(--border-highlight-light);
   --default-box-shadow: var(--box-shadow-light);
@@ -60,8 +60,8 @@ html[data-theme='light'] {
 html[data-theme='dark'] {
   --color-bg: var(--bg-dark);
   --color-header: var(--header-bg-dark);
-  --color-text: var(--text-dark);
-  --color-text-reverse: var(--text-light);
+  --color-text: var(--color-dark);
+  --color-text-reverse: var(--color-light);
   --default-border: var(--border-dark);
   --highlight-border: var(--border-highlight-dark);
   --default-box-shadow: var(--box-shadow-dark);
diff --git a/styles/globals.css b/styles/globals.css
index bf8fbc230..0492a5524 100644
--- a/styles/globals.css
+++ b/styles/globals.css
@@ -18,6 +18,34 @@ input {
     Oxygen, Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
   font-weight: 500;
 }
+/* safari */
+h2,
+h1,
+h3 {
+  font-weight: normal;
+}
+button {
+  background-color: var(--color-text-reverse);
+}
+a,
+p,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+span,
+div,
+li,
+ul,
+ol,
+input,
+textarea,
+button {
+  color: var(--color-text);
+}
+
 /*
 @media all and (max-width: 379px) {
   html {

From 6a20be248151570bd39dce4374454ab5b4f65908 Mon Sep 17 00:00:00 2001
From: siwolee <siwolee@student.42seoul.kr>
Date: Sat, 7 Sep 2024 13:14:54 +0900
Subject: [PATCH 14/14] =?UTF-8?q?fix:=20console.log=20=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/admin/takgu/party/PartyTemplate.tsx                | 4 ----
 components/agenda/Home/AgendaList.tsx                         | 1 -
 components/agenda/Layout/MenuBarContent.tsx                   | 2 +-
 components/agenda/modal/testModal.tsx                         | 4 ++--
 components/error/AgendaError.tsx                              | 2 +-
 components/takgu/modal/admin/AdminTemplateModal.tsx           | 1 -
 components/takgu/modal/tournament/TournamentRegistryModal.tsx | 4 +---
 hooks/useAxiosGet.ts                                          | 4 ++--
 pages/takgu/_api/pingpong/admin/announcement/index.tsx        | 4 ++--
 pages/takgu/_api/pingpong/admin/coinpolicy/index.ts           | 1 -
 pages/takgu/_api/pingpong/admin/feedback/index.ts             | 2 +-
 11 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/components/admin/takgu/party/PartyTemplate.tsx b/components/admin/takgu/party/PartyTemplate.tsx
index c4826f3ef..296c4b7c9 100644
--- a/components/admin/takgu/party/PartyTemplate.tsx
+++ b/components/admin/takgu/party/PartyTemplate.tsx
@@ -35,10 +35,6 @@ export default function PartyTemplate() {
   const setModal = useSetRecoilState(modalState);
   const [selectedCategory, setSelectedCategory] = useState('all');
 
-  useEffect(() => {
-    console.log('Render');
-  }, [templates]);
-
   const handleEditTemplate = (template?: PartyGameTemplate) => {
     setModal({ modalName: 'ADMIN-PARTY_TEMPLATE', template });
   };
diff --git a/components/agenda/Home/AgendaList.tsx b/components/agenda/Home/AgendaList.tsx
index 9e0b2fbe4..e54a3e78a 100644
--- a/components/agenda/Home/AgendaList.tsx
+++ b/components/agenda/Home/AgendaList.tsx
@@ -65,7 +65,6 @@ const AgendaListItem = ({
 }) => {
   const router = useRouter();
   const href = `/agenda/detail?agenda_key=${agendaInfo.agendaKey}`;
-  console.log(agendaInfo.agendaStatus);
   return (
     <button
       className={`${styles.agendaListItemBtn} ${
diff --git a/components/agenda/Layout/MenuBarContent.tsx b/components/agenda/Layout/MenuBarContent.tsx
index 7f7210209..04146a31e 100644
--- a/components/agenda/Layout/MenuBarContent.tsx
+++ b/components/agenda/Layout/MenuBarContent.tsx
@@ -22,7 +22,7 @@ const MenuBarContent = ({
     useContext<HeaderContextState | null>(HeaderContext)
       ?.resetOpenMenuBarState ||
     function () {
-      console.log('resetOpenMenuBarState is not defined');
+      console.log('resetOpenMenuBarState is not defined'); //error
     };
 
   return (
diff --git a/components/agenda/modal/testModal.tsx b/components/agenda/modal/testModal.tsx
index 166e9ca3b..411e3fc2e 100644
--- a/components/agenda/modal/testModal.tsx
+++ b/components/agenda/modal/testModal.tsx
@@ -9,7 +9,7 @@ const TestModal = () => {
       title: 'title',
       description: 'message',
       onProceed: () => {
-        console.log('onProceed');
+        console.log('onProceed'); //test
       },
       proceedText: '확인',
       cancelText: '취소',
@@ -28,7 +28,7 @@ const TestModal2 = () => {
       title: 'title',
       description: 'message',
       onProceed: () => {
-        console.log('onProceed');
+        console.log('onProceed'); //test
       },
     });
   };
diff --git a/components/error/AgendaError.tsx b/components/error/AgendaError.tsx
index 0b8995dc2..f9064711f 100644
--- a/components/error/AgendaError.tsx
+++ b/components/error/AgendaError.tsx
@@ -70,7 +70,7 @@ export default function ErrorPage() {
                 ) as HTMLInputElement;
                 if (!target) return;
 
-                console.log(target.value);
+                console.log(target.value); // DEV
                 localStorage.setItem('42gg-token', target.value);
                 router.reload();
               }}
diff --git a/components/takgu/modal/admin/AdminTemplateModal.tsx b/components/takgu/modal/admin/AdminTemplateModal.tsx
index fa2b65a23..7a0d30003 100644
--- a/components/takgu/modal/admin/AdminTemplateModal.tsx
+++ b/components/takgu/modal/admin/AdminTemplateModal.tsx
@@ -38,7 +38,6 @@ export default function TemplateModal({
 
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>) => {
     e.preventDefault();
-    console.log(formData);
     if (isUpdate(formData)) updateTemplate(formData);
     else createTemplate(formData);
     setModal({ modalName: null });
diff --git a/components/takgu/modal/tournament/TournamentRegistryModal.tsx b/components/takgu/modal/tournament/TournamentRegistryModal.tsx
index e4502be44..d07095b92 100644
--- a/components/takgu/modal/tournament/TournamentRegistryModal.tsx
+++ b/components/takgu/modal/tournament/TournamentRegistryModal.tsx
@@ -140,9 +140,7 @@ export default function TournamentRegistryModal({
   const buttonMappings: Record<string, any> = {
     LOADING: {
       content: '로딩중...',
-      handler: () => {
-        console.log('loading...');
-      },
+      handler: null,
     },
     BEFORE: {
       content: '등록',
diff --git a/hooks/useAxiosGet.ts b/hooks/useAxiosGet.ts
index f85c31935..5f1256166 100644
--- a/hooks/useAxiosGet.ts
+++ b/hooks/useAxiosGet.ts
@@ -27,7 +27,7 @@ const useAxiosGet = <T>({
       if (type === 'alert') {
         alert(e);
       } else if (type === 'console') {
-        console.log(err);
+        console.log(err); // test
       } else if (type === 'setError') {
         setError(err);
       }
@@ -51,7 +51,7 @@ export const useMockAxiosGet = <T>({
       if (type === 'alert') {
         alert(e);
       } else if (type === 'console') {
-        console.log(err);
+        console.log(err); // test
       } else if (type === 'setError') {
         setError(err);
       }
diff --git a/pages/takgu/_api/pingpong/admin/announcement/index.tsx b/pages/takgu/_api/pingpong/admin/announcement/index.tsx
index 90b76de06..1b05d5608 100644
--- a/pages/takgu/_api/pingpong/admin/announcement/index.tsx
+++ b/pages/takgu/_api/pingpong/admin/announcement/index.tsx
@@ -8,9 +8,9 @@ export default function handler(req: NextApiRequest, res: NextApiResponse) {
     });
   } else if (req.method === 'POST') {
     res.status(201).json({ text: 'post ok' });
-    console.log('post body :\n', req?.body);
+    console.log('post body :\n', req?.body); //dev
   } else if (req.method === 'PUT') {
     res.status(202).json({ text: ' delete(put) ok' });
-    console.log('put body :\n', req?.body);
+    console.log('put body :\n', req?.body); //dev
   }
 }
diff --git a/pages/takgu/_api/pingpong/admin/coinpolicy/index.ts b/pages/takgu/_api/pingpong/admin/coinpolicy/index.ts
index 199c8be77..b7448aebb 100644
--- a/pages/takgu/_api/pingpong/admin/coinpolicy/index.ts
+++ b/pages/takgu/_api/pingpong/admin/coinpolicy/index.ts
@@ -108,7 +108,6 @@ export default function handler(req: NextApiRequest, res: NextApiResponse) {
     res.status(200).json(resData);
   }
   if (method === 'POST') {
-    console.log(attendance);
     if (
       parseInt(attendance) > 50 ||
       parseInt(normal) > 50 ||
diff --git a/pages/takgu/_api/pingpong/admin/feedback/index.ts b/pages/takgu/_api/pingpong/admin/feedback/index.ts
index f7c44ec56..09e65728a 100644
--- a/pages/takgu/_api/pingpong/admin/feedback/index.ts
+++ b/pages/takgu/_api/pingpong/admin/feedback/index.ts
@@ -66,7 +66,7 @@ export default function handler(req: NextApiRequest, res: NextApiResponse) {
   const { page } = query as { page: string };
   if (method === 'GET') {
     const feedbacks: IPagedFeedback = makeFeedbacks(page);
-    console.log(feedbacks);
+    console.log(feedbacks); //
     return res.status(200).json(feedbacks);
   } else {
     res.setHeader('Allow', ['GET']);