From 066efd5b3c3389c066a2550644447bc876b0a1d5 Mon Sep 17 00:00:00 2001 From: Wyatt Benno Date: Thu, 20 Jun 2019 16:15:49 +0900 Subject: A small sass fix for #577 --- src/components/user_profile/user_profile.vue | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/components/user_profile') diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 48b774ea..bb5ab705 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -76,6 +76,11 @@ diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index eedb67b5..2f2f9e5f 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -47,7 +47,7 @@
- -
+
- + {{ $t('user_card.subscribe') }} - + {{ $t('user_card.subscribed') }}
+
- - - - - - + +
+
- - - - - - + +
-
- - - + +
+
+
@@ -366,25 +361,23 @@ justify-content: space-between; margin-right: -.75em; - > div { + > * { flex: 1 0 0; - margin-right: .75em; - margin-bottom: .6em; + margin: 0 .75em .6em 0; white-space: nowrap; - } - button { - width: 100%; - height: 100%; - margin: 0; + > button { + margin: 0; + width: 100%; + } } .remote-button { - height: 28px !important; - width: 92%; + height: 28px; + margin: 0; } - .pressed { + button.pressed { border-bottom-color: rgba(255, 255, 255, 0.2); border-top-color: rgba(0, 0, 0, 0.2); } diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js index 7eb4ed3a..39b99dac 100644 --- a/src/components/user_profile/user_profile.js +++ b/src/components/user_profile/user_profile.js @@ -3,7 +3,6 @@ import UserCard from '../user_card/user_card.vue' import FollowCard from '../follow_card/follow_card.vue' import Timeline from '../timeline/timeline.vue' import Conversation from '../conversation/conversation.vue' -import ModerationTools from '../moderation_tools/moderation_tools.vue' import List from '../list/list.vue' import withLoadMore from '../../hocs/with_load_more/with_load_more' @@ -132,7 +131,6 @@ const UserProfile = { Timeline, FollowerList, FriendList, - ModerationTools, FollowCard, Conversation } -- cgit v1.2.3-70-g09d2 From 7f9feacd264915df92d14399dc9c1aa5cb4d22e7 Mon Sep 17 00:00:00 2001 From: taehoon Date: Sun, 26 May 2019 14:15:35 -0400 Subject: prevent showing pinned statuses twice --- src/components/timeline/timeline.js | 10 +++++++++- src/components/timeline/timeline.vue | 2 +- src/components/user_profile/user_profile.vue | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) (limited to 'src/components/user_profile') diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 5e24bd15..55602c7b 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -11,7 +11,8 @@ const Timeline = { 'userId', 'tag', 'embedded', - 'count' + 'count', + 'excludedStatusIds' ], data () { return { @@ -39,6 +40,13 @@ const Timeline = { body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []), footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : []) } + }, + statuses () { + if (this.excludedStatusIds && this.excludedStatusIds.length > 0) { + return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.excludedStatusIds.includes(status.id)) + } else { + return this.timeline.visibleStatuses + } } }, components: { diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 1fc52083..623f65d7 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -29,7 +29,7 @@
Date: Fri, 19 Jul 2019 21:48:09 -0400 Subject: update prop name --- src/components/timeline/timeline.js | 6 +++--- src/components/user_profile/user_profile.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/components/user_profile') diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js index 55602c7b..7c8a761a 100644 --- a/src/components/timeline/timeline.js +++ b/src/components/timeline/timeline.js @@ -12,7 +12,7 @@ const Timeline = { 'tag', 'embedded', 'count', - 'excludedStatusIds' + 'pinnedStatusIds' ], data () { return { @@ -42,8 +42,8 @@ const Timeline = { } }, statuses () { - if (this.excludedStatusIds && this.excludedStatusIds.length > 0) { - return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.excludedStatusIds.includes(status.id)) + if (this.pinnedStatusIds && this.pinnedStatusIds.length > 0) { + return this.timeline.visibleStatuses && this.timeline.visibleStatuses.filter(status => !this.pinnedStatusIds.includes(status.id)) } else { return this.timeline.visibleStatuses } diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index 1723cffa..81c63d7e 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -34,6 +34,7 @@ :timeline="timeline" :timeline-name="'user'" :user-id="userId" + :pinned-status-ids="user.pinnedStatuseIds" />
Date: Fri, 19 Jul 2019 22:40:37 -0400 Subject: move pinned statuses showing logic in timeline --- src/components/timeline/timeline.vue | 12 ++++++++++++ src/components/user_profile/user_profile.vue | 12 ------------ 2 files changed, 12 insertions(+), 12 deletions(-) (limited to 'src/components/user_profile') diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue index 623f65d7..9990f20a 100644 --- a/src/components/timeline/timeline.vue +++ b/src/components/timeline/timeline.vue @@ -27,6 +27,18 @@
+
+ +
-
- -
Date: Fri, 19 Jul 2019 22:47:40 -0400 Subject: update prop syntax --- src/components/user_profile/user_profile.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/components/user_profile') diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index f4b284e2..fc745d1a 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,7 +20,7 @@ :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" - :timeline-name="'user'" + timeline-name="user" :user-id="userId" :pinned-status-ids="user.pinnedStatuseIds" /> -- cgit v1.2.3-70-g09d2 From 876c6de8066d9ac708bb0cd8e4d4c5e60f9502a6 Mon Sep 17 00:00:00 2001 From: taehoon Date: Fri, 19 Jul 2019 22:49:29 -0400 Subject: fix typos --- src/components/user_profile/user_profile.vue | 2 +- src/modules/users.js | 6 +++--- src/services/entity_normalizer/entity_normalizer.service.js | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/components/user_profile') diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index fc745d1a..e862440e 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -22,7 +22,7 @@ :timeline="timeline" timeline-name="user" :user-id="userId" - :pinned-status-ids="user.pinnedStatuseIds" + :pinned-status-ids="user.pinnedStatusIds" />
{ output.statuses_count = data.statuses_count output.friendIds = [] output.followerIds = [] - output.pinnedStatuseIds = [] + output.pinnedStatusIds = [] if (data.pleroma) { output.follow_request_count = data.pleroma.follow_request_count -- cgit v1.2.3-70-g09d2 From b2bd128f059de44a0ec27591dbc0052f494887a1 Mon Sep 17 00:00:00 2001 From: taehoon Date: Thu, 25 Jul 2019 15:14:44 -0400 Subject: allow zooming avatar in profile panel header --- src/components/user_card/user_card.js | 9 ++------- src/components/user_card/user_card.vue | 4 ++-- src/components/user_profile/user_profile.vue | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/components/user_profile') diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js index 070af38a..82d3b835 100644 --- a/src/components/user_card/user_card.js +++ b/src/components/user_card/user_card.js @@ -5,10 +5,9 @@ import ModerationTools from '../moderation_tools/moderation_tools.vue' import { hex2rgb } from '../../services/color_convert/color_convert.js' import { requestFollow, requestUnfollow } from '../../services/follow_manipulate/follow_manipulate' import generateProfileLink from 'src/services/user_profile_link_generator/user_profile_link_generator' -import { isEqual } from 'lodash' export default { - props: [ 'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered' ], + props: [ 'user', 'switcher', 'selected', 'hideBio', 'rounded', 'bordered', 'allowZoomingAvatar' ], data () { return { followRequestInProgress: false, @@ -101,10 +100,6 @@ export default { const validRole = rights.admin || rights.moderator const roleTitle = rights.admin ? 'admin' : 'moderator' return validRole && roleTitle - }, - isActiveRoute () { - const profileRoute = this.userProfileLink(this.user) - return profileRoute.name === this.$route.name && isEqual(profileRoute.params, this.$route.params) } }, components: { @@ -168,7 +163,7 @@ export default { reportUser () { this.$store.dispatch('openUserReportingModal', this.user.id) }, - enlargeAvatar () { + zoomAvatar () { const attachment = { url: this.user.profile_image_url_original, mimetype: 'image' diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue index 3c0bf0d4..3c200a7f 100644 --- a/src/components/user_card/user_card.vue +++ b/src/components/user_card/user_card.vue @@ -8,9 +8,9 @@