From 7cacc897847728775e3841d8fa9067184c90253a Mon Sep 17 00:00:00 2001
From: hoon7566 <hoon7566@gmail.com>
Date: Mon, 21 Mar 2022 20:57:13 +0900
Subject: [PATCH] =?UTF-8?q?feat(owner-vue):=20userInfo=20data=20=EC=83=81?=
 =?UTF-8?q?=EC=9C=84=20=EC=BB=B4=ED=8F=AC=EB=84=8C=ED=8A=B8=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- userInfo data 상위 컴포넌트로 이동
---
 .../src/views/Layout/DashboardLayout.vue      | 23 ++++++++++++++-----
 owner-vue/src/views/Layout/Topbar.vue         | 22 ++++--------------
 owner-vue/src/views/LoginUser.vue             |  4 ++--
 3 files changed, 23 insertions(+), 26 deletions(-)

diff --git a/owner-vue/src/views/Layout/DashboardLayout.vue b/owner-vue/src/views/Layout/DashboardLayout.vue
index d862227..b9c81f8 100644
--- a/owner-vue/src/views/Layout/DashboardLayout.vue
+++ b/owner-vue/src/views/Layout/DashboardLayout.vue
@@ -1,13 +1,16 @@
 <template>
   <v-app id="inspire">
-    <side-bar :drawer="drawer" @drawerEvent="drawer = !drawer"></side-bar>
+    <side-bar :drawer="drawer" @drawerEvent="drawer = !drawer" :userInfo="userInfo"/>
     <top-bar @drawerEvent="drawer = !drawer"
-              :notificationCounts="notificationCounts"/>
+             :notificationCounts="notificationCounts"
+             :userInfo="userInfo"
+    />
     <v-main style="background: #f5f5f540">
       <v-container class="py-8, px-6" fluid>
         <router-view
             v-on:plusCount="notificationCounts++"
             v-on:minusCount="notificationCounts--"
+            :userInfo="userInfo"
         ></router-view>
       </v-container>
     </v-main>
@@ -18,6 +21,7 @@
 import Sidebar from './Sidebar.vue'
 import Topbar from "./Topbar.vue";
 import notificationApi from "@/api/notification";
+import userApi from "@/api/user";
 
 export default {
   name: "DashboardLayout",
@@ -25,20 +29,27 @@ export default {
     'side-bar': Sidebar,
     'top-bar': Topbar
   },
-  mounted() {
-    this.searchNotificationCounts();
+  async mounted() {
+    await this.searchNotificationCounts();
+    // 사용자 정보 가져오기
+    this.userInfo = await this.getUserInfo();
   },
   data: function() {
     return {
       drawer: true,
-      notificationCounts: 0
+      notificationCounts: 0,
+      userInfo: {},
     }
   },
   methods: {
     searchNotificationCounts: async function() {
       const response = await notificationApi.countsNotification();
       this.notificationCounts = response.data.data;
-    }
+    },
+    getUserInfo: async function() {
+      const response = await userApi.requestUserInfo();
+      return response.data.data;
+    },
   }
 }
 </script>
diff --git a/owner-vue/src/views/Layout/Topbar.vue b/owner-vue/src/views/Layout/Topbar.vue
index e258372..795df99 100644
--- a/owner-vue/src/views/Layout/Topbar.vue
+++ b/owner-vue/src/views/Layout/Topbar.vue
@@ -33,7 +33,7 @@
                 <v-icon>mdi-account-circle</v-icon>
               </v-avatar>
             </v-badge>
-            <span class="ml-3">{{ userName }}</span>
+            <span class="ml-3">{{ userInfo.name }}</span>
           </v-chip>
         </span>
       </template>
@@ -44,7 +44,7 @@
           </v-list-item-avatar>
 
           <v-list-item-content>
-            <v-list-item-title>{{ userName }}</v-list-item-title>
+            <v-list-item-title>{{ userInfo.name }}</v-list-item-title>
             <v-list-item-subtitle>Logged In</v-list-item-subtitle>
           </v-list-item-content>
         </v-list-item>
@@ -63,27 +63,13 @@
 </template>
 
 <script>
-import userApi from "../../api/user";
 import authApi from "../../api/auth";
 
 export default {
   name: "Topbar",
-  props: ["notificationCounts"],
-  data() {
-    return {
-      userName: '',
-    };
-  },
-  async mounted() {
-    // 사용자 정보 가져오기
-    const data = await this.getUserInfo();
-    this.userName = data.name;
-  },
+  props: ["notificationCounts","userInfo"],
   methods: {
-    getUserInfo: async function() {
-      const response = await userApi.requestUserInfo();
-      return response.data.data;
-    },
+
     logout: async function() {
       await authApi.logout();
     },
diff --git a/owner-vue/src/views/LoginUser.vue b/owner-vue/src/views/LoginUser.vue
index 5539c1a..3dac15c 100644
--- a/owner-vue/src/views/LoginUser.vue
+++ b/owner-vue/src/views/LoginUser.vue
@@ -44,7 +44,7 @@ export default {
   name: "LoginUser",
   mounted() {
     if (false == jwt.isExpired()) {
-      this.$router.push('/order');
+      this.$router.push('/');
     }
   },
   data: function() {
@@ -62,7 +62,7 @@ export default {
 
       const flag = await userApi.requestLoginUser(this.email, this.password);
 
-      if (flag) await this.$router.push('/order');
+      if (flag) await this.$router.push('/');
     }
   }
 }