[Refactor]: 학교 이메일 인증 정책을 변경해요

src/components/myPage/ApproveBox.tsx

@@ -6,21 +6,21 @@ import {
   convertRecruitmentName
 } from '@/utils/mypage/recruitmentNameFormat';
 import useBottomSheet from '@/hooks/common/useBottomSheet';
+import { UserRoleType } from '@/types/user';
 
-type MemberRole = 'GUEST' | 'ASSOCIATE' | 'REGULAR' | 'ADMIN';
 type BoxVariantType = 'arrow' | 'checkbox' | 'text' | 'warn';
 type BoxStatusType = 'default' | 'success' | 'error';
 
 export const ApproveBox = ({
   role,
   currentRecruitment
 }: {
-  role: MemberRole;
+  role: UserRoleType;
   currentRecruitment: CurrentRecruitmentType;
 }) => {
   const { handleBottomSheet } = useBottomSheet();
   const boxContent: Record<
-    MemberRole,
+    UserRoleType,
     {
       title: string;
       description?: string;
@@ -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"
+        />
+      )}
+    </>
   );
 };
 

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={

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' | 'ADMIN';
+import { User, UserRoleType } from '@/types/user';
 
 const JoinStatus = ({
   role,
   currentRecruitmentRound,
   member
 }: {
-  role: MemberRole;
+  role: UserRoleType;
   currentRecruitmentRound: CurrentRecruitmentType;
   member: User;
 }) => {

src/types/status.ts

@@ -1 +1,2 @@
 export type Status = 'PENDING' | 'SATISFIED';
+export type UnivEmailStatus = 'IN_PROGRESS' | 'PENDING' | 'SATISFIED';

src/types/user.ts

@@ -1,21 +1,21 @@
-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;
   };
 };
 
-export type UserRoleType = 'GUEST' | 'ASSOCIATE' | 'REGULAR' | 'ADMIN';
+export type UserRoleType = 'GUEST' | 'ASSOCIATE' | 'REGULAR';
 
 export type AssociateRequirement = {
-  univStatus: Status;
+  univStatus: UnivEmailStatus;
   discordStatus: Status;
   bevyStatus: Status;
   infoStatus: Status;