Skip to content

Commit 84b3ad3

Browse files
authored
Merge pull request #134 from KakaoTech-BootCamp-Team-2/dev
fix:채팅방 수정 최종
2 parents bb5ecef + 2a541c4 commit 84b3ad3

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

src/pages/chat/ChatMessage.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import * as chat from './styled/ChatMessage.styled.js';
3-
import profileimg from '../../assets/images/peoplelogo.png';
3+
import profileimg from '../../assets/dummyImages/peoplelist3.png';
44

55
function ChatMessage({ name, message, time, isCurrentUser }) {
66
return (

src/pages/chat/ChatRoom.jsx

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ const ChatRoom = (props) => {
1010
const { uuid, name } = props;
1111
const [messages, setMessages] = useState([]);
1212
const [message, setMessage] = useState("");
13-
const currentUsername = '홍창기'; // 현재 사용자 설정
13+
const currentUsername = localStorage.getItem('username'); // 현재 사용자 설정
1414
const roomId = uuid;
1515
const [stompClient, setStompClient] = useState(null); // STOMP 클라이언트 객체 저장
1616

@@ -88,24 +88,11 @@ const ChatRoom = (props) => {
8888
message: message,
8989
};
9090

91-
// 서버로 메시지 발행 (전송)
9291
stompClient.send("/pub/messages", {}, JSON.stringify(chatMessage));
9392

94-
// 클라이언트에서 즉시 메시지 추가
95-
setMessages((prevMessages) => [
96-
...prevMessages,
97-
{
98-
id: Date.now(),
99-
username: chatMessage.username,
100-
message: chatMessage.message,
101-
time: new Date().toLocaleTimeString(),
102-
isCurrentUser: true,
103-
},
104-
]);
105-
10693
console.log("전송된 메시지:", chatMessage);
10794

108-
setMessage(""); // 입력창 초기화
95+
setMessage("");
10996
};
11097

11198
return (

src/pages/chat/styled/ChatMessage.styled.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export const lineTotalWrapper = styled.div`
88
flex-direction: row;
99
margin-top: 6px;
1010
margin-left: 15px;
11-
background-color: yellow;
11+
1212
`;
1313
export const lineTotalWrapper2 = styled.div`
1414
height: auto;

0 commit comments

Comments
 (0)