diff --git a/src/components/login/Login.tsx b/src/components/login/Login.tsx index 919c259..55a3901 100644 --- a/src/components/login/Login.tsx +++ b/src/components/login/Login.tsx @@ -3,44 +3,24 @@ import LogoImage from '@assets/login/project-logo.svg'; import KakaoLogo from '@assets/login/kakao-logo.svg'; import NaverLogo from '@assets/login/naver-logo.svg'; import GoogleLogo from '@assets/login/google-logo.svg'; -import { useEffect, useState } from 'react'; -import { useLocation, useNavigate } from 'react-router-dom'; const Login = () => { - const navigate = useNavigate(); - const location = useLocation(); - const [isRouteByEvent, setIsRouteByEvent] = useState(false); const handleKakaoButtonClick = () => { window.location.href = 'https://dev.teammanagers.kr/oauth2/authorization/kakao'; - setIsRouteByEvent(true); }; const handleNaverButtonClick = () => { window.location.href = 'https://dev.teammanagers.kr/oauth2/authorization/naver'; - setIsRouteByEvent(true); + true; }; const handleGoogleButtonClick = () => { window.location.href = 'https://dev.teammanagers.kr/oauth2/authorization/google'; - setIsRouteByEvent(true); }; - useEffect(() => { - const token = localStorage.getItem('accessToken'); - const isNewUser = !!localStorage.getItem('isNewUser'); - - if (token && !!isNewUser) { - navigate('/signup'); - } - - if (token && !isNewUser) { - navigate('/team'); - } - }, [isRouteByEvent, window.location.href]); - return ( diff --git a/src/pages/login/login.tsx b/src/pages/login/login.tsx index b03770e..8018af0 100644 --- a/src/pages/login/login.tsx +++ b/src/pages/login/login.tsx @@ -3,7 +3,7 @@ import LogoFadeIn from '@components/login/LogoFadeIn'; import { useLogoFadeIn } from '@hooks/useLogoFadeIn'; import styled from 'styled-components'; import { useEffect } from 'react'; -import { useLocation } from 'react-router-dom'; +import { useLocation, useNavigate } from 'react-router-dom'; const Wrapper = styled.div` height: 100vh; @@ -13,6 +13,7 @@ const Wrapper = styled.div` export const LoginPage = () => { const location = useLocation(); + const navigate = useNavigate(); const isLogoFadeInActivate = useLogoFadeIn(3000); useEffect(() => { @@ -30,6 +31,19 @@ export const LoginPage = () => { localStorage.setItem('isNewUser', isNewUser); }, [location]); + useEffect(() => { + const token = localStorage.getItem('accessToken'); + const isNewUser = !!localStorage.getItem('isNewUser'); + + if (token && !!isNewUser) { + navigate('/signup'); + } + + if (token && !isNewUser) { + navigate('/team'); + } + }, [location]); + return ( {isLogoFadeInActivate ? : }