diff --git a/src/App.tsx b/src/App.tsx
index b952095..06d163e 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -4,6 +4,7 @@ import {
OnboardingLogo1,
OnboardingLogo2
} from '@/assets/Onboarding';
+import { isAuthenticated } from '@/utils/auth';
import { Flex, Space, Text } from '@/components/common/Wrapper';
import { InformationBox } from '@/components/onboarding/InformationBox';
import { color, typography } from 'wowds-tokens';
@@ -160,7 +161,11 @@ function App() {
- navigate(RoutePath.Dashboard)}>
+ {
+ if (isAuthenticated()) navigate(RoutePath.Dashboard);
+ else navigate(RoutePath.GithubSignin);
+ }}>
가입하기
diff --git a/src/components/myPage/JoinRegularMember.tsx b/src/components/myPage/JoinRegularMember.tsx
index 6286d03..5c324c4 100644
--- a/src/components/myPage/JoinRegularMember.tsx
+++ b/src/components/myPage/JoinRegularMember.tsx
@@ -33,7 +33,7 @@ const JoinRegularMember = ({ paymentStatus }: { paymentStatus: Status }) => {
status={paymentStatus === 'UNSATISFIED' ? 'error' : 'success'}
subText={
paymentStatus === 'UNSATISFIED'
- ? '이제 카드·계좌이체 등 여러 결제수단을 지원해요.'
+ ? '카드·계좌이체 등 여러 결제수단을 지원해요.'
: undefined
}
/>
diff --git a/src/pages/StudentVerification.tsx b/src/pages/StudentVerification.tsx
index a1a08cb..58ebe3c 100644
--- a/src/pages/StudentVerification.tsx
+++ b/src/pages/StudentVerification.tsx
@@ -74,12 +74,13 @@ export const StudentVerification = () => {
@@ -176,6 +177,7 @@ const ButtonContainer = styled.div`
const EmailContainer = styled.div`
display: flex;
flex-direction: row;
+ max-width: 260px;
align-items: center;
gap: ${space.xs};
`;
@@ -183,5 +185,4 @@ const EmailContainer = styled.div`
const TextFieldWrapper = styled.div`
flex: 1;
height: 84.8px;
- width: 50%;
`;
diff --git a/src/pages/redirect/StudentVerificationServerRedirect.tsx b/src/pages/redirect/StudentVerificationServerRedirect.tsx
index b2c8598..8d252d7 100644
--- a/src/pages/redirect/StudentVerificationServerRedirect.tsx
+++ b/src/pages/redirect/StudentVerificationServerRedirect.tsx
@@ -1,19 +1,16 @@
import { Text, Flex } from '@/components/common/Wrapper';
import { useVerifyStudentEmail } from '@/hooks/mutation';
import { color } from 'wowds-tokens';
-import Button from 'wowds-ui/Button';
import GlobalSize from '@/constants/globalSize';
import { media } from '@/styles';
import styled from '@emotion/styled';
import { css } from '@emotion/react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
-import RoutePath from '@/routes/routePath';
+import { useSearchParams } from 'react-router-dom';
import { useLayoutEffect } from 'react';
import LoadingSpinner from '@/components/common/LoadingSpinner';
export const StudentVerificationServerRedirect = () => {
const [searchParams] = useSearchParams();
- const navigate = useNavigate();
const token = searchParams.get('token');
const { isSuccess, isPending, verifyStudentMail } = useVerifyStudentEmail();
@@ -21,7 +18,6 @@ export const StudentVerificationServerRedirect = () => {
if (token) verifyStudentMail(token);
}, [token, verifyStudentMail]);
- //TODO: 추후 로딩 스피너 추가 필요
return (
{isPending ? (
@@ -46,16 +42,6 @@ export const StudentVerificationServerRedirect = () => {
)}
-
-
-
)}
@@ -90,13 +76,3 @@ const TextContainer = styled.div`
flex-direction: column;
align-items: center;
`;
-
-const ButtonContainer = styled.div`
- position: absolute;
- bottom: 1.75rem;
- padding: 0px 0.75rem;
- width: 100%;
- display: flex;
- flex-direction: column;
- align-items: center;
-`;