From fe7dafe680eac00aa1e229634d4cb2d8726edcb5 Mon Sep 17 00:00:00 2001
From: Arina Yakovenko <yakovenko_arina@ma-al.com>
Date: Wed, 15 Apr 2026 12:47:10 +0200
Subject: [PATCH] fix: migrations

---
 .air.toml                                     |   2 +-
 app/service/emailService/email.go             |   2 +-
 bo/components.d.ts                            |   3 +-
 bo/src/App.vue                                |  14 +-
 bo/src/components/admin/FavoriteProducts.vue  |   7 +-
 bo/src/components/admin/PageProducts.vue      |   7 +-
 .../admin/ProductDetailView copy.vue          |   7 +-
 bo/src/components/admin/ProductDetailView.vue |   7 +-
 bo/src/components/admin/UsersList.vue         |   7 +-
 bo/src/components/admin/UsersSearch.vue       |   7 +-
 .../customer-management/Profile.vue           |   8 +-
 bo/src/components/customer/CartDetails.vue    |   7 +-
 bo/src/components/customer/PageAddresses.vue  |  14 +-
 bo/src/components/customer/PageCarts.vue      |   7 +-
 bo/src/components/customer/PageOrders.vue     |   7 +-
 bo/src/components/customer/PageProduct.vue    |   7 +-
 bo/src/components/customer/PageProducts.vue   |   7 +-
 .../customer/PageProfileDetails.vue           |   7 +-
 .../customer/PageProfileDetailsAddInfo.vue    |   7 +-
 bo/src/components/customer/PageStatistic.vue  |   7 +-
 .../customer/StorageFileBrowser.vue           |   7 +-
 bo/src/components/inner/CategoryMenu.vue      |   9 +-
 bo/src/layouts/management.vue                 |   6 +-
 bo/src/router/index.ts                        |  29 ++-
 bo/src/views/CategoryView.vue                 |  42 ----
 bo/src/views/HomeView.vue                     |   7 +-
 bo/src/views/RepoChartView.vue                |   7 +-
 bo/src/views/StorageView.vue                  |   1 -
 i18n/migrations/20260302163100_routes.sql     | 218 +++++++++++++++---
 .../20260302163123_create_tables_data.sql     |  21 +-
 30 files changed, 292 insertions(+), 196 deletions(-)
 delete mode 100644 bo/src/views/CategoryView.vue

diff --git a/.air.toml b/.air.toml
index c274c62..e70a5fd 100644
--- a/.air.toml
+++ b/.air.toml
@@ -28,7 +28,7 @@ tmp_dir = "tmp"
   rerun = false
   rerun_delay = 500
   send_interrupt = false
-  stop_on_error = false
+  stop_on_error = true
 
 [color]
   app = ""
diff --git a/app/service/emailService/email.go b/app/service/emailService/email.go
index 2c92117..ae3288d 100644
--- a/app/service/emailService/email.go
+++ b/app/service/emailService/email.go
@@ -153,6 +153,6 @@ func (s *EmailService) newUserAdminNotificationTemplate(userEmail, userName, bas
 // newUserAdminNotificationTemplate returns the HTML template for admin notification
 func (s *EmailService) newOrderPlacedTemplate(userID uint) string {
 	buf := bytes.Buffer{}
-	emails.EmailNewOrderPlacedWrapper(view.EmailLayout[view.EmailNewOrderPlacedData]{LangID: constdata.ADMIN_NOTIFICATION_LANGUAGE, Data: view.EmailNewOrderPlacedData{UserID: userID}}).Render(context.Background(), &buf)
+	// emails.EmailNewOrderPlacedWrapper(view.EmailLayout[view.EmailNewOrderPlacedData]{LangID: constdata.ADMIN_NOTIFICATION_LANGUAGE, Data: view.EmailNewOrderPlacedData{UserID: userID}}).Render(context.Background(), &buf)
 	return buf.String()
 }
diff --git a/bo/components.d.ts b/bo/components.d.ts
index 361fcb7..274bb33 100644
--- a/bo/components.d.ts
+++ b/bo/components.d.ts
@@ -11,7 +11,6 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    ButtonGoToProfile: typeof import('./src/components/customer-management/ButtonGoToProfile.vue')['default']
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
     CategoryMenu: typeof import('./src/components/inner/CategoryMenu.vue')['default']
     copy: typeof import('./src/components/admin/ProductDetailView copy.vue')['default']
@@ -45,7 +44,7 @@ declare module 'vue' {
     TopBar: typeof import('./src/components/TopBar.vue')['default']
     TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default']
     UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default']
-    UAvatar: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Avatar.vue')['default']
+    UApp: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/App.vue')['default']
     UButton: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Button.vue')['default']
     UCard: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Card.vue')['default']
     UCheckbox: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Checkbox.vue')['default']
diff --git a/bo/src/App.vue b/bo/src/App.vue
index 8596791..c09672a 100644
--- a/bo/src/App.vue
+++ b/bo/src/App.vue
@@ -1,15 +1,25 @@
 <script setup lang="ts">
+import { computed } from 'vue'
 import { TooltipProvider } from 'reka-ui'
-import { RouterView } from 'vue-router'
+import { RouterView, useRoute } from 'vue-router'
+import DefaultLayout from '@/layouts/default.vue'
+import EmptyLayout from '@/layouts/empty.vue'
+import ManagementLayout from '@/layouts/management.vue'
 import { useAuthStore } from './stores/customer/auth'
 
 const authStore = useAuthStore()
+const route = useRoute()
+const layout = computed(() => (route.meta.layout as string) || 'default')
 </script>
 
 <template>
   <Suspense>
     <TooltipProvider>
-      <RouterView />
+      <component :is="layout === 'empty' ? EmptyLayout : layout === 'management' ? ManagementLayout : DefaultLayout">
+        <RouterView v-slot="{ Component }">
+          <component :is="Component" />
+        </RouterView>
+      </component>
     </TooltipProvider>
   </Suspense>
 </template>
diff --git a/bo/src/components/admin/FavoriteProducts.vue b/bo/src/components/admin/FavoriteProducts.vue
index 669e96e..cb14bc1 100644
--- a/bo/src/components/admin/FavoriteProducts.vue
+++ b/bo/src/components/admin/FavoriteProducts.vue
@@ -1,12 +1,9 @@
 <template>
-    <component :is="Default || 'div'">
-        <div>
+            <div>
 
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 
 </script>
\ No newline at end of file
diff --git a/bo/src/components/admin/PageProducts.vue b/bo/src/components/admin/PageProducts.vue
index dbbd60a..095f638 100644
--- a/bo/src/components/admin/PageProducts.vue
+++ b/bo/src/components/admin/PageProducts.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="flex flex-col md:flex-row gap-10">
+            <div class="flex flex-col md:flex-row gap-10">
             <CategoryMenu />
             <div class="w-full flex flex-col items-center gap-4">
                 <UTable :data="productsList" :columns="columns" class="flex-1 w-full" :ui="{
@@ -9,13 +8,11 @@
                 <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
             </div>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { ref, watch, h, resolveComponent, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'
diff --git a/bo/src/components/admin/ProductDetailView copy.vue b/bo/src/components/admin/ProductDetailView copy.vue
index c0934ff..214a2c2 100644
--- a/bo/src/components/admin/ProductDetailView copy.vue	
+++ b/bo/src/components/admin/ProductDetailView copy.vue	
@@ -1,6 +1,5 @@
 <template>
-  <component :is="Default || 'div'">
-    <div class="flex items-center gap-2 mb-4">
+      <div class="flex items-center gap-2 mb-4">
       <UIcon name="line-md:arrow-left" class="text-(--text-sky-light) dark:text-(--text-sky-dark)" />
       <p class="cursor-pointer text-(--text-sky-light) dark:text-(--text-sky-dark)" @click="backFromProduct()">
         Back to products</p>
@@ -190,12 +189,10 @@
         </UTabs>
       </div>
     </div>
-  </component>
-</template>
+  </template>
 
 <script setup lang="ts">
 import { useEditable } from '@/composable/useConteditable';
-import Default from '@/layouts/default.vue';
 import { langs } from '@/router/langs';
 import { useProductStore } from '@/stores/product';
 import { useSettingsStore } from '@/stores/admin/settings';
diff --git a/bo/src/components/admin/ProductDetailView.vue b/bo/src/components/admin/ProductDetailView.vue
index 6f79e6d..1d97446 100644
--- a/bo/src/components/admin/ProductDetailView.vue
+++ b/bo/src/components/admin/ProductDetailView.vue
@@ -1,6 +1,5 @@
 <template>
-  <component :is="Default || 'div'">
-    <div class="flex items-center gap-2 mb-4">
+      <div class="flex items-center gap-2 mb-4">
       <UIcon name="line-md:arrow-left" class="text-(--text-sky-light) dark:text-(--text-sky-dark)" />
       <p class="cursor-pointer text-(--text-sky-light) dark:text-(--text-sky-dark)" @click="backFromProduct()">
         Back to products</p>
@@ -154,11 +153,9 @@
       </div>
       <div class=""></div>
     </div>
-  </component>
-</template>
+  </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 import { langs } from '@/router/langs';
 import { useProductStore } from '@/stores/admin/product';
 import { useSettingsStore } from '@/stores/admin/settings';
diff --git a/bo/src/components/admin/UsersList.vue b/bo/src/components/admin/UsersList.vue
index ae63ab3..eea62a4 100644
--- a/bo/src/components/admin/UsersList.vue
+++ b/bo/src/components/admin/UsersList.vue
@@ -1,17 +1,14 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="flex flex-col md:flex-row gap-10">
+            <div class="flex flex-col md:flex-row gap-10">
             <div class="w-full flex flex-col items-center gap-4">
                 <UTable :data="usersList" :columns="columns" class="flex-1 w-full"
                     :ui="{ root: 'max-w-100wv overflow-auto!' }" />
                 <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
             </div>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue'
 import { ref, computed, watch, resolveComponent, h } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
 import { useRoute, useRouter } from 'vue-router'
diff --git a/bo/src/components/admin/UsersSearch.vue b/bo/src/components/admin/UsersSearch.vue
index 1db9f33..439b864 100644
--- a/bo/src/components/admin/UsersSearch.vue
+++ b/bo/src/components/admin/UsersSearch.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default">
-        <div class="pt-70! flex flex-col items-center justify-center bg-gray-50 dark:bg-(--main-dark)">
+            <div class="pt-70! flex flex-col items-center justify-center bg-gray-50 dark:bg-(--main-dark)">
             <h1 class="text-6xl font-bold text-black dark:text-white mb-14">Search Users</h1>
 
             <div class="w-full max-w-4xl">
@@ -18,12 +17,10 @@
                 No users found with that name or ID
             </p>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { ref, computed, watch, resolveComponent, h } from 'vue'
-import Default from '@/layouts/default.vue';
 import type { TableColumn } from '@nuxt/ui';
 import { useRoute, useRouter } from 'vue-router';
 import { useFetchJson } from '@/composable/useFetchJson';
diff --git a/bo/src/components/customer-management/Profile.vue b/bo/src/components/customer-management/Profile.vue
index 0d76cc3..6166ec8 100644
--- a/bo/src/components/customer-management/Profile.vue
+++ b/bo/src/components/customer-management/Profile.vue
@@ -1,11 +1,7 @@
 <template>
-    <component :is="Management || 'div'">
-        <div>customer-management</div>
-    </component>
+    <div>customer-management</div>
 </template>
 
 
 <script setup lang="ts">
-import Management from '@/layouts/management.vue';
-
-</script>   
\ No newline at end of file
+</script>
\ No newline at end of file
diff --git a/bo/src/components/customer/CartDetails.vue b/bo/src/components/customer/CartDetails.vue
index 4fef8a8..498752e 100644
--- a/bo/src/components/customer/CartDetails.vue
+++ b/bo/src/components/customer/CartDetails.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-  <div class="">
+      <div class="">
     <h2
       class="font-semibold text-black dark:text-white pb-6 text-2xl">
       {{ t('Cart Items') }}
@@ -48,15 +47,13 @@
       </UButton>
     </div>
   </div>
-  </component>
-</template>
+  </template>
 
 <script setup lang="ts">
 import { useCartStore } from '@/stores/customer/cart'
 import { ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useRouter } from 'vue-router'
-import Default from '@/layouts/default.vue'
 const cartStore = useCartStore()
 const { t } = useI18n()
 const router = useRouter()
diff --git a/bo/src/components/customer/PageAddresses.vue b/bo/src/components/customer/PageAddresses.vue
index edd9ee8..c01be13 100644
--- a/bo/src/components/customer/PageAddresses.vue
+++ b/bo/src/components/customer/PageAddresses.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="">
+            <div class="">
             <div class="flex flex-col gap-5 mb-6">
                 <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Addresses') }}</h1>
                 <div class="flex md:flex-row flex-col justify-between items-start md:items-center gap-5 md:gap-0">
@@ -72,8 +71,7 @@
                                     {{ t('Cancel') }}
                                 </UButton>
 
-                                <UButton type="submit"
-                                    class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+                                <UButton type="submit" color="info" class="cursor-pointer">
                                     {{ t('Save') }}
                                 </UButton>
                             </div>
@@ -103,14 +101,12 @@
                 </template>
             </UModal>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { ref, reactive, computed, watch, onMounted } from 'vue'
 import { useCartStore } from '@/stores/customer/cart'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
 import { currentCountry } from '@/router/langs'
 
 type AddressFormState = Record<string, string>
@@ -230,9 +226,9 @@ function validate() {
 
 async function saveAddress() {
     if (isEditing.value && editingAddressId.value) {
-        await cartStore.updateAddress(editingAddressId.value, currentCountryId.value, formData)
+        await cartStore.updateAddress(editingAddressId.value, currentCountry.value?.id || 2, formData)
     } else {
-        await cartStore.addAddress(currentCountryId.value, formData)
+        await cartStore.addAddress(currentCountry.value?.id || 2, formData)
     }
     closeModal()
 }
diff --git a/bo/src/components/customer/PageCarts.vue b/bo/src/components/customer/PageCarts.vue
index 2c5a1d9..70d02ed 100644
--- a/bo/src/components/customer/PageCarts.vue
+++ b/bo/src/components/customer/PageCarts.vue
@@ -1,6 +1,5 @@
 <template>
-  <component :is="Default || 'div'">
-    <div class="flex flex-col gap-5 md:gap-10">
+      <div class="flex flex-col gap-5 md:gap-10">
       <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Cart') }}</h1>
       <div class="flex flex-col lg:flex-row gap-5 md:gap-10">
         <div class="flex-1">
@@ -147,8 +146,7 @@
         </div>
       </div>
     </div>
-  </component>
-</template>
+  </template>
 
 <script setup lang="ts">
 import { ref, computed, watch } from 'vue'
@@ -156,7 +154,6 @@ 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'
 const cartStore = useCartStore()
 const addressStore = useAddressStore()
 const { t } = useI18n()
diff --git a/bo/src/components/customer/PageOrders.vue b/bo/src/components/customer/PageOrders.vue
index a6f1809..13d4f74 100644
--- a/bo/src/components/customer/PageOrders.vue
+++ b/bo/src/components/customer/PageOrders.vue
@@ -1,9 +1,6 @@
 <template>
-    <component :is="Default || 'div'">
-        Orders page
-    </component>
-</template>
+            Orders page
+    </template>
 
 <script lang="ts" setup>
-import Default from '@/layouts/default.vue'
 </script>
\ No newline at end of file
diff --git a/bo/src/components/customer/PageProduct.vue b/bo/src/components/customer/PageProduct.vue
index 4a992d6..ad7c3e8 100644
--- a/bo/src/components/customer/PageProduct.vue
+++ b/bo/src/components/customer/PageProduct.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="">
+            <div class="">
             <div class="flex md:flex-row flex-col justify-between gap-8 my-6">
                 <div class="flex-1">
                     <div
@@ -79,14 +78,12 @@
             <hr class="border-t border-(--border-light) dark:border-(--border-dark) mb-8" />
             <ProductVariants />
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import ProductCustomization from './components/ProductCustomization.vue'
 import ProductVariants from './components/ProductVariants.vue'
-import Default from '@/layouts/default.vue'
 import { useFetchJson } from '@/composable/useFetchJson'
 import { useRoute } from 'vue-router'
 interface Color {
diff --git a/bo/src/components/customer/PageProducts.vue b/bo/src/components/customer/PageProducts.vue
index e07ef6f..e18bfc6 100644
--- a/bo/src/components/customer/PageProducts.vue
+++ b/bo/src/components/customer/PageProducts.vue
@@ -1,7 +1,6 @@
 <template>
     <suspense>
-        <component :is="Default || 'div'">
-            <div class="">
+                    <div class="">
                 <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
                     <template #item="{ item, active }">
                         <div class="flex items-center gap-2 px-3 py-2">
@@ -39,13 +38,11 @@
                     </div>
                 </div>
             </div>
-        </component>
-    </suspense>
+            </suspense>
 </template>
 
 <script setup lang="ts">
 import { ref, watch, h, resolveComponent, computed } from 'vue'
-import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
 import CategoryMenu from '../inner/CategoryMenu.vue'
diff --git a/bo/src/components/customer/PageProfileDetails.vue b/bo/src/components/customer/PageProfileDetails.vue
index 3617cf6..862c968 100644
--- a/bo/src/components/customer/PageProfileDetails.vue
+++ b/bo/src/components/customer/PageProfileDetails.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="">
+            <div class="">
             <div class="flex flex-col gap-5 mb-6">
                 <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Customer Data') }}</h1>
 
@@ -97,8 +96,7 @@
                 </div>
             </div>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { computed } from 'vue'
@@ -106,7 +104,6 @@ import { useRouter } from 'vue-router'
 import { useCustomerStore } from '@/stores/customer'
 import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
 const router = useRouter()
 const customerStore = useCustomerStore()
 const addressStore = useAddressStore()
diff --git a/bo/src/components/customer/PageProfileDetailsAddInfo.vue b/bo/src/components/customer/PageProfileDetailsAddInfo.vue
index 496f22c..b9f7115 100644
--- a/bo/src/components/customer/PageProfileDetailsAddInfo.vue
+++ b/bo/src/components/customer/PageProfileDetailsAddInfo.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="">
+            <div class="">
             <div class="max-w-2xl mx-auto">
                 <div class="flex flex-col gap-5 mb-6">
                     <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Create Account') }}</h1>
@@ -109,8 +108,7 @@
                 </div>
             </div>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { ref, watch } from 'vue'
@@ -119,7 +117,6 @@ import { useCustomerStore } from '@/stores/customer'
 import { useAddressStore } from '@/stores/customer/address'
 import { useI18n } from 'vue-i18n'
 import { useCartStore } from '@/stores/customer/cart'
-import Default from '@/layouts/default.vue'
 const router = useRouter()
 const customerStore = useCustomerStore()
 const addressStore = useAddressStore()
diff --git a/bo/src/components/customer/PageStatistic.vue b/bo/src/components/customer/PageStatistic.vue
index 466f718..ff2373f 100644
--- a/bo/src/components/customer/PageStatistic.vue
+++ b/bo/src/components/customer/PageStatistic.vue
@@ -1,9 +1,6 @@
 <template>
-    <component :is="Default || 'div'">
-        Statistic page
-    </component>
-</template>
+            Statistic page
+    </template>
 
 <script lang="ts" setup>
-import Default from '@/layouts/default.vue'
 </script>
\ No newline at end of file
diff --git a/bo/src/components/customer/StorageFileBrowser.vue b/bo/src/components/customer/StorageFileBrowser.vue
index a003e7f..34f4257 100644
--- a/bo/src/components/customer/StorageFileBrowser.vue
+++ b/bo/src/components/customer/StorageFileBrowser.vue
@@ -1,6 +1,5 @@
 <template>
-    <component :is="Default || 'div'">
-        <div class="p-4">
+            <div class="p-4">
             <div v-if="loading" class="flex justify-center py-8">
                 <ULoader />
             </div>
@@ -25,13 +24,11 @@
                 </template>
             </UTree>
         </div>
-    </component>
-</template>
+    </template>
 
 <script setup lang="ts">
 import { ref, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import Default from '@/layouts/default.vue'
 
 interface FileItemRaw {
     Name: string
diff --git a/bo/src/components/inner/CategoryMenu.vue b/bo/src/components/inner/CategoryMenu.vue
index 1ea7868..4f65a76 100644
--- a/bo/src/components/inner/CategoryMenu.vue
+++ b/bo/src/components/inner/CategoryMenu.vue
@@ -1,7 +1,7 @@
 <template>
   <UNavigationMenu orientation="vertical" type="single" :items="items" class="data-[orientation=vertical]:w-72" :ui="{
-    root:''
-  }"/>
+    root: ''
+  }" />
 </template>
 
 <script setup lang="ts">
@@ -39,9 +39,10 @@ function adaptMenu(menu: NavigationMenuItem[]) {
     if (item.children && item.children.length > 0) {
       item.open = path && path.includes(item.category_id) ? true : openAll.value
       adaptMenu(item.children);
+
       item.children.unshift({
         label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: {
-          name: 'admin-products-category', params: {
+          name: item.params.to, params: {
             category_id: item.params.category_id,
             link_rewrite: item.params.link_rewrite
           }
@@ -49,7 +50,7 @@ function adaptMenu(menu: NavigationMenuItem[]) {
       })
     } else {
       item.to = {
-        name: 'admin-products-category', params: {
+        name: item.params.to, params: {
           category_id: item.params.category_id,
           link_rewrite: item.params.link_rewrite
         }
diff --git a/bo/src/layouts/management.vue b/bo/src/layouts/management.vue
index 3d93339..a9a51f0 100644
--- a/bo/src/layouts/management.vue
+++ b/bo/src/layouts/management.vue
@@ -39,7 +39,7 @@
                     <UButton icon="i-lucide-panel-left" color="neutral" variant="ghost" aria-label="Toggle sidebar"
                         @click="open = !open" />
                     <p class="font-bold text-xl">Customer-Management: <span class="text-[20px] font-medium">{{ pageTitle
-                            }}</span></p>
+                    }}</span></p>
                 </div>
                 <div class="hidden md:flex items-center gap-12">
                     <div class="flex items-center gap-2">
@@ -179,8 +179,7 @@ const router = useRouter()
 
 const menu = ref<TopMenuItem[] | null>(null)
 
-const Id =Number(route.params.user_id)
-
+const Id = Number(route.params.user_id)
 async function cmGetTopMenu() {
     try {
         const { items } = await useFetchJson<TopMenuItem[]>(`/api/v1/restricted/menu/get-top-menu?target_user_id=${Id}`)
@@ -191,7 +190,6 @@ async function cmGetTopMenu() {
     }
 }
 
-console.log(route)
 watch(
     () => route.params.user_id,
     () => {
diff --git a/bo/src/router/index.ts b/bo/src/router/index.ts
index be6d4c8..57e096b 100644
--- a/bo/src/router/index.ts
+++ b/bo/src/router/index.ts
@@ -13,13 +13,30 @@ await getSettings()
 
 const routes = await getRoutes()
 let newRoutes = []
+
+function getLayoutFromComponent(path: string) {
+  const emptyLayouts = [
+    'LoginView.vue',
+    'RegisterView.vue',
+    'PasswordRecoveryView.vue',
+    'VerifyEmailView.vue',
+    'ResetPasswordForm.vue'
+  ]
+  return emptyLayouts.some((name) => path.includes(name)) ? 'empty' : 'default'
+}
+
 for (let r of routes) {
   const component = () => import(/* @vite-ignore */ `..${r.component}`)
+  const parsedMeta = r.meta ? JSON.parse(r.meta) : {}
+  const layout = parsedMeta.layout ?? getLayoutFromComponent(r.component)
   newRoutes.push({
     path: r.path,
     component,
     name: r.name,
-    meta: r.meta ? JSON.parse(r.meta) : {},
+    meta: {
+      ...parsedMeta,
+      layout,
+    },
   })
 }
 
@@ -73,15 +90,21 @@ async function setRoutes() {
     }
 
     const importedComponent = (await importer()).default
+    const parsedMeta = item.meta ? JSON.parse(item.meta) : {}
+    const layout = parsedMeta.layout ?? getLayoutFromComponent(item.component)
 
     router.addRoute('locale', {
       path: item.path,
       component: importedComponent,
       name: item.name,
-      meta: item.meta ? JSON.parse(item.meta) : {}
+      meta: {
+        ...parsedMeta,
+        layout,
+      }
     })
   }
-
+  
+  console.log(router);
   // await router.replace(router.currentRoute.value.fullPath)
 }
 
diff --git a/bo/src/views/CategoryView.vue b/bo/src/views/CategoryView.vue
deleted file mode 100644
index a2c1639..0000000
--- a/bo/src/views/CategoryView.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-    <component :is="Default || 'div'">
-        <div class="container mt-24">
-            <div class="row">
-                <!-- <div class="col-12">
-                    <h2 class="text-2xl">Category ID: {{ $route.params.category_id }}</h2>
-                    <div v-for="(p, i) in products" :key="i">
-                        <p>
-                            <span class="border-b-1 bg-red-100 px-4">{{ p.name }}</span>
-                            <span class="border-b-1 bg-red-100 px-4">{{ p.price }}</span>
-                        </p>
-                    </div>
-                </div> -->
-            </div>
-        </div>
-    </component>
-</template>
-
-
-<script setup lang="ts">
-// import { useRoute } from 'vue-router';
-import Default from '@/layouts/default.vue';
-import { useCategoryStore } from '@/stores/admin/category';
-import { ref, watch } from 'vue';
-import { useRoute } from 'vue-router';
-// const route = useRoute()
-// console.log(route);
-
-const categoryStore = useCategoryStore()
-const route = useRoute()
-
-const products = ref([])
-
-watch(() => route.params, async (n) => {
-    categoryStore.setCategoryID(parseInt(n.category_id as string))
-    const res = await categoryStore.getCategoryProducts()
-    // products.value = res
-
-}, { immediate: true })
-
-
-</script>
\ No newline at end of file
diff --git a/bo/src/views/HomeView.vue b/bo/src/views/HomeView.vue
index 08cec22..b653373 100644
--- a/bo/src/views/HomeView.vue
+++ b/bo/src/views/HomeView.vue
@@ -1,9 +1,6 @@
 <template>
-        <component :is="Default || 'div'">
-            home View
-        </component>
-</template>
+                    home View
+        </template>
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 
 </script>
\ No newline at end of file
diff --git a/bo/src/views/RepoChartView.vue b/bo/src/views/RepoChartView.vue
index c94fdc0..b8783a7 100644
--- a/bo/src/views/RepoChartView.vue
+++ b/bo/src/views/RepoChartView.vue
@@ -15,7 +15,6 @@ import { useAuthStore } from '@/stores/customer/auth'
 import { i18n } from '@/plugins/02_i18n'
 import type { TableColumn } from '@nuxt/ui'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
 
 ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale)
 
@@ -182,8 +181,7 @@ const columns = computed<TableColumn<IssueTimeSummary>[]>(() => [
 </script>
 
 <template>
-      <component :is="Default || 'div'">
-    <div class="">
+          <div class="">
         <div class="p-6 bg-(--main-light) dark:bg-(--black) font-sans">
             <h1 class="text-2xl font-bold mb-6 text-black dark:text-white">{{ $t('repo_chart.repository_work_chart') }}
             </h1>
@@ -256,5 +254,4 @@ const columns = computed<TableColumn<IssueTimeSummary>[]>(() => [
             </div>
         </div>
     </div>
-    </component>
-</template>
\ No newline at end of file
+    </template>
\ No newline at end of file
diff --git a/bo/src/views/StorageView.vue b/bo/src/views/StorageView.vue
index d055ed7..0a85dbe 100644
--- a/bo/src/views/StorageView.vue
+++ b/bo/src/views/StorageView.vue
@@ -7,6 +7,5 @@
 </template>
 
 <script setup lang="ts">
-import Default from '@/layouts/default.vue'
 import StorageFileBrowser from '@/components/customer/StorageFileBrowser.vue'
 </script>
\ No newline at end of file
diff --git a/i18n/migrations/20260302163100_routes.sql b/i18n/migrations/20260302163100_routes.sql
index 989c896..2ee9aec 100644
--- a/i18n/migrations/20260302163100_routes.sql
+++ b/i18n/migrations/20260302163100_routes.sql
@@ -10,17 +10,6 @@ CREATE TABLE IF NOT EXISTS b2b_routes (
 
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
--- INSERT IGNORE INTO b2b_routes
---   (name, path, component, meta, active)
--- VALUES
---   ('root', '', '', '{"trans": "route.root"}', 0),
---   ('home', '', '/views/HomeView.vue', '{"trans": "route.home"}', 1),
---   ('login', 'login', '/views/LoginView.vue', '{"guest":true}', 1),
---   ('register', 'register', '/views/RegisterView.vue', '{"guest":true}', 1),
---   ('password-recovery', 'password-recovery', '/views/PasswordRecoveryView.vue', '{"guest":true}', 1),
---   ('reset-password', 'reset-password', '/views/ResetPasswordView.vue', '{"guest":true}', 1),
---   ('verify-email', 'verify-email', '/views/VerifyEmailView.vue', '{"guest":true}', 1);
-
 INSERT IGNORE INTO `b2b_routes` (`id`, `name`, `path`, `component`, `meta`, `active`) VALUES 
 (1, 'root', '', '', '{"trans": "route.root"}', 0),
 (2, 'home', '', '/views/HomeView.vue', '{"trans": "route.home"}', 1),
@@ -29,16 +18,59 @@ INSERT IGNORE INTO `b2b_routes` (`id`, `name`, `path`, `component`, `meta`, `act
 (5, 'password-recovery', 'password-recovery', '/views/PasswordRecoveryView.vue', '{"guest":true}', 1),
 (6, 'reset-password', 'reset-password', '/views/ResetPasswordForm.vue', '{"guest":true}', 1),
 (7, 'verify-email', 'verify-email', '/views/VerifyEmailView.vue', '{"guest":true}', 1),
-(8, 'category', 'category/:category_id-:link_rewrite', '/views/CategoryView.vue', '{"guest":true}', 1),
 (9, 'admin-products-category', 'products/:category_id-:link_rewrite', '/components/admin/PageProducts.vue', '{
-  "guest": true
+"guest":true,
+"name": "Products Category"
 }', 1),
-(10, 'customer-addresses', 'addresses', '/components/customer/PageAddresses.vue', '{"guest":true}', 1),
-(11, 'customer-carts', 'carts', '/components/customer/PageCarts.vue', '{"guest":true}', 1),
-(12, 'customer-orders', 'orders', '/components/customer/PageOrders.vue', '{"guest":true}', 1),
-(13, 'customer-statistic', 'statistic', '/components/customer/PageStatistic.vue', '{"guest":true}', 1),
-(14, 'customer-product-details', 'products/:product_id/:link_rewrite', '/components/admin/ProductDetailView.vue', '{"guest":true}', 1),
-(15, 'admin-products', 'products', '/components/admin/PageProducts.vue', '{"guest":true}', 1);
+(10, 'customer-addresses', 'addresses', '/components/customer/PageAddresses.vue', '{
+"guest":true,
+"name": "Addresses"
+}', 1),
+(11, 'customer-cart', 'cart/:id', '/components/customer/PageCart.vue', '{
+"guest":true,
+"name": "Cart"
+}', 1),
+(12, 'customer-orders', 'orders', '/components/customer/PageOrders.vue', '{
+"guest":true,
+"name": "Order"
+}', 1),
+(13, 'customer-statistic', 'statistic', '/components/customer/PageStatistic.vue', '{
+"guest":true,
+"name": "Statistic"
+}
+', 1),
+(14, 'admin-product-details', 'products/:product_id', '/components/admin/ProductDetailView.vue', '{
+"guest":true,
+"name": "Products"
+}
+', 1),
+(15, 'admin-products', 'products', '/components/admin/PageProducts.vue', '{
+"guest":true,
+"name": "Products"
+}
+', 1),
+(16, 'admin-users-list', 'users-list', '/components/admin/UsersList.vue', '{
+"guest":true,
+"name": "Client List"
+}
+', 1),
+(17, 'customer-management-profile', ':user_id/profile', '/components/customer-management/Profile.vue', '{
+"guest":true,
+"name": "Profile"
+}
+', 1),
+(18, 'admin-users-search', 'users-search', '/components/admin/UsersSearch.vue', '{
+"guest":true,
+"name": "Search Clients"
+}
+', 1),
+(19, 'customer-storage-file', 'file-storage', '/components/customer/StorageFileBrowser.vue', '{
+"guest":true,
+"name": "File Storage"
+}', 1),
+(20, 'customer-products', 'products', '/components/customer/PageProducts.vue', '{ "guest":true, "name": "Products" }', 1),
+(21, 'customer-product-details', 'products/:product_id', '/components/customer/PageProduct.vue', '{ "guest":true, "name": "Products" }', 1),
+(22, 'customer-page-carts', 'carts', '/components/customer/PageCarts.vue', '{ "guest":true, "name": "Carts" }', 1);
 
 CREATE TABLE IF NOT EXISTS b2b_top_menu (
   menu_id INT AUTO_INCREMENT NOT NULL,
@@ -71,21 +103,6 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
   },
   "icon" : "quill:list"
 }', 1, '{"route":{"name":"admin-products","params":{"locale":""}}}', 1, 1),
-(3, '{
-  "name": "customer-carts",
-  "trans": {
-    "pl": {
-      "label": "Carts"
-    },
-    "en": {
-      "label": "Carts"
-    },
-    "de": {
-      "label": "Carts"
-    }
-  },
-  "icon" : "proicons:cart"
-}', 1, '{"route":{"name":"customer-carts","params":{"locale":""}}}', 1, 1),
 (4, '{
   "name": "customer-addresses",
   "trans": {
@@ -138,7 +155,138 @@ INSERT IGNORE INTO `b2b_top_menu` (`menu_id`, `label`, `parent_id`, `params`, `a
     }
   }
 }', 1, 1),
-(9, '{"name":"carts","trans":{"pl":{"label":"Koszyki"},"en":{"label":"Carts"},"de":{"label":"Warenkörbe"}}}', 3, '{"route":{"name":"home","params":{"locale":""}}}', 1, 1);
+(10, '{
+  "name": "customer-storage-file",
+  "trans": {
+    "pl": {
+      "label": "File Storage"
+    },
+    "en": {
+      "label": "File Storage"
+    },
+    "de": {
+      "label": "File Storage"
+    }
+  },
+  "icon": "carbon:volume-file-storage"
+}', 1, '{
+  "route": {
+    "name": "customer-storage-file",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(12, '{
+  "name": "admin-users-list",
+  "trans": {
+    "pl": {
+      "label": "Client List"
+    },
+    "en": {
+      "label": "Client List"
+    },
+    "de": {
+      "label": "Client List"
+    }
+  },
+  "icon": "tdesign:user-list"
+}', 1, '{
+  "route": {
+    "name": "admin-users-list",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(13, '{
+  "name": "admin-users-search",
+  "trans": {
+    "pl": {
+      "label": "Search Clients"
+    },
+    "en": {
+      "label": "Search Clients"
+    },
+    "de": {
+      "label": "Search Clients"
+    }
+  },
+  "icon": "material-symbols:search"
+}', 1, '{
+  "route": {
+    "name": "admin-users-search",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(14, '{
+  "name": "customer-management-profile",
+  "trans": {
+    "pl": {
+      "label": "Profile"
+    },
+    "en": {
+      "label": "Profile"
+    },
+    "de": {
+      "label": "Profile"
+    }
+  },
+  "icon": "akar-icons:statistic-up"
+}', 1, '{
+  "route": {
+    "name": "customer-management-profile",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(15, '{
+  "name": "customer-products",
+  "trans": {
+    "pl": {
+      "label": "Products"
+    },
+    "en": {
+      "label": "Products"
+    },
+    "de": {
+      "label": "Products"
+    }
+  },
+  "icon": "akar-icons:statistic-up"
+}', 1, '{
+  "route": {
+    "name": "customer-products",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1),
+(16, '{
+  "name": "customer-page-carts",
+  "trans": {
+    "pl": {
+      "label": "Carts"
+    },
+    "en": {
+      "label": "Carts"
+    },
+    "de": {
+      "label": "Carts"
+    }
+  },
+  "icon": "proicons:cart1"
+}', 1, '{
+  "route": {
+    "name": "customer-page-carts",
+    "params": {
+      "locale": ""
+    }
+  }
+}', 1, 1);
 
 
 -- +goose Down
diff --git a/i18n/migrations/20260302163123_create_tables_data.sql b/i18n/migrations/20260302163123_create_tables_data.sql
index 94c1233..fce9709 100644
--- a/i18n/migrations/20260302163123_create_tables_data.sql
+++ b/i18n/migrations/20260302163123_create_tables_data.sql
@@ -95,5 +95,24 @@ INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
 (7, '1'),
 (7, '2'),
 (7, '3'),
-(7, '4');
+(7, '4'),
+(9, '2'),
+(9, '3'),
+(10, '1'),
+(11, '1'),
+(12, '1'),
+(13, '1'),
+(14, '2'),
+(14, '3'),
+(15, '2'),
+(15, '3'),
+(16, '2'),
+(16, '3'),
+(17, '1'),
+(18, '2'),
+(18, '3'),
+(19, '1'),
+(20, '1'),
+(21, '1'),
+(22, '1');
 -- +goose Down
\ No newline at end of file