Skip to content

Commit

Permalink
fix: 상용배포 마이너 UI 이슈
Browse files Browse the repository at this point in the history
  • Loading branch information
eugene028 committed Aug 11, 2024
1 parent bfcc866 commit 11c72e5
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 28 deletions.
7 changes: 6 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -160,7 +161,11 @@ function App() {
<JoinText />
<OnboardingLogo2 />
<Space height={25} />
<ApplyButton onClick={() => navigate(RoutePath.Dashboard)}>
<ApplyButton
onClick={() => {
if (isAuthenticated()) navigate(RoutePath.Dashboard);
else navigate(RoutePath.GithubSignin);
}}>
가입하기
</ApplyButton>
<Space height={40} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/myPage/JoinRegularMember.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ const JoinRegularMember = ({ paymentStatus }: { paymentStatus: Status }) => {
status={paymentStatus === 'UNSATISFIED' ? 'error' : 'success'}
subText={
paymentStatus === 'UNSATISFIED'
? '이제 카드·계좌이체 등 여러 결제수단을 지원해요.'
? '카드·계좌이체 등 여러 결제수단을 지원해요.'
: undefined
}
/>
Expand Down
5 changes: 3 additions & 2 deletions src/pages/StudentVerification.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,13 @@ export const StudentVerification = () => {
<EmailContainer>
<TextFieldWrapper>
<TextField
style={{ minWidth: '100%' }}
ref={field.ref}
onChange={field.onChange}
onBlur={field.onBlur}
value={field.value}
error={fieldState.invalid}
placeholder="로컬파트 작성"
placeholder="이메일 작성"
label="학교 이메일"
helperText={fieldState.error?.message}
/>
Expand Down Expand Up @@ -176,12 +177,12 @@ const ButtonContainer = styled.div`
const EmailContainer = styled.div`
display: flex;
flex-direction: row;
max-width: 260px;
align-items: center;
gap: ${space.xs};
`;

const TextFieldWrapper = styled.div`
flex: 1;
height: 84.8px;
width: 50%;
`;
25 changes: 1 addition & 24 deletions src/pages/redirect/StudentVerificationServerRedirect.tsx
Original file line number Diff line number Diff line change
@@ -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();

Expand Down Expand Up @@ -46,16 +43,6 @@ export const StudentVerificationServerRedirect = () => {
</Text>
)}
</TextContainer>
<ButtonContainer>
<Button
type="submit"
role="button"
onClick={() => {
navigate(RoutePath.Dashboard);
}}>
대시보드로 바로가기
</Button>
</ButtonContainer>
</Container>
)}
</Wrapper>
Expand Down Expand Up @@ -90,13 +77,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;
`;

0 comments on commit 11c72e5

Please sign in to comment.