Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into user_teleport

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

app/delivery/middleware/auth.go

@@ -1,6 +1,7 @@
 package middleware
 
 import (
+	"strconv"
 	"strings"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
@@ -60,9 +61,52 @@ func AuthMiddleware() fiber.Handler {
 			})
 		}
 
-		// Set user in context
+		// Create locale. LangID is overwritten by auth Token
-		c.Locals(constdata.USER_LOCALES_NAME, user.ToSession())
+		var userLocale model.UserLocale
-		c.Locals(constdata.USER_LOCALES_ID, user.ID)
+		userLocale.OriginalUser = user
+
+		// Check if target user is present
+		targetUserIDAttribute := c.Query("target_user_id")
+
+		if targetUserIDAttribute == "" {
+			userLocale.User = user
+			c.Locals(constdata.USER_LOCALE, &userLocale)
+
+			return c.Next()
+		}
+
+		// We now populate the target user
+		if user.Role != model.RoleAdmin {
+			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
+				"error": "admin access required",
+			})
+		}
+
+		targetUserID, err := strconv.Atoi(targetUserIDAttribute)
+		if err != nil {
+			return c.Status(fiber.StatusInternalServerError).JSON(fiber.Map{
+				"error": "invalid target user id attribute",
+			})
+		}
+
+		// to verify target user, we use the same functionality as for verifying original user
+		// Get target user from database
+		user, err = authService.GetUserByID(uint(targetUserID))
+		if err != nil {
+			return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
+				"error": "target user not found",
+			})
+		}
+
+		// Check if target user is active
+		if !user.IsActive {
+			return c.Status(fiber.StatusForbidden).JSON(fiber.Map{
+				"error": "target user account is inactive",
+			})
+		}
+
+		userLocale.User = user
+		c.Locals(constdata.USER_LOCALE, &userLocale)
 
 		return c.Next()
 	}
@@ -95,24 +139,6 @@ func RequireAdmin() fiber.Handler {
 	}
 }
 
-// GetUserID extracts user ID from context
-func GetUserID(c fiber.Ctx) uint {
-	userID, ok := c.Locals("userID").(uint)
-	if !ok {
-		return 0
-	}
-	return userID
-}
-
-// GetUser extracts user from context
-func GetUser(c fiber.Ctx) *model.UserSession {
-	user, ok := c.Locals("user").(*model.UserSession)
-	if !ok {
-		return nil
-	}
-	return user
-}
-
 // GetConfig returns the app config
 func GetConfig() *config.Config {
 	return config.Get()

app/delivery/middleware/language.go

@@ -4,7 +4,9 @@ import (
 	"strconv"
 	"strings"
 
+	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/langsService"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"github.com/gofiber/fiber/v3"
 )
 
@@ -22,12 +24,8 @@ func LanguageMiddleware() fiber.Handler {
 			if id, err := strconv.ParseUint(langIDStr, 10, 32); err == nil {
 				langID = uint(id)
 				if langID > 0 {
-					lang, err := langService.GetLanguageById(langID)
+					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
-					if err == nil {
+					return c.Next()
-						c.Locals("langID", langID)
-						c.Locals("lang", lang)
-						return c.Next()
-					}
 				}
 			}
 		}
@@ -38,12 +36,8 @@ func LanguageMiddleware() fiber.Handler {
 			if id, err := strconv.ParseUint(cookieLang, 10, 32); err == nil {
 				langID = uint(id)
 				if langID > 0 {
-					lang, err := langService.GetLanguageById(langID)
+					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
-					if err == nil {
+					return c.Next()
-						c.Locals("langID", langID)
-						c.Locals("lang", lang)
-						return c.Next()
-					}
 				}
 			}
 		}
@@ -57,8 +51,7 @@ func LanguageMiddleware() fiber.Handler {
 				lang, err := langService.GetLanguageByISOCode(isoCode)
 				if err == nil && lang != nil {
 					langID = uint(lang.ID)
-					c.Locals("langID", langID)
+					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
-					c.Locals("lang", lang)
 					return c.Next()
 				}
 			}
@@ -68,8 +61,7 @@ func LanguageMiddleware() fiber.Handler {
 		defaultLang, err := langService.GetDefaultLanguage()
 		if err == nil && defaultLang != nil {
 			langID = uint(defaultLang.ID)
-			c.Locals("langID", langID)
+			c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
-			c.Locals("lang", defaultLang)
 		}
 
 		return c.Next()
@@ -104,11 +96,9 @@ func parseAcceptLanguage(header string) string {
 	return strings.ToLower(first)
 }
 
-// GetLanguageID extracts language ID from context
+func returnNewLocale(lang_id uint) *model.UserLocale {
-func GetLanguageID(c fiber.Ctx) uint {
+	newLocale := model.UserLocale{}
-	langID, ok := c.Locals("langID").(uint)
+	newLocale.OriginalUser = &model.Customer{}
-	if !ok {
+	newLocale.OriginalUser.LangID = lang_id
-		return 0
+	return &newLocale
-	}
-	return langID
 }

app/delivery/web/api/public/auth.go

@@ -268,15 +268,15 @@ func (h *AuthHandler) RefreshToken(c fiber.Ctx) error {
 
 // Me returns the current user info
 func (h *AuthHandler) Me(c fiber.Ctx) error {
-	user := c.Locals("user")
+	userLocale := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
-	if user == nil {
+	if userLocale.OriginalUser == nil {
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated),
 		})
 	}
 
 	return c.JSON(fiber.Map{
-		"user": user,
+		"user": *userLocale.OriginalUser,
 	})
 }
 
@@ -351,21 +351,12 @@ func (h *AuthHandler) CompleteRegistration(c fiber.Ctx) error {
 
 // Updates JWT Tokens. Requires authentication and updates access token only
 func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
-	userLocals, ok := c.Locals(constdata.USER_LOCALES_NAME).(*model.UserSession)
+	userLocale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
 	if !ok {
 		return c.Status(fiber.StatusUnauthorized).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated)))
 	}
 
-	user := model.Customer{
-		ID:        userLocals.UserID,
-		Email:     userLocals.Email,
-		Role:      userLocals.Role,
-		LangID:    userLocals.LangID,
-		CountryID: userLocals.CountryID,
-		IsActive:  userLocals.IsActive,
-	}
-
 	// Parse language and country_id from query params
 	langIDStr := c.Query("lang_id")
 
@@ -375,7 +366,7 @@ func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
 			return c.Status(fiber.StatusBadRequest).
 				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadLangID)))
 		}
-		user.LangID = uint(parsedID)
+		userLocale.OriginalUser.LangID = uint(parsedID)
 	}
 
 	countryIDStr := c.Query("country_id")
@@ -386,10 +377,10 @@ func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
 			return c.Status(fiber.StatusBadRequest).
 				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadCountryID)))
 		}
-		user.CountryID = uint(parsedID)
+		userLocale.OriginalUser.CountryID = uint(parsedID)
 	}
 
-	newAccessToken, err := h.authService.UpdateJWTToken(&user)
+	newAccessToken, err := h.authService.UpdateJWTToken(userLocale.OriginalUser)
 
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{

app/delivery/web/api/public/routing.go

@@ -3,6 +3,7 @@ package public
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -30,7 +31,7 @@ func RoutingHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *RoutingHandler) GetRouting(c fiber.Ctx) error {
-	lang_id, ok := c.Locals("langID").(uint)
+	lang_id, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))

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

@@ -5,6 +5,7 @@ import (
 
 	"git.ma-al.com/goc_daniel/b2b/app/service/cartsService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -37,7 +38,7 @@ func CartsHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))
@@ -53,7 +54,7 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))
@@ -78,7 +79,7 @@ func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))
@@ -94,7 +95,7 @@ func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))
@@ -117,7 +118,7 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))

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

@@ -5,6 +5,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/listService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/query_params"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
@@ -43,19 +44,19 @@ func (h *ListHandler) ListProducts(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	listing, err := h.listService.ListProducts(id_lang, paging, filters)
+	list, err := h.listService.ListProducts(id_lang, paging, filters)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	return c.JSON(response.Make(&listing.Items, int(listing.Count), i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
 }
 
 var columnMappingListProducts map[string]string = map[string]string{
@@ -74,19 +75,19 @@ func (h *ListHandler) ListUsers(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	listing, err := h.listService.ListUsers(id_lang, paging, filters)
+	list, err := h.listService.ListUsers(id_lang, paging, filters)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	return c.JSON(response.Make(&listing.Items, int(listing.Count), i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
 }
 
 var columnMappingListUsers map[string]string = map[string]string{

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

@@ -5,6 +5,7 @@ import (
 
 	"git.ma-al.com/goc_daniel/b2b/app/service/menuService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -33,7 +34,7 @@ func MenuHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
-	lang_id, ok := c.Locals("langID").(uint)
+	lang_id, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -56,7 +57,7 @@ func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
 }
 
 func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
-	lang_id, ok := c.Locals("langID").(uint)
+	lang_id, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -86,7 +87,7 @@ func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
 }
 
 func (h *MenuHandler) GetTopMenu(c fiber.Ctx) error {
-	lang_id, ok := c.Locals("langID").(uint)
+	lang_id, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))

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

@@ -6,6 +6,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/service/productTranslationService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -41,7 +42,7 @@ func ProductTranslationHandlerRoutes(r fiber.Router) fiber.Router {
 
 // GetProductDescription returns the product description for a given product ID
 func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))
@@ -72,7 +73,7 @@ func (h *ProductTranslationHandler) GetProductDescription(c fiber.Ctx) error {
 
 // SaveProductDescription saves the description for a given product ID, in given language
 func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))
@@ -109,7 +110,7 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 
 // TranslateProductDescription returns translated product description
 func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) error {
-	userID, ok := c.Locals("userID").(uint)
+	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)))

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

@@ -7,6 +7,7 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/service/meiliService"
 	searchservice "git.ma-al.com/goc_daniel/b2b/app/service/searchService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/localeExtractor"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/nullable"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/response"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
@@ -36,7 +37,7 @@ func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -49,12 +50,11 @@ func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	nothing := ""
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
-	return c.JSON(response.Make(&nothing, 0, i18n.T_(c, response.Message_OK)))
 }
 
 func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -88,7 +88,7 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 }
 
 func (h *MeiliSearchHandler) GetSettings(c fiber.Ctx) error {
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))

app/model/customer.go

@@ -82,6 +82,15 @@ type UserSession struct {
 	IsActive  bool         `json:"is_active"`
 }
 
+type UserLocale struct {
+	// User is the Target user if present, otherwise same as Original.
+	// User ought to be used in applications
+	User *Customer
+	// Original user is the one associated with auth token
+	OriginalUser *Customer
+	// Importantly, lang_id used in application is stored as OriginalUser.LangID
+}
+
 // ToSession converts User to UserSession
 func (u *Customer) ToSession() *UserSession {
 	return &UserSession{
@@ -98,6 +107,7 @@ func (u *Customer) ToSession() *UserSession {
 type LoginRequest struct {
 	Email    string `json:"email" form:"email"`
 	Password string `json:"password" form:"password"`
+	LangID   *uint  `json:"lang_id" form:"lang_id"`
 }
 
 // RegisterRequest represents the initial registration form data

app/model/productDescription.go

@@ -18,9 +18,10 @@ type ProductDescription struct {
 	AvailableLater   string `gorm:"column:available_later;type:varchar(255)" json:"available_later" form:"available_later"`
 	DeliveryInStock  string `gorm:"column:delivery_in_stock;type:varchar(255)" json:"delivery_in_stock" form:"delivery_in_stock"`
 	DeliveryOutStock string `gorm:"column:delivery_out_stock;type:varchar(255)" json:"delivery_out_stock" form:"delivery_out_stock"`
-	Usage            string `gorm:"column:usage;type:text" json:"usage" form:"usage"`
+	Usage            string `gorm:"column:_usage_;type:text" json:"usage" form:"usage"`
 
-	ExistsInDatabse bool `gorm:"-" json:"exists_in_database"`
+	ImageLink        string `gorm:"column:image_link" json:"image_link"`
+	ExistsInDatabase bool   `gorm:"-" json:"exists_in_database"`
 }
 
 type ProductRow struct {

app/repos/listRepo/listRepo.go

@@ -32,7 +32,7 @@ func (repo *ListRepo) ListProducts(id_lang uint, p find.Paging, filt *filters.Fi
             ps.id_product AS product_id,
             pl.name AS name,
             pl.link_rewrite AS link_rewrite,
-            CONCAT(?, ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
+            CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
             cl.name AS category_name,
             p.reference AS reference,
             COALESCE(v.variants_number, 0) AS variants_number,

app/repos/productDescriptionRepo/productDescriptionRepo.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"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"
@@ -36,15 +37,36 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
 			IDShop:    int32(constdata.SHOP_ID),
 			IDLang:    int32(productid_lang),
 		}).
+		Select(`
+			`+dbmodel.PsProductLangCols.IDProduct.TabCol()+` AS id_product,
+			`+dbmodel.PsProductLangCols.IDShop.TabCol()+` AS id_shop,
+			`+dbmodel.PsProductLangCols.IDLang.TabCol()+` AS id_lang,
+			`+dbmodel.PsProductLangCols.Description.TabCol()+` AS description,
+			`+dbmodel.PsProductLangCols.DescriptionShort.TabCol()+` AS description_short,
+			`+dbmodel.PsProductLangCols.LinkRewrite.TabCol()+` AS link_rewrite,
+			`+dbmodel.PsProductLangCols.MetaDescription.TabCol()+` AS meta_description,
+			`+dbmodel.PsProductLangCols.MetaKeywords.TabCol()+` AS meta_keywords,
+			`+dbmodel.PsProductLangCols.MetaTitle.TabCol()+` AS meta_title,
+			`+dbmodel.PsProductLangCols.Name.TabCol()+` AS name,
+			`+dbmodel.PsProductLangCols.AvailableNow.TabCol()+` AS available_now,
+			`+dbmodel.PsProductLangCols.AvailableLater.TabCol()+` AS available_later,
+			`+dbmodel.PsProductLangCols.DeliveryInStock.TabCol()+` AS delivery_in_stock,
+			`+dbmodel.PsProductLangCols.DeliveryOutStock.TabCol()+` AS delivery_out_stock,
+			`+dbmodel.PsProductLangCols.Usage.TabCol()+` AS _usage_,
+			CONCAT(?, '/', `+dbmodel.PsImageShopCols.IDImage.TabCol()+`, '-large_default/', `+dbmodel.PsProductLangCols.LinkRewrite.TabCol()+`, '.webp') AS image_link
+		`, config.Get().Image.ImagePrefix).
+		Joins("JOIN " + dbmodel.TableNamePsImageShop +
+			" ON " + dbmodel.PsImageShopCols.IDProduct.TabCol() + "=" + dbmodel.PsProductLangCols.IDProduct.TabCol() +
+			" AND " + dbmodel.PsImageShopCols.Cover.TabCol() + " = 1").
 		First(&ProductDescription).Error
 
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		// handle "not found" case only
-		ProductDescription.ExistsInDatabse = false
+		ProductDescription.ExistsInDatabase = false
 	} else if err != nil {
 		return nil, fmt.Errorf("database error: %w", err)
 	} else {
-		ProductDescription.ExistsInDatabse = true
+		ProductDescription.ExistsInDatabase = true
 	}
 
 	return &ProductDescription, nil

app/service/authService/auth.go

@@ -83,6 +83,15 @@ func (s *AuthService) Login(req *model.LoginRequest) (*model.AuthResponse, strin
 	// Update last login time
 	now := time.Now()
 	user.LastLoginAt = &now
+
+	if req.LangID != nil {
+		_, err := s.GetLangISOCode(*req.LangID)
+		if err != nil {
+			return nil, "", responseErrors.ErrBadLangID
+		}
+		user.LangID = *req.LangID
+	}
+
 	s.db.Save(&user)
 
 	// Generate access token (JWT)

app/utils/const_data/consts.go

@@ -11,5 +11,4 @@ const CATEGORY_TREE_ROOT_ID = 2
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
 
-const USER_LOCALES_NAME = "user"
+const USER_LOCALE = "user"
-const USER_LOCALES_ID = "userID"

app/utils/localeExtractor/localeExtractor.go

@@ -0,0 +1,23 @@
+package localeExtractor
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"github.com/gofiber/fiber/v3"
+)
+
+func GetLangID(c fiber.Ctx) (uint, bool) {
+	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	if !ok || user_locale.OriginalUser == nil {
+		return 0, false
+	}
+	return user_locale.OriginalUser.LangID, true
+}
+
+func GetUserID(c fiber.Ctx) (uint, bool) {
+	user_locale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	if !ok || user_locale.User == nil {
+		return 0, false
+	}
+	return user_locale.User.ID, true
+}

bo/components.d.ts

@@ -11,21 +11,16 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    Cart1: typeof import('./src/components/customer/Cart1.vue')['default']
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
-    CartSelector: typeof import('./src/components/customer/CartSelector.vue')['default']
     CategoryMenu: typeof import('./src/components/inner/categoryMenu.vue')['default']
     CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default']
-    copy: typeof import('./src/components/inner/categoryMenu copy.vue')['default']
     Cs_PrivacyPolicyView: typeof import('./src/components/terms/cs_PrivacyPolicyView.vue')['default']
     Cs_TermsAndConditionsView: typeof import('./src/components/terms/cs_TermsAndConditionsView.vue')['default']
     En_PrivacyPolicyView: typeof import('./src/components/terms/en_PrivacyPolicyView.vue')['default']
     En_TermsAndConditionsView: typeof import('./src/components/terms/en_TermsAndConditionsView.vue')['default']
     LangSwitch: typeof import('./src/components/inner/langSwitch.vue')['default']
     PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
-    PageCart: typeof import('./src/components/customer/PageCart.vue')['default']
     PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default']
-    PageCheckout: typeof import('./src/components/customer/PageCheckout.vue')['default']
     PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default']
     PageProduct: typeof import('./src/components/customer/PageProduct.vue')['default']
     PageProducts: typeof import('./src/components/admin/PageProducts.vue')['default']
@@ -36,7 +31,6 @@ declare module 'vue' {
     Pl_TermsAndConditionsView: typeof import('./src/components/terms/pl_TermsAndConditionsView.vue')['default']
     ProductCustomization: typeof import('./src/components/customer/components/ProductCustomization.vue')['default']
     ProductDetailView: typeof import('./src/components/admin/ProductDetailView.vue')['default']
-    ProductsView: typeof import('./src/components/admin/ProductsView.vue')['default']
     ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']

bo/src/components/TopBar.vue

@@ -58,11 +58,12 @@ await getTopMenu()
     <!-- px-4 sm:px-6 lg:px-8 -->
     <div class="container mx-auto px-4">
       <div class="flex items-center justify-between h-14">
+        <!-- Logo -->
         <RouterLink :to="{ name: 'home' }" class="flex items-center gap-2">
           <div class="w-8 h-8 rounded-lg bg-primary text-white flex items-center justify-center">
-            <UIcon name="carbon:ibm-webmethods-b2b-integration" class="w-5 h-5" />
+            <UIcon name="i-heroicons-clock" class="w-5 h-5" />
           </div>
-          <span class="font-semibold text-gray-900 dark:text-white">B2B</span>
+          <span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
         </RouterLink>
 
         <UNavigationMenu :type="'trigger'" :ui="{
@@ -70,7 +71,9 @@ await getTopMenu()
           list: 'gap-4'
         }" :items="menuItems" class="w-full"></UNavigationMenu>
         <div class="flex items-center gap-2">
+          <!-- Language Switcher -->
           <LangSwitch />
+          <!-- Theme Switcher -->
           <ThemeSwitch />
           <!-- Logout Button (only when authenticated) -->
           <button v-if="authStore.isAuthenticated" @click="authStore.logout()"

bo/src/components/TopBarLogin.vue

@@ -11,14 +11,18 @@ const authStore = useAuthStore()
     class="fixed top-0 left-0 right-0 z-50 bg-(--main-light)/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
     <div class="container px-4 sm:px-6 lg:px-8">
       <div class="flex items-center justify-between h-14">
+        <!-- Logo -->
         <RouterLink :to="{ name: 'home' }" class="flex items-center gap-2">
           <div class="w-8 h-8 rounded-lg bg-primary text-white flex items-center justify-center">
             <UIcon name="carbon:ibm-webmethods-b2b-integration" class="w-5 h-5" />
           </div>
           <span class="font-semibold text-gray-900 dark:text-white">B2B</span>
         </RouterLink>
+        <!-- Right Side Actions -->
         <div class="flex items-center gap-2">
+          <!-- Language Switcher -->
           <LangSwitch />
+          <!-- Theme Switcher -->
           <ThemeSwitch />
         </div>
       </div>

bo/src/components/admin/PageProducts.vue

@@ -1,70 +1,11 @@
 <template>
     <suspense>
         <component :is="Default || 'div'">
-            <!-- <div class="w-64 h-128">
+            <div class="flex gap-10">
                 <CategoryMenu />
-            </div> -->
+                <div class="w-full flex flex-col items-center gap-4">
-
+                    <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
-            <CategoryMenuListing />
+                    <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
-            <UTable :data="productsList" :columns="columns" class="flex-1">
-                <template #expanded="{ row }">
-                    <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
-                        thead: 'hidden'
-                    }" />
-                </template>
-            </UTable>
-
-            <div class="container mx-auto mt-20">
-                <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
-                <div v-if="loading" class="text-center py-8">
-                    <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
-                </div>
-                <div v-else-if="error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
-                    {{ error }}
-                </div>
-                <div v-else class="overflow-x-auto">
-                    <table class="min-w-full divide-y divide-gray-200 dark:divide-gray-700">
-                        <thead class="bg-gray-50 dark:bg-gray-800">
-                            <tr>
-                                <th
-                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    Image</th>
-                                <th
-                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    Product Code</th>
-                                <th
-                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    Name</th>
-                                <th
-                                    class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                                    Link</th>
-                            </tr>
-                        </thead>
-                        <tbody class="bg-white dark:bg-gray-900 divide-y divide-gray-200 dark:divide-gray-700">
-                            <tr v-for="product in productsList" :key="product.product_id"
-                                class="hover:bg-gray-50 dark:hover:bg-gray-800"
-                                @click="goToProduct(product.product_id)">
-                                <td class="px-6 py-4 whitespace-nowrap">
-                                    <img :src="product.image_link" alt="product image"
-                                        class="w-16 h-16 object-cover rounded" />
-                                </td>
-                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">{{
-                                    product.reference }}</td>
-                                <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">{{
-                                    product.name }}
-                                </td>
-                                <td class="px-6 py-4 whitespace-nowrap text-sm text-blue-600 dark:text-blue-400">
-                                    {{ product.link_rewrite }}
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                    <div class="flex justify-center items-center py-8">
-                        <UPagination v-model:page="page" :total="total" :page-size="perPage" />
-                    </div>
-                    <div v-if="productsList.length === 0" class="text-center py-8 text-gray-500 dark:text-gray-400">
-                        No products found
-                    </div>
                 </div>
             </div>
         </component>
@@ -77,27 +18,20 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenuListing from '../inner/categoryMenuListing.vue'
+import CategoryMenu from '../inner/categoryMenu.vue'
-
+import type { Product } from '@/types/product'
-interface Product {
-    reference: number
-    product_id: number
-    name: string
-    image_link: string
-    link_rewrite: string
-    quantity: number
-}
 
 const router = useRouter()
 const route = useRoute()
 
+const perPage = ref(15)
 const page = computed({
-    get: () => Number(route.query.page) || 1,
+    get: () => Number(route.query.p) || 1,
     set: (val: number) => {
         router.push({
             query: {
                 ...route.query,
-                page: val
+                p: val
             }
         })
     }
@@ -133,7 +67,6 @@ const sortField = computed({
     }
 })
 
-const perPage = ref(15)
 const total = ref(0)
 
 interface ApiResponse {
@@ -194,17 +127,25 @@ async function fetchProductList() {
     error.value = null
 
     const params = new URLSearchParams()
-
     Object.entries(route.query).forEach(([key, value]) => {
-        if (value) params.append(key, String(value))
+        if (value === undefined || value === null) return
+
+        if (Array.isArray(value)) {
+            value.forEach(v => params.append(key, String(v)))
+        } else {
+            params.append(key, String(value))
+        }
+
     })
 
-    const url = `/api/v1/restricted/list/list-products?${params}`
+    if (route.params.category_id)
+        params.append('category_id', String(route.params.category_id))
 
+    const url = `/api/v1/restricted/list/list-products?elems=${perPage.value}&${params.toString()}`
     try {
         const response = await useFetchJson<ApiResponse>(url)
         productsList.value = response.items || []
-        total.value = response.count || 0
+        total.value = Number(response.count) || 0
     } catch (e: unknown) {
         error.value = e instanceof Error ? e.message : 'Failed to load products'
     } finally {
@@ -212,19 +153,13 @@ async function fetchProductList() {
     }
 }
 
-function goToProduct(productId: number, imageLink: string) {
+function goToProduct(productId: number) {
     router.push({
-        name: 'product-detail',
+        name: 'customer-product-details',
-        params: { id: productId },
+        params: { product_id: productId }
-        query: { image: imageLink }
     })
 }
 
-const selectedCount = ref({
-    product_id: null as number | null,
-    count: 0
-})
-
 function getIcon(name: string) {
     if (sortField.value[0] === name) {
         if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
@@ -239,24 +174,6 @@ const UButton = resolveComponent('UButton')
 const UIcon = resolveComponent('UIcon')
 
 const columns: TableColumn<Product>[] = [
-    {
-        id: 'expand',
-        cell: ({ row }) =>
-            h(UButton, {
-                color: 'neutral',
-                variant: 'ghost',
-                icon: 'i-lucide-chevron-down',
-                square: true,
-                'aria-label': 'Expand',
-                ui: {
-                    leadingIcon: [
-                        'transition-transform',
-                        row.getIsExpanded() ? 'duration-200 rotate-180' : ''
-                    ]
-                },
-                onClick: () => row.toggleExpanded()
-            })
-    },
     {
         accessorKey: 'product_id',
         header: ({ column }) => {
@@ -283,13 +200,8 @@ const columns: TableColumn<Product>[] = [
                 })
             ])
         },
-        cell: ({ row }) => h('span', {
+        // header: '#',
-            class: 'cursor-pointer text-blue-500 hover:underline',
+        cell: ({ row }) => `#${row.getValue('product_id') as number}`
-            onClick: (e: Event) => {
-                e.stopPropagation()
-                goToProduct(row.original.product_id, row.original.image_link)
-            }
-        }, `#${row.getValue('product_id') as number}`)
     },
     {
         accessorKey: 'image_link',
@@ -327,13 +239,7 @@ const columns: TableColumn<Product>[] = [
                 })
             ])
         },
-        cell: ({ row }) => h('span', {
+        cell: ({ row }) => row.getValue('name') as string,
-            class: 'cursor-pointer text-blue-500 hover:underline',
-            onClick: (e: Event) => {
-                e.stopPropagation()
-                goToProduct(row.original.product_id, row.original.image_link)
-            }
-        }, row.getValue('name') as string),
         filterFn: (row, columnId, value) => {
             const name = row.getValue(columnId) as string
             return name.toLowerCase().includes(value.toLowerCase())
@@ -358,120 +264,17 @@ const columns: TableColumn<Product>[] = [
         },
         cell: ({ row }) => row.getValue('quantity') as number
     },
-    {
-        accessorKey: 'count',
-        header: 'Count',
-        cell: ({ row }) => {
-            return h(UInputNumber, {
-                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
-                'onUpdate:modelValue': (val: number) => {
-                    if (val)
-                        selectedCount.value = {
-                            product_id: row.original.product_id,
-                            count: val
-                        }
-                    else {
-                        selectedCount.value = {
-                            product_id: null,
-                            count: 0
-                        }
-                    }
-                },
-                min: 0,
-                max: row.original.quantity
-            })
-        }
-    },
     {
         accessorKey: 'count',
         header: '',
         cell: ({ row }) => {
             return h(UButton, {
                 onClick: () => {
-                    console.log('Clicked', row.original)
+                    goToProduct(row.original.product_id)
                 },
-                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
+                color: 'primary',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
                 variant: 'solid'
-            }, 'Add to cart')
+            }, () => 'Show product')
-        },
-    }
-]
-
-const columnsChild: TableColumn<Product>[] = [
-    {
-        accessorKey: 'product_id',
-        header: '',
-        cell: ({ row }) => h('span', {
-            class: 'cursor-pointer text-blue-500 hover:underline',
-            onClick: (e: Event) => {
-                e.stopPropagation()
-                goToProduct(row.original.product_id, row.original.image_link)
-            }
-        }, `#${row.getValue('product_id') as number}`)
-    },
-    {
-        accessorKey: 'image_link',
-        header: '',
-        cell: ({ row }) => {
-            return h('img', {
-                src: row.getValue('image_link') as string,
-                style: 'width:40px;height:40px;object-fit:cover;'
-            })
-        }
-    },
-    {
-        accessorKey: 'name',
-        header: '',
-        cell: ({ row }) => h('span', {
-            class: 'cursor-pointer text-blue-500 hover:underline',
-            onClick: (e: Event) => {
-                e.stopPropagation()
-                goToProduct(row.original.product_id, row.original.image_link)
-            }
-        }, row.getValue('name') as string)
-    },
-    {
-        accessorKey: 'quantity',
-        header: '',
-        cell: ({ row }) => row.getValue('quantity') as number
-    },
-    {
-        accessorKey: 'count',
-        header: '',
-        cell: ({ row }) => {
-            return h(UInputNumber, {
-                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
-                'onUpdate:modelValue': (val: number) => {
-                    if (val)
-                        selectedCount.value = {
-                            product_id: row.original.product_id,
-                            count: val
-                        }
-                    else {
-                        selectedCount.value = {
-                            product_id: null,
-                            count: 0
-                        }
-                    }
-                },
-                min: 0,
-                max: row.original.quantity
-            })
-        }
-    },
-    {
-        accessorKey: 'count',
-        header: '',
-        cell: ({ row }) => {
-            return h(UButton, {
-                onClick: () => {
-                    console.log('Clicked', row.original)
-                },
-                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
-                variant: 'solid'
-            }, 'Add to cart')
         },
     }
 ]

bo/src/components/admin/ProductDetailView.vue

@@ -1,6 +1,7 @@
 <template>
   <component :is="Default || 'div'">
     <div class="container my-10 mx-auto ">
+
       <div
         class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
         <div class="flex items-end gap-3">
@@ -100,6 +101,7 @@
           </div>
           <p ref="usageRef" v-html="productStore.productDescription.usage"
             class="flex flex-col justify-center w-full text-start dark:text-white! text-black!"></p>
+
         </div>
 
         <div v-if="activeTab === 'description'"
@@ -149,10 +151,7 @@ const selectedLanguage = ref('en')
 const currentLangId = ref(2)
 const productID = ref<number>(0)
 
-const imageUrl = computed(() => {
+// Watch for language changes and refetch product description
-  return route.query.image ? String(route.query.image) : ''
-})
-
 watch(selectedLanguage, async (newLang: string) => {
   if (productID.value) {
     await fetchForLanguage(newLang)
@@ -198,14 +197,10 @@ const originalDescription = ref('')
 const originalUsage = ref('')
 
 const saveDescription = async () => {
-  if (descriptionRef.value) {
-    productStore.productDescription.description = descriptionRef.value.innerHTML
-  }
-
   descriptionEdit.disableEdit()
-
+  await productStore.saveProductDescription(productID.value)
-  await productStore.saveProductDescription(productID.value, currentLangId.value)
 }
+
 const cancelDescriptionEdit = () => {
   if (descriptionRef.value) {
     descriptionRef.value.innerHTML = originalDescription.value
@@ -229,14 +224,9 @@ const enableEdit = () => {
 }
 
 const saveText = () => {
-  if (usageRef.value) {
-    productStore.productDescription.usage = usageRef.value.innerHTML
-  }
-
   usageEdit.disableEdit()
   isEditing.value = false
-
+  productStore.saveProductDescription(productID.value)
-  productStore.saveProductDescription(productID.value, currentLangId.value)
 }
 
 const cancelEdit = () => {
@@ -246,5 +236,14 @@ const cancelEdit = () => {
   usageEdit.disableEdit()
   isEditing.value = false
 }
+
 </script>
 
+<style>
+.images {
+  display: flex;
+  align-items: center;
+  gap: 70px;
+  margin: 20px 0 20px 0;
+}
+</style>

bo/src/components/admin/ProductsView.vue

@@ -1,237 +0,0 @@
-<script setup lang="ts">
-import { ref, computed, onMounted } from 'vue'
-import { useRouter } from 'vue-router'
-import { useAuthStore } from '@/stores/auth'
-import { useProductStore, type Product } from '@/stores/product'
-import { useI18n } from 'vue-i18n'
-import type { TableColumn } from '@nuxt/ui'
-import { h } from 'vue'
-import Default from '@/layouts/default.vue'
-
-const router = useRouter()
-const authStore = useAuthStore()
-const productStore = useProductStore()
-const { t } = useI18n()
-
-const searchName = ref('')
-const searchCode = ref('')
-const priceFromFilter = ref<number | null>(null)
-const priceToFilter = ref<number | null>(null)
-
-// Pagination
-const page = ref(1)
-const pageSize = 5
-
-// Fetch products on mount
-// onMounted(() => {
-//   productStore.getProductDescription(langID: , productID.value)
-// })
-
-// Filtered products
-// const filteredProducts = computed(() => {
-//   console.log(productStore.products);
-
-//   return productStore.products.filter(product => {
-//     const matchesName = product.name.toLowerCase().includes(searchName.value.toLowerCase())
-//     const matchesCode = product.code.toLowerCase().includes(searchCode.value.toLowerCase())
-//     const matchesPriceFrom = priceFromFilter.value === null || product.priceFrom >= priceFromFilter.value
-//     const matchesPriceTo = priceToFilter.value === null || product.priceTo <= priceToFilter.value
-
-//     return matchesName && matchesCode && matchesPriceFrom && matchesPriceTo
-//   })
-// })
-
-// const totalItems = computed(() => filteredProducts.value.length)
-
-// const paginatedProducts = computed(() => {
-//   const start = (page.value - 1) * pageSize
-//   const end = start + pageSize
-//   return filteredProducts.value.slice(start, end)
-// })
-
-// Reset page when filters change
-function resetPage() {
-  page.value = 1
-}
-
-// Navigate to product detail
-function goToProduct(product: Product) {
-  router.push({ name: 'product-detail', params: { id: product.id } })
-}
-
-// Table columns
-const columns = computed<TableColumn<Product>[]>(() => [
-  {
-    accessorKey: 'image',
-    header: () => h('div', { class: 'text-center' }, t('products.image')),
-    cell: ({ row }) => h('img', {
-      src: row.getValue('image'),
-      alt: 'Product',
-      class: 'w-12 h-12 object-cover rounded'
-    })
-  },
-  {
-    accessorKey: 'name',
-    header: t('products.product_name'),
-    cell: ({ row }) => {
-      const product = row.original
-      return h('button', {
-        class: 'text-primary hover:underline font-medium text-left',
-        onClick: (e: Event) => { e.stopPropagation(); goToProduct(product) }
-      }, product.name)
-    }
-  },
-  {
-    accessorKey: 'code',
-    header: t('products.product_code'),
-  },
-  {
-    accessorKey: 'description',
-    header: t('products.description'),
-    cell: ({ row }) => {
-      const desc = row.getValue('description') as string
-      return h('span', { class: 'text-sm text-gray-500 dark:text-gray-400' }, desc?.substring(0, 50) + (desc && desc.length > 50 ? '...' : ''))
-    }
-  },
-  {
-    accessorKey: 'inStock',
-    header: t('products.in_stock'),
-    cell: ({ row }) => {
-      const inStock = row.getValue('inStock')
-      return h('span', {
-        class: inStock ? 'text-green-600 font-medium' : 'text-red-600 font-medium'
-      }, inStock ? t('products.yes') : t('products.no'))
-    }
-  },
-  {
-    accessorKey: 'price',
-    header: t('products.price'),
-    cell: ({ row }) => {
-      const priceFromVal = row.original.priceFrom
-      const priceToVal = row.original.priceTo
-      return `${priceFromVal} - ${priceToVal}`
-    }
-  },
-  {
-    accessorKey: 'count',
-    header: t('products.count'),
-  },
-  {
-    id: 'actions',
-    header: '',
-    cell: ({ row }) => {
-      const product = row.original
-      return h('div', { class: 'flex gap-2' }, [
-        h('button', {
-          class: 'px-3 py-1.5 text-sm font-medium bg-primary text-white rounded-lg hover:bg-blue-600 transition-colors',
-          onClick: (e: Event) => { e.stopPropagation(); addToCart(product) }
-        }, t('products.add_to_cart')),
-        h('button', {
-          class: 'px-3 py-1.5 text-sm font-medium bg-gray-200 dark:bg-gray-700 text-black dark:text-white rounded-lg hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors',
-          onClick: (e: Event) => { e.stopPropagation(); incrementCount(product) }
-        }, '+')
-      ])
-    }
-  }
-])
-
-// Actions
-function addToCart(product: Product) {
-  console.log('Add to cart:', product)
-}
-
-function incrementCount(product: Product) {
-  product.count++
-}
-
-function clearFilters() {
-  searchName.value = ''
-  searchCode.value = ''
-  priceFromFilter.value = null
-  priceToFilter.value = null
-  resetPage()
-}
-</script>
-
-<template>
-  <component :is="Default || 'div'">
-  <div class="container">
-    <div class="p-6 bg-white dark:bg-(--black) min-h-screen font-sans">
-      <div>
-      </div>
-      <h1 class="text-2xl font-bold mb-6 text-black dark:text-white">{{ t('products.title') }}</h1>
-
-      <div v-if="!authStore.isAuthenticated" class="mb-4 p-3 bg-yellow-100 text-yellow-700 rounded">
-        {{ t('products.login_to_view') }}
-      </div>
-      <div v-if="productStore.loading" class="mb-4 p-3 bg-blue-100 text-blue-700 rounded">
-        {{ t('products.loading') }}...
-      </div>
-      <div v-if="productStore.error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
-        {{ productStore.error }}
-      </div>
-
-      <div v-if="authStore.isAuthenticated && !productStore.loading && !productStore.error" class="space-y-4">
-        <div
-          class="flex flex-wrap gap-4 mb-4 p-4 border border-(--border-light) dark:border-(--border-dark) rounded bg-gray-50 dark:bg-gray-800">
-          <div class="flex flex-col min-w-[180px]">
-            <label class="mb-1 text-sm font-medium text-black dark:text-white">{{ t('products.search_by_name')
-              }}</label>
-            <UInput v-model="searchName" :placeholder="t('products.search_name_placeholder')"
-              @update:model-value="resetPage" class="dark:text-white text-black" />
-          </div>
-          <div class="flex flex-col min-w-[180px]">
-            <label class="mb-1 text-sm font-medium text-black dark:text-white">{{ t('products.search_by_code')
-              }}</label>
-            <UInput v-model="searchCode" :placeholder="t('products.search_code_placeholder')"
-              @update:model-value="resetPage" class="dark:text-white text-black" />
-          </div>
-          <div class="flex flex-col min-w-[120px]">
-            <label class="mb-1 text-sm font-medium text-black dark:text-white">{{ t('products.price_from') }}</label>
-            <UInput v-model="priceFromFilter" type="number" :placeholder="t('products.price_from')"
-              @update:model-value="resetPage" class="dark:text-white text-black" />
-          </div>
-          <div class="flex flex-col min-w-[120px]">
-            <label class="mb-1 text-sm font-medium text-black dark:text-white">{{ t('products.price_to') }}</label>
-            <UInput v-model="priceToFilter" type="number" :placeholder="t('products.price_to')"
-              @update:model-value="resetPage" class="dark:text-white text-black" />
-          </div>
-          <div class="flex items-end">
-            <button @click="clearFilters"
-              class="px-4 py-2 text-sm font-medium text-black dark:text-white bg-gray-200 dark:bg-gray-700 rounded-lg hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors">
-              {{ t('products.clear_filters') }}
-            </button>
-          </div>
-        </div>
-        <!-- Products Table -->
-        <!-- <div class="border border-(--border-light) dark:border-(--border-dark) rounded overflow-hidden">
-          <UTable 
-            :data="paginatedProducts" 
-            :columns="columns" 
-            class="dark:text-white! text-dark"
-          />
-        </div> -->
-
-        <!-- Empty State -->
-        <!-- <div v-if="filteredProducts.length === 0" class="text-center py-10 text-gray-500 dark:text-gray-400">
-          {{ t('products.no_products') }}
-        </div> -->
-
-        <!-- Pagination -->
-        <!-- <div v-if="filteredProducts.length > 0" class="pt-4 flex justify-center items-center dark:text-white! text-dark">
-          <UPagination 
-            v-model:page="page" 
-            :page-count="pageSize" 
-            :total="totalItems" 
-          />
-        </div> -->
-
-        <!-- Results count -->
-        <!-- <div v-if="filteredProducts.length > 0" class="text-sm text-gray-600 dark:text-gray-400 text-center">
-          {{ t('products.showing') }} {{ paginatedProducts.length }} {{ t('products.of') }} {{ totalItems }} {{ t('products.products') }}
-        </div> -->
-      </div>
-    </div>
-  </div>
-  </component>
-</template>

bo/src/components/customer/CartSelector.vue

@@ -1,233 +0,0 @@
-<template>
-  <div class="relative">
-    <button
-      @click="toggleDropdown"
-      class="flex items-center gap-2 px-4 py-2 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) rounded-lg hover:bg-gray-100 dark:hover:bg-gray-700 transition-colors"
-    >
-      <UIcon name="mdi:cart" class="text-lg" />
-      <span class="text-black dark:text-white font-medium">{{ activeCartName }}</span>
-      <UIcon :name="isOpen ? 'mdi:chevron-up' : 'mdi:chevron-down'" class="text-lg" />
-    </button>
-
-    <div
-      v-if="isOpen"
-      class="absolute top-full right-0 mt-2 w-64 bg-white dark:bg-gray-800 border border-(--border-light) dark:border-(--border-dark) rounded-lg shadow-lg z-50"
-    >
-      <div class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
-        <div
-          v-for="cart in carts"
-          :key="cart.id"
-          class="flex items-center justify-between p-3 hover:bg-gray-50 dark:hover:bg-gray-700"
-          :class="{ 'bg-blue-50 dark:bg-blue-900/20': cart.id === activeCartId }"
-        >
-          <button
-            @click="selectCart(cart.id)"
-            class="flex-1 text-left"
-          >
-            <span class="text-black dark:text-white">{{ cart.name }}</span>
-            <span class="text-gray-500 dark:text-gray-400 text-sm ml-2">({{ cart.items.length }})</span>
-          </button>
-          <div class="flex items-center gap-1">
-            <button
-              @click.stop="startEditing(cart)"
-              class="p-1.5 text-gray-500 hover:text-(--accent-blue-light) dark:hover:text-(--accent-blue-dark) hover:bg-gray-100 dark:hover:bg-gray-600 rounded"
-              :title="t('Edit')"
-            >
-              <UIcon name="mdi:pencil" class="text-base" />
-            </button>
-            <button
-              @click.stop="confirmDelete(cart)"
-              class="p-1.5 text-gray-500 hover:text-red-500 hover:bg-gray-100 dark:hover:bg-gray-600 rounded"
-              :title="t('Delete')"
-            >
-              <UIcon name="mdi:delete" class="text-base" />
-            </button>
-          </div>
-        </div>
-      </div>
-
-      <div class="p-3 border-t border-(--border-light) dark:border-(--border-dark)">
-        <button
-          @click="showCreateModal = true"
-          class="w-full flex items-center gap-2 text-(--accent-blue-light) dark:text-(--accent-blue-dark) hover:bg-gray-50 dark:hover:bg-gray-700 p-2 rounded"
-        >
-          <UIcon name="mdi:plus" class="text-lg" />
-          <span>{{ t('Create New Cart') }}</span>
-        </button>
-      </div>
-    </div>
-
-    <div
-      v-if="isOpen"
-      @click="closeDropdown"
-      class="fixed inset-0 z-40"
-    />
-  </div>
-
-  <div
-    v-if="showCreateModal"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
-    @click.self="showCreateModal = false"
-  >
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-96">
-      <h3 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Create New Cart') }}</h3>
-      <div class="mb-4">
-        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-          {{ t('Cart Name') }}
-        </label>
-        <UInput
-          v-model="newCartName"
-          :placeholder="t('Enter cart name')"
-          class="w-full"
-        />
-      </div>
-      <div class="flex gap-3 justify-end">
-        <UButton
-          variant="outline"
-          color="neutral"
-          @click="showCreateModal = false"
-        >
-          {{ t('Cancel') }}
-        </UButton>
-        <UButton
-          color="primary"
-          @click="createNewCart"
-          :disabled="!newCartName.trim()"
-        >
-          {{ t('Create and Continue') }}
-        </UButton>
-      </div>
-    </div>
-  </div>
-
-  <div
-    v-if="editingCart"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
-    @click.self="editingCart = null"
-  >
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-96">
-      <h3 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Edit Cart Name') }}</h3>
-      <div class="mb-4">
-        <label class="block text-sm font-medium text-gray-700 dark:text-gray-300 mb-2">
-          {{ t('Cart Name') }}
-        </label>
-        <UInput
-          v-model="editCartName"
-          :placeholder="t('Enter cart name')"
-          class="w-full"
-        />
-      </div>
-      <div class="flex gap-3 justify-end">
-        <UButton
-          variant="outline"
-          color="neutral"
-          @click="editingCart = null"
-        >
-          {{ t('Cancel') }}
-        </UButton>
-        <UButton
-          color="primary"
-          @click="saveEditedCart"
-          :disabled="!editCartName.trim()"
-        >
-          {{ t('Save') }}
-        </UButton>
-      </div>
-    </div>
-  </div>
-
-  <div
-    v-if="deletingCart"
-    class="fixed inset-0 z-50 flex items-center justify-center bg-black/50"
-    @click.self="deletingCart = null"
-  >
-    <div class="bg-white dark:bg-gray-800 rounded-lg shadow-xl p-6 w-96">
-      <h3 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Delete Cart') }}</h3>
-      <p class="text-gray-600 dark:text-gray-400 mb-6">
-        {{ t('Are you sure you want to delete') }} "{{ deletingCart.name }}"?
-      </p>
-      <div class="flex gap-3 justify-end">
-        <UButton
-          variant="outline"
-          color="neutral"
-          @click="deletingCart = null"
-        >
-          {{ t('Cancel') }}
-        </UButton>
-        <UButton
-          color="error"
-          @click="confirmDeleteCart"
-        >
-          {{ t('Delete') }}
-        </UButton>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import { useCartStore } from '@/stores/cart'
-import { useI18n } from 'vue-i18n'
-
-const cartStore = useCartStore()
-const { t } = useI18n()
-
-const isOpen = ref(false)
-const showCreateModal = ref(false)
-const newCartName = ref('')
-const editingCart = ref<{ id: string; name: string } | null>(null)
-const editCartName = ref('')
-const deletingCart = ref<{ id: string; name: string } | null>(null)
-
-const carts = computed(() => cartStore.carts)
-const activeCartId = computed(() => cartStore.activeCartId)
-const activeCartName = computed(() => {
-  const cart = cartStore.activeCart
-  return cart ? cart.name : t('Select Cart')
-})
-
-function toggleDropdown() {
-  isOpen.value = !isOpen.value
-}
-
-function closeDropdown() {
-  isOpen.value = false
-}
-
-function selectCart(cartId: string) {
-  cartStore.setActiveCart(cartId)
-  closeDropdown()
-}
-
-function startEditing(cart: { id: string; name: string }) {
-  editingCart.value = { id: cart.id, name: cart.name }
-  editCartName.value = cart.name
-}
-
-function saveEditedCart() {
-  if (editingCart.value && editCartName.value.trim()) {
-    cartStore.renameCart(editingCart.value.id, editCartName.value.trim())
-    editingCart.value = null
-  }
-}
-
-function confirmDelete(cart: { id: string; name: string }) {
-  deletingCart.value = cart
-}
-
-function confirmDeleteCart() {
-  if (deletingCart.value) {
-    cartStore.deleteCart(deletingCart.value.id)
-    deletingCart.value = null
-  }
-}
-
-function createNewCart() {
-  if (newCartName.value.trim()) {
-    cartStore.createCart(newCartName.value.trim())
-    newCartName.value = ''
-    showCreateModal.value = false
-  }
-}
-</script>

bo/src/components/customer/PageCart.vue

@@ -1,198 +0,0 @@
-<template>
-    <component :is="Default || 'div'">
-  <div class="container mx-auto mt-20 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">
-        <div
-          class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
-          <h2
-            class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
-            {{ t('Selected Products') }}
-          </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>
-              <p class="text-black dark:text-white text-sm font-medium">{{ item.name }}</p>
-              <p class="text-black dark:text-white">${{ item.price.toFixed(2) }}</p>
-              <p class="text-black dark:text-white font-medium">${{ (item.price * item.quantity).toFixed(2)
-              }}</p>
-
-              <div class="flex items-center justify-end gap-10">
-                <UInputNumber v-model="item.quantity" :min="1"
-                  @update:model-value="(val: number) => cartStore.updateQuantity(item.id, val)" />
-                <div class="flex justify-center">
-                  <button @click="removeItem(item.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-[20px]" />
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div v-else class="p-8 text-center">
-            <UIcon name="mdi:cart-outline" class="text-6xl text-gray-300 dark:text-gray-600 mb-4" />
-            <p class="text-gray-500 dark:text-gray-400">{{ t('Your cart is empty') }}</p>
-            <RouterLink :to="{ name: 'product-card-full' }"
-              class="inline-block mt-4 text-(--accent-blue-light) dark:text-(--accent-blue-dark) hover:underline">
-              {{ t('Continue Shopping') }}
-            </RouterLink>
-          </div>
-        </div>
-      </div>
-      <div class="lg:w-80">
-        <div
-          class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6 sticky top-24">
-          <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Order Summary') }}</h2>
-          <div class="space-y-3 border-b border-(--border-light) dark:border-(--border-dark) pb-4 mb-4">
-            <div class="flex justify-between">
-              <span class="text-gray-600 dark:text-gray-400">{{ t('Products total') }}</span>
-              <span class="text-black dark:text-white">${{ cartStore.productsTotal.toFixed(2) }}</span>
-            </div>
-            <div class="flex justify-between">
-              <span class="text-gray-600 dark:text-gray-400">{{ t('Shipping') }}</span>
-              <span class="text-black dark:text-white">
-                {{ cartStore.shippingCost > 0 ? `$${cartStore.shippingCost.toFixed(2)}` : t('Free') }}
-              </span>
-            </div>
-            <div class="flex justify-between">
-              <span class="text-gray-600 dark:text-gray-400">{{ t('VAT') }} ({{ (cartStore.vatRate * 100).toFixed(0)
-                }}%)</span>
-              <span class="text-black dark:text-white">${{ cartStore.vatAmount.toFixed(2) }}</span>
-            </div>
-          </div>
-          <div class="flex justify-between mb-6">
-            <span class="text-black dark:text-white font-semibold text-lg">{{ t('Total') }}</span>
-            <span class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) font-bold text-lg">${{
-              cartStore.orderTotal.toFixed(2) }}</span>
-          </div>
-          <div class="flex flex-col gap-3">
-            <UButton block color="primary" @click="placeOrder" :disabled="!canPlaceOrder"
-              class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light) disabled:opacity-50 disabled:cursor-not-allowed">
-              {{ t('Place Order') }}
-            </UButton>
-            <UButton block variant="outline" color="neutral" @click="cancelOrder"
-              class="text-black dark:text-white border-(--border-light) dark:border-(--border-dark) hover:bg-gray-100 dark:hover:bg-gray-700">
-              {{ t('Cancel') }}
-            </UButton>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="grid grid-cols-1 md:grid-cols-2 gap-5 md:gap-10">
-      <div class="flex-1">
-        <div
-          class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
-          <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Select Delivery Address') }}</h2>
-          <div class="mb-4">
-            <UInput v-model="addressSearchQuery" type="text" :placeholder="t('Search address')"
-              class="w-full bg-white dark:bg-gray-800 text-black dark:text-white" />
-          </div>
-          <div v-if="addressStore.filteredAddresses.length > 0" class="space-y-3">
-            <label v-for="address in addressStore.filteredAddresses" :key="address.id"
-              class="flex items-start gap-3 p-4 border rounded-lg cursor-pointer transition-colors" :class="cartStore.selectedAddressId === address.id
-                ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
-                : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
-              <input type="radio" :value="address.id" v-model="selectedAddress"
-                class="mt-1 w-4 h-4 text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
-              <div class="flex-1">
-                <p class="text-black dark:text-white font-medium">{{ address.street }}</p>
-                <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.zipCode }}, {{ address.city }}</p>
-                <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.country }}</p>
-              </div>
-            </label>
-          </div>
-          <div v-else class="text-center py-6">
-            <UIcon name="mdi:map-marker-outline" class="text-4xl text-gray-400 mb-2" />
-            <p class="text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</p>
-            <RouterLink :to="{ name: 'addresses' }"
-              class="inline-block mt-2 text-(--accent-blue-light) dark:text-(--accent-blue-dark) hover:underline">
-              {{ t('Add Address') }}
-            </RouterLink>
-          </div>
-        </div>
-      </div>
-      <div class="flex-1">
-        <div
-          class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
-          <h2 class="text-lg font-semibold text-black dark:text-white mb-4">{{ t('Delivery Method') }}</h2>
-          <div class="space-y-3">
-            <label v-for="method in cartStore.deliveryMethods" :key="method.id"
-              class="flex items-center gap-3 p-4 border rounded-lg cursor-pointer transition-colors" :class="cartStore.selectedDeliveryMethodId === method.id
-                ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
-                : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
-              <input type="radio" :value="method.id" v-model="selectedDeliveryMethod"
-                class="w-4 h-4 text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
-              <div class="flex-1">
-                <div class="flex justify-between items-center">
-                  <span class="text-black dark:text-white font-medium">{{ method.name }}</span>
-                  <span class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) font-medium">
-                    {{ method.price > 0 ? `$${method.price.toFixed(2)}` : t('Free') }}
-                  </span>
-                </div>
-                <p class="text-gray-500 dark:text-gray-400 text-sm">{{ method.description }}</p>
-              </div>
-            </label>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  </component>
-</template>
-
-<script setup lang="ts">
-import { ref, computed, watch } from 'vue'
-import { useCartStore } from '@/stores/cart'
-import { useAddressStore } from '@/stores/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()
-const router = useRouter()
-
-const selectedAddress = ref<number | null>(cartStore.selectedAddressId)
-const selectedDeliveryMethod = ref<number | null>(cartStore.selectedDeliveryMethodId)
-const addressSearchQuery = ref('')
-
-watch(addressSearchQuery, (val) => {
-  addressStore.setSearchQuery(val)
-})
-
-watch(selectedAddress, (newValue) => {
-  cartStore.setSelectedAddress(newValue)
-})
-
-watch(selectedDeliveryMethod, (newValue) => {
-  if (newValue) {
-    cartStore.setDeliveryMethod(newValue)
-  }
-})
-
-const canPlaceOrder = computed(() => {
-  return cartStore.items.length > 0 &&
-    cartStore.selectedAddressId !== null &&
-    cartStore.selectedDeliveryMethodId !== null
-})
-function removeItem(itemId: number) {
-  cartStore.removeItem(itemId)
-}
-
-function placeOrder() {
-  if (canPlaceOrder.value) {
-    router.push({ name: 'checkout' })
-  }
-}
-
-function cancelOrder() {
-  router.back()
-}
-</script>

bo/src/components/customer/PageCheckout.vue

@@ -1,79 +0,0 @@
-<template>
-    <component :is="Default || 'div'">
-        <div class="container mx-auto mt-20">
-            <div class="max-w-2xl mx-auto">
-                <div class="grid grid-cols-3 pb-6">
-                    <button variant="outline" color="neutral" @click="goBackToCart"
-                        class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) flex items-center gap-2">
-                        <UIcon name="mdi:arrow-left" />
-                        {{ t('Back') }}
-                    </button>
-                    <h2 class="font-semibold text-black dark:text-white text-2xl  text-center">
-                        {{ t('Checkout') }}
-                    </h2>
-                </div>
-                <div
-                    class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden mb-6">
-                    <div class="p-6">
-                        <h3 class="text-lg font-semibold text-black dark:text-white mb-4">
-                            {{ t('Order Summary') }}
-                        </h3>
-                        <div class="space-y-3 border-b border-(--border-light) dark:border-(--border-dark) pb-4 mb-4">
-                            <div class="flex justify-between">
-                                <span class="text-gray-600 dark:text-gray-400">{{ t('Products') }}</span>
-                                <span class="text-black dark:text-white">{{ cartStore.items.length }} {{ t('items')
-                                    }}</span>
-                            </div>
-                            <div class="flex justify-between">
-                                <span class="text-gray-600 dark:text-gray-400">{{ t('Products total') }}</span>
-                                <span class="text-black dark:text-white">${{ cartStore.productsTotal.toFixed(2)
-                                    }}</span>
-                            </div>
-                            <div class="flex justify-between">
-                                <span class="text-gray-600 dark:text-gray-400">{{ t('VAT') }}</span>
-                                <span class="text-black dark:text-white">${{ cartStore.vatAmount.toFixed(2) }}</span>
-                            </div>
-                        </div>
-
-                        <div class="flex justify-between mb-6">
-                            <span class="text-black dark:text-white font-semibold text-lg">{{ t('Total') }}</span>
-                            <span class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) font-bold text-lg">
-                                ${{ cartStore.orderTotal.toFixed(2) }}
-                            </span>
-                        </div>
-
-                        <div class="space-y-2 mb-4">
-                            <div v-for="item in cartStore.items" :key="item.id" class="flex items-center gap-3 text-sm">
-                                <div
-                                    class="w-10 h-10 bg-white dark:bg-gray-700 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-lg text-gray-400" />
-                                </div>
-                                <span class="text-black dark:text-white flex-1 truncate">{{ item.name }}</span>
-                                <span class="text-gray-600 dark:text-gray-400">x{{ item.quantity }}</span>
-                                <span class="text-black dark:text-white">${{ (item.price * item.quantity).toFixed(2)
-                                    }}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </component>
-</template>
-
-<script setup lang="ts">
-import { useCartStore } from '@/stores/cart'
-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()
-
-function goBackToCart() {
-    router.push({ name: 'cart' })
-}
-</script>

bo/src/components/customer/PageProducts.vue

@@ -19,7 +19,7 @@
                 </div>
                 <div v-else class="overflow-x-auto">
                     <div class="flex gap-2">
-                        <CategoryMenuListing />
+                        <CategoryMenu />
                         <UTable :data="productsList" :columns="columns" class="flex-1">
                             <template #expanded="{ row }">
                                 <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
@@ -46,7 +46,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenuListing from '../inner/categoryMenuListing.vue'
+import CategoryMenu from '../inner/categoryMenu.vue'
 
 interface Product {
     reference: number

bo/src/components/inner/categoryMenu.vue

@@ -1,20 +1,57 @@
+<template>
+  <UNavigationMenu orientation="vertical" type="single" :items="items" class="data-[orientation=vertical]:w-72" />
+</template>
+
 <script setup lang="ts">
 import { getMenu } from '@/router/menu'
 import type { NavigationMenuItem } from '@nuxt/ui';
 import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+
 let menu = await getMenu() as NavigationMenuItem[]
-
 const openAll = ref(false)
+const route = useRoute()
 
+let categoryId = ref(route.params.category_id)
+function findPath(tree: NavigationMenuItem[], id: number, path: Array<number> = []): Array<number> | null {
+  for (let item of tree) {
+    let newPath: Array<number> = [...path, item.category_id]
+    if (item.category_id === id) {
+      return newPath
+    }
+    if (item.children) {
+      const result: Array<number> | null = findPath(item.children, id, newPath)
+
+      if (result) {
+        return result
+      }
+    }
+  }
+
+  return null
+}
+
+let path = findPath(menu, Number(categoryId.value))
 function adaptMenu(menu: NavigationMenuItem[]) {
   for (const item of menu) {
     if (item.children && item.children.length > 0) {
-      console.log(item);
+      item.open = path && path.includes(item.category_id) ? true : openAll.value
       adaptMenu(item.children);
-      item.open = openAll.value
+      item.children.unshift({
-      item.children.unshift({ label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: { name: 'category', params: item.params } })
+        label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: {
+          name: 'customer-products-category', params: {
+            category_id: item.params.category_id,
+            link_rewrite: item.params.link_rewrite
+          }
+        }
+      })
     } else {
-      item.to = { name: 'category', params: item.params };
+      item.to = {
+        name: 'customer-products-category', params: {
+          category_id: item.params.category_id,
+          link_rewrite: item.params.link_rewrite
+        }
+      };
       item.icon = 'i-lucide-file-text'
     }
   }
@@ -22,15 +59,10 @@ function adaptMenu(menu: NavigationMenuItem[]) {
 }
 
 menu = adaptMenu(menu)
-
 const items = ref<NavigationMenuItem[][]>([
   [
     ...menu as NavigationMenuItem[]
   ],
 
 ])
-</script>
+</script>
-
-<template>
-  <UNavigationMenu orientation="vertical" type="single" :items="items" class="p-4" />
-</template>

bo/src/components/inner/categoryMenuListing.vue

@@ -1,35 +0,0 @@
-<script setup lang="ts">
-import { getMenu } from '@/router/menu'
-import type { NavigationMenuItem } from '@nuxt/ui';
-import { ref } from 'vue';
-let menu = await getMenu() as NavigationMenuItem[]
-
-const openAll = ref(false)
-
-function adaptMenu(menu: NavigationMenuItem[]) {
-  for (const item of menu) {
-    if (item.children && item.children.length > 0) {
-      adaptMenu(item.children);
-      item.open = openAll.value
-      item.children.unshift({ label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: { name: 'category', params: item.params } })
-    } else {
-      item.to = { name: 'category', params: item.params };
-      item.icon = 'i-lucide-file-text'
-    }
-  }
-  return menu;
-}
-
-menu = adaptMenu(menu)
-
-const items = ref<NavigationMenuItem[][]>([
-  [
-    ...menu as NavigationMenuItem[]
-  ],
-
-])
-</script>
-
-<template>
-  <UNavigationMenu orientation="vertical" type="single" :items="items" class="p-4" />
-</template>

bo/src/router/index.ts

@@ -59,7 +59,6 @@ async function setRoutes() {
     const componentName = item.component
     const [, folder] = componentName.split('/')
     const componentPath = `/src${componentName}`
-    console.log(componentPath);
     
 
     let modules =
@@ -114,4 +113,3 @@ router.beforeEach((to, from) => {
 })
 
 export default router
-

bo/src/router/menu.ts

@@ -1,8 +1,15 @@
 import { useFetchJson } from "@/composable/useFetchJson";
 import type { MenuItem, Route } from "@/types/menu";
+import { ref } from "vue";
+import { settings } from "./settings";
 
+
+const categoryId = ref()
 export const getMenu = async () => {
-    const resp = await useFetchJson<MenuItem>('/api/v1/restricted/menu/get-category-tree');
+    if(!categoryId.value){
+        categoryId.value = settings['app'].category_tree_root_id
+    }
+    const resp = await useFetchJson<MenuItem>(`/api/v1/restricted/menu/get-category-tree?root_category_id=${categoryId.value}`);
     return resp.items.children
 }
 

bo/src/stores/cart.ts

@@ -18,16 +18,8 @@ export interface DeliveryMethod {
   description: string
 }
 
-export interface Cart {
-  id: string
-  name: string
-  items: CartItem[]
-}
-
 export const useCartStore = defineStore('cart', () => {
-  const carts = ref<Cart[]>([])
+  const items = ref<CartItem[]>([])
-  const activeCartId = ref<string | null>(null)
-
   const selectedAddressId = ref<number | null>(null)
   const selectedDeliveryMethodId = ref<number | null>(null)
   const shippingCost = ref(0)
@@ -39,15 +31,13 @@ export const useCartStore = defineStore('cart', () => {
     { id: 3, name: 'Priority Delivery', price: 30, description: 'Next business day' }
   ])
 
-  const items = computed(() => {
+  function initMockData() {
-    if (!activeCartId.value) return []
+    items.value = [
-    const cart = carts.value.find(c => c.id === activeCartId.value)
+      { id: 1, productId: 101, name: 'Premium Widget Pro', product_number: 'NC209/7000', image: '/img/product-1.jpg', price: 129.99, quantity: 2 },
-    return cart ? cart.items : []
+      { 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 }
-
+    ]
-  const activeCart = computed(() => {
+  }
-    return carts.value.find(c => c.id === activeCartId.value) || null
-  })
 
   const productsTotal = computed(() => {
     return items.value.reduce((sum, item) => sum + (item.price * item.quantity), 0)
@@ -65,63 +55,8 @@ export const useCartStore = defineStore('cart', () => {
     return items.value.reduce((sum, item) => sum + item.quantity, 0)
   })
 
-  function createCart(name: string): Cart {
-    const newCart: Cart = {
-      id: `cart-${Date.now()}`,
-      name,
-      items: []
-    }
-    carts.value.push(newCart)
-    activeCartId.value = newCart.id
-
-    return newCart
-  }
-
-  function deleteCart(cartId: string) {
-    const index = carts.value.findIndex(c => c.id === cartId)
-    if (index !== -1) {
-      carts.value.splice(index, 1)
-        if (activeCartId.value === cartId) {
-          const firstCart = carts.value[0]
-          activeCartId.value = firstCart ? firstCart.id : null
-        }
-    }
-  }
-
-  function renameCart(cartId: string, newName: string) {
-    const cart = carts.value.find(c => c.id === cartId)
-    if (cart) {
-      cart.name = newName
-    }
-  }
-
-  function setActiveCart(cartId: string) {
-    const cart = carts.value.find(c => c.id === cartId)
-    if (cart) {
-      activeCartId.value = cartId
-    }
-  }
-
-  function addItemToActiveCart(item: CartItem) {
-    if (!activeCartId.value) {
-      createCart('Cart 1')
-    }
-    const cart = carts.value.find(c => c.id === activeCartId.value)
-    if (cart) {
-      const existingItem = cart.items.find(i => i.productId === item.productId)
-      if (existingItem) {
-        existingItem.quantity += item.quantity
-      } else {
-        cart.items.push(item)
-      }
-    }
-  }
-
   function updateQuantity(itemId: number, quantity: number) {
-    const cart = carts.value.find(c => c.id === activeCartId.value)
+    const item = items.value.find(i => i.id === itemId)
-    if (!cart) return
-    
-    const item = cart.items.find(i => i.id === itemId)
     if (item) {
       if (quantity <= 0) {
         removeItem(itemId)
@@ -132,14 +67,12 @@ export const useCartStore = defineStore('cart', () => {
   }
 
   function deleteProduct(id: number): boolean {
-    const cart = carts.value.find(c => c.id === activeCartId.value)
+    const index = items.value.findIndex(a => a.id === id)
-    if (!cart) return false
-    
-    const index = cart.items.findIndex(a => a.id === id)
     if (index === -1) return false
 
-    cart.items.splice(index, 1)
+    items.value.splice(index, 1)
     resetProductPagination()
+
     return true
   }
 
@@ -148,20 +81,14 @@ export const useCartStore = defineStore('cart', () => {
   }
 
   function removeItem(itemId: number) {
-    const cart = carts.value.find(c => c.id === activeCartId.value)
+    const index = items.value.findIndex(i => i.id === itemId)
-    if (!cart) return
-    
-    const index = cart.items.findIndex(i => i.id === itemId)
     if (index !== -1) {
-      cart.items.splice(index, 1)
+      items.value.splice(index, 1)
     }
   }
 
   function clearCart() {
-    const cart = carts.value.find(c => c.id === activeCartId.value)
+    items.value = []
-    if (cart) {
-      cart.items = []
-    }
     selectedAddressId.value = null
     selectedDeliveryMethodId.value = null
     shippingCost.value = 0
@@ -179,40 +106,9 @@ export const useCartStore = defineStore('cart', () => {
     }
   }
 
-  function initMockData() {
-    const cart1: Cart = {
-      id: 'cart-1',
-      name: 'Cart 1',
-      items: [
-        { 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 }
-      ]
-    }
-    
-    const cart2: Cart = {
-      id: 'cart-2',
-      name: 'Cart 2',
-      items: [
-        { id: 3, productId: 103, name: 'Mega Tool Set', product_number: 'NC324/9030', image: '/img/product-3.jpg', price: 249.00, quantity: 3 }
-      ]
-    }
-    
-    const cart3: Cart = {
-      id: 'cart-3',
-      name: 'Cart 3',
-      items: []
-    }
-
-    carts.value = [cart1, cart2, cart3]
-    activeCartId.value = 'cart-1'
-  }
-
   initMockData()
 
   return {
-    carts,
-    activeCartId,
-    activeCart,
     items,
     selectedAddressId,
     selectedDeliveryMethodId,
@@ -223,14 +119,8 @@ export const useCartStore = defineStore('cart', () => {
     vatAmount,
     orderTotal,
     itemCount,
-    
-    createCart,
-    deleteCart,
-    renameCart,
-    setActiveCart,
-    addItemToActiveCart,
-    updateQuantity,
     deleteProduct,
+    updateQuantity,
     removeItem,
     clearCart,
     setSelectedAddress,

bo/src/stores/category.ts

@@ -13,24 +13,24 @@ const products = [
 // type CategoryProducts = {}
 
 export const useCategoryStore = defineStore('category', () => {
-    const id_category = ref(0)
+    const idCategory = ref(0)
     const categoryProducts = ref(products)
 
 
     function setCategoryID(id: number) {
-        id_category.value = id
+        idCategory.value = id
     }
 
     async function getCategoryProducts() {
         return new Promise<typeof products>((resolve) => {
             setTimeout(() => {
-                console.log('Fetching products from category id: ', id_category.value);
+                // console.log('Fetching products from category id: ', idCategory.value);
                 resolve(categoryProducts.value)
             }, 2000 * Math.random())
         })
     }
     return {
-        id_category,
+        idCategory,
         getCategoryProducts,
         setCategoryID
     }

bo/src/stores/product.ts

@@ -37,40 +37,29 @@ export const useProductStore = defineStore('product', () => {
         `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
       )
       productDescription.value = response.items
-      console.log(productDescription, 'dfsfsdf');
+      
-
     } catch (e: unknown) {
       error.value = e instanceof Error ? e.message : 'Failed to load product description'
     } finally {
       loading.value = false
     }
   }
-  function stripHtml(html: string) {
+
-    const div = document.createElement('div')
+  async function saveProductDescription(productID?: number) {
-    div.innerHTML = html
-    return div.textContent || div.innerText || ''
-  }
-  async function saveProductDescription(productID?: number, langId?: number) {
     const id = productID || 1
-    const lang = langId || 1
     try {
       const data = await useFetchJson(
-        `/api/v1/restricted/product-translation/save-product-description?productID=${id}&productLangID=${lang}`,
+        `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=1&productLangID=1`,
         {
           method: 'POST',
-          headers: {
+          body: JSON.stringify(
-            'Content-Type': 'application/json'
+            {
-          },
+              description: productDescription.value.description,
-          body: JSON.stringify({
+              description_short: productDescription.value.description_short,
-            name: stripHtml(productDescription.value?.name || ''),
+              meta_description: productDescription.value.meta_description,
-            description: stripHtml(productDescription.value?.description || ''),
+              available_now: productDescription.value.available_now,
-            description_short: stripHtml(productDescription.value?.description_short || ''),
+              usage: productDescription.value.usage
-            meta_title: stripHtml(productDescription.value?.meta_title || ''),
+            })
-            meta_description: stripHtml(productDescription.value?.meta_description || ''),
-            available_now: stripHtml(productDescription.value?.available_now || ''),
-            available_later: stripHtml(productDescription.value?.available_later || ''),
-            usage: stripHtml(productDescription.value?.usage || '')
-          })
         }
       )
       return data
@@ -79,12 +68,12 @@ export const useProductStore = defineStore('product', () => {
     }
   }
 
-  async function translateProductDescription(productID: number, fromLangId: number, toLangId: number, model: string = 'OpenAI') {
+  async function translateProductDescription(productID: number, fromLangId: number, toLangId: number) {
     loading.value = true
     error.value = null
 
     try {
-      const response = await useFetchJson<ProductDescription>(`/api/v1/restricted/product-translation/translate-product-description?productID=${productID}&productFromLangID=${fromLangId}&productToLangID=${toLangId}&model=${model}`)
+      const response = await useFetchJson<ProductDescription>(`/api/v1/restricted/product-description/translate-product-description?productID=${productID}&productShopID=1&productFromLangID=${fromLangId}&productToLangID=${toLangId}&model=OpenAI`)
       productDescription.value = response.items
       return response.items
     } catch (e: any) {

bo/src/types/product.d.ts

@@ -1,4 +1,4 @@
-  export interface ProductDescription {
+export interface ProductDescription {
   id?: number
   name?: string
   description: string
@@ -6,4 +6,12 @@
   meta_description: string
   available_now: string
   usage: string
+}
+
+export interface Product {
+  reference: number
+  product_id: number
+  name: string
+  image_link: string
+  link_rewrite: string
 }

bo/src/types/settings.d.ts

@@ -7,6 +7,7 @@ export interface Settings {
 }
 
 export interface App {
+  category_tree_root_id: number
   name: string
   environment: string
   base_url: string

bruno/b2b-daniel/get-product-description.yml

@@ -5,13 +5,13 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/product-translation/get-product-description?productID=51&productLangID=4
+  url: http://localhost:3000/api/v1/restricted/product-translation/get-product-description?productID=51&productLangID=1
   params:
     - name: productID
       value: "51"
       type: query
     - name: productLangID
-      value: "4"
+      value: "1"
       type: query
   auth: inherit
 

bruno/b2b-daniel/list-products.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10
+  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10&target_user_id=2
   params:
     - name: p
       value: "1"
@@ -13,6 +13,9 @@ http:
     - name: elems
       value: "10"
       type: query
+    - name: target_user_id
+      value: "2"
+      type: query
 
 settings:
   encodeUrl: true

storage/folder/a.txt

@@ -0,0 +1 @@
+This is a test.