pleroma-fe

commit: c824d2537884fb736ce7fe1263875b87d3c00c81
parent: ad905576fc7e60aa91f1ffabb84ce3e383b4539e
Author: Shpuld Shpludson <shp@cock.li>
Date:   Thu, 13 Dec 2018 14:41:57 +0000

Merge branch 'fix_empty_profiles' into 'develop'

Improved user profile display

Closes #82

See merge request pleroma/pleroma-fe!414
Diffstat:
M
src/components/user_profile/user_profile.vue
18
++++++++++++++++++
M
src/modules/users.js
5
++++-

2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue
@@ -3,6 +3,16 @@
     <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>
+      <div class="panel-body">
+        <i class="icon-spin3 animate-spin"></i>
+      </div>
+    </div>
     <Timeline :title="$t('user_profile.timeline_title')" :timeline="timeline" :timeline-name="'user'" :user-id="userId"/>
   </div>
 </template>
@@ -21,4 +31,12 @@
     align-items: stretch;
   }
 }
+.user-profile-placeholder {
+  .panel-body {
+    display: flex;
+    justify-content: center;
+    align-items: middle;
+    padding: 7em;
+  }
+}
 </style>
diff --git a/src/modules/users.js b/src/modules/users.js
@@ -17,6 +17,9 @@ export const mergeOrAdd = (arr, obj, item) => {
     // This is a new item, prepare it
     arr.push(item)
     obj[item.id] = item
+    if (item.screen_name && !item.screen_name.includes('@')) {
+      obj[item.screen_name] = item
+    }
     return { item, new: true }
   }
 }
@@ -87,7 +90,7 @@ const users = {
   actions: {
     fetchUser (store, id) {
       store.rootState.api.backendInteractor.fetchUser({ id })
-        .then((user) => store.commit('addNewUsers', user))
+        .then((user) => store.commit('addNewUsers', [user]))
     },
     registerPushNotifications (store) {
       const token = store.state.currentUser.credentials