|
72 | 72 | :class="{ |
73 | 73 | 'pr-12': $vuetify.breakpoint.mdAndDown && !isMT(message), |
74 | 74 | '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), |
75 | 77 | }" |
76 | 78 | > |
77 | 79 | <v-spacer v-if="isMT(message)"></v-spacer> |
|
88 | 90 | :color="isMT(message) ? 'primary' : 'default'" |
89 | 91 | > |
90 | 92 | <v-card-text |
91 | | - class="text--primary" |
| 93 | + class="text--primary text-break" |
92 | 94 | style="white-space: pre-line" |
93 | 95 | >{{ message.content }}</v-card-text |
94 | 96 | > |
|
102 | 104 | <template #activator="{ on, attrs }"> |
103 | 105 | <div v-bind="attrs" v-on="on"> |
104 | 106 | <v-icon |
105 | | - v-if="isExpired(message)" |
| 107 | + v-if="message.status === 'expired'" |
106 | 108 | color="warning" |
107 | 109 | class="mt-n2" |
108 | 110 | >mdi-alert</v-icon |
|
138 | 140 | </div> |
139 | 141 | </template> |
140 | 142 | <span> |
141 | | - {{ isExpired(message) ? 'expired' : message.status }} |
| 143 | + {{ message.status }} |
142 | 144 | </span> |
143 | 145 | </v-tooltip> |
144 | 146 | </div> |
@@ -246,14 +248,6 @@ export default Vue.extend({ |
246 | 248 | return ['sending', 'pending'].includes(message.status) |
247 | 249 | }, |
248 | 250 |
|
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 | | -
|
257 | 251 | async loadData() { |
258 | 252 | await this.$store.dispatch('loadPhones') |
259 | 253 | await this.$store.dispatch('loadThreads') |
@@ -331,13 +325,29 @@ export default Vue.extend({ |
331 | 325 | <style lang="scss"> |
332 | 326 | .messages-body { |
333 | 327 | padding-top: 50px; |
334 | | - width: 96%; |
| 328 | + padding-right: 20px; |
335 | 329 | max-height: calc(100vh - 200px); |
336 | | - max-width: 1761px; |
337 | 330 | position: absolute; |
| 331 | + width: 100%; |
338 | 332 | bottom: 120px; |
339 | 333 | } |
340 | 334 |
|
| 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 | +
|
341 | 351 | .no-scrollbar, |
342 | 352 | .no-scrollbar textarea { |
343 | 353 | overflow-x: hidden; |
|
0 commit comments