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.

Sign up for GitHub

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

Jump to bottom

사용자 전환 QA를 통한 사용자 전환 분기처리 버그 수정 #733

Merged
merged 2 commits into from
Oct 24, 2024
Merged

사용자 전환 QA를 통한 사용자 전환 분기처리 버그 수정 #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8eadd7a
fix: if 분기 조건 변경
jaeml06 Oct 23, 2024
d0e1a75
feat: 줄넘김 추가
jaeml06 Oct 23, 2024
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
6 changes: 4 additions & 2 deletions frontend/src/pages/Login/DataMigrationPage/OAuthMigrationResult/OAuthMigrationResultPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export default function OAuthMigrationResultPage() {
<LoginLayout.Main>
<div css={S.titleWrapper}>
<span css={S.title({ theme })}>
모우다를 사용할 준비가 되었어요
모우다를 사용할 <br /> 준비가 되었어요
</span>
<br />
<span css={S.subtitle({ theme })}>
Expand Down Expand Up @@ -65,7 +65,9 @@ export default function OAuthMigrationResultPage() {
<LoginLayout.Header></LoginLayout.Header>
<LoginLayout.Main>
<div css={S.titleWrapper}>
<span css={S.title({ theme })}>기록을 이전하는데 실패했어요!</span>
<span css={S.title({ theme })}>
기록을 이전하는데 <br /> 실패했어요!
</span>
<br />
<span css={S.subtitle({ theme })}>
혹시 이전 카카오 계정 가입자가 아닌가요?
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
apple: async () => {
setAccessToken(codeOrToken);
const isConverted = urlParams.get('isConverted');
if (isConverted === 'true') {
if (isConverted === 'false') {
navigate(ROUTES.kakaoSelection);
} else {
navigate(ROUTES.darakbangSelectOption);
Expand All @@ -53,10 +53,11 @@
google: async () => {
const response = await googleOAuth(codeOrToken);
setAccessToken(response.data.accessToken);
if (response.data.isConverted) {
if (!response.data.isConverted) {
navigate(ROUTES.kakaoSelection);
} else {
navigate(ROUTES.darakbangSelectOption);
}
navigate(ROUTES.darakbangSelectOption);
},
kakao: async () => {
kakaoMigration(codeOrToken);
Expand All @@ -77,7 +78,7 @@
};

loginOAuth();
}, [navigate, provider]);

Check warning on line 81 in frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx

View workflow job for this annotation

GitHub Actions / test 

React Hook useEffect has a missing dependency: 'kakaoMigration'. Either include it or remove the dependency array

return null;
}
Loading