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

Merge pull request 'add image link (large_default) to product description' (#49 ) from add_image_link into main
Reviewed-on: #49 Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>
2026-04-03 13:01:37 +02:00 · 2026-04-03 10:58:21 +00:00 · 2026-04-03 12:24:05 +02:00 · 2026-04-01 07:32:26 +00:00 · 2026-04-01 09:10:38 +02:00 · 2026-04-01 09:10:18 +02:00
30 changed files with 387 additions and 434 deletions
--- a/app/delivery/middleware/auth.go
+++ b/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
-		c.Locals(constdata.USER_LOCALES_NAME, user.ToSession())
-		c.Locals(constdata.USER_LOCALES_ID, user.ID)
+		// Create locale. LangID is overwritten by auth Token
+		var userLocale model.UserLocale
+		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()
--- a/app/delivery/middleware/language.go
+++ b/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)
-					if err == nil {
-						c.Locals("langID", langID)
-						c.Locals("lang", lang)
-						return c.Next()
-					}
+					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+					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)
-					if err == nil {
-						c.Locals("langID", langID)
-						c.Locals("lang", lang)
-						return c.Next()
-					}
+					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+					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("lang", lang)
+					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
 					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("lang", defaultLang)
+			c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
 		}

 		return c.Next()
@@ -104,11 +96,9 @@ func parseAcceptLanguage(header string) string {
 	return strings.ToLower(first)
 }

-// GetLanguageID extracts language ID from context
-func GetLanguageID(c fiber.Ctx) uint {
-	langID, ok := c.Locals("langID").(uint)
-	if !ok {
-		return 0
-	}
-	return langID
+func returnNewLocale(lang_id uint) *model.UserLocale {
+	newLocale := model.UserLocale{}
+	newLocale.OriginalUser = &model.Customer{}
+	newLocale.OriginalUser.LangID = lang_id
+	return &newLocale
 }
--- a/app/delivery/web/api/public/auth.go
+++ b/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")
-	if user == nil {
+	userLocale := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	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{
--- a/app/delivery/web/api/public/routing.go
+++ b/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)))
--- a/app/delivery/web/api/restricted/carts.go
+++ b/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)))
--- a/app/delivery/web/api/restricted/list.go
+++ b/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{
--- a/app/delivery/web/api/restricted/menu.go
+++ b/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)))
--- a/app/delivery/web/api/restricted/productTranslation.go
+++ b/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)))
--- a/app/delivery/web/api/restricted/search.go
+++ b/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(&nothing, 0, i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(nullable.GetNil(""), 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)))
--- a/app/model/customer.go
+++ b/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
--- a/app/model/productDescription.go
+++ b/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 {
--- a/app/repos/listRepo/listRepo.go
+++ b/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,
--- a/app/repos/productDescriptionRepo/productDescriptionRepo.go
+++ b/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
--- a/app/service/authService/auth.go
+++ b/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)
--- a/app/utils/const_data/consts.go
+++ b/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_LOCALES_ID = "userID"
+const USER_LOCALE = "user"
--- a/app/utils/localeExtractor/localeExtractor.go
+++ b/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
+}
--- a/bo/src/components/admin/PageProducts.vue
+++ b/bo/src/components/admin/PageProducts.vue
@@ -1,39 +1,11 @@
 <template>
    <suspense>
        <component :is="Default || 'div'">
-            <div class="container mx-auto mt-20">
-                <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
-                    <template #item="{ item, active }">
-                        <div class="flex items-center gap-2 px-3 py-2">
-                            <UIcon name="i-heroicons-book-open" />
-                            <span>{{ item.name }}</span>
-                        </div>
-                    </template>
-</UNavigationMenu> -->
-                <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
-                <div v-if="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">
-                    <div class="flex gap-2">
-                        <CategoryMenuListing />
-                        <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>
-                    <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 class="flex gap-10">
+                <CategoryMenu />
+                <div class="w-full flex flex-col items-center gap-4">
+                    <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
+                    <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
                </div>
            </div>
        </component>
@@ -46,26 +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'
-
-interface Product {
-    reference: number
-    product_id: number
-    name: string
-    image_link: string
-    link_rewrite: string
-}
+import CategoryMenu from '../inner/categoryMenu.vue'
+import type { Product } from '@/types/product'

 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
            }
        })
    }
@@ -101,7 +67,6 @@ const sortField = computed({
    }
 })

-const perPage = ref(15)
 const total = ref(0)

 interface ApiResponse {
@@ -162,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-products/get-listing?${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 {
@@ -182,16 +155,11 @@ async function fetchProductList() {

 function goToProduct(productId: number) {
    router.push({
-        name: 'product-detail',
-        params: { id: productId }
+        name: 'customer-product-details',
+        params: { product_id: productId }
    })
 }

-const selectedCount = ref({
-    product_id: null,
-    count: 0
-})
-
 function getIcon(name: string) {
    if (sortField.value[0] === name) {
        if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
@@ -205,25 +173,7 @@ const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
 const UIcon = resolveComponent('UIcon')

-const columns: TableColumn<Payment>[] = [
-    {
-        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()
-            })
-    },
+const columns: TableColumn<Product>[] = [
    {
        accessorKey: 'product_id',
        header: ({ column }) => {
@@ -314,108 +264,17 @@ const columns: TableColumn<Payment>[] = [
        },
        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',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
+                color: 'primary',
                variant: 'solid'
-            }, 'Add to cart')
-        },
-    }
-]
-
-const columnsChild: TableColumn<Payment>[] = [
-    {
-        accessorKey: 'product_id',
-        header: '',
-        cell: ({ row }) => `#${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 }) => 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')
+            }, () => 'Show product')
        },
    }
 ]
@@ -427,4 +286,4 @@ watch(
    },
    { immediate: true }
 )
-</script>
+</script>
--- a/bo/src/components/admin/ProductDetailView.vue
+++ b/bo/src/components/admin/ProductDetailView.vue
@@ -1,126 +1,130 @@
 <template>
  <component :is="Default || 'div'">
-  <div class="container my-10 mx-auto ">
+    <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">
-        <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!" valueKey="iso_code">
-          <template #default="{ modelValue }">
-            <div class="flex items-center gap-2">
-              <span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span>
-              <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code ==
-                modelValue)?.name}}</span>
-            </div>
-          </template>
-          <template #item-leading="{ item }">
-            <div class="flex items-center rounded-md cursor-pointer transition-colors">
-              <span class="text-md">{{ item.flag }}</span>
-              <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
-            </div>
-          </template>
-        </USelect>
+      <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">
+          <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!"
+            valueKey="iso_code">
+            <template #default="{ modelValue }">
+              <div class="flex items-center gap-2">
+                <span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span>
+                <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code ==
+                  modelValue)?.name}}</span>
+              </div>
+            </template>
+            <template #item-leading="{ item }">
+              <div class="flex items-center rounded-md cursor-pointer transition-colors">
+                <span class="text-md">{{ item.flag }}</span>
+                <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
+              </div>
+            </template>
+          </USelect>
+        </div>
+        <UButton @click="translateToSelectedLanguage" color="primary" :loading="translating"
+          class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!">
+          Translate
+        </UButton>
      </div>
-      <UButton @click="translateToSelectedLanguage" color="primary" :loading="translating"
-        class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!">
-        Translate
-      </UButton>
-    </div>

-    <div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
-      <div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl">
+      <div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
+        <div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl">
+          <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
+          <p class="text-lg font-medium dark:text-white text-black">Translating...</p>
+        </div>
+      </div>
+
+      <div v-if="productStore.loading" class="flex items-center justify-center py-20">
        <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
-        <p class="text-lg font-medium dark:text-white text-black">Translating...</p>
      </div>
-    </div>
-
-    <div v-if="productStore.loading" class="flex items-center justify-center py-20">
-      <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
-    </div>
-    <div v-else-if="productStore.error" class="flex items-center justify-center py-20">
-      <p class="text-red-500">{{ productStore.error }}</p>
-    </div>
-    <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
-      <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
-        <span class="text-gray-500 dark:text-gray-400">Product Image</span>
+      <div v-else-if="productStore.error" class="flex items-center justify-center py-20">
+        <p class="text-red-500">{{ productStore.error }}</p>
      </div>
-      <div class="flex flex-col gap-2">
-        <p class="text-[25px] font-bold text-black dark:text-white">
-          {{ productStore.productDescription.name || 'Product Name' }}
-        </p>
-        <p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
-        <div class="space-y-[10px]">
-          <div class="flex items-center gap-1">
-            <UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" />
-            <p class="text-[16px] font-bold text-(--accent-blue-light) dark:text-(--accent-blue-dark)">
-              {{ productStore.productDescription.available_now }}
-            </p>
+      <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
+        <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
+          <span class="text-gray-500 dark:text-gray-400">Product Image</span>
+        </div>
+        <div class="flex flex-col gap-2">
+          <p class="text-[25px] font-bold text-black dark:text-white">
+            {{ productStore.productDescription.name || 'Product Name' }}
+          </p>
+          <p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
+          <div class="space-y-[10px]">
+            <div class="flex items-center gap-1">
+              <UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" />
+              <p class="text-[16px] font-bold text-(--accent-blue-light) dark:text-(--accent-blue-dark)">
+                {{ productStore.productDescription.available_now }}
+              </p>
+            </div>
+            <div class="flex items-center gap-1">
+              <UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" />
+              <p class="text-[18px] font-bold text-black dark:text-white">
+                {{ productStore.productDescription.delivery_in_stock || 'Delivery information' }}
+              </p>
+            </div>
          </div>
-          <div class="flex items-center gap-1">
-            <UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" />
-            <p class="text-[18px] font-bold text-black dark:text-white">
-              {{ productStore.productDescription.delivery_in_stock || 'Delivery information' }}
-            </p>
+        </div>
+      </div>
+
+      <div v-if="productStore.productDescription" class="mt-16">
+        <div class="flex gap-4 my-6">
+          <UButton @click="activeTab = 'description'"
+            :class="['cursor-pointer', activeTab === 'description' ? 'bg-blue-500 text-white' : '']" color="neutral"
+            variant="outline">
+            <p class="dark:text-white">Description</p>
+          </UButton>
+
+          <UButton @click="activeTab = 'usage'"
+            :class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral"
+            variant="outline">
+            <p class="dark:text-white">Usage</p>
+          </UButton>
+        </div>
+
+        <div v-if="activeTab === 'usage'"
+          class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
+
+          <div class="flex justify-end items-center gap-3 mb-4">
+            <UButton v-if="!isEditing" @click="enableEdit"
+              class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
+              <p class="text-white">Change Text</p>
+              <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
+            </UButton>
+            <UButton v-if="isEditing" @click="saveText" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
+              <p class="dark:text-white text-black">Save the edited text</p>
+            </UButton>
+            <UButton v-if="isEditing" @click="cancelEdit" color="neutral" variant="outline"
+              class="p-2.5 cursor-pointer">
+              Cancel
+            </UButton>
+          </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'"
+          class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
+          <div class="flex items-center justify-end gap-3 mb-4">
+            <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit"
+              class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
+              <p class="text-white">Change Text</p>
+              <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
+            </UButton>
+            <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline"
+              class="p-2.5 cursor-pointer">
+              <p class="dark:text-white text-black ">Save the edited text</p>
+            </UButton>
+            <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" color="neutral"
+              variant="outline" class="p-2.5 cursor-pointer">Cancel</UButton>
+          </div>
+          <div ref="descriptionRef" v-html="productStore.productDescription.description"
+            class="flex flex-col justify-center dark:text-white text-black">
          </div>
        </div>
      </div>
    </div>
-
-    <div v-if="productStore.productDescription" class="mt-16">
-      <div class="flex gap-4 my-6">
-        <UButton @click="activeTab = 'description'"
-          :class="['cursor-pointer', activeTab === 'description' ? 'bg-blue-500 text-white' : '']" color="neutral"
-          variant="outline">
-          <p class="dark:text-white">Description</p>
-        </UButton>
-
-        <UButton @click="activeTab = 'usage'"
-          :class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral"
-          variant="outline">
-          <p class="dark:text-white">Usage</p>
-        </UButton>
-      </div>
-
-      <div v-if="activeTab === 'usage'"
-        class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
-
-        <div class="flex justify-end items-center gap-3 mb-4">
-          <UButton v-if="!isEditing" @click="enableEdit"
-            class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
-            <p class="text-white">Change Text</p>
-            <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
-          </UButton>
-          <UButton v-if="isEditing" @click="saveText" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-            <p class="dark:text-white text-black">Save the edited text</p>
-          </UButton>
-          <UButton v-if="isEditing" @click="cancelEdit" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-            Cancel
-          </UButton>
-        </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'"
-        class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
-        <div class="flex items-center justify-end gap-3 mb-4">
-          <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit"
-            class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
-            <p class="text-white">Change Text</p>
-            <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
-          </UButton>
-          <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-            <p class="dark:text-white text-black ">Save the edited text</p>
-          </UButton>
-          <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" color="neutral" variant="outline" class="p-2.5 cursor-pointer">Cancel</UButton>
-        </div>
-        <div ref="descriptionRef" v-html="productStore.productDescription.description"
-          class="flex flex-col justify-center dark:text-white text-black">
-        </div>
-      </div>
-    </div>
-  </div>
  </component>
 </template>

@@ -142,7 +146,7 @@ const isEditing = ref(false)

 const availableLangs = computed(() => langs)

-const selectedLanguage = ref('pl')
+const selectedLanguage = ref('en')

 const currentLangId = ref(2)
 const productID = ref<number>(0)
@@ -176,7 +180,7 @@ const translateToSelectedLanguage = async () => {
 }

 onMounted(async () => {
-  const id = route.params.id
+  const id = route.params.product_id
  if (id) {
    productID.value = Number(id)
    await fetchForLanguage(selectedLanguage.value)
--- a/bo/src/components/customer/PageProducts.vue
+++ b/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
@@ -167,7 +167,7 @@ async function fetchProductList() {
        if (value) params.append(key, String(value))
    })

-    const url = `/api/v1/restricted/list-products/get-listing?${params}`
+    const url = `/api/v1/restricted/list/list-products?${params}`

    try {
        const response = await useFetchJson<ApiResponse>(url)
--- a/bo/src/components/inner/categoryMenu.vue
+++ b/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({ label: item.label, icon: 'i-lucide-book-open', popover: item.label, to: { name: 'category', params: item.params } })
+      item.children.unshift({
+        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>
-
-<template>
-  <UNavigationMenu orientation="vertical" type="single" :items="items" class="p-4" />
-</template>
+</script>
--- a/bo/src/components/inner/categoryMenuListing.vue
+++ b/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>
--- a/bo/src/router/index.ts
+++ b/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 =
--- a/bo/src/router/menu.ts
+++ b/bo/src/router/menu.ts
@@ -1,12 +1,18 @@
 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-menu');
+    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
 }

-
 export const getRoutes = async () => {
    const resp = await useFetchJson<Route[]>('/api/v1/public/menu/get-routes');

--- a/bo/src/stores/category.ts
+++ b/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
    }
--- a/bo/src/stores/product.ts
+++ b/bo/src/stores/product.ts
@@ -34,9 +34,8 @@ export const useProductStore = defineStore('product', () => {

    try {
      const response = await useFetchJson<ProductDescription>(
-        `/api/v1/restricted/product-description/get-product-description?productID=${productID}&productLangID=${langId}`
+        `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
      )
-      console.log(response, 'dfsfsdf');
      productDescription.value = response.items
      
    } catch (e: unknown) {
--- a/bo/src/types/product.d.ts
+++ b/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
 }
--- a/bo/src/types/settings.d.ts
+++ b/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
--- a/bruno/b2b-daniel/get-product-description.yml
+++ b/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

--- a/bruno/b2b-daniel/list-products.yml
+++ b/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
--- a/storage/folder/a.txt
+++ b/storage/folder/a.txt
@@ -0,0 +1 @@
+This is a test.
Author	SHA1	Message	Date
Daniel Goc	e0c53c97ba	Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into user_teleport	2026-04-03 13:01:37 +02:00
goc_daniel	09a77c14c9	Merge pull request 'add image link (large_default) to product description' (#49 ) from add_image_link into main Reviewed-on: #49 Reviewed-by: Wiktor Dudzic <dudzic_wiktor@ma-al.com>	2026-04-03 10:58:21 +00:00
Daniel Goc	c7533a8deb	add image link (large_default) to product description	2026-04-03 12:24:05 +02:00
Arina Yakovenko	cf4d14a3cb	Merge pull request 'front-styles' (#44 ) from front-styles into main Reviewed-on: #44	2026-04-01 07:32:26 +00:00
Arina Yakovenko	30eb82ba53	fix: categories	2026-04-01 09:10:38 +02:00
Arina Yakovenko	a2a2c35ab3	Merge remote-tracking branch 'origin' into front-styles	2026-04-01 09:10:18 +02:00
Daniel Goc	03f04b2f53	Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into user_teleport	2026-03-31 16:57:44 +02:00
Daniel Goc	55da953f32	add teleporting	2026-03-31 16:56:05 +02:00
Marek Goc	684f910090	Merge pull request 'expand_get_menu' (#42 ) from expand_get_menu into main Reviewed-on: #42 Reviewed-by: Marek Goc <goc_marek@ma-al.com>	2026-03-31 14:55:35 +00:00
Arina Yakovenko	5feaa9e15c	Merge remote-tracking branch 'origin/expand_get_menu' into front-styles	2026-03-31 14:34:14 +02:00
Daniel Goc	04e2549a66	missing / in ImageLink	2026-03-31 14:30:47 +02:00
Arina Yakovenko	fb4f7048ab	fix: requests	2026-03-31 12:44:02 +02:00
Daniel Goc	a3f01eca7c	misspell fix	2026-03-31 12:27:31 +02:00