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

로그인 페이지와 사용자 전환 플로우 변경 #729

Merged
merged 4 commits into from
Oct 23, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ export const container = ({
`;

export const image = css`
width: 100%;
max-width: 40rem;
height: 100%;
max-height: 40rem;
`;
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@ export default function BetList() {
return bets && bets.length > 0 ? (
<BetCardList bets={bets} />
) : (
<MissingFallback text="아무런 글이 없어요..!" />
<MissingFallback text="아직 만들어진 룰렛이 없어요" />
);
}
2 changes: 1 addition & 1 deletion frontend/src/pages/Chatting/ChatPage/ChatPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export default function ChatPage() {
/>
))
) : (
<MissingFallback text="아직 열린 채팅방이 없습니다" />
<MissingFallback text="아직 만들어진 채팅방이 없어요" />
)}
</ChattingPreviewLayout.ContentContainer>
</ChattingPreviewLayout>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,9 @@ export default function ChattingRoomPage() {
tagValue={chatRoomDetail.attributes.isLoser ? '당첨!' : '미당첨'}
textList={
chatRoomDetail.attributes.isLoser
? ['축하드립니다!']
? [
`축하드립니다 ${chatRoomDetail.attributes.loser.nickname}님!`,
]
: [
`당첨된 사람은 ${chatRoomDetail.attributes.loser.nickname}님입니다!`,
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export default function OAuthMigrationResultPage() {
}
}}
>
다락방으로 이동하기
다락방 선택 페이지로 이동하기
</Button>
</LoginLayout.Footer>
</LoginLayout>
Expand Down
12 changes: 10 additions & 2 deletions frontend/src/pages/Login/OAuthLoginPage/OAuthLoginPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,20 @@
const oauthHandlers: Record<Provider, () => Promise<boolean | void>> = {
apple: async () => {
setAccessToken(codeOrToken);
navigate(ROUTES.kakaoSelection);
const isConverted = urlParams.get('isConverted');
if (isConverted === 'true') {
navigate(ROUTES.kakaoSelection);
} else {
navigate(ROUTES.darakbangSelectOption);
}
},
google: async () => {
const response = await googleOAuth(codeOrToken);
setAccessToken(response.data.accessToken);
navigate(ROUTES.kakaoSelection);
if (response.data.isConverted) {
navigate(ROUTES.kakaoSelection);
}
navigate(ROUTES.darakbangSelectOption);
},
kakao: async () => {
kakaoMigration(codeOrToken);
Expand All @@ -69,7 +77,7 @@
};

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

Check warning on line 80 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