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

Feat/#32 #33

Merged
merged 3 commits into from
Nov 27, 2023
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
8 changes: 3 additions & 5 deletions src/components/Register/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,13 @@ const RegisterPage = (props: {step: Step, setStep: Dispatch<React.SetStateAction

useEffect(() => {
const email = localStorage.getItem("email") ?? "";
setInfo({...info, email});

if (!email || email === "") {
alert("다시 로그인 해주세요");
window.location.href = "/";
}

setInfo({...info, email});
}, []);


Expand Down Expand Up @@ -88,9 +89,6 @@ const RegisterPage = (props: {step: Step, setStep: Dispatch<React.SetStateAction
cigarettePrice
});

localStorage.removeItem("email");
localStorage.removeItem("isRegister");

localStorage.setItem("accessToken", data.accessToken);
localStorage.setItem("refreshToken", data.refreshToken);

Expand All @@ -112,7 +110,7 @@ const RegisterPage = (props: {step: Step, setStep: Dispatch<React.SetStateAction
<>
<Container>
<Header>
<Link to="/onboarding"><LeftArrow src="/assets/register/left_arrow.svg"/></Link>
<Link to="/"><LeftArrow src="/assets/register/left_arrow.svg"/></Link>
<Register>회원가입</Register>
</Header>
<Title>{getData.title}</Title>
Expand Down
3 changes: 3 additions & 0 deletions src/pages/Home/Home.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const Home = () => {
const accessToken = localStorage.getItem("accessToken");
const refreshToken = localStorage.getItem("refreshToken");

localStorage.removeItem("email");
localStorage.removeItem("isRegister");

if (!(accessToken && refreshToken)) {
alert("로그아웃 되었습니다");
window.location.href = "/";
Expand Down
7 changes: 6 additions & 1 deletion src/pages/Onboarding/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, {useEffect} from 'react';
import Layout from "../../layout/Layout";
import Screen from "../../layout/Screen/Screen";
import styled from "styled-components";
Expand All @@ -14,6 +14,11 @@ const Onboarding = () => {
localStorage.setItem("isRegister", "false");
}

useEffect(() => {
localStorage.removeItem("email");
localStorage.removeItem("isRegister");
}, []);

return (
<>
<Layout>
Expand Down