Skip to content

Commit eaed24a

Browse files
committed
(clean) code prettier
1 parent ab802d0 commit eaed24a

File tree

3 files changed

+35
-37
lines changed

3 files changed

+35
-37
lines changed

src/ChatWindow/Message.vue

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,11 @@
125125
<span>{{ message.timestamp }}</span>
126126
<span v-if="isCheckmarkVisible">
127127
<svg-icon
128-
:name="message.distributed ? 'double-checkmark' : 'checkmark'"
129-
:param="message.seen ? 'seen' : ''"
130-
class="icon-check"
131-
></svg-icon>
132-
</span>
128+
:name="message.distributed ? 'double-checkmark' : 'checkmark'"
129+
:param="message.seen ? 'seen' : ''"
130+
class="icon-check"
131+
></svg-icon>
132+
</span>
133133
</div>
134134

135135
<div
@@ -340,16 +340,12 @@ export default {
340340
)
341341
},
342342
isCheckmarkVisible() {
343-
return (
344-
this.message.sender_id === this.currentUserId &&
345-
!this.message.deleted &&
346-
(
347-
this.message.saved ||
348-
this.message.distributed ||
349-
this.message.seen
350-
)
351-
)
352-
},
343+
return (
344+
this.message.sender_id === this.currentUserId &&
345+
!this.message.deleted &&
346+
(this.message.saved || this.message.distributed || this.message.seen)
347+
)
348+
},
353349
replyUsername() {
354350
const { sender_id } = this.message.replyMessage
355351
const replyUser = this.roomUsers.find(user => user._id === sender_id)

src/ChatWindow/RoomsList.vue

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,14 @@
6161
>
6262
<span v-if="isMessageCheckmarkVisible(room)">
6363
<svg-icon
64-
:name="room.lastMessage.distributed ? 'double-checkmark' : 'checkmark'"
65-
:param="room.lastMessage.seen ? 'seen' : ''"
66-
class="icon-check"
67-
></svg-icon>
64+
:name="
65+
room.lastMessage.distributed
66+
? 'double-checkmark'
67+
: 'checkmark'
68+
"
69+
:param="room.lastMessage.seen ? 'seen' : ''"
70+
class="icon-check"
71+
></svg-icon>
6872
</span>
6973
<format-message
7074
v-if="room.lastMessage"
@@ -163,25 +167,23 @@ export default {
163167
user => user._id === room.lastMessage.sender_id
164168
)
165169
166-
if (room.lastMessage.username) {
167-
return `${room.lastMessage.username} - ${content}`
168-
} else if (!user || user._id === this.currentUserId) {
169-
return content
170-
}
170+
if (room.lastMessage.username) {
171+
return `${room.lastMessage.username} - ${content}`
172+
} else if (!user || user._id === this.currentUserId) {
173+
return content
174+
}
171175
172176
return `${user.username} - ${content}`
173177
},
174-
isMessageCheckmarkVisible(room) {
175-
return (
176-
room.lastMessage &&
177-
room.lastMessage.sender_id === this.currentUserId &&
178-
(
179-
room.lastMessage.saved ||
180-
room.lastMessage.distributed ||
181-
room.lastMessage.seen
182-
)
183-
)
184-
}
178+
isMessageCheckmarkVisible(room) {
179+
return (
180+
room.lastMessage &&
181+
room.lastMessage.sender_id === this.currentUserId &&
182+
(room.lastMessage.saved ||
183+
room.lastMessage.distributed ||
184+
room.lastMessage.seen)
185+
)
186+
}
185187
}
186188
}
187189
</script>

src/ChatWindow/SvgIcon.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ export default {
8989
name: 'checkmark',
9090
path: 'M21,7L9,19L3.5,13.5L4.91,12.09L9,16.17L19.59,5.59L21,7Z'
9191
},
92-
{
92+
{
9393
name: 'double-checkmark',
9494
path:
95-
'M18 7l-1.41-1.41-6.34 6.34 1.41 1.41L18 7zm4.24-1.41L11.66 16.17 7.48 12l-1.41 1.41L11.66 19l12-12-1.42-1.41zM.41 13.41L6 19l1.41-1.41L1.83 12 .41 13.41z'
95+
'M18 7l-1.41-1.41-6.34 6.34 1.41 1.41L18 7zm4.24-1.41L11.66 16.17 7.48 12l-1.41 1.41L11.66 19l12-12-1.42-1.41zM.41 13.41L6 19l1.41-1.41L1.83 12 .41 13.41z'
9696
},
9797
{
9898
name: 'eye',

0 commit comments

Comments
 (0)