diff --git a/component/Funnel/LoginFunnel.tsx b/component/Funnel/LoginFunnel.tsx index 00f3fed..11068ee 100644 --- a/component/Funnel/LoginFunnel.tsx +++ b/component/Funnel/LoginFunnel.tsx @@ -8,14 +8,9 @@ import VerticalLogoIcon from "../icon/VerticalLogoIcon"; const LoginFunnel = () => { const router = useRouter(); - const Rest_api_key = "536cb646ce60d71102dc92d2b7845c8d"; //REST API KEY - const redirect_uri = "http://localhost:3000/signup"; //Redirect URI - // oauth 요청 URL - const kakaoURL = `https://kauth.kakao.com/oauth/authorize?client_id=${Rest_api_key}&redirect_uri=${redirect_uri}&response_type=code`; - - const signUpKakaoHandler = () => { - window.location.href = kakaoURL; - }; + // const signUpKakaoHandler = () => { + // window.location.href = kakaoURL; + // }; return ( @@ -32,9 +27,9 @@ const LoginFunnel = () => { flexDir={"column"} gap={"20px"} > - signUpKakaoHandler()} cursor={"pointer"}> + {/* signUpKakaoHandler()} cursor={"pointer"}> - + */} { return ( <> - + { 을 추천 받자! - - - - - 나.. 오늘 얼마나 먹었더라? -
안 찌려면 얼마만큼 운동해야하지? -
-
- 식선생 - - { - setFunnel("login"); - }} + + + + 나.. 오늘 얼마나 먹었더라? +
안 찌려면 얼마만큼 운동해야하지? +
+
+ 식선생 +
+ - 다음으로 -
-
+ { + setFunnel("login"); + }} + > + 다음으로 + + + ); }; diff --git a/component/template/MyPageTemplate.tsx b/component/template/MyPageTemplate.tsx index 9884697..fd8cc8a 100644 --- a/component/template/MyPageTemplate.tsx +++ b/component/template/MyPageTemplate.tsx @@ -12,15 +12,6 @@ const MyPageTemplate = () => { const router = useRouter(); const [userData, setUserData] = useState(); - useEffect(() => { - let userInfo = localStorage.getItem("userInfo"); - if (userInfo !== null) { - const userParsing: UserInfoType = JSON.parse(userInfo); - console.log(userParsing); - setUserData(userParsing); - } - }, [setUserData]); - return ( <> { h={"100vh"} pos={"relative"} maxW={"390px"} + minH={"844px"} padding={"60px 22px 0px 22px"} margin={"0 auto"} alignItems={"center"} diff --git a/component/template/SignupTemplate.tsx b/component/template/SignupTemplate.tsx index 91a18b4..f110eaa 100644 --- a/component/template/SignupTemplate.tsx +++ b/component/template/SignupTemplate.tsx @@ -17,7 +17,7 @@ export interface UserInfoType { targetweight: number; } -const SignupTemplate = ({ jwtToken }: { jwtToken: JwtToken }) => { +const SignupTemplate = ({ jwtToken }: { jwtToken?: JwtToken }) => { const [progress, setProgress] = useState(33.3); const [userInfo, setUserInfo] = useState({ name: "", @@ -29,12 +29,6 @@ const SignupTemplate = ({ jwtToken }: { jwtToken: JwtToken }) => { }); const { funnel, setFunnel } = useFunnel("userAgreement"); - useEffect(() => { - if (jwtToken) { - localStorage.setItem("jwt", jwtToken.jwt); - } - }, [jwtToken]); - return ( <> { h={"100vh"} pos={"relative"} maxW={"390px"} + minH={"844px"} padding={"60px 22px 0px 22px"} margin={"0 auto"} alignItems={"center"} diff --git a/src/app/main/page.tsx b/src/app/main/page.tsx index 525e7a4..f292d65 100644 --- a/src/app/main/page.tsx +++ b/src/app/main/page.tsx @@ -30,12 +30,6 @@ const Page = () => { reset, } = useForm(); - useEffect(() => { - const jwt = localStorage.getItem("jwt"); - const userInfo = localStorage.getItem("userInfo"); - if (!jwt && !userInfo) return redirect("/"); - }, []); - const onSubmit: SubmitHandler = async (data) => { reset(); await postUserDietMutation(data.msg); @@ -53,6 +47,7 @@ const Page = () => { margin={"0 auto"} bgColor={"#2B2C2C"} alignItems={"center"} + minH={"844px"} > diff --git a/src/app/signup/page.tsx b/src/app/signup/page.tsx index 3c4b433..8f5efa5 100644 --- a/src/app/signup/page.tsx +++ b/src/app/signup/page.tsx @@ -13,14 +13,14 @@ const Page = async ({ }: { searchParams: { code: string; error: string }; }) => { - const kakaoCode = searchParams.code; + // const kakaoCode = searchParams.code; - const errorCode = searchParams.error; - if (errorCode) return redirect("/"); + // const errorCode = searchParams.error; + // if (errorCode) return redirect("/"); - const jwtToken: JwtToken = await postKakaoCode(kakaoCode); + // const jwtToken: JwtToken = await postKakaoCode(kakaoCode); - return ; + return ; }; export default Page;