diff --git a/client/src/Components/EnterRoom.js b/client/src/Components/EnterRoom.js index 5f9892540eee3f765be48d0abef02aefc17b6dc5..f84d55373455b16e038fbaf2a2dc39073af21a8a 100644 --- a/client/src/Components/EnterRoom.js +++ b/client/src/Components/EnterRoom.js @@ -13,17 +13,17 @@ function EnterRoom(props) { async function recordEntryLog() { const leaveInfo = { userId: userId, roomCode: enterCode, leaveTime: realTime } try { - const check = await axios.get('/room/entrylog', { params: leaveInfo }) - if (check.data) { //있으면 put으로 - await axios.put('/room/entrylog', leaveInfo) - } else { //없으면 post - await axios.post('/room/entrylog', leaveInfo) - } + const check = await axios.get('/room/entrylog', { params: leaveInfo }) + if (check.data) { //있으면 put으로 + await axios.put('/room/entrylog', leaveInfo) + } else { //없으면 post + await axios.post('/room/entrylog', leaveInfo) + } } catch (error) { - catchErrors(error, setError) + catchErrors(error, setError) } - - } + + } function handleChange(event) { const { name, value } = event.target @@ -57,6 +57,9 @@ function EnterRoom(props) { 참여 코드로 채팅 참가 + {error && + {error} + }
@@ -67,7 +70,7 @@ function EnterRoom(props) { - +
diff --git a/client/src/Pages/LogInPage.js b/client/src/Pages/LogInPage.js index b5ab0f10d886ad7fe602d2922ad165b762511fba..1304e08de7482698ec39957ec174f0c50fee2aff 100644 --- a/client/src/Pages/LogInPage.js +++ b/client/src/Pages/LogInPage.js @@ -54,9 +54,9 @@ function LogIn() { return ( <> -
- -
+ +
+

로그인

이메일 @@ -85,7 +85,6 @@ function LogIn() { 필수 정보입니다! 비밀번호를 입력해주세요! -
- +
); diff --git a/client/src/Pages/SignUpPage.js b/client/src/Pages/SignUpPage.js index b368da0c596797f169c2550a16ee3647f3d9522e..9c00185679e61ff64553ec842d51b45638e75b1d 100644 --- a/client/src/Pages/SignUpPage.js +++ b/client/src/Pages/SignUpPage.js @@ -1,6 +1,6 @@ import React, { useState, useEffect } from 'react'; import axios from 'axios' -import { Button, Form, Container, Alert, Spinner} from 'react-bootstrap'; +import { Button, Form, Container, Alert, Spinner } from 'react-bootstrap'; import catchErrors from '../utils/catchErrors'; import { Redirect } from 'react-router-dom'; import Menu from '../Components/Menu'; @@ -17,7 +17,7 @@ function SingUp() { const [user, setUser] = useState(INIT_USER) const [error, setError] = useState('') const [disabled, setDisabled] = useState(true) - const [success, setSuccess] = useState(false) + const [success, setSuccess] = useState(false) const [loading, setLoading] = useState(false) useEffect(() => { @@ -54,9 +54,9 @@ function SingUp() { return ( <> -
- -
+ +
+

회원가입

@@ -129,7 +129,7 @@ function SingUp() { {error} }
- +
) diff --git a/client/src/utils/auth.js b/client/src/utils/auth.js index 8caacf753106e93db7ed4651cecf679373b229f7..9797c66e2e14376be7c4f6bf44abc76ba1634365 100644 --- a/client/src/utils/auth.js +++ b/client/src/utils/auth.js @@ -7,10 +7,9 @@ export function handleLogin(data) { } export async function handleLogout() { + alert('로그아웃 되었습니다') sessionStorage.clear(); await axios.get('/auth/logout') - //login페이지로 이동 - // window.location.href='/login' } export function isAuthenticated() {