menu수정

client/src/Components/Menu.js

@@ -12,15 +12,20 @@ function Menu() {
   return (
     <Navbar bg="dark" variant="dark">
       <Navbar.Brand href="/home">YDK Messenger</Navbar.Brand>
-      <div className='ml-1 mr-2' style={{ color: 'white' }}>{name} 님 환영합니다</div>
-      <Nav className="mr-auto">
-        <Nav.Link href="/home">Home</Nav.Link>
-        <Nav.Link href="/profile">Profile</Nav.Link>
-        <Nav.Link href="/hello">Hello</Nav.Link>
-      </Nav>
-      <Link to="./login">
-        <Button onClick={() => handleLogout()} variant="light" className="ml-3">Logout</Button>
-      </Link>
+      {name ?
+        <>
+          <div className='ml-1 mr-2' style={{ color: 'white' }}>{name} 님 환영합니다</div>
+          <Nav className="mr-auto">
+            <Nav.Link href="/home">Home</Nav.Link>
+            <Nav.Link href="/profile">Profile</Nav.Link>
+            <Nav.Link href="/hello">Hello</Nav.Link>
+          </Nav>
+          <Button className="ml-auto" onClick={() => handleLogout()} variant="light" className="ml-3">Logout</Button>
+        </>
+        : <Nav className="ml-auto">
+          <Nav.Link href='/login'>로그인</Nav.Link>
+          <Nav.Link href='/signup'>회원가입</Nav.Link>
+        </Nav>}
     </Navbar>
   )
 }

client/src/Pages/LogInPage.js

@@ -55,9 +55,7 @@ function LogIn() {
 
     return (
         <>
-            <Navbar bg="dark" variant="dark">
-                <Navbar.Brand>YDK Messenger</Navbar.Brand>
-            </Navbar>
+            <Menu />
             <Form onSubmit={handleSubmit} className='vh-100 flex-column align-items-center justify-content-center mt-2'>
                 <Container className="d-flex justify-content-center">
                     <div className="mt-5 p-5 shadow w-75">
@@ -99,10 +97,6 @@ function LogIn() {
                             block>
                             {loading && <Spinner as='span' animation='border' size='sm' role='status' aria-hidden='true' />} {' '} 로그인
                                 </Button>
-
-                        <Link to="./signup">
-                            <h6 type="button" className="text-right mt-2" style={{ cursor: 'pointer' }}>회원가입</h6>
-                        </Link>
                         {error && <Alert variant='danger'>
                             {error}
                         </Alert>}

client/src/Pages/SignUpPage.js

@@ -61,9 +61,7 @@ function SingUp() {
 
     return (
         <>
-            <Navbar bg="dark" variant="dark">
-                    <Navbar.Brand>YDK Messenger</Navbar.Brand>
-                </Navbar>
+            <Menu />
 
             <Form onSubmit={handleSubmit} className='vh-100 flex-column align-items-center justify-content-center mt-2'>
                 <Container className="d-flex justify-content-center">

client/src/utils/auth.js

@@ -10,7 +10,7 @@ export async function handleLogout() {
     sessionStorage.clear();
     await axios.get('/auth/logout')
     //login페이지로 이동
-    //window.location.href='/login'
+    window.location.href='/login'
 }
 
 export function isAuthenticated() {