From 2f7e313c9561a1d2d6eb98621415577f4fd93304 Mon Sep 17 00:00:00 2001
From: Yakovenko Valeriia <yakovenko_valeriia@ma-al.com>
Date: Fri, 3 Apr 2026 15:53:31 +0200
Subject: [PATCH] fix: user info

---
 bo/src/App.vue                                | 35 ++-----------------
 bo/src/components/TopBar.vue                  |  2 +-
 bo/src/components/TopBarLogin.vue             |  2 +-
 bo/src/components/admin/ProductDetailView.vue |  2 +-
 bo/src/components/customer/CartDetails.vue    |  2 +-
 bo/src/components/customer/PageAddresses.vue  |  2 +-
 bo/src/components/customer/PageCarts.vue      |  4 +--
 .../customer/PageProfileDetails.vue           |  2 +-
 .../customer/PageProfileDetailsAddInfo.vue    |  4 +--
 bo/src/composable/useFetchJson.ts             |  2 +-
 bo/src/layouts/default.vue                    | 21 ++++++-----
 bo/src/router/index.ts                        |  2 +-
 bo/src/stores/admin/customer.ts               |  1 -
 bo/src/stores/{user => customer}/address.ts   |  0
 bo/src/stores/{user => customer}/auth.ts      |  6 +++-
 bo/src/stores/{user => customer}/cart.ts      |  0
 bo/src/stores/user.ts                         | 32 +++++++++++++++++
 bo/src/types/user.d.ts                        | 15 ++++++++
 bo/src/views/LoginView.vue                    |  2 +-
 bo/src/views/PasswordRecoveryView.vue         |  2 +-
 bo/src/views/RegisterView.vue                 |  2 +-
 bo/src/views/RepoChartView.vue                |  2 +-
 bo/src/views/ResetPasswordForm.vue            |  2 +-
 23 files changed, 82 insertions(+), 62 deletions(-)
 rename bo/src/stores/{user => customer}/address.ts (100%)
 rename bo/src/stores/{user => customer}/auth.ts (97%)
 rename bo/src/stores/{user => customer}/cart.ts (100%)
 create mode 100644 bo/src/stores/user.ts
 create mode 100644 bo/src/types/user.d.ts

diff --git a/bo/src/App.vue b/bo/src/App.vue
index 54265cd..8596791 100644
--- a/bo/src/App.vue
+++ b/bo/src/App.vue
@@ -1,6 +1,9 @@
 <script setup lang="ts">
 import { TooltipProvider } from 'reka-ui'
 import { RouterView } from 'vue-router'
+import { useAuthStore } from './stores/customer/auth'
+
+const authStore = useAuthStore()
 </script>
 
 <template>
@@ -12,35 +15,3 @@ import { RouterView } from 'vue-router'
 </template>
 
 
-<!-- <template>
-  <component :is="layoutComponent">
-    <Suspense>
-      <RouterView />
-    </Suspense>
-  </component>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { useRoute } from 'vue-router'
-
-import DefaultLayout from '@/layouts/default.vue'
-import EmptyLayout from '@/layouts/empty.vue'
-
-const route = useRoute()
-
-const layouts = {
-  default: DefaultLayout,
-  auth: EmptyLayout
-}
-
-console.log(route.fullPath)
-console.log(route.name)
-console.log(route.matched)
-
-const layoutComponent = computed(() => {
-  console.log(route.meta);
-
-  return layouts[route.meta.layout as keyof typeof layouts] || DefaultLayout
-})
-</script> -->
diff --git a/bo/src/components/TopBar.vue b/bo/src/components/TopBar.vue
index f4d87d9..0fb84d5 100644
--- a/bo/src/components/TopBar.vue
+++ b/bo/src/components/TopBar.vue
@@ -38,7 +38,7 @@
 import { useFetchJson } from '@/composable/useFetchJson'
 import LangSwitch from './inner/LangSwitch.vue'
 import ThemeSwitch from './inner/ThemeSwitch.vue'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { computed, ref } from 'vue'
 import { currentLang } from '@/router/langs'
 import type { LabelTrans, TopMenuItem } from '@/types'
diff --git a/bo/src/components/TopBarLogin.vue b/bo/src/components/TopBarLogin.vue
index 3518837..921aa04 100644
--- a/bo/src/components/TopBarLogin.vue
+++ b/bo/src/components/TopBarLogin.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import LangSwitch from './inner/LangSwitch.vue'
 import ThemeSwitch from './inner/ThemeSwitch.vue'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 
 const authStore = useAuthStore()
 </script>
diff --git a/bo/src/components/admin/ProductDetailView.vue b/bo/src/components/admin/ProductDetailView.vue
index caf5763..43d187a 100644
--- a/bo/src/components/admin/ProductDetailView.vue
+++ b/bo/src/components/admin/ProductDetailView.vue
@@ -201,7 +201,7 @@
 import { useEditable } from '@/composable/useConteditable';
 import Default from '@/layouts/default.vue';
 import { langs } from '@/router/langs';
-import { useProductStore } from '@/stores/product';
+import { useProductStore } from '@/stores/admin/product';
 import { useSettingsStore } from '@/stores/admin/settings';
 import type { EditorToolbarItem } from '@nuxt/ui';
 import { onMounted, ref, watch } from 'vue';
diff --git a/bo/src/components/customer/CartDetails.vue b/bo/src/components/customer/CartDetails.vue
index 92d9c8b..4fef8a8 100644
--- a/bo/src/components/customer/CartDetails.vue
+++ b/bo/src/components/customer/CartDetails.vue
@@ -52,7 +52,7 @@
 </template>
 
 <script setup lang="ts">
-import { useCartStore } from '@/stores/user/cart'
+import { useCartStore } from '@/stores/customer/cart'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
diff --git a/bo/src/components/customer/PageAddresses.vue b/bo/src/components/customer/PageAddresses.vue
index 742432f..8806f5c 100644
--- a/bo/src/components/customer/PageAddresses.vue
+++ b/bo/src/components/customer/PageAddresses.vue
@@ -104,7 +104,7 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { useAddressStore } from '@/stores/user/address'
+import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import Default from '@/layouts/default.vue'
 const addressStore = useAddressStore()
diff --git a/bo/src/components/customer/PageCarts.vue b/bo/src/components/customer/PageCarts.vue
index 149d2f8..2c5a1d9 100644
--- a/bo/src/components/customer/PageCarts.vue
+++ b/bo/src/components/customer/PageCarts.vue
@@ -152,8 +152,8 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
-import { useCartStore } from '@/stores/user/cart'
-import { useAddressStore } from '@/stores/user/address'
+import { useCartStore } from '@/stores/customer/cart'
+import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
 import Default from '@/layouts/default.vue'
diff --git a/bo/src/components/customer/PageProfileDetails.vue b/bo/src/components/customer/PageProfileDetails.vue
index a1dabd8..3617cf6 100644
--- a/bo/src/components/customer/PageProfileDetails.vue
+++ b/bo/src/components/customer/PageProfileDetails.vue
@@ -104,7 +104,7 @@
 import { computed } from 'vue'
 import { useRouter } from 'vue-router'
 import { useCustomerStore } from '@/stores/customer'
-import { useAddressStore } from '@/stores/user/address'
+import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import Default from '@/layouts/default.vue'
 const router = useRouter()
diff --git a/bo/src/components/customer/PageProfileDetailsAddInfo.vue b/bo/src/components/customer/PageProfileDetailsAddInfo.vue
index b7fcd10..496f22c 100644
--- a/bo/src/components/customer/PageProfileDetailsAddInfo.vue
+++ b/bo/src/components/customer/PageProfileDetailsAddInfo.vue
@@ -116,9 +116,9 @@
 import { ref, watch } from 'vue'
 import { useRouter } from 'vue-router'
 import { useCustomerStore } from '@/stores/customer'
-import { useAddressStore } from '@/stores/user/address'
+import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
-import { useCartStore } from '@/stores/user/cart'
+import { useCartStore } from '@/stores/customer/cart'
 import Default from '@/layouts/default.vue'
 const router = useRouter()
 const customerStore = useCustomerStore()
diff --git a/bo/src/composable/useFetchJson.ts b/bo/src/composable/useFetchJson.ts
index 455b6ff..867f3f1 100644
--- a/bo/src/composable/useFetchJson.ts
+++ b/bo/src/composable/useFetchJson.ts
@@ -29,7 +29,7 @@ export async function useFetchJson<T = unknown>(url: string, opt?: RequestInit):
 
     // Handle 401 — access token expired; try to refresh via the HTTPOnly refresh_token cookie
     if (res.status === 401) {
-      const { useAuthStore } = await import('@/stores/user/auth')
+      const { useAuthStore } = await import('../stores/customer/auth')
       const authStore = useAuthStore()
 
       const refreshed = await authStore.refreshAccessToken()
diff --git a/bo/src/layouts/default.vue b/bo/src/layouts/default.vue
index d1431c8..425d895 100644
--- a/bo/src/layouts/default.vue
+++ b/bo/src/layouts/default.vue
@@ -24,11 +24,12 @@
       <template #footer>
         <UDropdownMenu :items="userItems" :content="{ align: 'center', collisionPadding: 12 }"
           :ui="{ content: 'w-(--reka-dropdown-menu-trigger-width) min-w-48' }">
-          <UButton v-bind="user" :label="user?.name" trailing-icon="i-lucide-chevrons-up-down" color="neutral"
+          <UButton  v-bind="userStore.user" :label="userStore.user?.email" trailing-icon="i-lucide-chevrons-up-down" color="neutral"
             variant="ghost" square class="w-full data-[state=open]:bg-elevated overflow-hidden" :ui="{
               trailingIcon: 'text-dimmed ms-auto'
             }" />
         </UDropdownMenu>
+        <!-- first_name: '', last_name: '' -->
       </template>
     </USidebar>
 
@@ -63,10 +64,14 @@ import { ref, computed, onMounted } from 'vue'
 import { useColorMode } from '@vueuse/core'
 import type { DropdownMenuItem, NavigationMenuItem } from '@nuxt/ui'
 import { defineShortcuts, extractShortcuts } from '@nuxt/ui/runtime/composables/defineShortcuts.js'
-import { LabelTrans, TopMenuItem } from '@/types'
+import { useAuthStore } from '../stores/customer/auth'
+
+const authStore = useAuthStore()
+const userStore = useUserStore()
+
+await userStore.getUser()
 
 const open = ref(true)
-const authStore = useAuthStore()
 const colorMode = useColorMode()
 
 const teams = ref([
@@ -156,10 +161,11 @@ function getItems(state: 'collapsed' | 'expanded') {
 import { useRouter } from 'vue-router'
 import { currentLang } from '@/router/langs'
 import { useFetchJson } from '@/composable/useFetchJson'
-import { useAuthStore } from '@/stores/user/auth'
 import CountryCurrencySwitch from '@/components/inner/CountryCurrencySwitch.vue'
 import LangSwitch from '@/components/inner/LangSwitch.vue'
 import ThemeSwitch from '@/components/inner/ThemeSwitch.vue'
+import type { LabelTrans, TopMenuItem } from '@/types'
+import { useUserStore } from '@/stores/user'
 
 
 const router = useRouter()
@@ -217,13 +223,6 @@ function transformMenu(
   })
 }
 
-const user = ref({
-  name: 'Benjamin Canac',
-  avatar: {
-    src: 'https://github.com/benjamincanac.png',
-    alt: 'Benjamin Canac'
-  }
-})
 
 const userItems = computed<DropdownMenuItem[][]>(() => [
   [
diff --git a/bo/src/router/index.ts b/bo/src/router/index.ts
index 8674008..be6d4c8 100644
--- a/bo/src/router/index.ts
+++ b/bo/src/router/index.ts
@@ -1,7 +1,7 @@
 import { createRouter, createWebHistory } from 'vue-router'
 import { currentLang, langs, switchLocalization } from './langs'
 import { getSettings } from './settings'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { getRoutes } from './menu'
 
 function isAuthenticated(): boolean {
diff --git a/bo/src/stores/admin/customer.ts b/bo/src/stores/admin/customer.ts
index 5e5ca08..962ded0 100644
--- a/bo/src/stores/admin/customer.ts
+++ b/bo/src/stores/admin/customer.ts
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
-import type { Address } from './user/address'
 
 export interface CustomerData {
   companyName: string
diff --git a/bo/src/stores/user/address.ts b/bo/src/stores/customer/address.ts
similarity index 100%
rename from bo/src/stores/user/address.ts
rename to bo/src/stores/customer/address.ts
diff --git a/bo/src/stores/user/auth.ts b/bo/src/stores/customer/auth.ts
similarity index 97%
rename from bo/src/stores/user/auth.ts
rename to bo/src/stores/customer/auth.ts
index 3afea09..2c33095 100644
--- a/bo/src/stores/user/auth.ts
+++ b/bo/src/stores/customer/auth.ts
@@ -1,6 +1,7 @@
 import { defineStore } from 'pinia'
 import { ref, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
+import { useUserStore } from '../user'
 
 export interface User {
   id: string
@@ -41,6 +42,8 @@ export const useAuthStore = defineStore('auth', () => {
     _isAuthenticated.value = readIsAuthenticatedCookie()
   }
 
+//   const auth = useAuthStore()
+// const userStore = useUserStore()
   async function login(email: string, password: string) {
     loading.value = true
     error.value = null
@@ -60,6 +63,7 @@ export const useAuthStore = defineStore('auth', () => {
 
       user.value = response.user
       _syncAuthState()
+      //   await userStore.getUser()
 
       return true
     } catch (e: any) {
@@ -99,7 +103,7 @@ export const useAuthStore = defineStore('auth', () => {
     error.value = null
     try {
       const body: any = { first_name, last_name, email, password, confirm_password, lang: lang || 'en' }
-      
+
       // Add company information if provided
       if (company_name) body.company_name = company_name
       if (company_email) body.company_email = company_email
diff --git a/bo/src/stores/user/cart.ts b/bo/src/stores/customer/cart.ts
similarity index 100%
rename from bo/src/stores/user/cart.ts
rename to bo/src/stores/customer/cart.ts
diff --git a/bo/src/stores/user.ts b/bo/src/stores/user.ts
new file mode 100644
index 0000000..88f61b2
--- /dev/null
+++ b/bo/src/stores/user.ts
@@ -0,0 +1,32 @@
+import type { User } from '@/types/user'
+import { ref } from 'vue'
+import { defineStore } from 'pinia'
+import { useFetchJson } from '@/composable/useFetchJson'
+
+export const useUserStore = defineStore('user', () => {
+    const error = ref<string | null>(null)
+    const user = ref<User | null>(null)
+
+    async function getUser() {
+        error.value = null
+        try {
+            const data = await useFetchJson<User>(`/api/v1/restricted/customer`)
+            console.log('getUser API response:', data)
+
+            const response: User = (data as any).items ?? data
+            console.log('User response:', response)
+            user.value = response
+
+            return response
+        } catch (err: any) {
+            error.value = err?.message ?? 'Unknown error'
+            return null
+        }
+    }
+
+    return {
+        error,
+        user,
+        getUser
+    }
+})
\ No newline at end of file
diff --git a/bo/src/types/user.d.ts b/bo/src/types/user.d.ts
new file mode 100644
index 0000000..d054444
--- /dev/null
+++ b/bo/src/types/user.d.ts
@@ -0,0 +1,15 @@
+
+export interface User {
+    id: string
+    email: string
+    name: string
+    first_name?: string
+    last_name?: string
+    company_name?: string
+    company_email?: string
+    company_address?: Address
+    billing_address?: Address
+    regon?: string
+    nip?: string
+    vat?: string
+}
diff --git a/bo/src/views/LoginView.vue b/bo/src/views/LoginView.vue
index 510f84c..51f0de4 100644
--- a/bo/src/views/LoginView.vue
+++ b/bo/src/views/LoginView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, defineAsyncComponent, ref } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'
diff --git a/bo/src/views/PasswordRecoveryView.vue b/bo/src/views/PasswordRecoveryView.vue
index 8311c44..958e90e 100644
--- a/bo/src/views/PasswordRecoveryView.vue
+++ b/bo/src/views/PasswordRecoveryView.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref } from 'vue'
 import { useRouter } from 'vue-router'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'
diff --git a/bo/src/views/RegisterView.vue b/bo/src/views/RegisterView.vue
index 4dc736c..8484ee9 100644
--- a/bo/src/views/RegisterView.vue
+++ b/bo/src/views/RegisterView.vue
@@ -117,7 +117,7 @@
 <script setup lang="ts">
 import { ref, computed, defineAsyncComponent } from 'vue'
 import { useRouter } from 'vue-router'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { useI18n } from 'vue-i18n'
diff --git a/bo/src/views/RepoChartView.vue b/bo/src/views/RepoChartView.vue
index 59050e4..c94fdc0 100644
--- a/bo/src/views/RepoChartView.vue
+++ b/bo/src/views/RepoChartView.vue
@@ -11,7 +11,7 @@ import {
     LinearScale,
 } from 'chart.js'
 import { getYears, getQuarters, getIssues, type QuarterData, type IssueTimeSummary } from '@/composable/useRepoApi'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { i18n } from '@/plugins/02_i18n'
 import type { TableColumn } from '@nuxt/ui'
 import { useI18n } from 'vue-i18n'
diff --git a/bo/src/views/ResetPasswordForm.vue b/bo/src/views/ResetPasswordForm.vue
index 00d12c1..61c2c5c 100644
--- a/bo/src/views/ResetPasswordForm.vue
+++ b/bo/src/views/ResetPasswordForm.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { useRouter, useRoute } from 'vue-router'
-import { useAuthStore } from '@/stores/user/auth'
+import { useAuthStore } from '@/stores/customer/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'