From 8f255fbad4ee80718da6b2154c410995561729de Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Dec 2018 19:14:38 +0300
Subject: [PATCH 1/5] Refactor follower/friends out of statuses/timeline into
user_profile where it belongs. Changed display of profile to single panel
with tabs.
---
src/components/timeline/timeline.js | 36 +++--------
src/components/timeline/timeline.vue | 33 ++--------
src/components/user_profile/user_profile.js | 24 +++++++
src/components/user_profile/user_profile.vue | 66 ++++++++++++++++----
src/modules/statuses.js | 17 -----
src/modules/users.js | 17 +++++
6 files changed, 110 insertions(+), 83 deletions(-)
diff --git a/src/components/timeline/timeline.js b/src/components/timeline/timeline.js
index f28b85bd..98da8660 100644
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@@ -10,7 +10,8 @@ const Timeline = {
'timelineName',
'title',
'userId',
- 'tag'
+ 'tag',
+ 'embedded'
],
data () {
return {
@@ -20,15 +21,6 @@ const Timeline = {
},
computed: {
timelineError () { return this.$store.state.statuses.error },
- followers () {
- return this.timeline.followers
- },
- friends () {
- return this.timeline.friends
- },
- viewing () {
- return this.timeline.viewing
- },
newStatusCount () {
return this.timeline.newStatusCount
},
@@ -38,6 +30,14 @@ const Timeline = {
} else {
return ` (${this.newStatusCount})`
}
+ },
+ classes () {
+ return {
+ root: ['timeline'].concat(!this.embedded ? ['panel', 'panel-default'] : []),
+ header: ['timeline-heading'].concat(!this.embedded ? ['panel-heading'] : []),
+ body: ['timeline-body'].concat(!this.embedded ? ['panel-body'] : []),
+ footer: ['timeline-footer'].concat(!this.embedded ? ['panel-footer'] : [])
+ }
}
},
components: {
@@ -60,12 +60,6 @@ const Timeline = {
userId: this.userId,
tag: this.tag
})
-
- // don't fetch followers for public, friend, twkn
- if (this.timelineName === 'user') {
- this.fetchFriends()
- this.fetchFollowers()
- }
},
mounted () {
if (typeof document.hidden !== 'undefined') {
@@ -103,16 +97,6 @@ const Timeline = {
tag: this.tag
}).then(() => store.commit('setLoading', { timeline: this.timelineName, value: false }))
}, 1000, this),
- fetchFollowers () {
- const id = this.userId
- this.$store.state.api.backendInteractor.fetchFollowers({ id })
- .then((followers) => this.$store.dispatch('addFollowers', { followers }))
- },
- fetchFriends () {
- const id = this.userId
- this.$store.state.api.backendInteractor.fetchFriends({ id })
- .then((friends) => this.$store.dispatch('addFriends', { friends }))
- },
scrollLoad (e) {
const bodyBRect = document.body.getBoundingClientRect()
const height = Math.max(bodyBRect.height, -(bodyBRect.y))
diff --git a/src/components/timeline/timeline.vue b/src/components/timeline/timeline.vue
index bc7f74c2..6ba598c5 100644
--- a/src/components/timeline/timeline.vue
+++ b/src/components/timeline/timeline.vue
@@ -1,6 +1,6 @@
<template>
- <div class="timeline panel panel-default" v-if="viewing == 'statuses'">
- <div class="panel-heading timeline-heading">
+ <div :class="classes.root">
+ <div :class="classes.header">
<div class="title">
{{title}}
</div>
@@ -14,43 +14,20 @@
{{$t('timeline.up_to_date')}}
</div>
</div>
- <div class="panel-body">
+ <div :class="classes.body">
<div class="timeline">
<status-or-conversation v-for="status in timeline.visibleStatuses" :key="status.id" v-bind:statusoid="status" class="status-fadein"></status-or-conversation>
</div>
</div>
- <div class="panel-footer">
+ <div :class="classes.footer">
<a href="#" v-on:click.prevent='fetchOlderStatuses()' v-if="!timeline.loading">
<div class="new-status-notification text-center panel-footer">{{$t('timeline.load_older')}}</div>
</a>
<div class="new-status-notification text-center panel-footer" v-else>...</div>
</div>
</div>
- <div class="timeline panel panel-default" v-else-if="viewing == 'followers'">
- <div class="panel-heading timeline-heading">
- <div class="title">
- {{$t('user_card.followers')}}
- </div>
- </div>
- <div class="panel-body">
- <div class="timeline">
- <user-card v-for="follower in followers" :key="follower.id" :user="follower" :showFollows="false"></user-card>
- </div>
- </div>
- </div>
- <div class="timeline panel panel-default" v-else-if="viewing == 'friends'">
- <div class="panel-heading timeline-heading">
- <div class="title">
- {{$t('user_card.followees')}}
- </div>
- </div>
- <div class="panel-body">
- <div class="timeline">
- <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card>
- </div>
- </div>
- </div>
</template>
+
<script src="./timeline.js"></script>
<style lang="scss">
diff --git a/src/components/user_profile/user_profile.js b/src/components/user_profile/user_profile.js
index 1d79713d..8ff0daad 100644
--- a/src/components/user_profile/user_profile.js
+++ b/src/components/user_profile/user_profile.js
@@ -1,4 +1,5 @@
import UserCardContent from '../user_card_content/user_card_content.vue'
+import UserCard from '../user_card/user_card.vue'
import Timeline from '../timeline/timeline.vue'
const UserProfile = {
@@ -14,6 +15,12 @@ const UserProfile = {
},
computed: {
timeline () { return this.$store.state.statuses.timelines.user },
+ friends () {
+ return this.user.friends
+ },
+ followers () {
+ return this.user.followers
+ },
userId () {
return this.$route.params.id
},
@@ -25,15 +32,32 @@ const UserProfile = {
}
}
},
+ methods: {
+ fetchFollowers () {
+ const id = this.userId
+ this.$store.dispatch('addFollowers', { id })
+ },
+ fetchFriends () {
+ const id = this.userId
+ this.$store.dispatch('addFriends', { id })
+ }
+ },
watch: {
userId () {
this.$store.dispatch('stopFetching', 'user')
this.$store.commit('clearTimeline', { timeline: 'user' })
this.$store.dispatch('startFetching', ['user', this.userId])
+ },
+ user () {
+ if (!this.user.followers) {
+ this.fetchFollowers()
+ this.fetchFriends()
+ }
}
},
components: {
UserCardContent,
+ UserCard,
Timeline
}
}
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 4d2853a6..319c9850 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -1,20 +1,38 @@
<template>
- <div>
- <div v-if="user" class="user-profile panel panel-default">
- <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
- </div>
- <div v-else class="panel user-profile-placeholder">
- <div class="panel-heading">
- <div class="title">
- {{ $t('settings.profile_tab') }}
+<div>
+ <div v-if="user" class="user-profile panel panel-default">
+ <user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
+ <tab-switcher>
+ <Timeline label="Posts" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
+ <div :label="$t('user_card.followers')">
+ <div v-if="followers">
+ <user-card v-for="follower in followers" :key="follower.id" :user="follower" :showFollows="false"></user-card>
+ </div>
+ <div class="userlist-placeholder" v-else>
+ <i class="icon-spin3 animate-spin"></i>
</div>
</div>
- <div class="panel-body">
- <i class="icon-spin3 animate-spin"></i>
+ <div :label="$t('user_card.followees')">
+ <div v-if="friends">
+ <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card>
+ </div>
+ <div class="userlist-placeholder" v-else>
+ <i class="icon-spin3 animate-spin"></i>
+ </div>
+ </div>
+ </tab-switcher>
+ </div>
+ <div v-else class="panel user-profile-placeholder">
+ <div class="panel-heading">
+ <div class="title">
+ {{ $t('settings.profile_tab') }}
</div>
</div>
- <Timeline :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
+ <div class="panel-body">
+ <i class="icon-spin3 animate-spin"></i>
+ </div>
</div>
+</div>
</template>
<script src="./user_profile.js"></script>
@@ -24,12 +42,36 @@
.user-profile {
flex: 2;
flex-basis: 500px;
- padding-bottom: 10px;
+
.panel-heading {
background: transparent;
flex-direction: column;
align-items: stretch;
}
+ .userlist-placeholder {
+ display: flex;
+ justify-content: center;
+ align-items: middle;
+ padding: 2em;
+ }
+
+ .timeline-heading {
+ display: flex;
+ justify-content: center;
+
+ .loadmore-button, .alert {
+ flex: 1;
+ }
+
+ .loadmore-button {
+ height: 28px;
+ margin: 10px .6em;
+ }
+
+ .title, .loadmore-text {
+ display: none
+ }
+ }
}
.user-profile-placeholder {
.panel-body {
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index 8cdd4e28..5bbf5f46 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -14,7 +14,6 @@ const emptyTl = () => ({
loading: false,
followers: [],
friends: [],
- viewing: 'statuses',
userId: 0,
flushMarker: 0
})
@@ -399,16 +398,6 @@ export const mutations = {
setNotificationsSilence (state, { value }) {
state.notifications.desktopNotificationSilence = value
},
- setProfileView (state, { v }) {
- // load followers / friends only when needed
- state.timelines['user'].viewing = v
- },
- addFriends (state, { friends }) {
- state.timelines['user'].friends = friends
- },
- addFollowers (state, { followers }) {
- state.timelines['user'].followers = followers
- },
markNotificationsAsSeen (state) {
each(state.notifications.data, (notification) => {
notification.seen = true
@@ -437,12 +426,6 @@ const statuses = {
setNotificationsSilence ({ rootState, commit }, { value }) {
commit('setNotificationsSilence', { value })
},
- addFriends ({ rootState, commit }, { friends }) {
- commit('addFriends', { friends })
- },
- addFollowers ({ rootState, commit }, { followers }) {
- commit('addFollowers', { followers })
- },
deleteStatus ({ rootState, commit }, status) {
commit('setDeleted', { status })
apiService.deleteStatus({ id: status.id, credentials: rootState.users.currentUser.credentials })
diff --git a/src/modules/users.js b/src/modules/users.js
index 25d1c81f..220e16d6 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -51,6 +51,15 @@ export const mutations = {
endLogin (state) {
state.loggingIn = false
},
+ // TODO Clean after ourselves?
+ addFriends (state, { id, friends }) {
+ const user = state.usersObject[id]
+ user.friends = friends
+ },
+ addFollowers (state, { id, followers }) {
+ const user = state.usersObject[id]
+ user.followers = followers
+ },
addNewUsers (state, users) {
each(users, (user) => mergeOrAdd(state.users, state.usersObject, user))
},
@@ -92,6 +101,14 @@ const users = {
store.rootState.api.backendInteractor.fetchUser({ id })
.then((user) => store.commit('addNewUsers', [user]))
},
+ addFriends ({ rootState, commit }, { id }) {
+ rootState.api.backendInteractor.fetchFriends({ id })
+ .then((friends) => commit('addFriends', { id, friends }))
+ },
+ addFollowers ({ rootState, commit }, { id }) {
+ rootState.api.backendInteractor.fetchFollowers({ id })
+ .then((followers) => commit('addFollowers', { id, followers }))
+ },
registerPushNotifications (store) {
const token = store.state.currentUser.credentials
const vapidPublicKey = store.rootState.instance.vapidPublicKey
From 23d434c40c9b1ef218be53991f003d8767b50e7a Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Dec 2018 19:17:03 +0300
Subject: [PATCH 2/5] collateral fixes for user-card: use still-image, styles
for custom emoji
---
src/components/user_card/user_card.js | 4 +++-
src/components/user_card/user_card.vue | 10 +++++++++-
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/components/user_card/user_card.js b/src/components/user_card/user_card.js
index b8eb28e3..e674627a 100644
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@@ -1,4 +1,5 @@
import UserCardContent from '../user_card_content/user_card_content.vue'
+import StillImage from '../still-image/still-image.vue'
const UserCard = {
props: [
@@ -12,7 +13,8 @@ const UserCard = {
}
},
components: {
- UserCardContent
+ UserCardContent,
+ StillImage
},
computed: {
currentUser () { return this.$store.state.users.currentUser }
diff --git a/src/components/user_card/user_card.vue b/src/components/user_card/user_card.vue
index eb0d7576..a16960cd 100644
--- a/src/components/user_card/user_card.vue
+++ b/src/components/user_card/user_card.vue
@@ -1,7 +1,7 @@
<template>
<div class="card">
<a href="#">
- <img @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url">
+ <StillImage @click.prevent="toggleUserExpanded" class="avatar" :src="user.profile_image_url"/>
</a>
<div class="usercard" v-if="userExpanded">
<user-card-content :user="user" :switcher="false"></user-card-content>
@@ -40,6 +40,14 @@
margin-top:0.0em;
text-align: left;
width: 100%;
+ .user-name {
+ img {
+ object-fit: contain;
+ height: 16px;
+ width: 16px;
+ vertical-align: middle;
+ }
+ }
}
.follows-you {
From bf805361d06c51f13d38a6d4d86aa07e53c2346e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Dec 2018 19:18:57 +0300
Subject: [PATCH 3/5] collateral fix for tab display
---
src/components/tab_switcher/tab_switcher.scss | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/tab_switcher/tab_switcher.scss b/src/components/tab_switcher/tab_switcher.scss
index 428335c0..f7449439 100644
--- a/src/components/tab_switcher/tab_switcher.scss
+++ b/src/components/tab_switcher/tab_switcher.scss
@@ -26,7 +26,6 @@
.tab-wrapper {
height: 28px;
- overflow: hidden;
position: relative;
display: flex;
flex: 0 0 auto;
From 56fdbf18c534182bbe996954c4e76167cf825b0c Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Dec 2018 19:21:05 +0300
Subject: [PATCH 4/5] missing string and unification with counters (order)
---
src/components/user_profile/user_profile.vue | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
index 319c9850..5c823b3d 100644
--- a/src/components/user_profile/user_profile.vue
+++ b/src/components/user_profile/user_profile.vue
@@ -3,18 +3,18 @@
<div v-if="user" class="user-profile panel panel-default">
<user-card-content :user="user" :switcher="true" :selected="timeline.viewing"></user-card-content>
<tab-switcher>
- <Timeline label="Posts" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
- <div :label="$t('user_card.followers')">
- <div v-if="followers">
- <user-card v-for="follower in followers" :key="follower.id" :user="follower" :showFollows="false"></user-card>
+ <Timeline :label="$t('user_card.statuses')" :embedded="true" :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
+ <div :label="$t('user_card.followees')">
+ <div v-if="friends">
+ <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card>
</div>
<div class="userlist-placeholder" v-else>
<i class="icon-spin3 animate-spin"></i>
</div>
</div>
- <div :label="$t('user_card.followees')">
- <div v-if="friends">
- <user-card v-for="friend in friends" :key="friend.id" :user="friend" :showFollows="true"></user-card>
+ <div :label="$t('user_card.followers')">
+ <div v-if="followers">
+ <user-card v-for="follower in followers" :key="follower.id" :user="follower" :showFollows="false"></user-card>
</div>
<div class="userlist-placeholder" v-else>
<i class="icon-spin3 animate-spin"></i>
From 485a531d57108f8adf57ae5043610ef107b26d3e Mon Sep 17 00:00:00 2001
From: Henry Jameson <me@hjkos.com>
Date: Mon, 17 Dec 2018 21:02:16 +0300
Subject: [PATCH 5/5] clean up the unused stuff
---
.../user_card_content/user_card_content.vue | 28 +++----------------
1 file changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/components/user_card_content/user_card_content.vue b/src/components/user_card_content/user_card_content.vue
index a40aff35..f80e30ff 100644
--- a/src/components/user_card_content/user_card_content.vue
+++ b/src/components/user_card_content/user_card_content.vue
@@ -104,16 +104,16 @@
</div>
</div>
<div class="panel-body profile-panel-body" v-if="!hideBio">
- <div v-if="!hideUserStatsLocal || switcher" class="user-counts" :class="{clickable: switcher}">
- <div class="user-count" v-on:click.prevent="setProfileView('statuses')" :class="{selected: selected === 'statuses'}">
+ <div v-if="!hideUserStatsLocal || switcher" class="user-counts">
+ <div class="user-count" v-on:click.prevent="setProfileView('statuses')">
<h5>{{ $t('user_card.statuses') }}</h5>
<span v-if="!hideUserStatsLocal">{{user.statuses_count}} <br></span>
</div>
- <div class="user-count" v-on:click.prevent="setProfileView('friends')" :class="{selected: selected === 'friends'}">
+ <div class="user-count" v-on:click.prevent="setProfileView('friends')">
<h5>{{ $t('user_card.followees') }}</h5>
<span v-if="!hideUserStatsLocal">{{user.friends_count}}</span>
</div>
- <div class="user-count" v-on:click.prevent="setProfileView('followers')" :class="{selected: selected === 'followers'}">
+ <div class="user-count" v-on:click.prevent="setProfileView('followers')">
<h5>{{ $t('user_card.followers') }}</h5>
<span v-if="!hideUserStatsLocal">{{user.followers_count}}</span>
</div>
@@ -304,18 +304,6 @@
justify-content: space-between;
color: $fallback--lightText;
color: var(--lightText, $fallback--lightText);
-
- &.clickable {
- .user-count {
- cursor: pointer;
-
- &:hover:not(.selected) {
- transition: border-bottom 100ms;
- border-bottom: 3px solid $fallback--link;
- border-bottom: 3px solid var(--link, $fallback--link);
- }
- }
- }
}
.user-count {
@@ -323,14 +311,6 @@
padding: .5em 0 .5em 0;
margin: 0 .5em;
- &.selected {
- transition: none;
- border-bottom: 5px solid $fallback--link;
- border-bottom: 5px solid var(--link, $fallback--link);
- border-radius: $fallback--btnRadius;
- border-radius: var(--btnRadius, $fallback--btnRadius);
- }
-
h5 {
font-size:1em;
font-weight: bolder;