Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/components/ChatRoom.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ const ChatRoom = ({ roomId: propRoomId, onLeaveRoom, refreshRooms }) => {
userId: userData.id,
username: userData.username,
nickname: userData.nickname || userData.username,
avatarUrl: userData.avatarUrl, // 프로필 이미지 URL 추가
message: messageText,
sendAt: new Date().toISOString()
};
Expand Down Expand Up @@ -347,6 +348,7 @@ const ChatRoom = ({ roomId: propRoomId, onLeaveRoom, refreshRooms }) => {
chatMsgId: message.id || Date.now(),
userId: parseInt(message.userId),
nickname: message.nickname || message.from || '알 수 없는 사용자',
avatarUrl: message.avatarUrl, // avatarUrl 추가
message: message.message,
sendAt: message.sendAt || new Date().toISOString()
};
Expand Down Expand Up @@ -637,7 +639,15 @@ const ChatRoom = ({ roomId: propRoomId, onLeaveRoom, refreshRooms }) => {
className={`message ${msg.userId === userInfo.id ? 'sent' : 'received'} ${msg.failed ? 'failed' : ''}`}
>
<div className="avatar">
{/* 실제 사용자 아바타가 있으면 추가 */}
{msg.avatarUrl ? (
<img
src={msg.avatarUrl}
alt={msg.nickname}
className="user-avatar"
/>
) : (
<i className="fas fa-user"></i>
)}
</div>
<div className="content">
<div className="sender">{msg.nickname}</div>
Expand Down
11 changes: 11 additions & 0 deletions src/components/ChatStyles.css
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,17 @@
overflow: hidden;
}

.message .avatar img.user-avatar {
width: 100%;
height: 100%;
object-fit: cover;
}

.message .avatar i.fa-user {
font-size: 20px;
color: #fff;
}

.message.sent .avatar {
display: none;
}
Expand Down
1 change: 1 addition & 0 deletions src/services/WebSocketService.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ class WebSocketService {
userId: parseInt(userData.id), // userId를 숫자로 변환
nickname: userData.username,
from: userData.username,
avatarUrl: userData.avatarUrl, // 사용자 아바타 URL 추가
message: message,
sendAt: new Date().toISOString(),
isLocalMessage: true // 로컬에서 보낸 메시지 표시
Expand Down