Skip to content

Commit 31c3bd2

Browse files
rlcz1woou4578
andauthored
refactor: side bar login modal (#466)
* refactor: side bar login modal * refactor: move to main page every time when logout --------- Co-authored-by: SeoJeongchan <wjdcks822@gmail.com>
1 parent ae096db commit 31c3bd2

File tree

1 file changed

+13
-4
lines changed

1 file changed

+13
-4
lines changed

frontend/src/components/SideBar.js

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, { useRef, useEffect, useState } from 'react';
2+
import LoginModal from './LoginModal';
23
import styled from "@emotion/styled";
3-
import { Link } from "react-router-dom";
4+
import { Link, useNavigate } from "react-router-dom";
45
import { useSelector, useDispatch } from "react-redux";
56
import { logout } from "../redux/slice/UserSlice";
67
import { showToast } from '../redux/slice/ToastSlice';
@@ -126,6 +127,9 @@ const SideBar = ({isOpen, setIsOpen}) => {
126127
const nickname = user.nickname;
127128
const loginState = user.loginState;
128129
const [cookies, setCookie, removeCookie] = useCookies(['refreshToken']);
130+
const [isLoginModalOpen, setIsLoginModalOpen] = useState(false);
131+
const navigator = useNavigate();
132+
129133
const toggleMenu = () => {
130134
setIsOpen(false);
131135
};
@@ -192,6 +196,7 @@ const SideBar = ({isOpen, setIsOpen}) => {
192196
if (window.confirm("로그아웃 하시겠습니까?") === false) return;
193197
removeCookie('refreshToken', { path: '/' });
194198
dispatch(logout());
199+
navigator("/");
195200
dispatch(showToast({ contents: "login", toastIndex: 4 }));
196201
setTimeout(() => {
197202
window.location.reload();
@@ -202,17 +207,17 @@ const SideBar = ({isOpen, setIsOpen}) => {
202207
</div>
203208
</Title>
204209
) :(
205-
<Link to="/login-page" onClick={toggleMenu} style={{display: "block"}}>
210+
<button onClick={() => setIsLoginModalOpen(true)} style={{display: "block", width: "100%", padding: 0}}>
206211
<Title>
207212
<div style={{height: "100%"}}>
208213
<span className="material-symbols-outlined" style={{fontSize:35, lineHeight: "50px", float: "left"}}>account_circle</span>
209214
<AccountWrap>
210215
<span style={{marginLeft: 5, float: "left", fontSize: 16, lineHeight: "50px"}}>로그인&nbsp;</span>
211-
<span className="material-symbols-outlined" style={{float: "right", lineHeight: "50px", fontSize: 18}}>arrow_forward_ios</span>
216+
{/* <span className="material-symbols-outlined" style={{float: "right", lineHeight: "50px", fontSize: 18}}>arrow_forward_ios</span> */}
212217
</AccountWrap>
213218
</div>
214219
</Title>
215-
</Link>
220+
</button>
216221
)
217222
}
218223

@@ -272,6 +277,10 @@ const SideBar = ({isOpen, setIsOpen}) => {
272277
</VisitorBadge>
273278
</div>
274279
</SideBarWrap>
280+
<LoginModal
281+
visible={isLoginModalOpen}
282+
onClose={() => setIsLoginModalOpen(false)}
283+
/>
275284
</>
276285
);
277286
}

0 commit comments

Comments
 (0)