diff --git a/src/components/myPage/ApproveBox.tsx b/src/components/myPage/ApproveBox.tsx index d6df24e..805cf00 100644 --- a/src/components/myPage/ApproveBox.tsx +++ b/src/components/myPage/ApproveBox.tsx @@ -52,16 +52,21 @@ export const ApproveBox = ({ status: 'error' }, REGULAR: { - title: '모든 가입 절차를 완료했어요.', - boxVariant: 'text', + title: 'WOW CLASS', + description: + 'GDSC Hongik의 스터디 서비스인 WOW CLASS를 이용할 수 있어요.', + boxVariant: 'arrow', status: 'success' } }; + return ( { if (role === 'ASSOCIATE') handleBottomSheet(); - else { + else if (role === 'REGULAR') { + window.location.href = 'https://study.gdschongik.com/'; + } else { return; } }}> diff --git a/src/components/myPage/JoinRegularMember.tsx b/src/components/myPage/JoinRegularMember.tsx index 5c324c4..4fcb339 100644 --- a/src/components/myPage/JoinRegularMember.tsx +++ b/src/components/myPage/JoinRegularMember.tsx @@ -1,10 +1,17 @@ import { Text, Flex } from '@/components/common/Wrapper'; import RoutePath from '@/routes/routePath'; import { Status } from '@/types/status'; +import { User } from '@/types/user'; import { useNavigate } from 'react-router-dom'; import Box from 'wowds-ui/Box'; -const JoinRegularMember = ({ paymentStatus }: { paymentStatus: Status }) => { +const JoinRegularMember = ({ + paymentStatus, + member +}: { + paymentStatus?: Status; + member: User; +}) => { const navigate = useNavigate(); const handleClickRoute = () => { @@ -23,20 +30,30 @@ const JoinRegularMember = ({ paymentStatus }: { paymentStatus: Status }) => { 정회원 가입 조건 - + {paymentStatus ? ( + + ) : ( + member.role === 'REGULAR' && ( + + ) + )} ); }; diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx index 47a56e1..915edd7 100644 --- a/src/pages/Dashboard.tsx +++ b/src/pages/Dashboard.tsx @@ -31,6 +31,8 @@ export const Dashboard = () => { const { member, currentRecruitmentRound, currentMembership } = data; + console.log(data); + return (
@@ -43,9 +45,10 @@ export const Dashboard = () => { member={member} /> - {currentMembership && ( + {(currentMembership || member.role === 'REGULAR') && ( )}