From 30149f55f47a725006f551d5a0522343b9985f31 Mon Sep 17 00:00:00 2001
From: lain <lain@soykaf.club>
Date: Tue, 30 Jun 2020 14:50:33 +0200
Subject: [PATCH] Data import, user panel, who to follow: Reduxify.

---
 .../settings_modal/tabs/data_import_export_tab.js         | 6 +++---
 src/components/user_panel/user_panel.js                   | 2 +-
 src/components/who_to_follow/who_to_follow.vue            | 2 +-
 .../who_to_follow_panel/who_to_follow_panel.vue           | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/settings_modal/tabs/data_import_export_tab.js b/src/components/settings_modal/tabs/data_import_export_tab.js
index 168f89e1..ff109abc 100644
--- a/src/components/settings_modal/tabs/data_import_export_tab.js
+++ b/src/components/settings_modal/tabs/data_import_export_tab.js
@@ -51,12 +51,12 @@ const DataImportExportTab = {
       // Get addresses
       return users.map((user) => {
         // check is it's a local user
-        if (user && user.is_local) {
+        if (user && user.redux.is_local) {
           // append the instance address
           // eslint-disable-next-line no-undef
-          return user.screen_name + '@' + location.hostname
+          return user.redux.acct + '@' + location.hostname
         }
-        return user.screen_name
+        return user.redux.acct
       }).join('\n')
     }
   }
diff --git a/src/components/user_panel/user_panel.js b/src/components/user_panel/user_panel.js
index c2f51eb6..5418c6df 100644
--- a/src/components/user_panel/user_panel.js
+++ b/src/components/user_panel/user_panel.js
@@ -5,7 +5,7 @@ import { mapState } from 'vuex'
 
 const UserPanel = {
   computed: {
-    signedIn () { return this.user },
+    signedIn () { return this.redux.user },
     ...mapState({ user: state => state.users.currentUser })
   },
   components: {
diff --git a/src/components/who_to_follow/who_to_follow.vue b/src/components/who_to_follow/who_to_follow.vue
index 3a17d0e2..3de18922 100644
--- a/src/components/who_to_follow/who_to_follow.vue
+++ b/src/components/who_to_follow/who_to_follow.vue
@@ -6,7 +6,7 @@
     <div class="panel-body">
       <FollowCard
         v-for="user in users"
-        :key="user.id"
+        :key="user.redux.id"
         :user="user"
         class="list-item"
       />
diff --git a/src/components/who_to_follow_panel/who_to_follow_panel.vue b/src/components/who_to_follow_panel/who_to_follow_panel.vue
index 518acd97..ce8102e8 100644
--- a/src/components/who_to_follow_panel/who_to_follow_panel.vue
+++ b/src/components/who_to_follow_panel/who_to_follow_panel.vue
@@ -9,12 +9,12 @@
       <div class="who-to-follow">
         <p
           v-for="user in usersToFollow"
-          :key="user.id"
+          :key="user.redux.id"
           class="who-to-follow-items"
         >
-          <img :src="user.img">
-          <router-link :to="userProfileLink(user.id, user.name)">
-            {{ user.name }}
+          <img :src="user.redux.avatar">
+          <router-link :to="userProfileLink(user.redux.id, user.redux.display_name)">
+            {{ user.redux.display_name }}
           </router-link><br>
         </p>
         <p class="who-to-follow-more">