Skip to content

Commit 3aafb48

Browse files
committed
Fix the message details page
1 parent a7da64a commit 3aafb48

1 file changed

Lines changed: 23 additions & 13 deletions

File tree

web/pages/threads/_id.vue

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
:class="{
7373
'pr-12': $vuetify.breakpoint.mdAndDown && !isMT(message),
7474
'pl-12 pr-5': $vuetify.breakpoint.mdAndDown && isMT(message),
75+
'pl-16 ml-16': $vuetify.breakpoint.lgAndUp && isMT(message),
76+
'pr-16 mr-16': $vuetify.breakpoint.lgAndUp && !isMT(message),
7577
}"
7678
>
7779
<v-spacer v-if="isMT(message)"></v-spacer>
@@ -88,7 +90,7 @@
8890
:color="isMT(message) ? 'primary' : 'default'"
8991
>
9092
<v-card-text
91-
class="text--primary"
93+
class="text--primary text-break"
9294
style="white-space: pre-line"
9395
>{{ message.content }}</v-card-text
9496
>
@@ -102,7 +104,7 @@
102104
<template #activator="{ on, attrs }">
103105
<div v-bind="attrs" v-on="on">
104106
<v-icon
105-
v-if="isExpired(message)"
107+
v-if="message.status === 'expired'"
106108
color="warning"
107109
class="mt-n2"
108110
>mdi-alert</v-icon
@@ -138,7 +140,7 @@
138140
</div>
139141
</template>
140142
<span>
141-
{{ isExpired(message) ? 'expired' : message.status }}
143+
{{ message.status }}
142144
</span>
143145
</v-tooltip>
144146
</div>
@@ -246,14 +248,6 @@ export default Vue.extend({
246248
return ['sending', 'pending'].includes(message.status)
247249
},
248250
249-
isExpired(message: Message): boolean {
250-
return (
251-
this.isPending(message) &&
252-
new Date().getTime() - new Date(message.created_at).getTime() >
253-
5 * 60 * 1000
254-
) // 5 minutes
255-
},
256-
257251
async loadData() {
258252
await this.$store.dispatch('loadPhones')
259253
await this.$store.dispatch('loadThreads')
@@ -331,13 +325,29 @@ export default Vue.extend({
331325
<style lang="scss">
332326
.messages-body {
333327
padding-top: 50px;
334-
width: 96%;
328+
padding-right: 20px;
335329
max-height: calc(100vh - 200px);
336-
max-width: 1761px;
337330
position: absolute;
331+
width: 100%;
338332
bottom: 120px;
339333
}
340334
335+
@media (min-width: 960px) {
336+
.messages-body {
337+
max-width: 900px;
338+
}
339+
}
340+
@media (min-width: 1264px) {
341+
.messages-body {
342+
max-width: 1185px;
343+
}
344+
}
345+
@media (min-width: 1904px) {
346+
.messages-body {
347+
max-width: 1785px;
348+
}
349+
}
350+
341351
.no-scrollbar,
342352
.no-scrollbar textarea {
343353
overflow-x: hidden;

0 commit comments

Comments
 (0)