From ff259667023b8bb46bf8b122e4d1caaa6503274e Mon Sep 17 00:00:00 2001 From: Brenden Bice Date: Mon, 1 Apr 2019 22:30:23 -0400 Subject: display users in stacked avatarlist --- src/components/avatar_list/avatar_list.vue | 54 ++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/components/avatar_list/avatar_list.vue (limited to 'src/components/avatar_list/avatar_list.vue') diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue new file mode 100644 index 00000000..204ccb9a --- /dev/null +++ b/src/components/avatar_list/avatar_list.vue @@ -0,0 +1,54 @@ + + + + + -- cgit v1.2.3-70-g09d2 From 0d8eb1d00b9044398fccf0760329fb81887c9b18 Mon Sep 17 00:00:00 2001 From: Brenden Bice Date: Mon, 1 Apr 2019 22:38:56 -0400 Subject: set default avatar background --- src/components/avatar_list/avatar_list.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/components/avatar_list/avatar_list.vue') diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue index 204ccb9a..3241609c 100644 --- a/src/components/avatar_list/avatar_list.vue +++ b/src/components/avatar_list/avatar_list.vue @@ -28,6 +28,7 @@ height: 40px; width: 40px; line-height: 40px; + background-color: $main-background; } } } -- cgit v1.2.3-70-g09d2 From 44d07ceb25ab8902a4d67b156474e737d6541362 Mon Sep 17 00:00:00 2001 From: Brenden Bice Date: Tue, 2 Apr 2019 04:25:08 -0400 Subject: support mobile size screen --- src/components/avatar_list/avatar_list.vue | 20 ++++++++++++++++---- src/components/status/status.vue | 4 +++- 2 files changed, 19 insertions(+), 5 deletions(-) (limited to 'src/components/avatar_list/avatar_list.vue') diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue index 3241609c..56ca12a2 100644 --- a/src/components/avatar_list/avatar_list.vue +++ b/src/components/avatar_list/avatar_list.vue @@ -14,14 +14,26 @@ display: inline-flex; /* Causes LI items to display in row. */ list-style-type: none; margin: 0; - padding: 0px 16px 0px 0px; - flex-direction: row-reverse; + padding: 0px 20px 0px 0px; + flex-direction: row; + flex-wrap: wrap; &__item { height: 40px; margin: 0; padding: 0; - width: 25px; + width: 20px; + + &:nth-child( 1 ) { z-index: 10 ; } + &:nth-child( 2 ) { z-index: 9 ; } + &:nth-child( 3 ) { z-index: 8 ; } + &:nth-child( 4 ) { z-index: 7 ; } + &:nth-child( 5 ) { z-index: 6 ; } + &:nth-child( 6 ) { z-index: 5 ; } + &:nth-child( 7 ) { z-index: 4 ; } + &:nth-child( 8 ) { z-index: 3 ; } + &:nth-child( 9 ) { z-index: 2 ; } + &:nth-child( 10 ) { z-index: 1 ; } .avatars__img { border-radius: 50%; @@ -35,7 +47,7 @@ .transparent-avatar { .avatars__item { - &:first-child { + &:last-child { position: relative; .avatars__img { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index 6b8e0b3d..f67f849c 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -629,7 +629,9 @@ a.unmute { .favourited-users, .reblogged-users { - flex: 1; + flex-basis: 50%; + flex-grow: 1; + flex-shrink: 1; .title { margin: 0 0 10px 0; -- cgit v1.2.3-70-g09d2 From 4ab2ddb03cdd3740eb18d8c7d85de80e176db29f Mon Sep 17 00:00:00 2001 From: Brenden Bice Date: Tue, 2 Apr 2019 11:04:39 -0400 Subject: improve code quality --- src/components/avatar_list/avatar_list.vue | 4 ++-- src/components/conversation/conversation.js | 16 ++-------------- src/modules/statuses.js | 8 ++++---- 3 files changed, 8 insertions(+), 20 deletions(-) (limited to 'src/components/avatar_list/avatar_list.vue') diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue index 56ca12a2..a3bed515 100644 --- a/src/components/avatar_list/avatar_list.vue +++ b/src/components/avatar_list/avatar_list.vue @@ -1,7 +1,7 @@ diff --git a/src/components/conversation/conversation.js b/src/components/conversation/conversation.js index 18635aa1..851d30e9 100644 --- a/src/components/conversation/conversation.js +++ b/src/components/conversation/conversation.js @@ -153,22 +153,10 @@ const conversation = { } }, fetchFavouritedByUsers (id) { - this.$store.state.api.backendInteractor.fetchFavouritedByUsers({id}).then((response) => { - const favoritedByUsers = response.map(item => ({ - src: item.avatar_static, - name: item.display_name - })) - this.$store.dispatch('addFavoritedByUsers', { favoritedByUsers, id }) - }) + this.$store.dispatch('fetchFavouritedByUsers', { id }) }, fetchRebloggedByUsers (id) { - this.$store.state.api.backendInteractor.fetchRebloggedByUsers({id}).then((response) => { - const rebloggedByUsers = response.map(item => ({ - src: item.avatar_static, - name: item.display_name - })) - this.$store.dispatch('addRebloggedByUsers', { rebloggedByUsers, id }) - }) + this.$store.dispatch('fetchRebloggedByUsers', { id }) } } } diff --git a/src/modules/statuses.js b/src/modules/statuses.js index c749e60f..2cfc3ff1 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -537,11 +537,11 @@ const statuses = { credentials: rootState.users.currentUser.credentials }) }, - addFavoritedByUsers ({ rootState, commit }, { favoritedByUsers, id }) { - commit('addFavoritedByUsers', { favoritedByUsers, id }) + fetchFavouritedByUsers ({ rootState, commit }, { id }) { + rootState.api.backendInteractor.fetchFavouritedByUsers({id}).then((favoritedByUsers) => commit('addFavoritedByUsers', { favoritedByUsers, id })) }, - addRebloggedByUsers ({ rootState, commit }, { rebloggedByUsers, id }) { - commit('addRebloggedByUsers', { rebloggedByUsers, id }) + fetchRebloggedByUsers ({ rootState, commit }, { id }) { + rootState.api.backendInteractor.fetchRebloggedByUsers({id}).then((rebloggedByUsers) => commit('addRebloggedByUsers', { rebloggedByUsers, id })) } }, mutations -- cgit v1.2.3-70-g09d2 From 6511166631aa752faff02568802362155918e804 Mon Sep 17 00:00:00 2001 From: Brenden Bice Date: Tue, 2 Apr 2019 12:02:40 -0400 Subject: display favs & favorited user in one line --- src/components/avatar_list/avatar_list.vue | 42 +++++++++++------------------- src/components/status/status.js | 10 +++---- src/components/status/status.vue | 29 ++++----------------- 3 files changed, 25 insertions(+), 56 deletions(-) (limited to 'src/components/avatar_list/avatar_list.vue') diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue index a3bed515..fd6d8336 100644 --- a/src/components/avatar_list/avatar_list.vue +++ b/src/components/avatar_list/avatar_list.vue @@ -1,7 +1,7 @@ @@ -14,43 +14,31 @@ display: inline-flex; /* Causes LI items to display in row. */ list-style-type: none; margin: 0; - padding: 0px 20px 0px 0px; - flex-direction: row; - flex-wrap: wrap; + padding: 0px 15px 0px 0px; + flex-direction: row-reverse; - &__item { - height: 40px; + &-item { + height: 30px; margin: 0; padding: 0; - width: 20px; + width: 15px; - &:nth-child( 1 ) { z-index: 10 ; } - &:nth-child( 2 ) { z-index: 9 ; } - &:nth-child( 3 ) { z-index: 8 ; } - &:nth-child( 4 ) { z-index: 7 ; } - &:nth-child( 5 ) { z-index: 6 ; } - &:nth-child( 6 ) { z-index: 5 ; } - &:nth-child( 7 ) { z-index: 4 ; } - &:nth-child( 8 ) { z-index: 3 ; } - &:nth-child( 9 ) { z-index: 2 ; } - &:nth-child( 10 ) { z-index: 1 ; } - - .avatars__img { + .avatars-img { border-radius: 50%; - height: 40px; - width: 40px; - line-height: 40px; + height: 30px; + width: 30px; + line-height: 30px; background-color: $main-background; } } } .transparent-avatar { - .avatars__item { - &:last-child { + .avatars-item { + &:first-child { position: relative; - .avatars__img { + .avatars-img { &::after { content: ''; position: absolute; diff --git a/src/components/status/status.js b/src/components/status/status.js index eda96373..b275d4fa 100644 --- a/src/components/status/status.js +++ b/src/components/status/status.js @@ -259,11 +259,11 @@ const Status = { } return this.status.summary_html + '
' + this.status.statusnet_html }, - favouritedByUsers () { - return this.statusoid.favoritedBy ? this.statusoid.favoritedBy : [] - }, - rebloggedByUsers () { - return this.statusoid.rebloggedBy ? this.statusoid.rebloggedBy : [] + combinedFavsAndRepeatsAvatars () { + return [].concat( + this.statusoid.favoritedBy ? this.statusoid.favoritedBy : [], + this.statusoid.rebloggedBy ? this.statusoid.rebloggedBy : [] + ) } }, components: { diff --git a/src/components/status/status.vue b/src/components/status/status.vue index f67f849c..ce4b2554 100644 --- a/src/components/status/status.vue +++ b/src/components/status/status.vue @@ -133,6 +133,10 @@ +
+ +
+
@@ -142,16 +146,6 @@
-
-
-

Boosted By {{rebloggedByUsers.length}}:

- -
-
-

Favourited By {{favouritedByUsers.length}}:

- -
-
@@ -622,21 +616,8 @@ a.unmute { } } -.boosted-users { - display: flex; - justify-content: space-between; +.favs-favourited-users { margin-top: 10px; - - .favourited-users, - .reblogged-users { - flex-basis: 50%; - flex-grow: 1; - flex-shrink: 1; - - .title { - margin: 0 0 10px 0; - } - } } @media all and (max-width: 800px) { -- cgit v1.2.3-70-g09d2 From 8a2f55644c56cdedf27c5bdb8bd54c642fadbe4d Mon Sep 17 00:00:00 2001 From: Brenden Bice Date: Tue, 2 Apr 2019 16:00:09 -0400 Subject: improve code quality --- src/components/avatar_list/avatar_list.vue | 35 ++++++----------------------- src/components/conversation/conversation.js | 10 ++------- 2 files changed, 9 insertions(+), 36 deletions(-) (limited to 'src/components/avatar_list/avatar_list.vue') diff --git a/src/components/avatar_list/avatar_list.vue b/src/components/avatar_list/avatar_list.vue index fd6d8336..5df62ce5 100644 --- a/src/components/avatar_list/avatar_list.vue +++ b/src/components/avatar_list/avatar_list.vue @@ -1,6 +1,6 @@