From 18a1f5d62a72da45d62672043397a7471ab2c090 Mon Sep 17 00:00:00 2001 From: eugenijm Date: Tue, 7 Jul 2020 18:30:05 +0300 Subject: [PATCH] Add the empty chat list placeholder. Do not use full height when displaying the chat list. Remove an unsued chat action. --- src/components/chat_list/chat_list.vue | 27 +++++++++++++++++-- .../post_status_form/post_status_form.js | 2 +- src/i18n/en.json | 3 ++- src/modules/chats.js | 3 --- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/src/components/chat_list/chat_list.vue b/src/components/chat_list/chat_list.vue index e62f58e5..fa138f16 100644 --- a/src/components/chat_list/chat_list.vue +++ b/src/components/chat_list/chat_list.vue @@ -15,7 +15,10 @@
-
+
@@ -39,10 +48,24 @@ @import '../../_variables.scss'; .chat-list { - min-height: calc(100vh - 67px); + min-height: 25em; margin-bottom: 0; border-bottom-left-radius: 0; border-bottom-right-radius: 0; + + &::after { + border-bottom-left-radius: 0; + border-bottom-right-radius: 0; + } +} + +.emtpy-chat-list-alert { + padding: 3em; + font-size: 1.2em; + display: flex; + justify-content: center; + color: $fallback--text; + color: var(--faint, $fallback--text); } diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js index 9e7cce0f..b0d94555 100644 --- a/src/components/post_status_form/post_status_form.js +++ b/src/components/post_status_form/post_status_form.js @@ -192,7 +192,7 @@ const PostStatusForm = { this.newStatus.poll.error }, showPreview () { - return !!this.preview || this.previewLoading + return !this.disablePreview && (!!this.preview || this.previewLoading) }, emptyStatus () { return this.newStatus.status.trim() === '' && this.newStatus.files.length === 0 diff --git a/src/i18n/en.json b/src/i18n/en.json index c9a34556..5cc75460 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -794,7 +794,8 @@ "more": "More", "delete_confirm": "Do you really want to delete this message?", "error_loading_chat": "Something went wrong when loading the chat.", - "error_sending_message": "Something went wrong when sending the message." + "error_sending_message": "Something went wrong when sending the message.", + "empty_chat_list_placeholder": "You don't have any chats yet. Start a new chat!" }, "file_type": { "audio": "Audio", diff --git a/src/modules/chats.js b/src/modules/chats.js index f868ca0c..228d6256 100644 --- a/src/modules/chats.js +++ b/src/modules/chats.js @@ -83,9 +83,6 @@ const chats = { resetChatNewMessageCount ({ commit }, value) { commit('resetChatNewMessageCount', value) }, - removeFromCurrentChatStatuses ({ commit }, { id }) { - commit('removeFromCurrentChatStatuses', id) - }, clearCurrentChat ({ rootState, commit, dispatch }, value) { commit('setCurrentChatId', { chatId: undefined }) commit('setCurrentChatFetcher', { fetcher: undefined })