From 09c60c775f3672fe96097dc7cead56b900b0f0ef Mon Sep 17 00:00:00 2001
From: megavrilinvv <vastre@rambler.ru>
Date: Wed, 14 Dec 2022 13:05:23 +0300
Subject: [PATCH] =?UTF-8?q?[WIP]=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?=
 =?UTF-8?q?=D0=BB=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BF=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D0=B8=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B5=D0=B3=D0=BE=20=D0=B0=D0=B2=D0=B0=D1=82?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LoggedInLayout.vue |  1 +
 src/components/TheHeader.vue      | 14 ++++++++++++--
 src/pages/login/TheLogin.vue      | 26 ++++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/src/components/LoggedInLayout.vue b/src/components/LoggedInLayout.vue
index 6fe976e..6d6bed7 100644
--- a/src/components/LoggedInLayout.vue
+++ b/src/components/LoggedInLayout.vue
@@ -1,6 +1,7 @@
 <template lang="pug">
 .flex.flex-col.w-full.h-full.gap-y-2
     the-header(
+      :url="url",
       :is-open-form="isOpenForm",
       :close-form="closeForm",
       :open-form="openForm",
diff --git a/src/components/TheHeader.vue b/src/components/TheHeader.vue
index 20fdd79..983b911 100644
--- a/src/components/TheHeader.vue
+++ b/src/components/TheHeader.vue
@@ -23,8 +23,9 @@
       button.header-buttons.flex.justify-center.items-center.mr-8.p-0
         .icon-bell.text-xxl
       .flex.justify-centflexer.items-center.relative
-        base-avatar.mr-2(:size="32")
-          img(:src="avatarSrc", alt="Avatar")
+        base-avatar.mr-2(:size="36", :color="userData.color", v-if="!userData.photo") {{changeName}}       
+        base-avatar.mr-2(:size="32", v-else)
+          img.h-full.object-cover(:src="url + userData.photo", alt="Avatar")
         button.header-buttons(@click="openPopup")
           .icon-down-arrow.text-xxs.flex.justify-center.items-center.p-0
         base-popup.right-2.top-10(v-if="showPopup", :width="160", v-click-outside="openPopup")
@@ -49,6 +50,7 @@ export default {
     BaseClientFormCreate,
   },
   props: {
+    url: String,
     openForm: Function,
     closeForm: Function,
     isOpenForm: Boolean,
@@ -62,8 +64,16 @@ export default {
         name: "Гордеев Николай Степанович",
       },
       showPopup: false,
+      userData: JSON.parse(localStorage.getItem("userData")),
     };
   },
+  computed: {
+    changeName() {
+      return `${this.userData.last_name || ""} ${
+        this.userData.first_name || ""
+      } ${this.userData.patronymic || ""}`;
+    },
+  },
   methods: {
     logout() {
       localStorage.removeItem("tokenAccess");
diff --git a/src/pages/login/TheLogin.vue b/src/pages/login/TheLogin.vue
index d0f82d1..dc549f3 100644
--- a/src/pages/login/TheLogin.vue
+++ b/src/pages/login/TheLogin.vue
@@ -54,6 +54,7 @@ export default {
       authorized: true,
       user: { username: "", password: "" },
       redColor: "var(--border-red-color)",
+      userData: {},
     };
   },
   computed: {
@@ -83,6 +84,30 @@ export default {
       localStorage.username = this.user.username;
       localStorage.password = this.user.password;
     },
+    auth(token) {
+      fetch("http://45.84.227.122:8080/auth/users/me/", {
+        headers: {
+          Authorization: `Bearer ${token}`,
+        },
+      })
+        .then((res) => {
+          return res.json();
+        })
+        .then((data) => {
+          fetch(`http://45.84.227.122:8080/accounts/users/${data.id}/detail`, {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          })
+            .then((res) => {
+              return res.json();
+            })
+            .then((data) => {
+              this.userData = data;
+              localStorage.setItem("userData", JSON.stringify(this.userData));
+            });
+        });
+    },
     login() {
       const requestOptions = {
         method: "POST",
@@ -103,6 +128,7 @@ export default {
           if (token) {
             localStorage.setItem("tokenAccess", token.access);
             this.$router.push("/");
+            this.auth(token.access);
           } else {
             this.$router.push("/login");
           }