Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fix]: Bevy 관련된 UI 및 DTO 제거 #120

Merged
merged 1 commit into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions src/apis/bevy/bevyApi.ts

This file was deleted.

10 changes: 1 addition & 9 deletions src/components/auth/guard/VerificationGuard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PropsWithChildren, useEffect } from 'react';
import memberApi from '@/apis/member/memberApi';
import { useQuery } from '@tanstack/react-query';

type GuardType = 'StudentVerification' | 'Discord' | 'SignUp' | 'Bevy';
type GuardType = 'StudentVerification' | 'Discord' | 'SignUp';

interface VerificationGuardProps extends PropsWithChildren {
guardType: GuardType;
Expand Down Expand Up @@ -49,14 +49,6 @@ export default function VerificationGuard({
navigate(RoutePath.Dashboard);
return;
}
if (
guardType === 'Bevy' &&
data.member.associateRequirement.bevyStatus === 'SATISFIED'
) {
toast.error('bevy 가입을 이미 완료했습니다.');
navigate(RoutePath.Dashboard);
return;
}
}, [data, guardType, navigate]);

return children;
Expand Down
3 changes: 1 addition & 2 deletions src/components/discordConnect/CompleteDiscordConnect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ export const CompleteDiscordConnect = () => {
<Text typo="h1">디스코드 연동이 완료되었어요!</Text>
<Space height="lg" />
<Text typo="body1">
회비 납부, Bevy 가입 등 모든 절차가 완료되면 자동으로 승인될
예정이에요!
회비 납부 등 모든 절차가 완료되면 자동으로 승인될 예정이에요!
</Text>
</Flex>
<Button
Expand Down
49 changes: 1 addition & 48 deletions src/components/myPage/AssociateRequirementCheck.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const AssociateRequirementCheck = ({
}: {
associateRequirement: AssociateRequirement;
}) => {
const { infoStatus, discordStatus, bevyStatus, univStatus } =
associateRequirement;
const { infoStatus, discordStatus, univStatus } = associateRequirement;
const navigate = useNavigate();

const univStatusContent = (univStatus: UnivEmailStatus) => {
Expand Down Expand Up @@ -95,52 +94,6 @@ const AssociateRequirementCheck = ({
status={univStatus === 'SATISFIED' ? 'success' : 'error'}
variant={univStatus === 'SATISFIED' ? 'text' : 'arrow'}
/>
<Box
text={
bevyStatus === 'UNSATISFIED' ? (
<Flex
direction="column"
gap="xs"
justify="flex-start"
align="flex-start">
<Text typo="h3" color="textBlack">
GDSC Bevy 가입이 마무리되지 않았어요.
</Text>
<Text typo="body1" color="sub">
전체 GDSC 이벤트를 확인할 수 있는
<br />
플랫폼이에요. 지금 가입해볼까요?
</Text>
</Flex>
) : (
<Flex
direction="column"
gap="xs"
justify="flex-start"
align="flex-start">
<Text typo="h3" color="textBlack">
GDSC Bevy 가입을 완료했어요.
</Text>
<Text typo="body1" color="sub">
이제 전체 GDSC 이벤트에 대한 정보를
<br />
확인하고 참여할 수 있어요.
</Text>
</Flex>
)
}
variant="arrow"
status={bevyStatus === 'UNSATISFIED' ? 'error' : 'success'}
onClick={() => {
if (bevyStatus === 'UNSATISFIED') {
navigate(RoutePath.Bevy);
} else {
window.open(
'https://gdsc.community.dev/hongik-university-seoul-south-korea/'
);
}
}}
/>
</Flex>
);
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/myPage/MemberStatusInfoBox.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ const MemberStatusInfoBox = forwardRef(
Q. 준회원, 정회원이 무엇이고, 어떤 차이인가요?
</Text>
<Text typo="body1" color="textWhite">
준회원은 가입 후 디스코드 연동, 재학생 인증, Bevy 가입을 완료한
회원이에요. 정회원 활동 기간이 끝나면, 다시 준회원으로 변경돼요.
준회원은 가입 후 디스코드 연동, 재학생 인증을 완료한 회원이에요.
정회원 활동 기간이 끝나면, 다시 준회원으로 변경돼요.
</Text>
<Text typo="body1" color="textWhite">
정회원은 정회원 모집 신청을 통해 회비 납부까지 완료한 회원이에요. 이번
Expand Down
27 changes: 0 additions & 27 deletions src/hooks/mutation/usePostBevyLink.ts

This file was deleted.

207 changes: 0 additions & 207 deletions src/pages/Bevy.tsx

This file was deleted.

1 change: 0 additions & 1 deletion src/pages/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
export * from './Auth';
export * from './Bevy';
export * from './JoinDiscord';
export * from './Dashboard';
export * from './MyPageEdit';
Expand Down
14 changes: 0 additions & 14 deletions src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import {
SignUp,
Dashboard,
JoinDiscord,
Bevy,
PaymentsSuccess,
PaymentsFail,
PaymentsCheckout
Expand Down Expand Up @@ -118,19 +117,6 @@ const router = sentryCreateBrowserRouter([
{
path: RoutePath.DiscordGuide,
element: <DiscordGuide />
},
{
path: RoutePath.Bevy,
children: [
{
index: true,
element: (
<VerificationGuard guardType="Bevy">
<Bevy />
</VerificationGuard>
)
}
]
}
]
},
Expand Down
1 change: 0 additions & 1 deletion src/routes/routePath.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const RoutePath = {
Home: '/',

Dashboard: '/dashboard',
Bevy: '/bevy',
Discord: '/discord',
DiscordConnect: '/discord/connect',
DiscordGuide: '/discord/guide',
Expand Down
Loading
Loading