From 0b05a6604b7e5b0836529fe0f1e64ecf7c8e7e03 Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Thu, 1 Aug 2024 21:07:28 +0900
Subject: [PATCH 1/6] =?UTF-8?q?fix:=20email=20=EC=9D=B8=EC=A6=9D=20error?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A4=91=EB=B3=B5=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/mutation/useSendStudentEmail.ts | 3 ---
 src/pages/StudentVerification.tsx         | 7 ++++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/hooks/mutation/useSendStudentEmail.ts b/src/hooks/mutation/useSendStudentEmail.ts
index 63aabf7..a8077b1 100644
--- a/src/hooks/mutation/useSendStudentEmail.ts
+++ b/src/hooks/mutation/useSendStudentEmail.ts
@@ -11,9 +11,6 @@ export default function useSendStudentEmail() {
     onSuccess: () => {
       toast('메일 전송이 완료되었습니다.');
       navigation(RoutePath.Dashboard);
-    },
-    onError: (error) => {
-      toast(error.message);
     }
   });
 
diff --git a/src/pages/StudentVerification.tsx b/src/pages/StudentVerification.tsx
index 9668a05..afe7d63 100644
--- a/src/pages/StudentVerification.tsx
+++ b/src/pages/StudentVerification.tsx
@@ -17,7 +17,7 @@ export const StudentVerification = () => {
   //TODO: 추후 pending 상태 백엔드 API 수정하면 반영해둘것.
   const [, setPending] = useState(false);
   const [isClicked, setIsClicked] = useState(false);
-  const { onSubmit, control, isValid, onVerifyStudent, loading } =
+  const { onSubmit, control, isValid, onVerifyStudent, isPending } =
     useStudentVerification();
 
   const IsStudentVerified = async () => {
@@ -39,7 +39,7 @@ export const StudentVerification = () => {
     onSubmit();
   };
 
-  if (loading) {
+  if (isPending) {
     return <div>로딩중입니다...</div>;
   }
 
@@ -96,6 +96,7 @@ export const StudentVerification = () => {
             인증메일 받기
           </Button>
           <StudentGuideLink
+            color={color.sub}
             to={RoutePath.StudentEmailLinkGuideLink}
             target="_blank">
             학교 이메일이 무엇인가요?
@@ -130,7 +131,7 @@ const StudentGuideLink = styled(Link)`
     color: ${color.sub};
   }
   &:visited {
-    color: ${color.textBlack};
+    color: ${color.sub};
   }
   ${typography.label2};
 `;

From 4af970892a79feda4428a4e28391c2b1cbf8e9b7 Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Thu, 1 Aug 2024 21:08:42 +0900
Subject: [PATCH 2/6] =?UTF-8?q?refac:=20=EC=8A=A4=ED=8C=B8=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=ED=95=A8=20=EC=95=88=EB=82=B4=EB=AC=B8=EA=B5=AC=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

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

diff --git a/src/pages/StudentVerification.tsx b/src/pages/StudentVerification.tsx
index afe7d63..5b24c9e 100644
--- a/src/pages/StudentVerification.tsx
+++ b/src/pages/StudentVerification.tsx
@@ -90,6 +90,7 @@ export const StudentVerification = () => {
           * 메일 전송이 최대 30분 가량 늦어질 수 있어요.
           <br />* 메일 전송이 되지 않을 경우 카카오톡 채널을 통해 코어 멤버에게
           문의해 주세요.
+          <br />* 인증메일이 스팸메일함에 전송될 수 있으니 확인해주세요.
         </Text>
         <ButtonContainer>
           <Button disabled={!isValid} style={{ maxWidth: '100%' }}>

From e41c4557fda96800086cbf98d2cb806773e04d03 Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Thu, 1 Aug 2024 21:28:25 +0900
Subject: [PATCH 3/6] =?UTF-8?q?chore:=20=EC=B1=84=EB=84=90=ED=86=A1=20?=
 =?UTF-8?q?=EC=9C=84=EC=A0=AF=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/chatbot/ChannelService.ts | 64 ------------------------
 src/components/chatbot/Chatbot.tsx       | 17 -------
 src/main.tsx                             |  2 -
 3 files changed, 83 deletions(-)
 delete mode 100644 src/components/chatbot/ChannelService.ts
 delete mode 100644 src/components/chatbot/Chatbot.tsx

diff --git a/src/components/chatbot/ChannelService.ts b/src/components/chatbot/ChannelService.ts
deleted file mode 100644
index 70e5326..0000000
--- a/src/components/chatbot/ChannelService.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-declare global {
-  interface Window {
-    ChannelIO: (arg0: string, arg1?: unknown, arg2?: unknown) => void;
-    ChannelIOInitialized: boolean;
-  }
-}
-
-class ChannelService {
-  constructor() {
-    this.loadScript();
-  }
-
-  loadScript() {
-    const w = window;
-    if (w.ChannelIOInitialized) {
-      return;
-    }
-    const channelIO = function () {
-      // eslint-disable-next-line prefer-rest-params
-      channelIO.c(arguments);
-    };
-
-    channelIO.q = [] as any[];
-    channelIO.c = function (args: any) {
-      channelIO.q.push(args);
-    };
-    w.ChannelIO = channelIO;
-    function initializeChannelIO() {
-      if (w.ChannelIOInitialized) {
-        return;
-      }
-      w.ChannelIOInitialized = true;
-      const script = document.createElement("script");
-      script.type = "text/javascript";
-      script.async = true;
-      script.src = "https://cdn.channel.io/plugin/ch-plugin-web.js";
-      const firstScript = document.getElementsByTagName("script")[0];
-      if (firstScript?.parentNode) {
-        firstScript.parentNode.insertBefore(script, firstScript);
-      }
-    }
-    if (document.readyState === "complete") {
-      initializeChannelIO();
-    } else {
-      w.addEventListener("DOMContentLoaded", initializeChannelIO);
-      w.addEventListener("load", initializeChannelIO);
-    }
-  }
-  boot(settings: any, callback: any) {
-    window.ChannelIO("boot", settings, callback);
-  }
-  onBadgeChanged(callback: (number: number) => void) {
-    window.ChannelIO("onBadgeChanged", callback);
-  }
-  addTags(tags: string[]) {
-    window.ChannelIO("addTags", tags);
-  }
-  shutdown() {
-    window.ChannelIO("shutdown");
-  }
-}
-
-export default ChannelService;
diff --git a/src/components/chatbot/Chatbot.tsx b/src/components/chatbot/Chatbot.tsx
deleted file mode 100644
index 422ef9e..0000000
--- a/src/components/chatbot/Chatbot.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { useEffect } from 'react';
-
-import { CHANNELIO_PLUGIN_KEY } from '@constants/environment';
-
-import ChannelService from '@/components/chatbot/ChannelService';
-
-export default function Chatbot() {
-  useEffect(() => {
-    const channelTalk = new ChannelService();
-
-    channelTalk.boot({ pluginKey: CHANNELIO_PLUGIN_KEY }, () => {});
-
-    return () => channelTalk.shutdown();
-  }, []);
-
-  return <script src="https://unpkg.com/lodash" async={true} />;
-}
diff --git a/src/main.tsx b/src/main.tsx
index 44b13d4..7762635 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -8,7 +8,6 @@ import { GlobalStyle } from '@/styles';
 import { Global } from '@emotion/react';
 import { ToastContainer } from 'react-toastify';
 import './styles/styles.scss';
-import Chatbot from '@/components/chatbot/Chatbot';
 
 const queryClient = new QueryClient({
   defaultOptions: {
@@ -24,7 +23,6 @@ ReactDOM.createRoot(document.getElementById('root')!).render(
     <QueryClientProvider client={queryClient}>
       <BottomSheetProvider>
         <Global styles={GlobalStyle} />
-        <Chatbot />
         <Routers />
         <ReactQueryDevtools />
       </BottomSheetProvider>

From 650ed9595dbd2570b54941c3ea641e4831244c46 Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Tue, 6 Aug 2024 17:49:00 +0900
Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=ED=95=99=ED=9A=8C=EC=9B=90=20?=
 =?UTF-8?q?=EB=AA=A8=EC=A7=91=20=EB=A7=88=EA=B0=90=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?Box=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/myPage/ApproveBox.tsx | 47 +++++++++++++++-------------
 src/components/myPage/JoinStatus.tsx |  2 +-
 src/types/user.ts                    |  2 +-
 3 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/components/myPage/ApproveBox.tsx b/src/components/myPage/ApproveBox.tsx
index 28cf01d..ef20828 100644
--- a/src/components/myPage/ApproveBox.tsx
+++ b/src/components/myPage/ApproveBox.tsx
@@ -7,7 +7,7 @@ import {
 } from '@/utils/mypage/recruitmentNameFormat';
 import useBottomSheet from '@/hooks/common/useBottomSheet';
 
-type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR' | 'ADMIN';
+type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
 type BoxVariantType = 'arrow' | 'checkbox' | 'text' | 'warn';
 type BoxStatusType = 'default' | 'success' | 'error';
 
@@ -44,29 +44,34 @@ export const ApproveBox = ({
       title: '모든 가입 절차를 완료했어요.',
       boxVariant: 'text',
       status: 'success'
-    },
-    //TODO: 어드민 가입 상태 논의하기
-    ADMIN: {
-      title: '모든 가입 절차를 완료했어요.',
-      boxVariant: 'text',
-      status: 'success'
     }
   };
   return (
-    <BoxWrapper
-      onClick={() => {
-        if (role === 'ASSOCIATE') handleBottomSheet();
-        else {
-          return;
-        }
-      }}>
-      <Box
-        variant={boxContent[role].boxVariant}
-        text={boxContent[role].title}
-        subText={boxContent[role].description}
-        status={boxContent[role].status}
-      />
-    </BoxWrapper>
+    <>
+      {currentRecruitment.period.open ? (
+        <BoxWrapper
+          onClick={() => {
+            if (role === 'ASSOCIATE') handleBottomSheet();
+            else {
+              return;
+            }
+          }}>
+          <Box
+            variant={boxContent[role].boxVariant}
+            text={boxContent[role].title}
+            subText={boxContent[role].description}
+            status={boxContent[role].status}
+          />
+        </BoxWrapper>
+      ) : (
+        <Box
+          variant="warn"
+          text="학회원 모집이 마감되었어요"
+          subText="2학기 모집 소식을 받고 싶으시다면 @gdsc.hongik 을 팔로우 해주세요."
+          status="error"
+        />
+      )}
+    </>
   );
 };
 
diff --git a/src/components/myPage/JoinStatus.tsx b/src/components/myPage/JoinStatus.tsx
index 58efd73..33cbe80 100644
--- a/src/components/myPage/JoinStatus.tsx
+++ b/src/components/myPage/JoinStatus.tsx
@@ -9,7 +9,7 @@ import { CurrentRecruitmentType } from '@/apis/member/memberType';
 import MemberStatusStepper from './MemberStatusStepper';
 import { User } from '@/types/user';
 
-type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR' | 'ADMIN';
+type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
 
 const JoinStatus = ({
   role,
diff --git a/src/types/user.ts b/src/types/user.ts
index e93e027..f485e5c 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -12,7 +12,7 @@ export type User = {
   };
 };
 
-export type UserRoleType = 'GUEST' | 'ASSOCIATE' | 'REGULAR' | 'ADMIN';
+export type UserRoleType = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
 
 export type AssociateRequirement = {
   univStatus: Status;

From fff5e58dfffd7d3941c2f156ba5e9ac3288d5acd Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Tue, 6 Aug 2024 17:56:30 +0900
Subject: [PATCH 5/6] =?UTF-8?q?fix:=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?=
 =?UTF-8?q?=EC=9D=B8=EC=A6=9D=20in=5Fprogress=20=EB=8B=A8=EA=B3=84=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

---
 .../myPage/AssociateRequirementCheck.tsx      | 62 ++++++++++++-------
 src/types/status.ts                           |  1 +
 src/types/user.ts                             |  6 +-
 3 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/src/components/myPage/AssociateRequirementCheck.tsx b/src/components/myPage/AssociateRequirementCheck.tsx
index 2deefd4..be6e727 100644
--- a/src/components/myPage/AssociateRequirementCheck.tsx
+++ b/src/components/myPage/AssociateRequirementCheck.tsx
@@ -1,5 +1,6 @@
 import { Flex, Text } from '@/components/common/Wrapper';
 import Box from 'wowds-ui/Box';
+import { UnivEmailStatus } from '@/types/status';
 import { Discord } from '@/assets/Discord';
 import { AssociateRequirement } from '@/types/user';
 import RoutePath from '@/routes/routePath';
@@ -14,6 +15,42 @@ const AssociateRequirementCheck = ({
     associateRequirement;
   const navigate = useNavigate();
 
+  const univStatusContent = (univStatus: UnivEmailStatus) => {
+    if (univStatus === 'PENDING')
+      return (
+        <Flex
+          direction="column"
+          gap="xs"
+          justify="flex-start"
+          align="flex-start">
+          <Text typo="h3" color="textBlack">
+            재학생 이메일 인증이 필요해요.
+          </Text>
+          <Text typo="body1" color="sub">
+            홍익대학교 재학생인지 알려주세요.
+            <br />
+            학교 Gmail을 통해 인증할 수 있어요.
+          </Text>
+        </Flex>
+      );
+    if (univStatus === 'IN_PROGRESS')
+      return (
+        <Flex
+          direction="column"
+          gap="xs"
+          justify="flex-start"
+          align="flex-start">
+          <Text typo="h3" color="textBlack">
+            재학생 이메일 인증이 진행 중이에요.
+          </Text>
+          <Text typo="body1" color="sub">
+            메일함을 확인해주세요.
+          </Text>
+        </Flex>
+      );
+    return '홍익대학교 재학생 인증을 완료했어요.';
+  };
+
   return (
     <Flex justify="flex-start" direction="column" align="flex-start" gap="sm">
       <Text typo="h2" color="black">
@@ -55,28 +92,9 @@ const AssociateRequirementCheck = ({
         onClick={() => {
           navigate(RoutePath.AuthenticationProcess2_StudentVerification);
         }}
-        text={
-          univStatus === 'PENDING' ? (
-            <Flex
-              direction="column"
-              gap="xs"
-              justify="flex-start"
-              align="flex-start">
-              <Text typo="h3" color="textBlack">
-                재학생 이메일 인증이 필요해요.
-              </Text>
-              <Text typo="body1" color="sub">
-                홍익대학교 재학생인지 알려주세요.
-                <br />
-                학교 Gmail을 통해 인증할 수 있어요.
-              </Text>
-            </Flex>
-          ) : (
-            '홍익대학교 재학생 인증을 완료했어요.'
-          )
-        }
-        status={univStatus === 'PENDING' ? 'error' : 'success'}
-        variant={univStatus === 'PENDING' ? 'arrow' : 'text'}
+        text={univStatusContent(univStatus)}
+        status={univStatus === 'SATISFIED' ? 'success' : 'error'}
+        variant={univStatus === 'SATISFIED' ? 'text' : 'arrow'}
       />
       <Box
         text={
diff --git a/src/types/status.ts b/src/types/status.ts
index 23a532f..2f538f1 100644
--- a/src/types/status.ts
+++ b/src/types/status.ts
@@ -1 +1,2 @@
 export type Status = 'PENDING' | 'SATISFIED';
+export type UnivEmailStatus = 'IN_PROGRESS' | 'PENDING' | 'SATISFIED';
diff --git a/src/types/user.ts b/src/types/user.ts
index f485e5c..918d04f 100644
--- a/src/types/user.ts
+++ b/src/types/user.ts
@@ -1,11 +1,11 @@
-import { Status } from '@/types/status';
+import { Status, UnivEmailStatus } from '@/types/status';
 
 export type User = {
   memberId: string; // C000000 (학번)
   role: UserRoleType;
   basicInfo: UserBasicInfo;
   associateRequirement: {
-    univStatus: Status;
+    univStatus: UnivEmailStatus;
     discordStatus: Status;
     bevyStatus: Status;
     infoStatus: Status;
@@ -15,7 +15,7 @@ export type User = {
 export type UserRoleType = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
 
 export type AssociateRequirement = {
-  univStatus: Status;
+  univStatus: UnivEmailStatus;
   discordStatus: Status;
   bevyStatus: Status;
   infoStatus: Status;

From 4ffcdc7f27fdf6fcf7d62ab3a82eaabb09e23d36 Mon Sep 17 00:00:00 2001
From: Eugene Kim <eugene02876@gmail.com>
Date: Wed, 7 Aug 2024 18:19:35 +0900
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=EC=9D=B4=EB=AF=B8=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=ED=95=98=EA=B3=A0=20=EC=9E=88=EB=8A=94=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/myPage/ApproveBox.tsx | 6 +++---
 src/components/myPage/JoinStatus.tsx | 6 ++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/myPage/ApproveBox.tsx b/src/components/myPage/ApproveBox.tsx
index ef20828..912da3c 100644
--- a/src/components/myPage/ApproveBox.tsx
+++ b/src/components/myPage/ApproveBox.tsx
@@ -6,8 +6,8 @@ import {
   convertRecruitmentName
 } from '@/utils/mypage/recruitmentNameFormat';
 import useBottomSheet from '@/hooks/common/useBottomSheet';
+import { UserRoleType } from '@/types/user';
 
-type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
 type BoxVariantType = 'arrow' | 'checkbox' | 'text' | 'warn';
 type BoxStatusType = 'default' | 'success' | 'error';
 
@@ -15,12 +15,12 @@ export const ApproveBox = ({
   role,
   currentRecruitment
 }: {
-  role: MemberRole;
+  role: UserRoleType;
   currentRecruitment: CurrentRecruitmentType;
 }) => {
   const { handleBottomSheet } = useBottomSheet();
   const boxContent: Record<
-    MemberRole,
+    UserRoleType,
     {
       title: string;
       description?: string;
diff --git a/src/components/myPage/JoinStatus.tsx b/src/components/myPage/JoinStatus.tsx
index 33cbe80..b8542e0 100644
--- a/src/components/myPage/JoinStatus.tsx
+++ b/src/components/myPage/JoinStatus.tsx
@@ -7,16 +7,14 @@ import { ApproveBox } from './ApproveBox';
 import { Text, Flex, Space } from '../common/Wrapper';
 import { CurrentRecruitmentType } from '@/apis/member/memberType';
 import MemberStatusStepper from './MemberStatusStepper';
-import { User } from '@/types/user';
-
-type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
+import { User, UserRoleType } from '@/types/user';
 
 const JoinStatus = ({
   role,
   currentRecruitmentRound,
   member
 }: {
-  role: MemberRole;
+  role: UserRoleType;
   currentRecruitmentRound: CurrentRecruitmentType;
   member: User;
 }) => {