From f96a7acf386fb3dc5927f6aae56883f1e98e528e Mon Sep 17 00:00:00 2001
From: Kostya <ckutls228@gmail.com>
Date: Sun, 26 Nov 2023 15:39:06 +0300
Subject: [PATCH] fixed changed from main branch in developckutls

---
 .../src/components/HeaderComponent.vue        | 46 +++++++------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/luckydiamond/src/components/HeaderComponent.vue b/luckydiamond/src/components/HeaderComponent.vue
index 21d7bd8..68ca310 100644
--- a/luckydiamond/src/components/HeaderComponent.vue
+++ b/luckydiamond/src/components/HeaderComponent.vue
@@ -1,32 +1,3 @@
-<script>
-import '@/assets/css/ComponentsStyles/header.css'
-// import { GetAuthCodeFromCurrentPath } from '@/assets/js/authentication/LoggingMiddleware.js';
-import { LogIn } from '@/assets/js/authentication/AuthService.js';
-
-export default {
-  name: 'Header-Element-page',
-  data() {
-    return {
-      balance: 25000,
-      auth: false
-    }
-  }, created() {
-    try {
-      let authCode = this.$route.query.code;
-      console.log('Auth Code:', authCode);
-
-      if (authCode) {
-        const data =  LogIn(authCode);
-        console.log('Auth Data:', data);
-      } else {
-        console.log('Auth Code отсутствует');
-      }
-    } catch (error) {
-      console.error('Ошибка при аутентификации:', error);
-    }
-  }
-}
-</script>
 <template>
   <header class="header">
     <div class="header__content">
@@ -69,9 +40,9 @@ export default {
   </header>
 </template>
 
-<<<<<<< HEAD
 <script>
 import '@/assets/css/ComponentsStyles/header.css'
+import { LogIn } from '@/assets/js/authentication/AuthService.js';
 
 export default {
   name: 'Header-Element-page',
@@ -84,6 +55,21 @@ export default {
   },
   mounted() {
     this.route = this.$route.name
+  },
+  created() {
+    try {
+      let authCode = this.$route.query.code;
+      console.log('Auth Code:', authCode);
+
+      if (authCode) {
+        const data =  LogIn(authCode);
+        console.log('Auth Data:', data);
+      } else {
+        console.log('Auth Code отсутствует');
+      }
+    } catch (error) {
+      console.error('Ошибка при аутентификации:', error);
+    }
   }
 }
 </script>