Skip to content

Commit

Permalink
[Client] / fix: chat leck clear
Browse files Browse the repository at this point in the history
  • Loading branch information
yoon-jisung committed May 6, 2021
1 parent 0501fb9 commit 05f1ad7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 39 deletions.
48 changes: 11 additions & 37 deletions src/GamePages/InGame.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,10 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
SetIsOpen(false);
};

// const onMessageSubmit = (e) => {
// const { name, message } = state;
// socket.current.emit('message', { name, message });
// e.preventDefault();
// setState({ message: '', name });
// };

const onMessageSubmit = (e) => {
e.preventDefault();
const { name, message } = state;
socket.emit('send message', name, message);
// socket.emit('send message', name, message);

setState({ message: '', name });
};
Expand All @@ -113,8 +105,6 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
};

const startRound = () => {
// setIsPresenter(false);
// setPresenter({ nickname: '', id: '' });
setWinner([]);
setAnswer('');
setIsPresenter(false);
Expand All @@ -127,19 +117,8 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
socket.emit('set answer', { answer });
};

// const endRound = () => {
// socket.emit('end round');
// };

//! --------------------------method--------------------------

// useEffect(() => {
// socket.on('message', ({ name, message }) => {
// setChat([...chat, { name, message }]);
// });
// console.log('채팅이야!!!!!', chat);
// }, [chat]);

useEffect(() => {
// * 문제가 선택되면 게임스타트와 문제를 서버에 보내줌
SetAnswer(answer);
Expand Down Expand Up @@ -169,16 +148,22 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
setWinner([...winner, name]);
});

socket.on('show chat', (name, message) => {
console.log('너니 ?????', message);
setChat(chat.concat([{ name, message }]));
});

socket.on('renew userlist', (list) => {
console.log('d우ㅠ저소ㅓ켓');
setUserlist([...list]);
});
}, []);

useEffect(() => {
socket.on('show chat', (name, message) => {
if (chat.length > 10) {
setChat([...chat.slice(1), { name, message }]);
} else {
setChat([...chat, { name, message }]);
}
});
}, [state]);

useEffect(() => {
// * 사용자 정보 소켓으로 불러 오기

Expand All @@ -189,17 +174,6 @@ export default function InGame({ accessToken, isLogIn, loginCheck, userInfo }) {
console.log('userlist', userlist);
}, []);

// useEffect(() => {
// // * 결과창이 열리고 서버에 라운드가 종료메세지 보냄 , 일정 시간이 지나면 결과창 닫히고 다시 게임 시작
// const closeResult = setTimeout(() => {
// setResultPopup(false);
// setChat([]);
// if (presenter.id === userInfo.id) {
// startRound();
// }
// }, 3000);
// }, [resultPopup]);

return (
<>
<div className="justBox"></div>
Expand Down
1 change: 1 addition & 0 deletions src/GamePages/components/Chat.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default function Chat({ chat, onMessageSubmit, onTextChange, state }) {
<div className="card">
<div className="render-chat">
<h1>Chat Log</h1>

{chat.map(({ name, message }, index) => {
return (
<div key={index}>
Expand Down
5 changes: 3 additions & 2 deletions src/GamePages/components/User.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import UserPic from '../../images/Character1.png';

export default function User({ users, userInfo }) {
console.log('유저!!', users);
return (
<div className="UserTable">
<ul className="users">
Expand All @@ -10,7 +11,7 @@ export default function User({ users, userInfo }) {
<div className="inGameUserNickName">{el.nickname}</div>
</li>;
})}
<li className="inGameUserProfile">
{/* <li className="inGameUserProfile">
<img className="inGameImg" src={UserPic} alt="user_profile" />
<div>
<div className="inGameUserNickName">
Expand All @@ -30,7 +31,7 @@ export default function User({ users, userInfo }) {
<li className="inGameUserProfile">
<img className="inGameImg" src={UserPic} alt="user_profile" />
<div className="inGameUserNickName">닉네임 : {userInfo.nickname}</div>
</li>
</li> */}
</ul>
</div>
);
Expand Down

0 comments on commit 05f1ad7

Please sign in to comment.