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,15 +24,11 @@ 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 {
-						c.Locals("langID", langID)
-						c.Locals("lang", lang)
 					return c.Next()
 				}
 			}
 		}
-		}
 
 		// 2. Check cookie
 		cookieLang := c.Cookies("lang_id", "")
@@ -38,15 +36,11 @@ 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 {
-						c.Locals("langID", langID)
-						c.Locals("lang", lang)
 					return c.Next()
 				}
 			}
 		}
-		}
 
 		// 3. Check Accept-Language header
 		acceptLang := c.Get("Accept-Language", "")
@@ -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,8 +18,9 @@ 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"`
 
+	ImageLink        string `gorm:"column:image_link" json:"image_link"`
 	ExistsInDatabase bool   `gorm:"-" json:"exists_in_database"`
 }
 

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,6 +37,27 @@ 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) {

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

@@ -12,14 +12,13 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
-    CategoryMenu: typeof import('./src/components/inner/CategoryMenu.vue')['default']
+    CategoryMenu: typeof import('./src/components/inner/categoryMenu.vue')['default']
     CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default']
-    CountryCurrencySwitch: typeof import('./src/components/inner/CountryCurrencySwitch.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']
+    LangSwitch: typeof import('./src/components/inner/langSwitch.vue')['default']
     PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
     PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default']
     PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default']
@@ -35,7 +34,7 @@ declare module 'vue' {
     ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
-    ThemeSwitch: typeof import('./src/components/inner/ThemeSwitch.vue')['default']
+    ThemeSwitch: typeof import('./src/components/inner/themeSwitch.vue')['default']
     TopBar: typeof import('./src/components/TopBar.vue')['default']
     TopBarLogin: typeof import('./src/components/TopBarLogin.vue')['default']
     UAlert: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Alert.vue')['default']

bo/src/components/TopBar.vue

@@ -1,49 +1,13 @@
-<template>
-  <header
-    class="fixed top-0 left-0 right-0 z-50 bg-white/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
-    <!-- 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="i-heroicons-clock" class="w-5 h-5" />
-          </div>
-          <span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
-        </RouterLink>
-
-        <UNavigationMenu :type="'trigger'" :ui="{
-          root: 'justify-center',
-          list: 'gap-4'
-        }" :items="menuItems" class="w-full"></UNavigationMenu>
-        <div class="flex items-center gap-2">
-          <CountryCurrencySwitch />
-          <!-- Language Switcher -->
-          <LangSwitch />
-          <!-- Theme Switcher -->
-          <ThemeSwitch />
-          <!-- Logout Button (only when authenticated) -->
-          <button v-if="authStore.isAuthenticated" @click="authStore.logout()"
-            class="px-3 py-1.5 text-sm font-medium text-black dark:text-white hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-600 rounded-lg transition-colors border border-(--border-light) dark:border-(--border-dark)">
-            {{ $t('general.logout') }}
-          </button>
-        </div>
-      </div>
-    </div>
-  </header>
-</template>
-
 <script setup lang="ts">
 import { useFetchJson } from '@/composable/useFetchJson'
-import LangSwitch from './inner/LangSwitch.vue'
+import LangSwitch from './inner/langSwitch.vue'
-import ThemeSwitch from './inner/ThemeSwitch.vue'
+import ThemeSwitch from './inner/themeSwitch.vue'
 import { useAuthStore } from '@/stores/auth'
-import { computed, ref } from 'vue'
+import { computed, onMounted, ref } from 'vue'
 import { currentLang } from '@/router/langs'
 import type { LabelTrans, TopMenuItem } from '@/types'
 import type { NavigationMenuItem } from '@nuxt/ui'
 import { useRoute, useRouter } from 'vue-router'
-import CountryCurrencySwitch from './inner/CountryCurrencySwitch.vue'
 
 const authStore = useAuthStore()
 let menu = ref()
@@ -87,3 +51,37 @@ function transformMenu(items: TopMenuItem[], locale: string | undefined): Naviga
 }
 await getTopMenu()
 </script>
+
+<template>
+  <header
+    class="fixed top-0 left-0 right-0 z-50 bg-white/80 dark:bg-(--black) backdrop-blur-md border-b border-(--border-light) dark:border-(--border-dark)">
+    <!-- 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="i-heroicons-clock" class="w-5 h-5" />
+          </div>
+          <span class="font-semibold text-gray-900 dark:text-white">TimeTracker</span>
+        </RouterLink>
+
+        <UNavigationMenu :type="'trigger'" :ui="{
+          root: 'justify-center',
+          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()"
+            class="px-3 py-1.5 text-sm font-medium text-black dark:text-white hover:text-black dark:hover:text-white hover:bg-gray-100 dark:hover:bg-gray-600 rounded-lg transition-colors border border-(--border-light) dark:border-(--border-dark)">
+            {{ $t('general.logout') }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </header>
+</template>

bo/src/components/TopBarLogin.vue

@@ -1,6 +1,6 @@
 <script setup lang="ts">
-import LangSwitch from './inner/LangSwitch.vue'
+import LangSwitch from './inner/langSwitch.vue'
-import ThemeSwitch from './inner/ThemeSwitch.vue'
+import ThemeSwitch from './inner/themeSwitch.vue'
 import { useAuthStore } from '@/stores/auth'
 
 const authStore = useAuthStore()

bo/src/components/admin/PageProducts.vue

@@ -7,7 +7,7 @@
                     <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
                     <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
                 </div>
-            </div> -->
+            </div>
         </component>
     </suspense>
 </template>
@@ -18,7 +18,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 CategoryMenu from '../inner/CategoryMenu.vue'
+import CategoryMenu from '../inner/categoryMenu.vue'
 import type { Product } from '@/types/product'
 
 const router = useRouter()

bo/src/components/admin/ProductDetailView.vue

@@ -1,60 +1,32 @@
 <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 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-center gap-3">
+        <div class="flex items-end gap-3">
-
+          <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!"
-          <template v-if="!isViewingExistingTranslation">
+            valueKey="iso_code">
-            <USelectMenu
-              v-model="selectedLangId"
-              :items="langOptions"
-              value-key="id"
-              class="w-40"
-              :search-input="false"
-            >
             <template #default="{ modelValue }">
-                <span class="dark:text-white text-black">
+              <div class="flex items-center gap-2">
-                  {{ langOptions.find(l => l.id === modelValue)?.name }}
+                <span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span>
-                </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 }">
-                <span class="dark:text-white text-black font-medium">
+              <div class="flex items-center rounded-md cursor-pointer transition-colors">
-                  {{ item.name }}
+                <span class="text-md">{{ item.flag }}</span>
-                </span>
+                <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
+              </div>
             </template>
-            </USelectMenu>
+          </USelect>
-
+        </div>
-            <UButton
+        <UButton @click="translateToSelectedLanguage" color="primary" :loading="translating"
-              @click="translateOrSave"
+          class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!">
-              :disabled="selectedLangId === defaultLangId"
-              :loading="translating"
-              class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!"
-            >
           Translate
         </UButton>
-          </template>
-
-
-          <template v-else>
-            <UButton
-              @click="goBackToDefault"
-              color="neutral"
-              variant="outline"
-              class="cursor-pointer"
-            >
-              <UIcon name="i-lucide-arrow-left" class="mr-1" />
-              <p class="dark:text-white">Back to Polish</p>
-            </UButton>
-          </template>
       </div>
-      </div>
-
-      <p v-if="noTranslation" class="text-red-500 mt-2">
-        No translation available
-      </p>
 
       <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">
@@ -66,23 +38,18 @@
       <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>
-
         <div class="flex flex-col gap-2">
           <p class="text-[25px] font-bold text-black dark:text-white">
-            {{ productName || 'Product Name' }}
+            {{ productStore.productDescription.name || 'Product Name' }}
           </p>
-
+          <p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
-          <p v-html="displayedShortDescription" 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" />
@@ -90,7 +57,6 @@
                 {{ 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">
@@ -101,43 +67,63 @@
         </div>
       </div>
 
-      <!-- TABS -->
       <div v-if="productStore.productDescription" class="mt-16">
         <div class="flex gap-4 my-6">
-          <UButton @click="activeTab = 'description'" :class="btnClass('description')" variant="outline">
+          <UButton @click="activeTab = 'description'"
-            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="btnClass('usage')" variant="outline">
+          <UButton @click="activeTab = 'usage'"
-            Usage
+            :class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral"
+            variant="outline">
+            <p class="dark:text-white">Usage</p>
           </UButton>
         </div>
 
-        <!-- USAGE -->
+        <div v-if="activeTab === 'usage'"
-        <div v-if="activeTab === 'usage'" class="box">
+          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 mb-4 gap-2">
+
-            <UButton v-if="!isEditing" @click="enableUsageEdit" class="bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)! text-white px-3 py-1 rounded">
+          <div class="flex justify-end items-center gap-3 mb-4">
-              Edit Usage
+            <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>
-            <UButton v-if="isEditing" @click="saveUsage" class="px-3 py-1 border rounded">Save</UButton>
-            <UButton v-if="isEditing" @click="cancelUsageEdit" class="px-3 py-1 border rounded">Cancel</UButton>
           </div>
-          <p ref="usageRef" v-html="displayedUsage || 'Usage information not available'" class="text-black dark:text-white"></p>
+          <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>
 
-        <!-- DESCRIPTION -->
+        <div v-if="activeTab === 'description'"
-        <div v-if="activeTab === 'description'" class="box">
+          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 mb-4 gap-2">
+          <div class="flex items-center justify-end gap-3 mb-4">
-            <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit" class="bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)! text-white px-3 py-1 rounded">
+            <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit"
-              Edit Description
+              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" class="px-3 py-1 border rounded">Save</UButton>
+            <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline"
-            <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" class="px-3 py-1 border rounded">Cancel</UButton>
+              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 ref="descriptionRef" v-html="displayedDescription || 'Description not available'" class="text-black dark:text-white"></div>
         </div>
       </div>
-
     </div>
   </component>
 </template>
@@ -146,175 +132,118 @@
 import { ref, computed, onMounted, watch } from 'vue'
 import { useRoute } from 'vue-router'
 import { useProductStore } from '@/stores/product'
-import { useSettingsStore } from '@/stores/settings'
-import { langs } from '@/router/langs'
 import { useEditable } from '@/composable/useConteditable'
+import { langs } from '@/router/langs'
+import type { Language } from '@/types'
 import Default from '@/layouts/default.vue'
 
 const route = useRoute()
-const productStore = useProductStore()
-const settingsStore = useSettingsStore()
-
 const activeTab = ref('description')
+const productStore = useProductStore()
 const translating = ref(false)
-const noTranslation = ref(false)
 
-const defaultLangId = ref(0)
+const isEditing = ref(false)
-const selectedLangId = ref(0)
+
-const activeLangId = ref(0)
+const availableLangs = computed(() => langs)
-const productID = ref(0)
+
+const selectedLanguage = ref('en')
+
+const currentLangId = ref(2)
+const productID = ref<number>(0)
+
+// Watch for language changes and refetch product description
+watch(selectedLanguage, async (newLang: string) => {
+  if (productID.value) {
+    await fetchForLanguage(newLang)
+  }
+})
+
+const fetchForLanguage = async (langCode: string) => {
+  const lang = langs.find((l: Language) => l.iso_code === langCode)
+  if (lang && productID.value) {
+    await productStore.getProductDescription(lang.id, productID.value)
+    currentLangId.value = lang.id
+  }
+}
+
+const translateToSelectedLanguage = async () => {
+  const targetLang = langs.find((l: Language) => l.iso_code === selectedLanguage.value)
+  if (targetLang && currentLangId.value && productID.value) {
+    translating.value = true
+    try {
+      await productStore.translateProductDescription(productID.value, currentLangId.value, targetLang.id)
+      currentLangId.value = targetLang.id
+    } finally {
+      translating.value = false
+    }
+  }
+}
+
+onMounted(async () => {
+  const id = route.params.product_id
+  if (id) {
+    productID.value = Number(id)
+    await fetchForLanguage(selectedLanguage.value)
+  }
+})
 
 const descriptionRef = ref<HTMLElement | null>(null)
 const usageRef = ref<HTMLElement | null>(null)
 
 const descriptionEdit = useEditable(descriptionRef)
 const usageEdit = useEditable(usageRef)
-const isEditing = ref(false)
 
-const originalUsage = ref('')
 const originalDescription = ref('')
+const originalUsage = ref('')
 
-const langOptions = computed(() => langs.filter(l => l.active !== false))
+const saveDescription = async () => {
-
+  descriptionEdit.disableEdit()
-watch(selectedLangId, async (newLang) => {
+  await productStore.saveProductDescription(productID.value)
-  if (!productID.value) return
-
-  if (newLang === defaultLangId.value) {
-    noTranslation.value = false
-    activeLangId.value = defaultLangId.value
-    await productStore.getProductDescription(defaultLangId.value, productID.value)
-    await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
-    return
-  }
-
-  await productStore.getProductDescription(newLang, productID.value)
-
-  const desc = productStore.productDescription
-
-  if (!desc || (!desc.description && !desc.description_short && !desc.usage)) {
-    noTranslation.value = true
-    activeLangId.value = defaultLangId.value
-    await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
-  } else {
-    noTranslation.value = false
-    activeLangId.value = newLang
-  }
-})
-
-const isViewingExistingTranslation = computed(() => activeLangId.value !== defaultLangId.value && !noTranslation.value)
-
-const productName = computed(() => {
-  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
-    return productStore.productDescription?.name || ''
-  }
-  return productStore.defaultProductDescription?.name || productStore.productDescription?.name || ''
-})
-
-const displayedDescription = computed(() => {
-  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
-    return productStore.productDescription?.description || ''
-  }
-  return productStore.defaultProductDescription?.description || ''
-})
-
-const displayedShortDescription = computed(() => {
-  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
-    return productStore.productDescription?.description_short || ''
-  }
-  return productStore.defaultProductDescription?.description_short || ''
-})
-
-const displayedUsage = computed(() => {
-  if (activeLangId.value !== defaultLangId.value && !noTranslation.value) {
-    return productStore.productDescription?.usage || ''
-  }
-  return productStore.defaultProductDescription?.usage || ''
-})
-
-const goBackToDefault = async () => {
-  selectedLangId.value = defaultLangId.value
-  activeLangId.value = defaultLangId.value
-  noTranslation.value = false
-  await productStore.getProductDescription(defaultLangId.value, productID.value)
-  await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
 }
 
-const translateOrSave = async () => {
+const cancelDescriptionEdit = () => {
-  if (!productID.value || selectedLangId.value === defaultLangId.value) return
+  if (descriptionRef.value) {
-
+    descriptionRef.value.innerHTML = originalDescription.value
-  translating.value = true
-  try {
-    const res = await productStore.translateProductDescription(productID.value, defaultLangId.value, selectedLangId.value)
-    if (res) {
-      activeLangId.value = selectedLangId.value
-      noTranslation.value = false
-    }
-  } finally {
-    translating.value = false
   }
+  descriptionEdit.disableEdit()
 }
 
-const btnClass = (tab: string) => ['cursor-pointer px-4 py-2', activeTab.value === tab ? 'bg-blue-500 text-white' : '']
-
-/* USAGE EDIT */
-const enableUsageEdit = () => {
-  originalUsage.value = displayedUsage.value
-  usageEdit.enableEdit()
-  isEditing.value = true
-}
-const saveUsage = async () => {
-  if (usageRef.value && productStore.productDescription) {
-    productStore.productDescription.usage = usageRef.value.innerHTML
-  }
-  usageEdit.disableEdit()
-  isEditing.value = false
-  await productStore.saveProductDescription(productID.value, activeLangId.value, 1)
-}
-const cancelUsageEdit = () => {
-  if (usageRef.value) usageRef.value.innerHTML = originalUsage.value
-  if (productStore.productDescription) productStore.productDescription.usage = originalUsage.value
-  usageEdit.disableEdit()
-  isEditing.value = false
-}
-
-/* DESCRIPTION EDIT */
 const enableDescriptionEdit = () => {
-  originalDescription.value = displayedDescription.value
+  if (descriptionRef.value) {
+    originalDescription.value = descriptionRef.value.innerHTML
+  }
   descriptionEdit.enableEdit()
 }
-const saveDescription = async () => {
+
-  if (descriptionRef.value && productStore.productDescription) {
+const enableEdit = () => {
-    productStore.productDescription.description = descriptionRef.value.innerHTML
+  if (usageRef.value) {
+    originalUsage.value = usageRef.value.innerHTML
   }
-  descriptionEdit.disableEdit()
+  isEditing.value = true
-  await productStore.saveProductDescription(productID.value, activeLangId.value, 1)
+  usageEdit.enableEdit()
-}
-const cancelDescriptionEdit = () => {
-  if (descriptionRef.value) descriptionRef.value.innerHTML = originalDescription.value
-  if (productStore.productDescription) productStore.productDescription.description = originalDescription.value
-  descriptionEdit.disableEdit()
 }
 
-onMounted(async () => {
+const saveText = () => {
-  const settings = await settingsStore.getSettings()
+  usageEdit.disableEdit()
-  if (settings) {
+  isEditing.value = false
-    defaultLangId.value = settings.app.shop_default_language
+  productStore.saveProductDescription(productID.value)
-    selectedLangId.value = defaultLangId.value
+}
-    activeLangId.value = defaultLangId.value
+
+const cancelEdit = () => {
+  if (usageRef.value) {
+    usageRef.value.innerHTML = originalUsage.value
   }
-  const id = route.params.product_id
+  usageEdit.disableEdit()
-  if (id) {
+  isEditing.value = false
-    productID.value = Number(id)
+}
-    await productStore.getProductDescription(defaultLangId.value, productID.value)
+
-    await productStore.getDefaultProductDescription(defaultLangId.value, productID.value)
-  }
-})
 </script>
 
 <style>
-.box {
+.images {
-  padding: 20px;
+  display: flex;
-  border: 1px solid var(--border-light);
+  align-items: center;
-  border-radius: 8px;
+  gap: 70px;
+  margin: 20px 0 20px 0;
 }
 </style>

bo/src/components/customer/PageProducts.vue

@@ -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 CategoryMenu from '../inner/CategoryMenu.vue'
+import CategoryMenu from '../inner/categoryMenu.vue'
 
 interface Product {
     reference: number

bo/src/components/inner/CountryCurrencySwitch.vue

@@ -1,68 +0,0 @@
-<template>
-  <p>Country: {{ currentCountry?.name }}</p>
-  <p>Currency: {{ currentCountry?.ps_currency.iso_code }}</p>
-  <USelectMenu v-model="country" :items="countries"
-    class="w-40 bg-(--main-light) dark:bg-(--black) rounded-md shadow-sm  hover:none!" valueKey="id"
-    :searchInput="false">
-    <template #default="{ modelValue }">
-      <div class="flex items-center gap-1">
-        <span class="font-medium dark:text-white text-black">{{ modelValue.name }}</span>
-      </div>
-    </template>
-    <template #item-leading="{ item }">
-      <div class="flex items-center rounded-md cursor-pointer transition-colors">
-        <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
-      </div>
-    </template>
-  </USelectMenu>
-</template>
-
-<script setup lang="ts">
-import { countries, currentCountry } from '@/router/langs'
-import { useRouter, useRoute } from 'vue-router'
-import { useCookie } from '@/composable/useCookie'
-import { computed, watch } from 'vue'
-import { i18n } from '@/plugins/02_i18n'
-import { useFetchJson } from '@/composable/useFetchJson'
-const router = useRouter()
-const route = useRoute()
-
-const cookie = useCookie()
-
-const country = computed({
-  get() {
-    return currentCountry.value
-  },
-  set(value: string) {
-    // i18n.locale.value = value
-    currentCountry.value = countries.find((x) => x.id == Number(value))
-    cookie.setCookie('country_id', `${countries.find((x) => x.id == Number(value))?.id}`, { days: 60, secure: true, sameSite: 'Lax' })
-
-    // changeLang()
-  },
-})
-
-// async function changeLang() {
-//   try {
-//     const { items } = await useFetchJson('/api/v1/public/auth/update-choice', {
-//       method: 'POST'
-//     })
-
-//   } catch (error) {
-//     console.log(error)
-//   }
-// }
-
-watch(
-  () => country,
-  (newCountry) => {
-    if (newCountry) {
-      console.log(newCountry.value);
-
-      // i18n.locale.value = newLocale  
-      currentCountry.value = countries.find((x) => x.id == Number(newCountry.value?.id))
-    }
-  },
-  { immediate: true },
-)
-</script>

bo/src/plugins/02_i18n.ts

@@ -1,12 +1,11 @@
 
 import { useFetchJson } from '@/composable/useFetchJson'
-import { initCountryCurrency, initLangs, langs } from '@/router/langs'
+import { initLangs, langs } from '@/router/langs'
 import { watch } from 'vue'
 import { createI18n, type PathValue } from 'vue-i18n'
 
 // const x =
 await initLangs()
-await initCountryCurrency()
 export const i18ninstall = createI18n({
   legacy: false, // you must set `false`, to use Composition API
   locale: 'en',

bo/src/router/langs.ts

@@ -1,16 +1,12 @@
 import { useCookie } from "@/composable/useCookie"
 import { useFetchJson } from "@/composable/useFetchJson"
-import type { Country, Language } from "@/types"
+import type { Language } from "@/types"
 import { reactive, ref } from "vue"
 
 export const langs = reactive([] as Language[])
 export const currentLang = ref<Language>()
 
-export const countries = reactive([] as Country[])
+const deflang = ref<Language>()
-export const currentCountry = ref<Country>()
-
-const defLang = ref<Language>()
-const defCountry = ref<Country>()
 const cookie = useCookie()
 // Get available language codes for route matching
 // export const availableLocales = computed(() => langs.map((l) => l.lang_code))
@@ -26,27 +22,8 @@ export async function initLangs() {
         if (cc) {
             idfromcookie = langs.find((x) => x.id == parseInt(cc))
         }
-        defLang.value = items.find((x) => x.is_default == true)
+        deflang.value = items.find((x) => x.is_default == true)
-        currentLang.value = idfromcookie ?? defLang.value
+        currentLang.value = idfromcookie ?? deflang.value
-    } catch (error) {
-        console.error('Failed to fetch languages:', error)
-    }
-}
-
-// Initialize country/currency from API
-
-export async function initCountryCurrency() {
-    try {
-        const { items } = await useFetchJson<Country[]>('/api/v1/restricted/langs-and-countries/get-countries')
-        countries.push(...items)
-
-        let idfromcookie = null
-        const cc = cookie.getCookie('country_id')
-        if (cc) {
-            idfromcookie = langs.find((x) => x.id == parseInt(cc))
-        }
-        defCountry.value = items.find((x) => x.id === defLang.value?.id)
-        currentCountry.value = idfromcookie ?? defCountry.value
     } catch (error) {
         console.error('Failed to fetch languages:', error)
     }

bo/src/stores/product.ts

@@ -23,8 +23,7 @@ export interface ProductResponse {
 }
 
 export const useProductStore = defineStore('product', () => {
-  const productDescription = ref<ProductDescription | null>(null)
+  const productDescription = ref()
-  const defaultProductDescription = ref<ProductDescription | null>(null)
   const currentProduct = ref<Product | null>(null)
   const loading = ref(false)
   const error = ref<string | null>(null)
@@ -38,6 +37,7 @@ export const useProductStore = defineStore('product', () => {
         `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
       )
       productDescription.value = response.items
+      
     } catch (e: unknown) {
       error.value = e instanceof Error ? e.message : 'Failed to load product description'
     } finally {
@@ -45,30 +45,20 @@ export const useProductStore = defineStore('product', () => {
     }
   }
 
-  async function getDefaultProductDescription(langId: number, productID: number) {
+  async function saveProductDescription(productID?: number) {
-    try {
-      const response = await useFetchJson<ProductDescription>(
-        `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
-      )
-      defaultProductDescription.value = response.items
-    } catch (e: unknown) {
-      console.error('Failed to load default product description:', e)
-    }
-  }
-
-  async function saveProductDescription(productID?: number, langId?: number, shopId = 1) {
     const id = productID || 1
     try {
       const data = await useFetchJson(
-        `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=${shopId}&productLangID=${langId ?? 1}`,
+        `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=1&productLangID=1`,
         {
           method: 'POST',
-          body: JSON.stringify({
+          body: JSON.stringify(
-            description: productDescription.value?.description,
+            {
-            description_short: productDescription.value?.description_short,
+              description: productDescription.value.description,
-            meta_description: productDescription.value?.meta_description,
+              description_short: productDescription.value.description_short,
-            available_now: productDescription.value?.available_now,
+              meta_description: productDescription.value.meta_description,
-            usage: productDescription.value?.usage
+              available_now: productDescription.value.available_now,
+              usage: productDescription.value.usage
             })
         }
       )
@@ -100,12 +90,10 @@ export const useProductStore = defineStore('product', () => {
 
   return {
     productDescription,
-    defaultProductDescription,
     currentProduct,
     loading,
     error,
     getProductDescription,
-    getDefaultProductDescription,
     clearCurrentProduct,
     saveProductDescription,
     translateProductDescription,

bo/src/stores/settings.ts

@@ -2,19 +2,13 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import type { Resp } from '@/types'
 import type { Settings } from '@/types/settings'
 import { defineStore } from 'pinia'
-import { ref } from 'vue'
 
 export const useSettingsStore = defineStore('settings', () => {
-  const settings = ref<Settings | null>(null)
+  async function getSettings() {
-  const loaded = ref(false)
+    const { items } = await useFetchJson<Resp<Settings>>('/api/v1/settings',)
-
+    console.log(items);
-  async function getSettings(): Promise<Settings | null> {
-    if (loaded.value && settings.value) return settings.value
-    const resp = await useFetchJson<Settings>('/api/v1/settings')
-    settings.value = resp.items
-    loaded.value = true
-    return resp.items
   }
 
-  return { settings, loaded, getSettings }
+  getSettings()
+  return {}
 })

bo/src/types/lang.d.ts

@@ -12,20 +12,3 @@ export interface Language {
   active: boolean
   flag: string
 }
-
-export interface Country {
-  id: number
-  name: string
-  flag: string
-  currency_id: string
-  ps_currency: {
-    id_currency: string
-    name: string
-    iso_code: string
-    numeric_iso_code: string
-    precision: number
-    conversion_rate: number
-    deleted: boolean
-    active: boolean
-  }
-}

bo/src/types/product.d.ts

@@ -5,7 +5,6 @@ export interface ProductDescription {
   description_short: string
   meta_description: string
   available_now: string
-  delivery_in_stock?: string
   usage: string
 }
 

bo/src/types/settings.d.ts

@@ -12,7 +12,6 @@ export interface App {
   environment: string
   base_url: string
   password_regex: string
-  shop_default_language: number
 }
 
 export interface Server {

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.