diff --git a/src/hooks/queries/login/useGetGoogleToken.ts b/src/hooks/queries/login/useGetGoogleToken.ts index 06faa08..976a9b2 100644 --- a/src/hooks/queries/login/useGetGoogleToken.ts +++ b/src/hooks/queries/login/useGetGoogleToken.ts @@ -12,6 +12,7 @@ const useGetGoogleToken = (code: string | null = '') => { if (data?.data?.accessToken === undefined) { void router.push(`/mypage/profile?googleEmail=${data?.data?.googleEmail}`); + return; } if (data?.data) { localStorage.setItem('accessToken', data.data.accessToken); diff --git a/src/hooks/queries/login/usePostUser.ts b/src/hooks/queries/login/usePostUser.ts index 86afc28..2ad0bd0 100644 --- a/src/hooks/queries/login/usePostUser.ts +++ b/src/hooks/queries/login/usePostUser.ts @@ -22,7 +22,7 @@ const usePostUser = () => { }) => { localStorage.setItem('accessToken', data.accessToken); localStorage.setItem('refreshToken', data.refreshToken); - void router.push('/home'); + void router.push('/login'); }; return useBaseMutation(queryKeys.KAKAO(), `/users`, onSuccess); }; diff --git a/src/pages/login/index.tsx b/src/pages/login/index.tsx index fded3c2..9f6e9df 100644 --- a/src/pages/login/index.tsx +++ b/src/pages/login/index.tsx @@ -1,6 +1,6 @@ import MonstersImg from '@/assets/images/img_login_monsters.svg'; import KaKaoImg from '@/assets/images/img_login_kakao.svg'; -import GoogleImg from '@/assets/images/img_login_google.svg'; +// import GoogleImg from '@/assets/images/img_login_google.svg'; import LogoTextImg from '@/assets/logos/text_logo_l.svg'; import { type NextPage } from 'next'; import { useGetGoogleToken, useGetKakaoToken } from '@/hooks/queries/login'; @@ -10,15 +10,15 @@ const LoginPage: NextPage = () => { const router = useRouter(); const kakaoURL = `https://kauth.kakao.com/oauth/authorize?client_id=${process.env.NEXT_PUBLIC_KAKAO_API_KEY}&redirect_uri=${process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI}&response_type=code`; - const googleURL = `https://accounts.google.com/o/oauth2/v2/auth?client_id=${process.env.NEXT_PUBLIC_GOOGLE_API_KEY}&redirect_uri=${process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI}&response_type=code&scope=email&access_type=offline`; + // const googleURL = `https://accounts.google.com/o/oauth2/v2/auth?client_id=${process.env.NEXT_PUBLIC_GOOGLE_API_KEY}&redirect_uri=${process.env.NEXT_PUBLIC_GOOGLE_REDIRECT_URI}&response_type=code&scope=email&access_type=offline`; const handleKaKaoClick: () => void = () => { window.location.href = `${kakaoURL}&type=kakao`; }; - const handleGoogleClick: () => void = () => { - window.location.href = `${googleURL}&type=google`; - }; + // const handleGoogleClick: () => void = () => { + // window.location.href = `${googleURL}&type=google`; + // }; const { code, scope } = router.query; @@ -43,7 +43,7 @@ const LoginPage: NextPage = () => {
- + {/* */}
diff --git a/src/pages/mypage/profile/index.tsx b/src/pages/mypage/profile/index.tsx index 914219e..47db46c 100644 --- a/src/pages/mypage/profile/index.tsx +++ b/src/pages/mypage/profile/index.tsx @@ -37,7 +37,7 @@ const ProfilePage: NextPage = () => { const MyInfo = kakaoId ? null : useGetMe(); - const [selectedProfile, setSelectedProfile] = useState('GREEN'); + const [selectedProfile, setSelectedProfile] = useState(MyInfo?.profileImage ?? 'GREEN'); const [nickname, setNickname] = useState(MyInfo?.nickname ?? ''); const [isNicknameAvailable, setIsNicknameAvailable] = useState(null); const [isNicknameChecked, setIsNicknameChecked] = useState(null);