From 6079301ec45c6c13a1f8b5f9f6acf52b5a449331 Mon Sep 17 00:00:00 2001 From: Shpuld Shpuldson Date: Thu, 16 Jul 2020 17:42:16 +0300 Subject: [PATCH 1/4] Move user list from reactions to its own component, make favs and rts use it --- .../emoji_reactions/emoji_reactions.js | 4 +- .../emoji_reactions/emoji_reactions.vue | 65 +--------------- src/components/status/status.js | 30 ++++---- src/components/status/status.vue | 35 ++++++--- .../user_list_popover/user_list_popover.js | 13 ++++ .../user_list_popover/user_list_popover.vue | 74 +++++++++++++++++++ 6 files changed, 131 insertions(+), 90 deletions(-) create mode 100644 src/components/user_list_popover/user_list_popover.js create mode 100644 src/components/user_list_popover/user_list_popover.vue diff --git a/src/components/emoji_reactions/emoji_reactions.js b/src/components/emoji_reactions/emoji_reactions.js index ae7f53be..bb11b840 100644 --- a/src/components/emoji_reactions/emoji_reactions.js +++ b/src/components/emoji_reactions/emoji_reactions.js @@ -1,5 +1,5 @@ import UserAvatar from '../user_avatar/user_avatar.vue' -import Popover from '../popover/popover.vue' +import UserListPopover from '../user_list_popover/user_list_popover.vue' const EMOJI_REACTION_COUNT_CUTOFF = 12 @@ -7,7 +7,7 @@ const EmojiReactions = { name: 'EmojiReactions', components: { UserAvatar, - Popover + UserListPopover }, props: ['status'], data: () => ({ diff --git a/src/components/emoji_reactions/emoji_reactions.vue b/src/components/emoji_reactions/emoji_reactions.vue index bac4c605..2f14b5b2 100644 --- a/src/components/emoji_reactions/emoji_reactions.vue +++ b/src/components/emoji_reactions/emoji_reactions.vue @@ -1,44 +1,11 @@
-
+
- + - {{ user.screen_name }} + {{ user.screen_name }}
@@ -45,29 +42,29 @@