From e3c947840636ac7508837e16cfc7a4e913ba4739 Mon Sep 17 00:00:00 2001 From: Eugene Kim Date: Wed, 4 Sep 2024 22:33:58 +0900 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=EC=99=80=EC=9A=B0=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EB=B0=95=EC=8A=A4=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 | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) 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; } }}> From 7738ba2f35deeb3fd2c745920d9c9814132a67b9 Mon Sep 17 00:00:00 2001 From: Eugene Kim Date: Wed, 4 Sep 2024 23:19:38 +0900 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=EC=A0=95=ED=9A=8C=EC=9B=90=20?= =?UTF-8?q?=EA=B0=80=EC=9E=85=20=EC=A1=B0=EA=B1=B4=20regular=EC=9D=BC?= =?UTF-8?q?=EB=95=8C=20=EB=B3=B4=EC=9D=B4=EB=8F=84=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/myPage/JoinRegularMember.tsx | 47 ++++++++++++++------- src/pages/Dashboard.tsx | 7 ++- 2 files changed, 37 insertions(+), 17 deletions(-) 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') && ( )} Date: Thu, 5 Sep 2024 00:18:21 +0900 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20?= =?UTF-8?q?=EB=8F=84=EB=A9=94=EC=9D=B8=20=EC=9E=85=EB=A0=A5=EC=8B=9C=20UI?= =?UTF-8?q?=20=EA=B9=A8=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=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 --- .../bottomsheet/JoinRegularMemberBottomSheet.tsx | 5 ++++- src/components/myPage/ApproveBox.tsx | 15 ++++++++++----- src/components/myPage/JoinStatus.tsx | 15 ++++++++++++--- src/components/signup/EmailInputField.tsx | 10 ++++++++-- src/pages/Dashboard.tsx | 1 + 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx b/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx index b8b4ca6..1a2c0e4 100644 --- a/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx +++ b/src/components/bottomsheet/JoinRegularMemberBottomSheet.tsx @@ -81,10 +81,13 @@ const JoinRegularMemberBottomSheet = ({ text={{recruitmentPeriod}} /> diff --git a/src/components/myPage/ApproveBox.tsx b/src/components/myPage/ApproveBox.tsx index 805cf00..c085ec6 100644 --- a/src/components/myPage/ApproveBox.tsx +++ b/src/components/myPage/ApproveBox.tsx @@ -1,6 +1,9 @@ import Box from 'wowds-ui/Box'; import styled from '@emotion/styled'; -import { CurrentRecruitmentType } from '@/apis/member/memberType'; +import { + CurrentMembershipType, + CurrentRecruitmentType +} from '@/apis/member/memberType'; import { convertRecruitmentPeriod, convertRecruitmentName @@ -13,14 +16,16 @@ type BoxStatusType = 'default' | 'success' | 'error'; export const ApproveBox = ({ role, - currentRecruitment + currentRecruitment, + currentMembership }: { role: UserRoleType; currentRecruitment: CurrentRecruitmentType; + currentMembership?: CurrentMembershipType; }) => { const { handleBottomSheet } = useBottomSheet(); - if (!currentRecruitment) { + if (!currentRecruitment && role !== 'REGULAR') { return ( { - if (role === 'ASSOCIATE') handleBottomSheet(); + if (role === 'ASSOCIATE' && !currentMembership) handleBottomSheet(); else if (role === 'REGULAR') { window.location.href = 'https://study.gdschongik.com/'; } else { diff --git a/src/components/myPage/JoinStatus.tsx b/src/components/myPage/JoinStatus.tsx index b8542e0..e6673dd 100644 --- a/src/components/myPage/JoinStatus.tsx +++ b/src/components/myPage/JoinStatus.tsx @@ -5,18 +5,23 @@ import styled from '@emotion/styled'; import MemberStatusInfoBox from '@/components/myPage/MemberStatusInfoBox'; import { ApproveBox } from './ApproveBox'; import { Text, Flex, Space } from '../common/Wrapper'; -import { CurrentRecruitmentType } from '@/apis/member/memberType'; +import { + CurrentMembershipType, + CurrentRecruitmentType +} from '@/apis/member/memberType'; import MemberStatusStepper from './MemberStatusStepper'; import { User, UserRoleType } from '@/types/user'; const JoinStatus = ({ role, currentRecruitmentRound, - member + member, + currentMembership }: { role: UserRoleType; currentRecruitmentRound: CurrentRecruitmentType; member: User; + currentMembership?: CurrentMembershipType; }) => { const [openInfo, setOpenInfo] = useState(false); const helpButtonRef = useRef(null); @@ -50,7 +55,11 @@ const JoinStatus = ({ - + ); }; diff --git a/src/components/signup/EmailInputField.tsx b/src/components/signup/EmailInputField.tsx index fa2f587..e7d4452 100644 --- a/src/components/signup/EmailInputField.tsx +++ b/src/components/signup/EmailInputField.tsx @@ -38,7 +38,7 @@ const EmailInputField = ({ control }: DepartmentSelectProps) => { render={({ field, fieldState }) => ( { {customEmail ? ( { From 03e97f7684cab8fe10ac31f968ebb14435527a1d Mon Sep 17 00:00:00 2001 From: Eugene Kim Date: Thu, 5 Sep 2024 01:07:36 +0900 Subject: [PATCH 4/4] =?UTF-8?q?fix:=20textfield=20=EC=82=AC=EC=9A=A9=20?= =?UTF-8?q?=EC=95=88=ED=95=98=EB=8A=94=20=EA=B2=83=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/signup/EmailInputField.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/components/signup/EmailInputField.tsx b/src/components/signup/EmailInputField.tsx index e7d4452..0a9ed67 100644 --- a/src/components/signup/EmailInputField.tsx +++ b/src/components/signup/EmailInputField.tsx @@ -137,9 +137,3 @@ const EmailFieldWrapper = styled.div` align-items: center; justify-content: space-between; `; - -const TextFieldStyle = { - minWidth: '100%', - flex: 1, - maxWidth: '100%' -};