From aa2cf51c05ebdf411d74af5debbbc8fa4d3cf457 Mon Sep 17 00:00:00 2001 From: eugenijm Date: Thu, 7 May 2020 16:10:53 +0300 Subject: Add Chats --- src/i18n/en.json | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) (limited to 'src/i18n') diff --git a/src/i18n/en.json b/src/i18n/en.json index 72c3b1f7..c9a34556 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -44,6 +44,7 @@ }, "features_panel": { "chat": "Chat", + "pleroma_chat_messages": "Pleroma Chat", "gopher": "Gopher", "media_proxy": "Media proxy", "scope_options": "Scope options", @@ -124,7 +125,8 @@ "user_search": "User Search", "search": "Search", "who_to_follow": "Who to follow", - "preferences": "Preferences" + "preferences": "Preferences", + "chats": "Chats" }, "notifications": { "broken_favorite": "Unknown status, searching for it…", @@ -287,6 +289,7 @@ "change_password": "Change Password", "change_password_error": "There was an issue changing your password.", "changed_password": "Password changed successfully!", + "chatMessageRadius": "Chat message", "collapse_subject": "Collapse posts with subjects", "composing": "Composing", "confirm_new_password": "Confirm new password", @@ -518,7 +521,12 @@ "selectedMenu": "Selected menu item", "disabled": "Disabled", "toggled": "Toggled", - "tabs": "Tabs" + "tabs": "Tabs", + "chat": { + "incoming": "Incoming", + "outgoing": "Outgoing", + "border": "Border" + } }, "radii": { "_tab_label": "Roundness" @@ -677,6 +685,7 @@ "its_you": "It's you!", "media": "Media", "mention": "Mention", + "message": "Message", "mute": "Mute", "muted": "Muted", "per_day": "per day", @@ -775,5 +784,25 @@ "password_reset_disabled": "Password reset is disabled. Please contact your instance administrator.", "password_reset_required": "You must reset your password to log in.", "password_reset_required_but_mailer_is_disabled": "You must reset your password, but password reset is disabled. Please contact your instance administrator." + }, + "chats": { + "message_user": "Message {nickname}", + "delete": "Delete", + "chats": "Chats", + "new": "New Chat", + "empty_message_error": "Cannot post empty message", + "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." + }, + "file_type": { + "audio": "Audio", + "video": "Video", + "image": "Image", + "file": "File" + }, + "display_date": { + "today": "Today" } } -- cgit v1.2.3-70-g09d2 From 18a1f5d62a72da45d62672043397a7471ab2c090 Mon Sep 17 00:00:00 2001 From: eugenijm Date: Tue, 7 Jul 2020 18:30:05 +0300 Subject: 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(-) (limited to 'src/i18n') 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 }) -- cgit v1.2.3-70-g09d2