Merge remote-tracking branch 'origin/translate' into front-styles

Reviewed-on: #70
Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>

.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 = ""

app/delivery/web/api/restricted/carts.go

@@ -29,10 +29,12 @@ func CartsHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewCartsHandler()
 
 	r.Get("/add-new-cart", handler.AddNewCart)
+	r.Delete("/remove-cart", handler.RemoveCart)
 	r.Get("/change-cart-name", handler.ChangeCartName)
 	r.Get("/retrieve-carts-info", handler.RetrieveCartsInfo)
 	r.Get("/retrieve-cart", handler.RetrieveCart)
 	r.Get("/add-product-to-cart", handler.AddProduct)
+	r.Delete("/remove-product-from-cart", handler.RemoveProduct)
 
 	return r
 }
@@ -53,6 +55,29 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 	return c.JSON(response.Make(&new_cart, 0, i18n.T_(c, response.Message_OK)))
 }
 
+func (h *CartsHandler) RemoveCart(c fiber.Ctx) error {
+	userID, ok := localeExtractor.GetUserID(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	cart_id_attribute := c.Query("cart_id")
+	cart_id, err := strconv.Atoi(cart_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.cartsService.RemoveCart(userID, uint(cart_id))
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}
+
 func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 	userID, ok := localeExtractor.GetUserID(c)
 	if !ok {
@@ -117,6 +142,7 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 	return c.JSON(response.Make(cart, 0, i18n.T_(c, response.Message_OK)))
 }
 
+// adds or sets given amount of products to the cart
 func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
 	userID, ok := localeExtractor.GetUserID(c)
 	if !ok {
@@ -159,7 +185,59 @@ func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	err = h.cartsService.AddProduct(userID, uint(cart_id), uint(product_id), product_attribute_id, uint(amount))
+	set_amount_attribute := c.Query("set_amount")
+	set_amount, err := strconv.ParseBool(set_amount_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.cartsService.AddProduct(userID, uint(cart_id), uint(product_id), product_attribute_id, amount, set_amount)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+}
+
+// removes product from the cart.
+func (h *CartsHandler) RemoveProduct(c fiber.Ctx) error {
+	userID, ok := localeExtractor.GetUserID(c)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
+	}
+
+	cart_id_attribute := c.Query("cart_id")
+	cart_id, err := strconv.Atoi(cart_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	product_id_attribute := c.Query("product_id")
+	product_id, err := strconv.Atoi(product_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	product_attribute_id_attribute := c.Query("product_attribute_id")
+	var product_attribute_id *uint
+	if product_attribute_id_attribute == "" {
+		product_attribute_id = nil
+	} else {
+		val, err := strconv.Atoi(product_attribute_id_attribute)
+		if err != nil {
+			return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+		}
+		uval := uint(val)
+		product_attribute_id = &uval
+	}
+
+	err = h.cartsService.RemoveProduct(userID, uint(cart_id), uint(product_id), product_attribute_id)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))

app/repos/cartsRepo/cartsRepo.go

@@ -1,9 +1,13 @@
 package cartsRepo
 
 import (
+	"errors"
+
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+	"gorm.io/gorm"
 )
 
 type UICartsRepo interface {
@@ -15,7 +19,8 @@ type UICartsRepo interface {
 	RetrieveCartsInfo(user_id uint) ([]model.CustomerCart, error)
 	RetrieveCart(user_id uint, cart_id uint) (*model.CustomerCart, error)
 	CheckProductExists(product_id uint, product_attribute_id *uint) (bool, error)
-	AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error
+	AddProduct(cart_id uint, product_id uint, product_attribute_id *uint, amount uint, set_amount bool) error
+	RemoveProduct(cart_id uint, product_id uint, product_attribute_id *uint) error
 }
 
 type CartsRepo struct{}
@@ -129,14 +134,61 @@ func (repo *CartsRepo) CheckProductExists(product_id uint, product_attribute_id
 	}
 }
 
-func (repo *CartsRepo) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
+func (repo *CartsRepo) AddProduct(cart_id uint, product_id uint, product_attribute_id *uint, amount uint, set_amount bool) error {
-	product := model.CartProduct{
+	var product model.CartProduct
-		CartID:             cart_id,
-		ProductID:          product_id,
-		ProductAttributeID: product_attribute_id,
-		Amount:             amount,
-	}
-	err := db.DB.Create(&product).Error
 
-	return err
+	err := db.DB.
+		Where(&model.CartProduct{
+			CartID:             cart_id,
+			ProductID:          product_id,
+			ProductAttributeID: product_attribute_id,
+		}).
+		First(&product).Error
+
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			if amount < 1 {
+				return responseErrors.ErrAmountMustBePositive
+			} else if amount > constdata.MAX_AMOUNT_OF_PRODUCT_IN_CART {
+				return responseErrors.ErrAmountMustBeReasonable
+			}
+
+			product = model.CartProduct{
+				CartID:             cart_id,
+				ProductID:          product_id,
+				ProductAttributeID: product_attribute_id,
+				Amount:             amount,
+			}
+
+			return db.DB.Create(&product).Error
+		}
+
+		// Some other DB error
+		return err
+	}
+
+	// Product already exists in cart
+	if set_amount {
+		product.Amount = amount
+	} else {
+		product.Amount = product.Amount + amount
+	}
+
+	if product.Amount < 1 {
+		return responseErrors.ErrAmountMustBePositive
+	} else if product.Amount > constdata.MAX_AMOUNT_OF_PRODUCT_IN_CART {
+		return responseErrors.ErrAmountMustBeReasonable
+	}
+
+	return db.DB.Save(&product).Error
+}
+
+func (repo *CartsRepo) RemoveProduct(cart_id uint, product_id uint, product_attribute_id *uint) error {
+	return db.DB.
+		Where(&model.CartProduct{
+			CartID:             cart_id,
+			ProductID:          product_id,
+			ProductAttributeID: product_attribute_id,
+		}).
+		Delete(&model.CartProduct{}).Error
 }

app/repos/localeSelectorRepo/localeSelectorRepo.go

@@ -3,6 +3,7 @@ package localeSelectorRepo
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
 )
 
 type UILocaleSelectorRepo interface {
@@ -25,7 +26,9 @@ func (r *LocaleSelectorRepo) GetLanguages() ([]model.Language, error) {
 func (r *LocaleSelectorRepo) GetCountriesAndCurrencies() ([]model.Country, error) {
 	var countries []model.Country
 	err := db.Get().
-		Preload("PSCurrency").
+		Select("*").
+		Preload("Currency").
+		Joins("LEFT JOIN " + dbmodel.TableNamePsCountryLang + " AS cl ON cl." + dbmodel.PsCountryLangCols.IDCountry.Col() + " = b2b_countries.ps_id_country AND cl." + dbmodel.PsCountryLangCols.IDLang.Col() + " = 2").
 		Find(&countries).Error
 	return countries, err
 }

app/service/cartsService/cartsService.go

@@ -74,7 +74,7 @@ func (s *CartsService) RetrieveCart(user_id uint, cart_id uint) (*model.Customer
 	return s.repo.RetrieveCart(user_id, cart_id)
 }
 
-func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount uint) error {
+func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint, amount int, set_amount bool) error {
 	exists, err := s.repo.UserHasCart(user_id, cart_id)
 	if err != nil {
 		return err
@@ -91,5 +91,17 @@ func (s *CartsService) AddProduct(user_id uint, cart_id uint, product_id uint, p
 		return responseErrors.ErrProductOrItsVariationDoesNotExist
 	}
 
-	return s.repo.AddProduct(user_id, cart_id, product_id, product_attribute_id, amount)
+	return s.repo.AddProduct(cart_id, product_id, product_attribute_id, uint(amount), set_amount)
+}
+
+func (s *CartsService) RemoveProduct(user_id uint, cart_id uint, product_id uint, product_attribute_id *uint) error {
+	exists, err := s.repo.UserHasCart(user_id, cart_id)
+	if err != nil {
+		return err
+	}
+	if !exists {
+		return responseErrors.ErrUserHasNoSuchCart
+	}
+
+	return s.repo.RemoveProduct(cart_id, product_id, product_attribute_id)
 }

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()
 }

app/utils/const_data/consts.go

@@ -15,6 +15,7 @@ var CATEGORY_BLACKLIST = []uint{250}
 
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
+const MAX_AMOUNT_OF_PRODUCT_IN_CART = 1024
 
 const MAX_AMOUNT_OF_ADDRESSES_PER_USER = 10
 

app/utils/responseErrors/responseErrors.go

@@ -65,6 +65,8 @@ var (
 	ErrMaxAmtOfCartsReached              = errors.New("maximal amount of carts reached")
 	ErrUserHasNoSuchCart                 = errors.New("user does not have cart with given id")
 	ErrProductOrItsVariationDoesNotExist = errors.New("product or its variation with given ids does not exist")
+	ErrAmountMustBePositive              = errors.New("amount must be positive")
+	ErrAmountMustBeReasonable            = errors.New("amount must be reasonable")
 
 	// Typed errors for orders handler
 	ErrEmptyCart          = errors.New("the cart is empty")
@@ -205,6 +207,10 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 		return i18n.T_(c, "error.err_user_has_no_such_cart")
 	case errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return i18n.T_(c, "error.err_product_or_its_variation_does_not_exist")
+	case errors.Is(err, ErrAmountMustBePositive):
+		return i18n.T_(c, "error.err_amount_must_be_positive")
+	case errors.Is(err, ErrAmountMustBeReasonable):
+		return i18n.T_(c, "error.err_amount_must_be_reasonable")
 
 	case errors.Is(err, ErrEmptyCart):
 		return i18n.T_(c, "error.err_cart_is_empty")
@@ -292,6 +298,8 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrMaxAmtOfCartsReached),
 		errors.Is(err, ErrUserHasNoSuchCart),
 		errors.Is(err, ErrProductOrItsVariationDoesNotExist),
+		errors.Is(err, ErrAmountMustBePositive),
+		errors.Is(err, ErrAmountMustBeReasonable),
 		errors.Is(err, ErrEmptyCart),
 		errors.Is(err, ErrUserHasNoSuchOrder),
 		errors.Is(err, ErrInvalidReductionType),

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']

bo/src/App.vue

@@ -1,18 +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>
-  <UApp>
+  <Suspense>
-    <Suspense>
+    <TooltipProvider>
-      <TooltipProvider>
+      <component :is="layout === 'empty' ? EmptyLayout : layout === 'management' ? ManagementLayout : DefaultLayout">
-        <RouterView />
+        <RouterView v-slot="{ Component }">
-        <UNotifications />
+          <component :is="Component" />
-      </TooltipProvider>
+        </RouterView>
-    </Suspense>
+      </component>
-  </UApp>
+    </TooltipProvider>
+  </Suspense>
 </template>

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>

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'

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';

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';

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'

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';

bo/src/components/customer-management/Profile.vue

@@ -1,11 +1,7 @@
 <template>
-    <component :is="Management || 'div'">
+    <div>customer-management</div>
-        <div>customer-management</div>
-    </component>
 </template>
 
 
 <script setup lang="ts">
-import Management from '@/layouts/management.vue';
+</script>
-
-</script>   

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()

bo/src/components/customer/PageAddresses.vue

@@ -1,180 +1,246 @@
 <template>
-    <component :is="Default || 'div'">
+            <div class="">
-    <div class="">
+            <div class="flex flex-col gap-5 mb-6">
-        <div class="flex flex-col gap-5 mb-6">
+                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Addresses') }}</h1>
-            <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">
-            <div class="flex md:flex-row flex-col justify-between items-start md:items-center gap-5 md:gap-0">
+                    <div class="flex gap-2 items-center">
-                <div class="flex gap-2 items-center">
+                        <UInput v-model="searchQuery" type="text" :placeholder="t('Search address')"
-                    <UInput v-model="searchQuery" type="text" :placeholder="t('Search address')"
+                            class="bg-white dark:bg-gray-800 text-black dark:text-white absolute" />
-                        class="bg-white dark:bg-gray-800 text-black dark:text-white absolute" />
+                        <UIcon name="ic:baseline-search"
-                    <UIcon name="ic:baseline-search"
+                            class="text-[20px] text-(--text-sky-light) dark:text-(--text-sky-dark) relative left-40" />
-                        class="text-[20px] text-(--text-sky-light) dark:text-(--text-sky-dark) relative left-40" />
+                    </div>
-                </div>
+                    <UButton color="info" @click="openCreateModal">
-                <UButton color="primary" @click="openCreateModal"
+                        <UIcon name="mdi:add-bold" />
-                    class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+                        {{ t('Add Address') }}
-                    <UIcon name="mdi:add-bold" />
+                    </UButton>
-                    {{ t('Add Address') }}
-                </UButton>
-            </div>
-        </div>
-        <div v-if="paginatedAddresses.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
-            <div v-for="address in paginatedAddresses" :key="address.id"
-                class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) hover:shadow-md transition-shadow flex justify-between">
-                <div class="flex flex-col gap-2 items-strat justify-end">
-                    <p class="text-black dark:text-white">{{ address.street }}</p>
-                    <p class="text-black dark:text-white">{{ address.zipCode }}, {{ address.city }}</p>
-                    <p class="text-black dark:text-white">{{ address.country }}</p>
-                </div>
-                <div class="flex flex-col items-end justify-between gap-2">
-                    <button @click="confirmDelete(address.id)"
-                    class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
-                    :title="t('Remove')">
-                    <UIcon name="material-symbols:delete" class="text-[18px]" />
-                </button>
-                <UButton size="sm" color="neutral" variant="outline" @click="openEditModal(address)"
-                    class="text-(--text-sky-light) dark:text-(--text-sky-dark) text-[13px]">
-                    {{ t('edit') }}
-                    <UIcon name="ic:sharp-edit" class="text-[15px]" />
-                </UButton>
                 </div>
             </div>
-        </div>
+            <div v-if="cartStore.addressLoading" class="text-center py-8 text-gray-500 dark:text-gray-400">
-        <div v-else class="text-center py-8 text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</div>
+                {{ t('Loading addresses...') }}
-        <div class="mt-6 flex justify-center">
+            </div>
-            <UPagination v-model:page="page" :total="totalItems" :page-size="pageSize" />
+            <div v-else-if="cartStore.addressError" class="text-center py-8 text-red-500 dark:text-red-400">
-        </div>
+                {{ cartStore.addressError }}
-        <UModal v-model:open="showModal" :overlay="true" class="max-w-md mx-auto">
+            </div>
-            <template #content>
+            <div v-else-if="cartStore.paginatedAddresses.length"
-                <div class="p-6 flex flex-col gap-6">
+                class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
-                    <p class="text-[20px] text-black dark:text-white ">Address</p>
+                <div v-for="address in cartStore.paginatedAddresses" :key="address.id"
-                    <UForm @submit.prevent="saveAddress" class="space-y-4" :validate="validate">
+                    class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) hover:shadow-md transition-shadow flex justify-between">
-                        <div>
+                    <div class="flex flex-col gap-2 items-start justify-end">
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Street *</label>
+                        <p class="text-black dark:text-white font-semibold">{{ address.address_info.recipient }}</p>
-                            <UInput v-model="formData.street" placeholder="Enter street" name="street" class="w-full" />
+                        <p class="text-black dark:text-white">{{ address.address_info.street }} {{
-                        </div>
+                            address.address_info.building_no }}{{ address.address_info.apartment_no ? '/' +
-                        <div>
+                                address.address_info.apartment_no : '' }}</p>
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Zip Code *</label>
+                        <p class="text-black dark:text-white">{{ address.address_info.postal_code }}, {{
-                            <UInput v-model="formData.zipCode" placeholder="Enter zip code" name="zipCode"
+                            address.address_info.city }}</p>
-                                class="w-full" />
+                        <p class="text-black dark:text-white">{{ address.address_info.voivodeship }}</p>
-                        </div>
+                        <p v-if="address.address_info.address_line2" class="text-black dark:text-white">{{
-                        <div>
+                            address.address_info.address_line2 }}</p>
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">City *</label>
-                            <UInput v-model="formData.city" placeholder="Enter city" name="city" class="w-full" />
-                        </div>
-                        <div>
-                            <label class="block text-sm font-medium text-black dark:text-white mb-1">Country *</label>
-                            <UInput v-model="formData.country" placeholder="Enter country" name="country"
-                                class="w-full" />
-                        </div>
-                    </UForm>
-                    <div class="flex justify-end gap-2">
-                        <UButton variant="outline" color="neutral" @click="closeModal"
-                            class="text-black dark:text-white">{{ t('Cancel') }}</UButton>
-                        <UButton variant="outline" color="neutral" @click="saveAddress"
-                            class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
-                            {{ t('Save') }}</UButton>
                     </div>
-                </div>
+                    <div class="flex flex-col items-end justify-between gap-2">
-            </template>
+                        <button @click="confirmDelete(address.id)"
-        </UModal>
+                            class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
-        <UModal v-model:open="showDeleteConfirm" :overlay="true" class="max-w-md mx-auto">
+                            :title="t('Remove')">
-            <template #content>
+                            <UIcon name="material-symbols:delete" class="text-[18px]" />
-                <div class="p-6 flex flex-col gap-3">
+                        </button>
-                    <div class="flex flex-col gap-2 justify-center items-center">
+                        <UButton size="sm" color="neutral" variant="outline" @click="openEditModal(address)"
-                        <p class="flex items-end gap-2 dark:text-white text-black">
+                            class="text-(--text-sky-light) dark:text-(--text-sky-dark) text-[13px]">
-                            <UIcon name='f7:exclamationmark-triangle' class="text-[35px] text-red-700" />
+                            {{ t('edit') }}
-                            Confirm Delete
+                            <UIcon name="ic:sharp-edit" class="text-[15px]" />
-                        </p>
-                        <p class="text-gray-700 dark:text-gray-300">
-                            {{ t('Are you sure you want to delete this address?') }}</p>
-                    </div>
-                    <div class="flex justify-center gap-5">
-                        <UButton variant="outline" color="neutral" @click="showDeleteConfirm = false"
-                            class="dark:text-white text-black">{{ t('Cancel') }}
                         </UButton>
-                        <UButton variant="outline" color="neutral" @click="deleteAddress" class="text-red-700">
-                            {{ t('Delete') }}</UButton>
                     </div>
                 </div>
-            </template>
+            </div>
-        </UModal>
+            <div v-else class="text-center py-8 text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</div>
-    </div>
+            <div class="mt-6 flex justify-center">
-    </component>
+                <UPagination v-model:page="page" :total="totalItems" :page-size="pageSize" />
-</template>
+            </div>
+            <UModal v-model:open="showModal" :overlay="true" class="max-w-md mx-auto">
+                <template #content>
+                    <div class="p-6 flex flex-col gap-6">
+                        <p class="text-[20px] text-black dark:text-white ">Address</p>
+                        <UForm @submit="saveAddress" class="space-y-4" :validate="validate" :state="formData">
+                            <template v-for="field in formFieldKeys" :key="field">
+                                <UFormField :label="fieldLabel(field)" :name="field"
+                                    :required="field !== 'address_line2'">
+                                    <UInput v-model="formData[field]" :placeholder="fieldLabel(field)" class="w-full" />
+                                </UFormField>
+                            </template>
+
+                            <div class="flex justify-end gap-2">
+                                <UButton variant="outline" color="neutral" @click="closeModal">
+                                    {{ t('Cancel') }}
+                                </UButton>
+
+                                <UButton type="submit" color="info" class="cursor-pointer">
+                                    {{ t('Save') }}
+                                </UButton>
+                            </div>
+                        </UForm>
+                    </div>
+                </template>
+            </UModal>
+            <UModal v-model:open="showDeleteConfirm" :overlay="true" class="max-w-md mx-auto">
+                <template #content>
+                    <div class="p-6 flex flex-col gap-3">
+                        <div class="flex flex-col gap-2 justify-center items-center">
+                            <p class="flex items-end gap-2 dark:text-white text-black">
+                                <UIcon name='f7:exclamationmark-triangle' class="text-[35px] text-red-700" />
+                                Confirm Delete
+                            </p>
+                            <p class="text-gray-700 dark:text-gray-300">
+                                {{ t('Are you sure you want to delete this address?') }}</p>
+                        </div>
+                        <div class="flex justify-center gap-5">
+                            <UButton variant="outline" color="neutral" @click="showDeleteConfirm = false"
+                                class="dark:text-white text-black">{{ t('Cancel') }}
+                            </UButton>
+                            <UButton variant="outline" color="neutral" @click="deleteAddress" class="text-red-700">
+                                {{ t('Delete') }}</UButton>
+                        </div>
+                    </div>
+                </template>
+            </UModal>
+        </div>
+    </template>
 
 <script setup lang="ts">
-import { ref, computed, watch } from 'vue'
+import { ref, reactive, computed, watch, onMounted } from 'vue'
-import { useAddressStore } from '@/stores/customer/address'
+import { useCartStore } from '@/stores/customer/cart'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
+import { currentCountry } from '@/router/langs'
-const addressStore = useAddressStore()
+
+type AddressFormState = Record<string, string>
+
+const cartStore = useCartStore()
 const { t } = useI18n()
-const searchQuery = ref('')
+const searchQuery = ref(cartStore.addressSearchQuery)
 const showModal = ref(false)
 const isEditing = ref(false)
 const editingAddressId = ref<number | null>(null)
-const formData = ref({ street: '', zipCode: '', city: '', country: '' })
+const addressTemplate = ref<AddressFormState | null>(null)
+const formData = reactive<AddressFormState>({})
 
 const showDeleteConfirm = ref(false)
 const addressToDelete = ref<number | null>(null)
 
-const page = ref(addressStore.currentPage)
+const page = computed<number>({
-const paginatedAddresses = computed(() => addressStore.paginatedAddresses)
+    get: () => cartStore.addressCurrentPage,
-const totalItems = computed(() => addressStore.totalItems)
+    set: (value: number) => cartStore.setAddressPage(value)
-const pageSize = addressStore.pageSize
-
-watch(page, (newPage) => addressStore.setPage(newPage))
-watch(searchQuery, (val) => {
-    addressStore.setSearchQuery(val)
 })
-function openCreateModal() {
+const totalItems = computed(() => cartStore.totalAddressItems)
+const pageSize = cartStore.addressPageSize
+const formFieldKeys = computed(() => (addressTemplate.value ? Object.keys(addressTemplate.value) : []))
+
+watch(searchQuery, (val) => {
+    cartStore.setAddressSearchQuery(val)
+})
+
+onMounted(() => {
+    cartStore.fetchAddresses()
+})
+
+function clearFormData() {
+    Object.keys(formData).forEach((key) => delete formData[key])
+}
+
+function fieldLabel(key: string) {
+    const labels: Record<string, string> = {
+        postal_code: 'Zip Code',
+        post_town: 'City',
+        city: 'City',
+        county: 'County',
+        region: 'Region',
+        voivodeship: 'Region / Voivodeship',
+        street: 'Street',
+        thoroughfare: 'Street',
+        building_no: 'Building No',
+        building_name: 'Building Name',
+        house_number: 'House Number',
+        orientation_number: 'Orientation Number',
+        apartment_no: 'Apartment No',
+        sub_building: 'Sub Building',
+        address_line2: 'Address Line 2',
+        recipient: 'Recipient'
+    }
+
+    return t(labels[key] ?? key.replace(/_/g, ' ').replace(/\b\w/g, (chr) => chr.toUpperCase()))
+}
+
+async function openCreateModal() {
     resetForm()
     isEditing.value = false
+
+    const template = await cartStore.getAddressTemplate(Number(currentCountry.value?.id) | 2).catch(() => null)
+    if (template) {
+        addressTemplate.value = template
+        clearFormData()
+        Object.assign(formData, template)
+    }
+
     showModal.value = true
 }
-function openEditModal(address: any) {
+
-    formData.value = {
+async function openEditModal(address: any) {
-        street: address.street,
+    currentCountry.value = address.country_id || 1
-        zipCode: address.zipCode,
+    const template = await cartStore.getAddressTemplate(address.country_id | 2).catch(() => null)
-        city: address.city,
+
-        country: address.country
+    if (template) {
+        addressTemplate.value = template
+        clearFormData()
+        Object.assign(formData, template)
     }
+
+    if (address.address_info) {
+        formFieldKeys.value.forEach((key) => {
+            formData[key] = address.address_info[key] ?? ''
+        })
+    }
+
     isEditing.value = true
     editingAddressId.value = address.id
     showModal.value = true
 }
+
 function resetForm() {
-    formData.value = { street: '', zipCode: '', city: '', country: '' }
+    clearFormData()
     editingAddressId.value = null
 }
+
 function closeModal() {
     showModal.value = false
     resetForm()
 }
+
 function validate() {
-    const errors = []
+    const errors: Array<{ name: string; message: string }> = []
-    if (!formData.value.street) errors.push({ name: 'street', message: 'Street required' })
+    const optionalFields = new Set(['address_line2'])
-    if (!formData.value.zipCode) errors.push({ name: 'zipCode', message: 'Zip Code required' })
+
-    if (!formData.value.city) errors.push({ name: 'city', message: 'City required' })
+    formFieldKeys.value.forEach((key) => {
-    if (!formData.value.country) errors.push({ name: 'country', message: 'Country required' })
+        if (!optionalFields.has(key) && !formData[key]?.trim()) {
-    return errors.length ? errors : null
+            errors.push({ name: key, message: `${fieldLabel(key)} required` })
+        }
+    })
+
+    return errors
 }
-function saveAddress() {
+
-    if (validate()) return
+async function saveAddress() {
     if (isEditing.value && editingAddressId.value) {
-        addressStore.updateAddress(editingAddressId.value, formData.value)
+        await cartStore.updateAddress(editingAddressId.value, currentCountry.value?.id || 2, formData)
     } else {
-        addressStore.addAddress(formData.value)
+        await cartStore.addAddress(currentCountry.value?.id || 2, formData)
     }
     closeModal()
 }
+
 function confirmDelete(id: number) {
     addressToDelete.value = id
     showDeleteConfirm.value = true
 }
-function deleteAddress() {
+
+async function deleteAddress() {
     if (addressToDelete.value) {
-        addressStore.deleteAddress(addressToDelete.value)
+        await cartStore.deleteAddress(addressToDelete.value)
     }
     showDeleteConfirm.value = false
     addressToDelete.value = null

bo/src/components/customer/PageCarts.vue

@@ -1,14 +1,21 @@
 <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 md:flex-row justify-between items-center gap-4">
+      <div class="flex flex-col lg:flex-row gap-5 md:gap-10">
-                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Carts') }}</h1>
+        <div class="flex-1">
-                <div class="flex gap-3">
+          <div
-                    <UButton color="primary" @click="showCreateModal = true"
+            class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-                        class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+            <h2
-                        <UIcon name="mdi:plus" class="mr-1" />
+              class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-                        {{ t('New Cart') }}
+              {{ t('Selected Products') }}
-                    </UButton>
+            </h2>
+            <div v-if="cartStore.items.length > 0">
+              <div v-for="item in cartStore.items" :key="item.id"
+                class="grid grid-cols-5 items-center p-4 border-b border-(--border-light) dark:border-(--border-dark) w-[100%]">
+                <div
+                  class="bg-(--second-light) dark:bg-(--main-dark) rounded flex items-center justify-center overflow-hidden">
+                  <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
+                  <UIcon v-else name="mdi:package-variant" class="text-2xl text-gray-400" />
                 </div>
             </div>
 
@@ -66,18 +73,22 @@
                         {{ t('Create') }}
                     </UButton>
                 </div>
-            </template>
+              </label>
-        </UModal>
+            </div>
-    </component>
+          </div>
-</template>
+        </div>
+      </div>
+    </div>
+  </template>
 
 <script setup lang="ts">
 import { ref, onMounted } from 'vue'
 import { useCartStore } from '@/stores/customer/cart'
 import { useI18n } from 'vue-i18n'
-import Default from '@/layouts/default.vue'
 import { useRouter } from 'vue-router'
-
+const cartStore = useCartStore()
+const addressStore = useAddressStore()
+const { t } = useI18n()
 const router = useRouter()
 
 const cartStore = useCartStore()

bo/src/components/customer/PageOrders.vue

@@ -1,9 +1,6 @@
 <template>
-    <component :is="Default || 'div'">
+            Orders page
-        Orders page
+    </template>
-    </component>
-</template>
 
 <script lang="ts" setup>
-import Default from '@/layouts/default.vue'
 </script>

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,13 @@
             <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 {
     id: string

bo/src/components/customer/PageProducts.vue

@@ -1,7 +1,14 @@
 <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">
+                            <UIcon name="i-heroicons-book-open" />
+                            <span>{{ item.name }}</span>
+                        </div>
+                    </template>
+</UNavigationMenu> -->
                 <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
                 <div v-if="customerProductStore.loading" class="text-center py-8">
                     <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
@@ -31,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'

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()

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()

bo/src/components/customer/PageStatistic.vue

@@ -1,9 +1,6 @@
 <template>
-    <component :is="Default || 'div'">
+            Statistic page
-        Statistic page
+    </template>
-    </component>
-</template>
 
 <script lang="ts" setup>
-import Default from '@/layouts/default.vue'
 </script>

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

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,
     () => {

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)
 }
 

bo/src/stores/customer/cart.ts

@@ -1,8 +1,6 @@
 import { defineStore } from 'pinia'
-import { computed, ref } from 'vue'
+import { ref, computed } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
-import type { ApiResponse } from '@/types'
-import { useRoute } from 'vue-router'
 
 export interface Cart {
   id: number
@@ -10,23 +8,144 @@ export interface Cart {
   items: any[]
 }
 
+export interface Address {
+  id: number
+  country_id: number
+  customer_id: number
+  address_info: Record<string, string>
+}
+
+export type AddressTemplate = Record<string, string>
+
 export const useCartStore = defineStore('cart', () => {
   const carts = ref<Cart[]>([])
   const activeCartId = ref<number | null>(null)
   const error = ref<string | null>(null)
 
-  async function fetchCarts() {
+  const addresses = ref<Address[]>([])
-    try {
+  const addressLoading = ref(false)
-      const res = await useFetchJson<ApiResponse>(
+  const addressError = ref<string | null>(null)
-        `/api/v1/restricted/carts/retrieve-carts-info`
+  const addressSearchQuery = ref('')
-      )
+  const addressCurrentPage = ref(1)
+  const addressPageSize = 20
+  const addressTotalCount = ref(0)
 
-      carts.value = res.items
+  function transformAddressResponse(address: any): Address {
-    } catch (e: any) {
+    const info = address.address_info || address.addressInfo || {}
-      error.value = e?.message ?? 'Error loading carts'
+
+    return {
+      id: address.id ?? 0,
+      country_id: address.country_id ?? address.countryId ?? 1,
+      customer_id: address.customer_id ?? address.customerId ?? 0,
+      address_info: info as Record<string, string>
     }
   }
 
+  async function fetchAddresses() {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      const queryParam = addressSearchQuery.value ? `&query=${encodeURIComponent(addressSearchQuery.value)}` : ''
+      const response = await useFetchJson<Address[]>(`/api/v1/restricted/addresses/retrieve-addresses?page=${addressCurrentPage.value}&elems=${addressPageSize}${queryParam}`)
+      addresses.value = response.items || []
+      addressTotalCount.value = response.count ?? addresses.value.length
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to load addresses'
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function addAddress(countryId: number, formData: AddressTemplate): Promise<Address | null> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      const response = await useFetchJson<any>(`/api/v1/restricted/addresses/add-new-address?country_id=${countryId}`, {
+        method: 'POST',
+        body: JSON.stringify(formData)
+      })
+
+      await fetchAddresses()
+      return transformAddressResponse(response.items ?? response)
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to create address'
+      return null
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function getAddressTemplate(countryId: number): Promise<AddressTemplate> {
+    const response = await useFetchJson<any>(`/api/v1/restricted/addresses/get-template?country_id=${countryId}`)
+    return response.items ?? {}
+  }
+
+  async function updateAddress(id: number, countryId: number, formData: AddressTemplate): Promise<boolean> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      await useFetchJson<any>(`/api/v1/restricted/addresses/modify-address?country_id=${countryId}&address_id=${id}`, {
+        method: 'POST',
+        body: JSON.stringify(formData)
+      })
+
+      await fetchAddresses()
+      return true
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to update address'
+      return false
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  async function deleteAddress(id: number): Promise<boolean> {
+    addressLoading.value = true
+    addressError.value = null
+
+    try {
+      await useFetchJson<any>(`/api/v1/restricted/addresses/delete-address?address_id=${id}`, {
+        method: 'DELETE'
+      })
+
+      await fetchAddresses()
+      return true
+    } catch (error: unknown) {
+      addressError.value = error instanceof Error ? error.message : 'Failed to delete address'
+      return false
+    } finally {
+      addressLoading.value = false
+    }
+  }
+
+  const totalAddressItems = computed(() => addressTotalCount.value || addresses.value.length)
+  const totalAddressPages = computed(() => Math.ceil(totalAddressItems.value / addressPageSize))
+
+  const paginatedAddresses = computed(() => addresses.value)
+
+  function setAddressPage(page: number) {
+    addressCurrentPage.value = page
+    return fetchAddresses()
+  }
+
+  function setAddressSearchQuery(query: string) {
+    addressSearchQuery.value = query
+    addressCurrentPage.value = 1
+    return fetchAddresses()
+  }
+
+
+  function initMockData() {
+    items.value = [
+      { id: 1, productId: 101, name: 'Premium Widget Pro', product_number: 'NC209/7000', image: '/img/product-1.jpg', price: 129.99, quantity: 2 },
+      { id: 2, productId: 102, name: 'Ultra Gadget X', product_number: 'NC234/6453', image: '/img/product-2.jpg', price: 89.50, quantity: 1 },
+      { id: 3, productId: 103, name: 'Mega Tool Set', product_number: 'NC324/9030', image: '/img/product-3.jpg', price: 249.00, quantity: 3 }
+    ]
+  }
+
   async function addNewCart(name: string) {
     try {
       error.value = null
@@ -93,15 +212,37 @@ export const useCartStore = defineStore('cart', () => {
   })
 
   return {
-    carts,
+    items,
-    activeCartId,
+    selectedAddressId,
-    error,
+    selectedDeliveryMethodId,
-    errorMessage,
+    shippingCost,
-    activeCart,
+    vatRate,
-    setActiveCart,
+    deliveryMethods,
-    addProduct,
+    productsTotal,
-    fetchCarts,
+    vatAmount,
-    addNewCart,
+    orderTotal,
-    initCart,
+    itemCount,
+    deleteProduct,
+    updateQuantity,
+    removeItem,
+    clearCart,
+    setSelectedAddress,
+    setDeliveryMethod,
+    addresses,
+    addressLoading,
+    addressError,
+    addressSearchQuery,
+    addressCurrentPage,
+    addressPageSize,
+    paginatedAddresses,
+    totalAddressItems,
+    totalAddressPages,
+    fetchAddresses,
+    addAddress,
+    updateAddress,
+    deleteAddress,
+    setAddressPage,
+    setAddressSearchQuery,
+    getAddressTemplate
   }
 })

bo/src/views/CategoryView.vue

@@ -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>

bo/src/views/HomeView.vue

@@ -1,9 +1,6 @@
 <template>
-        <component :is="Default || 'div'">
+                    home View
-            home View
+        </template>
-        </component>
-</template>
 <script setup lang="ts">
-import Default from '@/layouts/default.vue';
 
 </script>

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>
-</template>

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>

bruno/b2b_daniel/carts/add-product-to-cart (1).yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&amount=1
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&amount=1&set_amount=false
   params:
     - name: cart_id
       value: "1"
@@ -16,6 +16,9 @@ http:
     - name: amount
       value: "1"
       type: query
+    - name: set_amount
+      value: "false"
+      type: query
   auth: inherit
 
 settings:

bruno/b2b_daniel/carts/add-product-to-cart.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=1
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=1&set_amount=true
   params:
     - name: cart_id
       value: "1"
@@ -19,6 +19,9 @@ http:
     - name: amount
       value: "1"
       type: query
+    - name: set_amount
+      value: "true"
+      type: query
   auth: inherit
 
 settings:

bruno/b2b_daniel/environments/dev.yml

@@ -0,0 +1 @@
+name: dev

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),
+(10, 'customer-addresses', 'addresses', '/components/customer/PageAddresses.vue', '{
-(11, 'customer-carts', 'carts', '/components/customer/PageCarts.vue', '{"guest":true}', 1),
+"guest":true,
-(12, 'customer-orders', 'orders', '/components/customer/PageOrders.vue', '{"guest":true}', 1),
+"name": "Addresses"
-(13, 'customer-statistic', 'statistic', '/components/customer/PageStatistic.vue', '{"guest":true}', 1),
+}', 1),
-(14, 'customer-product-details', 'products/:product_id/:link_rewrite', '/components/admin/ProductDetailView.vue', '{"guest":true}', 1),
+(11, 'customer-cart', 'cart/:id', '/components/customer/PageCart.vue', '{
-(15, 'admin-products', 'products', '/components/admin/PageProducts.vue', '{"guest":true}', 1);
+"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

i18n/migrations/20260302163123_create_tables_data.sql

@@ -75,6 +75,7 @@ INSERT INTO `b2b_route_roles` (`route_id`, `role_id`) VALUES
 (2, '1'),
 (2, '2'),
 (2, '3'),
+(2, '4'),
 (3, '1'),
 (3, '2'),
 (3, '3'),
@@ -94,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