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

app/delivery/middleware/auth.go

@@ -1,7 +1,6 @@
 package middleware
 
 import (
-	"strconv"
 	"strings"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
@@ -61,52 +60,9 @@ func AuthMiddleware() fiber.Handler {
 			})
 		}
 
-		// Create locale. LangID is overwritten by auth Token
+		// Set user in context
-		var userLocale model.UserLocale
+		c.Locals(constdata.USER_LOCALES_NAME, user.ToSession())
-		userLocale.OriginalUser = user
+		c.Locals(constdata.USER_LOCALES_ID, user.ID)
-
-		// 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()
 	}
@@ -139,6 +95,24 @@ 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,9 +4,7 @@ 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"
 )
 
@@ -24,8 +22,12 @@ func LanguageMiddleware() fiber.Handler {
 			if id, err := strconv.ParseUint(langIDStr, 10, 32); err == nil {
 				langID = uint(id)
 				if langID > 0 {
-					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+					lang, err := langService.GetLanguageById(langID)
-					return c.Next()
+					if err == nil {
+						c.Locals("langID", langID)
+						c.Locals("lang", lang)
+						return c.Next()
+					}
 				}
 			}
 		}
@@ -36,8 +38,12 @@ func LanguageMiddleware() fiber.Handler {
 			if id, err := strconv.ParseUint(cookieLang, 10, 32); err == nil {
 				langID = uint(id)
 				if langID > 0 {
-					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+					lang, err := langService.GetLanguageById(langID)
-					return c.Next()
+					if err == nil {
+						c.Locals("langID", langID)
+						c.Locals("lang", lang)
+						return c.Next()
+					}
 				}
 			}
 		}
@@ -51,7 +57,8 @@ func LanguageMiddleware() fiber.Handler {
 				lang, err := langService.GetLanguageByISOCode(isoCode)
 				if err == nil && lang != nil {
 					langID = uint(lang.ID)
-					c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+					c.Locals("langID", langID)
+					c.Locals("lang", lang)
 					return c.Next()
 				}
 			}
@@ -61,7 +68,8 @@ func LanguageMiddleware() fiber.Handler {
 		defaultLang, err := langService.GetDefaultLanguage()
 		if err == nil && defaultLang != nil {
 			langID = uint(defaultLang.ID)
-			c.Locals(constdata.USER_LOCALE, returnNewLocale(langID))
+			c.Locals("langID", langID)
+			c.Locals("lang", defaultLang)
 		}
 
 		return c.Next()
@@ -96,9 +104,11 @@ func parseAcceptLanguage(header string) string {
 	return strings.ToLower(first)
 }
 
-func returnNewLocale(lang_id uint) *model.UserLocale {
+// GetLanguageID extracts language ID from context
-	newLocale := model.UserLocale{}
+func GetLanguageID(c fiber.Ctx) uint {
-	newLocale.OriginalUser = &model.Customer{}
+	langID, ok := c.Locals("langID").(uint)
-	newLocale.OriginalUser.LangID = lang_id
+	if !ok {
-	return &newLocale
+		return 0
+	}
+	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 {
-	userLocale := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	user := c.Locals("user")
-	if userLocale.OriginalUser == nil {
+	if user == nil {
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated),
 		})
 	}
 
 	return c.JSON(fiber.Map{
-		"user": *userLocale.OriginalUser,
+		"user": user,
 	})
 }
 
@@ -351,12 +351,21 @@ 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 {
-	userLocale, ok := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	userLocals, ok := c.Locals(constdata.USER_LOCALES_NAME).(*model.UserSession)
 	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")
 
@@ -366,7 +375,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)))
 		}
-		userLocale.OriginalUser.LangID = uint(parsedID)
+		user.LangID = uint(parsedID)
 	}
 
 	countryIDStr := c.Query("country_id")
@@ -377,10 +386,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)))
 		}
-		userLocale.OriginalUser.CountryID = uint(parsedID)
+		user.CountryID = uint(parsedID)
 	}
 
-	newAccessToken, err := h.authService.UpdateJWTToken(userLocale.OriginalUser)
+	newAccessToken, err := h.authService.UpdateJWTToken(&user)
 
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{

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

@@ -3,7 +3,6 @@ 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"
@@ -31,7 +30,7 @@ func RoutingHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *RoutingHandler) GetRouting(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	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,7 +5,6 @@ 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"
@@ -38,7 +37,7 @@ func CartsHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -54,7 +53,7 @@ func (h *CartsHandler) AddNewCart(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -79,7 +78,7 @@ func (h *CartsHandler) ChangeCartName(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -95,7 +94,7 @@ func (h *CartsHandler) RetrieveCartsInfo(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -118,7 +117,7 @@ func (h *CartsHandler) RetrieveCart(c fiber.Ctx) error {
 }
 
 func (h *CartsHandler) AddProduct(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	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,7 +5,6 @@ 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"
@@ -44,19 +43,19 @@ func (h *ListHandler) ListProducts(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	list, err := h.listService.ListProducts(id_lang, paging, filters)
+	listing, 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(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&listing.Items, int(listing.Count), i18n.T_(c, response.Message_OK)))
 }
 
 var columnMappingListProducts map[string]string = map[string]string{
@@ -75,19 +74,19 @@ func (h *ListHandler) ListUsers(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}
 
-	list, err := h.listService.ListUsers(id_lang, paging, filters)
+	listing, 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(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&listing.Items, int(listing.Count), i18n.T_(c, response.Message_OK)))
 }
 
 var columnMappingListUsers map[string]string = map[string]string{

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

@@ -5,7 +5,6 @@ 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"
@@ -34,7 +33,7 @@ func MenuHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -57,7 +56,7 @@ func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
 }
 
 func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -87,7 +86,7 @@ func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
 }
 
 func (h *MenuHandler) GetTopMenu(c fiber.Ctx) error {
-	lang_id, ok := localeExtractor.GetLangID(c)
+	lang_id, ok := c.Locals("langID").(uint)
 	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,7 +6,6 @@ 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"
@@ -42,7 +41,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 := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -73,7 +72,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 := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrInvalidBody)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
@@ -110,7 +109,7 @@ func (h *ProductTranslationHandler) SaveProductDescription(c fiber.Ctx) error {
 
 // TranslateProductDescription returns translated product description
 func (h *ProductTranslationHandler) TranslateProductDescription(c fiber.Ctx) error {
-	userID, ok := localeExtractor.GetUserID(c)
+	userID, ok := c.Locals("userID").(uint)
 	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,7 +7,6 @@ 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"
@@ -37,7 +36,7 @@ func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router {
 }
 
 func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -50,11 +49,12 @@ func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
+	nothing := ""
+	return c.JSON(response.Make(&nothing, 0, i18n.T_(c, response.Message_OK)))
 }
 
 func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
-	id_lang, ok := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	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 := localeExtractor.GetLangID(c)
+	id_lang, ok := c.Locals("langID").(uint)
 	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,15 +82,6 @@ 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{
@@ -107,7 +98,6 @@ 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

@@ -20,8 +20,7 @@ type ProductDescription struct {
 	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"`
 
-	ImageLink        string `gorm:"column:image_link" json:"image_link"`
+	ExistsInDatabase bool `gorm:"-" json:"exists_in_database"`
-	ExistsInDatabase bool   `gorm:"-" json:"exists_in_database"`
 }
 
 type ProductRow struct {

app/repos/productDescriptionRepo/productDescriptionRepo.go

@@ -4,7 +4,6 @@ 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"
@@ -37,27 +36,6 @@ 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) {
@@ -74,10 +52,10 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
 
 // If it doesn't exist, returns an error.
 func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productid_lang uint) error {
-	record := dbmodel.PsProductLang{
+	record := model.ProductDescription{
-		IDProduct: int32(productID),
+		ProductID: productID,
-		IDShop:    int32(constdata.SHOP_ID),
+		ShopID:    constdata.SHOP_ID,
-		IDLang:    int32(productid_lang),
+		LangID:    productid_lang,
 	}
 
 	err := db.Get().

app/service/authService/auth.go

@@ -83,15 +83,6 @@ 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/service/productTranslationService/productTranslationService.go

@@ -89,24 +89,13 @@ func (s *ProductTranslationService) GetProductDescription(userID uint, productID
 // Updates relevant fields with the "updates" map
 func (s *ProductTranslationService) SaveProductDescription(userID uint, productID uint, productLangID uint, updates map[string]string) error {
 	// only some fields can be affected
-	allowedFields := []string{"description", "description_short", "link_rewrite", "meta_description", "meta_keywords", "meta_title", "name",
+	allowedFields := []string{"description", "description_short", "meta_description", "meta_title", "name", "available_now", "available_later", "usage"}
-		"available_now", "available_later", "delivery_in_stock", "delivery_out_stock", "usage"}
 	for key := range updates {
 		if !slices.Contains(allowedFields, key) {
 			return responseErrors.ErrBadField
 		}
 	}
 
-	if text, exists := updates["link_rewrite"]; exists {
-		// sanitize and check that link_rewrite is a valid url slug
-		sanitized := SanitizeSlug(text)
-		if !IsValidSlug(sanitized) {
-			return responseErrors.ErrInvalidURLSlug
-		}
-
-		updates["link_rewrite"] = sanitized
-	}
-
 	// check that fields description, description_short and usage, if they exist, have a valid html format
 	mustBeHTML := []string{"description", "description_short", "usage"}
 	for i := 0; i < len(mustBeHTML); i++ {
@@ -147,28 +136,20 @@ func (s *ProductTranslationService) TranslateProductDescription(userID uint, pro
 
 	fields := []*string{&productDescription.Description,
 		&productDescription.DescriptionShort,
-		&productDescription.LinkRewrite,
 		&productDescription.MetaDescription,
-		&productDescription.MetaKeywords,
 		&productDescription.MetaTitle,
 		&productDescription.Name,
 		&productDescription.AvailableNow,
 		&productDescription.AvailableLater,
-		&productDescription.DeliveryInStock,
-		&productDescription.DeliveryOutStock,
 		&productDescription.Usage,
 	}
 	keys := []string{"translation_of_product_description",
 		"translation_of_product_short_description",
-		"translation_of_product_url_link",
 		"translation_of_product_meta_description",
-		"translation_of_product_meta_keywords",
 		"translation_of_product_meta_title",
 		"translation_of_product_name",
-		"translation_of_product_available_now_message",
+		"translation_of_product_available_now",
-		"translation_of_product_available_later_message",
+		"translation_of_product_available_later",
-		"translation_of_product_delivery_in_stock_message",
-		"translation_of_product_delivery_out_stock_message",
 		"translation_of_product_usage",
 	}
 

app/service/productTranslationService/sanitizeURLSlug.go

@@ -1,69 +0,0 @@
-package productTranslationService
-
-import (
-	"strings"
-	"unicode"
-
-	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-	"github.com/dlclark/regexp2"
-	"golang.org/x/text/runes"
-	"golang.org/x/text/transform"
-	"golang.org/x/text/unicode/norm"
-)
-
-func IsValidSlug(s string) bool {
-	var slug_regex2 = regexp2.MustCompile(constdata.SLUG_REGEX, regexp2.None)
-
-	ok, _ := slug_regex2.MatchString(s)
-	return ok
-}
-
-func SanitizeSlug(s string) string {
-	s = strings.TrimSpace(strings.ToLower(s))
-
-	// First apply explicit transliteration for language-specific letters.
-	s = transliterateWithTable(s)
-
-	// Then normalize and strip any remaining combining marks.
-	s = removeDiacritics(s)
-
-	// Replace all non-alphanumeric runs with "-"
-	var non_alphanum_regex2 = regexp2.MustCompile(constdata.NON_ALNUM_REGEX, regexp2.None)
-	s, _ = non_alphanum_regex2.Replace(s, "-", -1, -1)
-
-	// Collapse repeated "-" and trim edges
-	var multi_dash_regex2 = regexp2.MustCompile(constdata.MULTI_DASH_REGEX, regexp2.None)
-	s, _ = multi_dash_regex2.Replace(s, "-", -1, -1)
-
-	s = strings.Trim(s, "-")
-
-	return s
-}
-
-func transliterateWithTable(s string) string {
-	var b strings.Builder
-	b.Grow(len(s))
-
-	for _, r := range s {
-		if repl, ok := constdata.TRANSLITERATION_TABLE[r]; ok {
-			b.WriteString(repl)
-		} else {
-			b.WriteRune(r)
-		}
-	}
-
-	return b.String()
-}
-
-func removeDiacritics(s string) string {
-	t := transform.Chain(
-		norm.NFD,
-		runes.Remove(runes.In(unicode.Mn)),
-		norm.NFC,
-	)
-	out, _, err := transform.String(t, s)
-	if err != nil {
-		return s
-	}
-	return out
-}

app/utils/const_data/consts.go

@@ -11,29 +11,5 @@ const CATEGORY_TREE_ROOT_ID = 2
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
 
-const USER_LOCALE = "user"
+const USER_LOCALES_NAME = "user"
-
+const USER_LOCALES_ID = "userID"
-// Slug sanitization
-const NON_ALNUM_REGEX = `[^a-z0-9]+`
-const MULTI_DASH_REGEX = `-+`
-const SLUG_REGEX = `^[a-z0-9]+(?:-[a-z0-9]+)*$`
-
-// Currently supports only German+Polish specific cases
-var TRANSLITERATION_TABLE = map[rune]string{
-	// German
-	'ä': "ae",
-	'ö': "oe",
-	'ü': "ue",
-	'ß': "ss",
-
-	// Polish
-	'ą': "a",
-	'ć': "c",
-	'ę': "e",
-	'ł': "l",
-	'ń': "n",
-	'ó': "o",
-	'ś': "s",
-	'ż': "z",
-	'ź': "z",
-}

app/utils/localeExtractor/localeExtractor.go

@@ -1,23 +0,0 @@
-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
-}

app/utils/responseErrors/responseErrors.go

@@ -42,7 +42,6 @@ var (
 	// Typed errors for product description handler
 	ErrBadAttribute   = errors.New("bad or missing attribute value in header")
 	ErrBadField       = errors.New("this field can not be updated")
-	ErrInvalidURLSlug = errors.New("URL slug does not obey the industry standard")
 	ErrInvalidXHTML   = errors.New("text is not in xhtml format")
 	ErrAIResponseFail = errors.New("AI responded with failure")
 	ErrAIBadOutput    = errors.New("AI response does not obey the format")
@@ -137,8 +136,6 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 		return i18n.T_(c, "error.err_bad_attribute")
 	case errors.Is(err, ErrBadField):
 		return i18n.T_(c, "error.err_bad_field")
-	case errors.Is(err, ErrInvalidURLSlug):
-		return i18n.T_(c, "error.invalid_url_slug")
 	case errors.Is(err, ErrInvalidXHTML):
 		return i18n.T_(c, "error.err_invalid_html")
 	case errors.Is(err, ErrAIResponseFail):
@@ -198,7 +195,6 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrInvalidPassword),
 		errors.Is(err, ErrBadAttribute),
 		errors.Is(err, ErrBadField),
-		errors.Is(err, ErrInvalidURLSlug),
 		errors.Is(err, ErrInvalidXHTML),
 		errors.Is(err, ErrBadPaging),
 		errors.Is(err, ErrNoRootFound),

bo/components.d.ts

@@ -12,13 +12,15 @@ 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']
+    copy: typeof import('./src/components/admin/ProductDetailView copy.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']
@@ -34,7 +36,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/App.vue

@@ -7,3 +7,37 @@ import { RouterView } from 'vue-router'
     <RouterView />
   </Suspense>
 </template>
+
+
+<!-- <template>
+  <component :is="layoutComponent">
+    <Suspense>
+      <RouterView />
+    </Suspense>
+  </component>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useRoute } from 'vue-router'
+
+import DefaultLayout from '@/layouts/default.vue'
+import EmptyLayout from '@/layouts/empty.vue'
+
+const route = useRoute()
+
+const layouts = {
+  default: DefaultLayout,
+  auth: EmptyLayout
+}
+
+console.log(route.fullPath)
+console.log(route.name)
+console.log(route.matched)
+
+const layoutComponent = computed(() => {
+  console.log(route.meta);
+
+  return layouts[route.meta.layout as keyof typeof layouts] || DefaultLayout
+})
+</script> -->

bo/src/app.config.ts

@@ -8,9 +8,9 @@ export const uiOptions: NuxtUIOptions = {
             }
         },
         button: {
-            slots: {
+            // slots: {
-                base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
+            //     base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
-            },
+            // },
         },
         input: {
             slots: {
@@ -40,9 +40,10 @@ export const uiOptions: NuxtUIOptions = {
         },
         selectMenu: {
             slots: {
-                base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
+                // base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
-                content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! z-80 text-(--black)! dark:text-white!',
+                // content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! z-80',
-                itemLeadingIcon: 'text-(--black)! dark:text-white!'
+                // content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! z-80 text-(--black)! dark:text-white!',
+                // itemLeadingIcon: 'text-(--black)! dark:text-white!'
             }
 
         },

bo/src/assets/error.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><g fill="none"><path stroke="#5b5b5b" stroke-width="2" d="M3 11c0-3.771 0-5.657 1.172-6.828S7.229 3 11 3h2c3.771 0 5.657 0 6.828 1.172S21 7.229 21 11v2c0 3.771 0 5.657-1.172 6.828S16.771 21 13 21h-2c-3.771 0-5.657 0-6.828-1.172S3 16.771 3 13z"/><path fill="#5b5b5b" fill-rule="evenodd" d="m19 13.585l-.02-.02c-.39-.39-.726-.726-1.026-.979c-.317-.267-.662-.502-1.088-.63a3 3 0 0 0-1.732 0c-.426.129-.77.363-1.088.63c-.3.253-.636.59-1.025.98l-.029.028c-.307.306-.487.486-.628.601l-.02.017l-.012-.023c-.087-.16-.189-.393-.36-.792l-.053-.124l-.022-.052c-.356-.83-.655-1.528-.95-2.054c-.305-.541-.685-1.05-1.277-1.346a3 3 0 0 0-1.597-.307c-.66.055-1.201.386-1.685.775c-.406.327-.86.77-1.388 1.297V13q0 .774.003 1.411l1.114-1.114c.69-.69 1.15-1.147 1.525-1.45c.37-.298.53-.335.6-.34a1 1 0 0 1 .532.102c.061.031.196.124.43.54c.236.42.493 1.016.877 1.912l.053.124l.017.038c.149.348.287.67.425.924c.145.265.355.583.709.802a2 2 0 0 0 1.398.27c.41-.073.723-.29.956-.482c.222-.184.47-.432.738-.7l.03-.03c.425-.425.701-.7.928-.891c.218-.184.32-.228.376-.245a1 1 0 0 1 .578 0c.056.017.158.061.376.245c.227.191.503.466.929.892l1.35 1.35c.046-.718.054-1.61.056-2.773" clip-rule="evenodd"/><circle cx="16.5" cy="7.5" r="1.5" fill="#5b5b5b"/></g></svg>

bo/src/assets/main.css

@@ -9,7 +9,7 @@ body {
   font-family: "Inter", sans-serif;
 }
 
-.container{
+.container {
   max-width: 2100px;
 }
 
@@ -30,7 +30,7 @@ body {
 
   /* text */
   --accent-blue-dark: #3B82F6;
-  --accent-blue-light:#2563EB;
+  --accent-blue-light: #2563EB;
   --text-dark: #FFFEFB;
 
   /* placeholder */
@@ -52,22 +52,25 @@ body {
   --ui-bg-elevated: var(--color-gray-500);
   --ui-error: var(--dark-red);
   --border: var(--border-dark);
-    --tw-border-style: var(--border-dark);
+  --tw-border-style: var(--border-dark);
 }
 
-  .label-form {
+.label-form {
-    @apply text-(--gray) dark:text-(--gray-dark) pl-0 md:pl-6 leading-none;
+  @apply text-(--gray) dark:text-(--gray-dark) pl-0 md:pl-6 leading-none;
-  }
+}
 
-  .title {
+.title {
-    @apply font-medium text-[19px] sm:text-xl md:text-[22px] leading-none text-(--black) dark:text-(--main-light);
+  @apply font-medium text-[19px] sm:text-xl md:text-[22px] leading-none text-(--black) dark:text-(--main-light);
-  }
+}
 
-  .column-title {
+.column-title {
-    @apply md:ml-[25px] mb-[25px] sm:mb-[30px];
+  @apply md:ml-[25px] mb-[25px] sm:mb-[30px];
-  }
+}
 
-  .form-title {
+.form-title {
-    @apply text-(--accent-green) dark:text-(--accent-green-dark) font-medium;
+  @apply text-(--accent-green) dark:text-(--accent-green-dark) font-medium;
-  }
+}
 
+.blue-button {
+  @apply bg-info! text-white!
+}

bo/src/components/TopBar.vue

@@ -1,13 +1,50 @@
+<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)">
+    <div class="container mx-auto px-4">
+      <div class="flex items-center justify-between h-16">
+        <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">{{ settings.app.name }}</span>
+        </RouterLink>
+
+        <UNavigationMenu :type="'trigger'" :ui="{
+          root: 'justify-center',
+          list: 'gap-4 text-(--black)',
+          linkLabel: 'text-(--black) text-sm!'
+        }" :items="menuItems" class="" />
+        <div class="flex items-center gap-12">
+          <div class="flex items-center gap-2">
+            <CountryCurrencySwitch />
+            <LangSwitch />
+          </div>
+          <div class="flex items-center gap-2">
+            <ThemeSwitch />
+            <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) whitespace-nowrap">
+              {{ $t('general.logout') }}
+            </button>
+          </div>
+        </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, onMounted, ref } from 'vue'
+import { computed, 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'
+import { settings } from '@/router/settings'
 
 const authStore = useAuthStore()
 let menu = ref()
@@ -51,37 +88,3 @@ 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()
@@ -173,6 +173,7 @@ const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
 const UIcon = resolveComponent('UIcon')
 
+import errorImg from '@/assets/error.svg'
 const columns: TableColumn<Product>[] = [
     {
         accessorKey: 'product_id',
@@ -209,9 +210,13 @@ const columns: TableColumn<Product>[] = [
         cell: ({ row }) => {
             return h('img', {
                 src: row.getValue('image_link') as string,
-                style: 'width:40px;height:40px;object-fit:cover;'
+                style: 'width:40px;height:40px;object-fit:cover;',
+                onError: (e: Event) => {
+                    const target = e.target as HTMLImageElement
+                    target.src = errorImg
+                }
             })
-        }
+        },
     },
     {
         accessorKey: 'name',
@@ -272,8 +277,9 @@ const columns: TableColumn<Product>[] = [
                 onClick: () => {
                     goToProduct(row.original.product_id)
                 },
-                color: 'primary',
+                class: 'cursor-pointer',
-                variant: 'solid'
+                color: 'info',
+                variant: 'soft'
             }, () => 'Show product')
         },
     }

bo/src/components/admin/ProductDetailView.vue

@@ -1,16 +1,277 @@
 <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!"
+          <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!" valueKey="id">
-            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="text-md">{{availableLangs.find(x => x.id == modelValue)?.flag}}</span>
-                <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code ==
+                <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.id ==
+                  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>
+
+      <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" />
+      </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">
+            {{ 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>
+      </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>
+
+<script setup lang="ts">
+import { useEditable } from '@/composable/useConteditable';
+import Default from '@/layouts/default.vue';
+import { langs } from '@/router/langs';
+import { useProductStore } from '@/stores/product';
+import { useSettingsStore } from '@/stores/settings';
+import type { Language } from '@/types';
+import { watch } from 'vue';
+import { onMounted, ref } from 'vue';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+
+const route = useRoute()
+const settingStore = useSettingsStore()
+const productStore = useProductStore()
+
+
+const selectedLanguage = ref(settingStore.shopDefaultLanguage)
+const availableLangs = computed(() => langs)
+const productID = ref<number>(0)
+const toLangId = ref(settingStore.shopDefaultLanguage)
+const defaultLangId = ref(settingStore.shopDefaultLanguage)
+const translating = ref(false)
+
+
+const activeTab = ref('description')
+const usageRef = ref<HTMLElement | null>(null)
+const originalUsage = ref('')
+const isEditing = ref(false)
+const usageEdit = useEditable(usageRef)
+const descriptionRef = ref<HTMLElement | null>(null)
+const descriptionEdit = useEditable(descriptionRef)
+
+
+const originalDescription = ref('')
+
+// Коли користувач обирає мову, ця функція бере текст продукту з основної мови і перекладає його на вибрану мову. Поки переклад йде – показує спінер. Коли переклад готовий, активна мова оновлюється, а спінер зникає.
+
+const translateToSelectedLanguage = async () => {
+  const targetLang = langs.find((l: Language) => l.id === selectedLanguage.value)
+  if (targetLang && toLangId.value && productID.value) {
+    translating.value = true
+    try {
+      await productStore.translateProductDescription(productID.value, toLangId.value, defaultLangId.value)
+      toLangId.value = targetLang.id
+    } finally {
+      translating.value = false
+    }
+  }
+}
+
+
+// знайти мову → підвантажити опис → запам’ятати, що це “базова” мова для перекладу.
+const fetchForLanguage = async (langCode: number) => {
+  const lang = langs.find((l: Language) => l.id === langCode)
+  if (lang && productID.value) {
+    await productStore.getProductDescription(lang.id, productID.value)
+    toLangId.value = lang.id
+  }
+}
+
+watch(selectedLanguage, async (newLang: number) => {
+  if (productID.value) {
+    await fetchForLanguage(newLang)
+  }
+})
+
+onMounted(async () => {
+  const id = route.params.product_id
+  if (id) {
+    productID.value = Number(id)
+    await fetchForLanguage(selectedLanguage.value)
+  }
+})
+
+
+const enableEdit = () => {
+  if (usageRef.value) {
+    originalUsage.value = usageRef.value.innerHTML
+  }
+  isEditing.value = true
+  usageEdit.enableEdit()
+}
+
+const saveText = () => {
+  if (usageRef.value) {
+    productStore.productDescription.usage = usageRef.value.innerHTML
+  }
+
+  usageEdit.disableEdit()
+  isEditing.value = false
+
+  productStore.saveProductDescription(productID.value, toLangId.value)
+}
+
+const cancelEdit = () => {
+  if (usageRef.value) {
+    usageRef.value.innerHTML = originalUsage.value
+  }
+  usageEdit.disableEdit()
+  isEditing.value = false
+}
+
+const enableDescriptionEdit = () => {
+  if (descriptionRef.value) {
+    originalDescription.value = descriptionRef.value.innerHTML
+  }
+  descriptionEdit.enableEdit()
+}
+
+const saveDescription = async () => {
+  if (descriptionRef.value) {
+    productStore.productDescription.description = descriptionRef.value.innerHTML
+  }
+
+  descriptionEdit.disableEdit()
+
+  await productStore.saveProductDescription(productID.value, toLangId.value)
+}
+
+const cancelDescriptionEdit = () => {
+  if (descriptionRef.value) {
+    descriptionRef.value.innerHTML = originalDescription.value
+  }
+  descriptionEdit.disableEdit()
+}
+</script>
+
+
+
+<!-- <template>
+  <component :is="Default || 'div'">
+    <div class="container my-10 mx-auto ">
+      <div
+        class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
+        <div class="flex items-end gap-3">
+          <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!" valueKey="id">
+            <template #default="{ modelValue }">
+              <div class="flex items-center gap-2">
+                <span class="text-md">{{availableLangs.find(x => x.id == modelValue)?.flag}}</span>
+                <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.id ==
                   modelValue)?.name}}</span>
               </div>
             </template>
@@ -67,6 +328,10 @@
         </div>
       </div>
 
+
+
+
+
       <div v-if="productStore.productDescription" class="mt-16">
         <div class="flex gap-4 my-6">
           <UButton @click="activeTab = 'description'"
@@ -101,7 +366,6 @@
           </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'"
@@ -136,22 +400,26 @@ import { useEditable } from '@/composable/useConteditable'
 import { langs } from '@/router/langs'
 import type { Language } from '@/types'
 import Default from '@/layouts/default.vue'
+import { useSettingsStore } from '@/stores/settings'
 
 const route = useRoute()
 const activeTab = ref('description')
 const productStore = useProductStore()
 const translating = ref(false)
-
+const settingStore = useSettingsStore()
 const isEditing = ref(false)
 
 const availableLangs = computed(() => langs)
 
-const selectedLanguage = ref('en')
+const selectedLanguage = ref(settingStore.shopDefaultLanguage)
 
 const currentLangId = ref(2)
 const productID = ref<number>(0)
 
-// Watch for language changes and refetch product description
+const imageUrl = computed(() => {
+  return route.query.image ? String(route.query.image) : ''
+})
+
 watch(selectedLanguage, async (newLang: string) => {
   if (productID.value) {
     await fetchForLanguage(newLang)
@@ -197,10 +465,14 @@ const originalDescription = ref('')
 const originalUsage = ref('')
 
 const saveDescription = async () => {
-  descriptionEdit.disableEdit()
+  if (descriptionRef.value) {
-  await productStore.saveProductDescription(productID.value)
+    productStore.productDescription.description = descriptionRef.value.innerHTML
-}
+  }
 
+  descriptionEdit.disableEdit()
+
+  await productStore.saveProductDescription(productID.value, currentLangId.value)
+}
 const cancelDescriptionEdit = () => {
   if (descriptionRef.value) {
     descriptionRef.value.innerHTML = originalDescription.value
@@ -224,9 +496,14 @@ const enableEdit = () => {
 }
 
 const saveText = () => {
+  if (usageRef.value) {
+    productStore.productDescription.usage = usageRef.value.innerHTML
+  }
+
   usageEdit.disableEdit()
   isEditing.value = false
-  productStore.saveProductDescription(productID.value)
+
+  productStore.saveProductDescription(productID.value, currentLangId.value)
 }
 
 const cancelEdit = () => {
@@ -236,14 +513,4 @@ const cancelEdit = () => {
   usageEdit.disableEdit()
   isEditing.value = false
 }
-
+</script> -->
-</script>
-
-<style>
-.images {
-  display: flex;
-  align-items: center;
-  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

@@ -0,0 +1,53 @@
+<template>
+  <div class="flex flex-col">
+    <p class="text-sm">Country/Currency:</p>
+    <USelectMenu v-model="country" :items="countries"
+      class="w-44 bg-(--main-light) dark:bg-(--black) rounded-md hover:none! text-sm!" valueKey="id"
+      :searchInput="false">
+      <template #default="{ modelValue }">
+        <div class="flex items-center gap-1">
+          <span class="font-medium dark:text-white text-black whitespace-nowrap">{{ modelValue.name }} / {{
+            currentCountry?.ps_currency.iso_code }}</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>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { countries, currentCountry, switchLocalization } from '@/router/langs'
+import { useRouter, useRoute } from 'vue-router'
+import { useCookie } from '@/composable/useCookie'
+import { computed, watch } from 'vue'
+const router = useRouter()
+const route = useRoute()
+
+const cookie = useCookie()
+
+const country = computed({
+  get() {
+    return currentCountry.value
+  },
+  set(value: string) {
+    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' })
+
+    switchLocalization()
+  },
+})
+
+watch(
+  () => country,
+  (newCountry) => {
+    if (newCountry) {
+      currentCountry.value = countries.find((x) => x.id == Number(newCountry.value?.id))
+    }
+  },
+  { immediate: true },
+)
+</script>

bo/src/components/inner/LangSwitch.vue

@@ -1,34 +1,37 @@
 <template>
-  <USelectMenu v-model="locale" :items="langs"
+  <div class="flex flex-col">
-    class="w-40 bg-(--main-light) dark:bg-(--black) rounded-md shadow-sm  hover:none!" valueKey="iso_code"
+    <p class="text-sm">Language:</p>
-    :searchInput="false">
+    <USelectMenu v-model="locale" :items="langs"
-    <template #default="{ modelValue }">
+      class="w-40 bg-(--main-light) dark:bg-(--black) rounded-md shadow-sm  hover:none!" valueKey="iso_code"
-      <div class="flex items-center gap-1">
+      :searchInput="false">
-        <!-- <span class="text-md dark:text-white text-black">{{langs.find(x => x.iso_code == modelValue)?.flag}}</span> -->
+      <template #default="{ modelValue }">
-        <span class="font-medium dark:text-white text-black">{{langs.find(x => x.iso_code == modelValue)?.name}}</span>
+        <div class="flex items-center gap-1">
-      </div>
+          <!-- <span class="text-md dark:text-white text-black">{{langs.find(x => x.iso_code == modelValue)?.flag}}</span> -->
-    </template>
+          <span class="font-medium dark:text-white text-black">{{langs.find(x => x.iso_code ==
-    <template #item-leading="{ item }">
+            modelValue)?.name}}</span>
-      <div class="flex items-center rounded-md cursor-pointer transition-colors">
+        </div>
-        <!-- <span class="text-md ">{{ item.flag }}</span> -->
+      </template>
-        <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
+      <template #item-leading="{ item }">
-      </div>
+        <div class="flex items-center rounded-md cursor-pointer transition-colors">
-    </template>
+          <!-- <span class="text-md ">{{ item.flag }}</span> -->
-  </USelectMenu>
+          <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
+        </div>
+      </template>
+    </USelectMenu>
+  </div>
 </template>
 
 <script setup lang="ts">
-import { langs, currentLang } from '@/router/langs'
+import { langs, currentLang, switchLocalization } 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 locale = computed({
   get() {
     return currentLang.value?.iso_code || i18n.locale.value
@@ -52,21 +55,10 @@ const locale = computed({
       }
     }
 
-    changeLang()
+    switchLocalization()
   },
 })
 
-async function changeLang() {
-  try {
-    const { items } = await useFetchJson('/api/v1/public/auth/update-choice', {
-      method: 'POST'
-    })
-
-  } catch (error) {
-    console.log(error)
-  }
-}
-
 watch(
   () => route.params.locale,
   (newLocale) => {

bo/src/components/inner/ThemeSwitch.vue

@@ -0,0 +1,37 @@
+<template>
+  <UButton variant="outline" size="sm" color="info" @click="themeStorage.setTheme()">
+    <span class="hidden sm:inline">
+      <UIcon class="size-5" :name="themeStorage.themeIcon" />
+    </span>
+  </UButton>
+  <!-- <UButton variant="solid" size="sm" color="info" @click="themeStorage.setTheme()">
+    <span class="hidden sm:inline">
+      <UIcon class="size-5" :name="themeStorage.themeIcon" />
+    </span>
+  </UButton>
+  <UButton variant="soft" size="sm" color="info" @click="themeStorage.setTheme()">
+    <span class="hidden sm:inline">
+      <UIcon class="size-5" :name="themeStorage.themeIcon" />
+    </span>
+  </UButton>
+  <UButton variant="subtle" size="sm" color="info" @click="themeStorage.setTheme()">
+    <span class="hidden sm:inline">
+      <UIcon class="size-5" :name="themeStorage.themeIcon" />
+    </span>
+  </UButton>
+  <UButton variant="ghost" size="sm" color="info" @click="themeStorage.setTheme()">
+    <span class="hidden sm:inline">
+      <UIcon class="size-5" :name="themeStorage.themeIcon" />
+    </span>
+  </UButton>
+  <UButton variant="link" size="sm" color="info" @click="themeStorage.setTheme()">
+    <span class="hidden sm:inline">
+      <UIcon class="size-5" :name="themeStorage.themeIcon" />
+    </span>
+  </UButton> -->
+</template>
+
+<script setup lang="ts">
+import { useThemeStore } from '@/stores/theme'
+const themeStorage = useThemeStore()
+</script>

bo/src/components/inner/themeSwitch.vue

@@ -1,12 +0,0 @@
-<template>
-  <UButton variant="ghost" size="sm" @click="themeStorage.setTheme()">
-    <span class="hidden sm:inline">
-      <UIcon class="size-5" :name="themeStorage.themeIcon" />
-    </span>
-  </UButton>
-</template>
-
-<script setup lang="ts">
-import { useThemeStore } from '@/stores/theme'
-const themeStorage = useThemeStore()
-</script>

bo/src/plugins/02_i18n.ts

@@ -1,11 +1,12 @@
 
 import { useFetchJson } from '@/composable/useFetchJson'
-import { initLangs, langs } from '@/router/langs'
+import { initCountryCurrency, 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/index.ts

@@ -59,7 +59,7 @@ async function setRoutes() {
     const componentName = item.component
     const [, folder] = componentName.split('/')
     const componentPath = `/src${componentName}`
-    
+
 
     let modules =
       folder === 'views' ? viewModules : componentModules
@@ -80,6 +80,8 @@ async function setRoutes() {
       meta: item.meta ? JSON.parse(item.meta) : {}
     })
   }
+
+  // await router.replace(router.currentRoute.value.fullPath)
 }
 
 await setRoutes()

bo/src/router/langs.ts

@@ -1,12 +1,16 @@
 import { useCookie } from "@/composable/useCookie"
 import { useFetchJson } from "@/composable/useFetchJson"
-import type { Language } from "@/types"
+import type { Country, Language } from "@/types"
 import { reactive, ref } from "vue"
 
 export const langs = reactive([] as Language[])
 export const currentLang = ref<Language>()
 
-const deflang = ref<Language>()
+export const countries = reactive([] as Country[])
+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))
@@ -22,9 +26,39 @@ 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)
+    }
+}
+
+export async function switchLocalization() {
+  try {
+    await useFetchJson('/api/v1/public/auth/update-choice', {
+      method: 'POST'
+    })
+
+  } catch (error) {
+    console.log(error)
+  }
+}

bo/src/stores/product.ts

@@ -2,6 +2,7 @@ import { defineStore } from 'pinia'
 import { ref } from 'vue'
 import { useFetchJson } from '@/composable/useFetchJson'
 import type { ProductDescription } from '@/types/product'
+import { useSettingsStore } from './settings'
 
 export interface Product {
   id: number
@@ -23,21 +24,20 @@ export interface ProductResponse {
 }
 
 export const useProductStore = defineStore('product', () => {
-  const productDescription = ref()
+
-  const currentProduct = ref<Product | null>(null)
   const loading = ref(false)
   const error = ref<string | null>(null)
+  const productDescription = ref()
 
-  async function getProductDescription(langId = 1, productID: number) {
+  async function getProductDescription(langId: number, productID: number) {
     loading.value = true
     error.value = null
-
     try {
       const response = await useFetchJson<ProductDescription>(
         `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
       )
       productDescription.value = response.items
-      
+      console.log(productDescription, 'dfsfsdf');
     } catch (e: unknown) {
       error.value = e instanceof Error ? e.message : 'Failed to load product description'
     } finally {
@@ -45,35 +45,12 @@ export const useProductStore = defineStore('product', () => {
     }
   }
 
-  async function saveProductDescription(productID?: number) {
+  async function translateProductDescription(productID: number, toLangId: number, defaultLangId: number, model: string = 'OpenAI') {
-    const id = productID || 1
-    try {
-      const data = await useFetchJson(
-        `/api/v1/restricted/product-description/save-product-description?productID=${id}&productShopID=1&productLangID=1`,
-        {
-          method: 'POST',
-          body: JSON.stringify(
-            {
-              description: productDescription.value.description,
-              description_short: productDescription.value.description_short,
-              meta_description: productDescription.value.meta_description,
-              available_now: productDescription.value.available_now,
-              usage: productDescription.value.usage
-            })
-        }
-      )
-      return data
-    } catch (e) {
-      console.error(e)
-    }
-  }
-
-  async function translateProductDescription(productID: number, fromLangId: number, toLangId: number) {
     loading.value = true
     error.value = null
 
     try {
-      const response = await useFetchJson<ProductDescription>(`/api/v1/restricted/product-description/translate-product-description?productID=${productID}&productShopID=1&productFromLangID=${fromLangId}&productToLangID=${toLangId}&model=OpenAI`)
+      const response = await useFetchJson<ProductDescription>(`/api/v1/restricted/product-translation/translate-product-description?productID=${productID}&productFromLangID=${defaultLangId}&productToLangID=${toLangId}&model=${model}`)
       productDescription.value = response.items
       return response.items
     } catch (e: any) {
@@ -84,18 +61,166 @@ export const useProductStore = defineStore('product', () => {
     }
   }
 
-  function clearCurrentProduct() {
+
-    currentProduct.value = null
+  function stripHtml(html: string) {
+    const div = document.createElement('div')
+    div.innerHTML = html
+    return div.textContent || div.innerText || ''
+  }
+
+  async function saveProductDescription(productID?: number, langId?: number) {
+    const id = productID || 1
+    const lang = langId || 1
+    try {
+      const data = await useFetchJson(
+        `/api/v1/restricted/product-translation/save-product-description?productID=${id}&productLangID=${lang}`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify({
+            name: stripHtml(productDescription.value?.name || ''),
+            description: stripHtml(productDescription.value?.description || ''),
+            description_short: stripHtml(productDescription.value?.description_short || ''),
+            meta_title: stripHtml(productDescription.value?.meta_title || ''),
+            meta_description: stripHtml(productDescription.value?.meta_description || ''),
+            available_now: stripHtml(productDescription.value?.available_now || ''),
+            available_later: stripHtml(productDescription.value?.available_later || ''),
+            usage: stripHtml(productDescription.value?.usage || '')
+          })
+        }
+      )
+      return data
+    } catch (e) {
+      console.error(e)
+    }
   }
 
   return {
     productDescription,
-    currentProduct,
     loading,
     error,
-    getProductDescription,
-    clearCurrentProduct,
-    saveProductDescription,
     translateProductDescription,
+    getProductDescription,
+    saveProductDescription
+
   }
 })
+
+
+
+// import { defineStore } from 'pinia'
+// import { ref } from 'vue'
+// import { useFetchJson } from '@/composable/useFetchJson'
+// import type { ProductDescription } from '@/types/product'
+// import { useSettingsStore } from './settings'
+
+// export interface Product {
+//   id: number
+//   image: string
+//   name: string
+//   code: string
+//   inStock: boolean
+//   priceFrom: number
+//   priceTo: number
+//   count: number
+//   description?: string
+//   howToUse?: string
+//   productDetails?: string
+// }
+
+// export interface ProductResponse {
+//   items: Product[]
+//   items_count: number
+// }
+
+// export const useProductStore = defineStore('product', () => {
+//   const productDescription = ref()
+//   const currentProduct = ref<Product | null>(null)
+//   const loading = ref(false)
+//   const error = ref<string | null>(null)
+
+//   async function getProductDescription(langId = 1, productID: number) {
+//     loading.value = true
+//     error.value = null
+
+//     try {
+//       const response = await useFetchJson<ProductDescription>(
+//         `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
+//       )
+//       productDescription.value = response.items
+//       console.log(productDescription, 'dfsfsdf');
+
+//     } catch (e: unknown) {
+//       error.value = e instanceof Error ? e.message : 'Failed to load product description'
+//     } finally {
+//       loading.value = false
+//     }
+//   }
+//   function stripHtml(html: string) {
+//     const div = document.createElement('div')
+//     div.innerHTML = html
+//     return div.textContent || div.innerText || ''
+//   }
+//   async function saveProductDescription(productID?: number, langId?: number) {
+//     const id = productID || 1
+//     const lang = langId || 1
+//     try {
+//       const data = await useFetchJson(
+//         `/api/v1/restricted/product-translation/save-product-description?productID=${id}&productLangID=${lang}`,
+//         {
+//           method: 'POST',
+//           headers: {
+//             'Content-Type': 'application/json'
+//           },
+//           body: JSON.stringify({
+//             name: stripHtml(productDescription.value?.name || ''),
+//             description: stripHtml(productDescription.value?.description || ''),
+//             description_short: stripHtml(productDescription.value?.description_short || ''),
+//             meta_title: stripHtml(productDescription.value?.meta_title || ''),
+//             meta_description: stripHtml(productDescription.value?.meta_description || ''),
+//             available_now: stripHtml(productDescription.value?.available_now || ''),
+//             available_later: stripHtml(productDescription.value?.available_later || ''),
+//             usage: stripHtml(productDescription.value?.usage || '')
+//           })
+//         }
+//       )
+//       return data
+//     } catch (e) {
+//       console.error(e)
+//     }
+//   }
+
+//   const defaultLangId = ref(1)
+//   async function translateProductDescription(productID: number, fromLangId: number, defaultLangId: number, model: string = 'OpenAI') {
+//     loading.value = true
+//     error.value = null
+
+//     try {
+//       const response = await useFetchJson<ProductDescription>(`/api/v1/restricted/product-translation/translate-product-description?productID=${productID}&productFromLangID=${fromLangId}&productToLangID=${defaultLangId}&model=${model}`)
+//       productDescription.value = response.items
+//       return response.items
+//     } catch (e: any) {
+//       error.value = e?.message || 'Failed to translate product description'
+//       console.error('Failed to translate product description:', e)
+//     } finally {
+//       loading.value = false
+//     }
+//   }
+
+//   function clearCurrentProduct() {
+//     currentProduct.value = null
+//   }
+
+//   return {
+//     productDescription,
+//     currentProduct,
+//     loading,
+//     error,
+//     getProductDescription,
+//     clearCurrentProduct,
+//     saveProductDescription,
+//     translateProductDescription,
+//   }
+// })

bo/src/stores/settings.ts

@@ -2,13 +2,20 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import type { Resp } from '@/types'
 import type { Settings } from '@/types/settings'
 import { defineStore } from 'pinia'
+import { computed, ref } from 'vue'
 
 export const useSettingsStore = defineStore('settings', () => {
-  async function getSettings() {
+  const settings = ref<Settings | null>(null)
-    const { items } = await useFetchJson<Resp<Settings>>('/api/v1/settings',)
+  const loaded = ref(false)
-    console.log(items);
+  const shopDefaultLanguage = computed(() => settings.value?.app?.shop_default_language ?? 1)
+
+  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
   }
 
-  getSettings()
+  return { settings, loaded, shopDefaultLanguage, getSettings }
-  return {}
 })

bo/src/types/lang.d.ts

@@ -12,3 +12,20 @@ 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,6 +5,7 @@ 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,6 +12,7 @@ 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&target_user_id=2
+  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10
   params:
     - name: p
       value: "1"
@@ -13,9 +13,6 @@ http:
     - name: elems
       value: "10"
       type: query
-    - name: target_user_id
-      value: "2"
-      type: query
 
 settings:
   encodeUrl: true

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

@@ -1,28 +0,0 @@
-info:
-  name: translate-product-description
-  type: http
-  seq: 20
-
-http:
-  method: GET
-  url: http://localhost:3000/api/v1/restricted/product-translation/translate-product-description?productID=51&productFromLangID=1&productToLangID=3&model=Google
-  params:
-    - name: productID
-      value: "51"
-      type: query
-    - name: productFromLangID
-      value: "1"
-      type: query
-    - name: productToLangID
-      value: "3"
-      type: query
-    - name: model
-      value: Google
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

storage/folder/a.txt

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