Skip to content

Commit 88e6e11

Browse files
committed
(UI) prepend username to last message
1 parent 6a9a751 commit 88e6e11

File tree

2 files changed

+28
-9
lines changed

2 files changed

+28
-9
lines changed

demo/src/ChatContainer.vue

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,13 +277,16 @@ export default {
277277
if (message.deleted) content = 'This message was deleted'
278278
279279
return {
280-
content,
281-
timestamp,
282-
date: message.timestamp.seconds,
283-
seen: message.sender_id === this.currentUserId ? message.seen : null,
284-
new:
285-
message.sender_id !== this.currentUserId &&
286-
(!message.seen || !message.seen[this.currentUserId])
280+
...message,
281+
...{
282+
content,
283+
timestamp,
284+
date: message.timestamp.seconds,
285+
seen: message.sender_id === this.currentUserId ? message.seen : null,
286+
new:
287+
message.sender_id !== this.currentUserId &&
288+
(!message.seen || !message.seen[this.currentUserId])
289+
}
287290
}
288291
},
289292

src/ChatWindow/RoomsList.vue

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
></div>
5353
<div class="room-name text-ellipsis" v-html="room.roomName"></div>
5454
<div
55-
class="text-date"
5655
v-if="room.lastMessage"
56+
class="text-date"
5757
v-html="room.lastMessage.timestamp"
5858
></div>
5959
</div>
@@ -65,6 +65,7 @@
6565
<span v-if="room.lastMessage.seen">
6666
<svg-icon name="checkmark" class="icon-check" />
6767
</span>
68+
<span v-html="getLastUsername(room)"></span>
6869
<span v-html="room.lastMessage.content"></span>
6970
</div>
7071
</div>
@@ -131,6 +132,17 @@ export default {
131132
const user = room.users.find(u => u._id !== this.currentUserId)
132133
133134
if (user.status) return user.status.state
135+
},
136+
getLastUsername(room) {
137+
if (room.users.length <= 2) return
138+
139+
const user = this.room.users.find(
140+
user => user._id === this.room.lastMessage.sender_id
141+
)
142+
143+
if (user._id === this.currentUserId) return
144+
145+
return `${user.username} -&nbsp;`
134146
}
135147
}
136148
}
@@ -268,8 +280,12 @@ input {
268280
}
269281
270282
.text-last {
271-
color: var(--chat-room-color-message);
272283
font-size: 12px;
284+
color: var(--chat-room-color-message);
285+
286+
* {
287+
display: inline-block;
288+
}
273289
}
274290
275291
.message-new {

0 commit comments

Comments
 (0)