sanitize and save URL slugs

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

.env

@@ -58,3 +58,5 @@ FILE_MAAL_PL_PASSWORD=1FnwqcEgIUjQHjt1
 
 IMAGE_PREFIX=https://www.naluconcept.com # remove prefix to serv them from same host as presta
 CORS_ORGIN=https://www.naluconcept.com
+
+DSN=root:Maal12345678@tcp(localhost:3306)/nalu

app/api/openapi.json

@@ -1127,21 +1127,32 @@
         }
       }
     },
-    "/api/v1/restricted/menu/get-menu": {
+    "/api/v1/restricted/menu/get-category-tree": {
       "get": {
         "tags": ["Menu"],
-        "summary": "Get menu structure",
-        "description": "Returns the menu structure for the current language. Requires authentication.",
-        "operationId": "getMenu",
+        "summary": "Get category tree",
+        "description": "Returns the category tree rooted at the given category ID for the current language. Requires authentication.",
+        "operationId": "getCategoryTree",
         "security": [
           {
             "CookieAuth": [],
             "BearerAuth": []
           }
         ],
+        "parameters": [
+          {
+            "name": "root_category_id",
+            "in": "query",
+            "description": "Root category ID to build the tree from",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
         "responses": {
           "200": {
-            "description": "Menu retrieved successfully",
+            "description": "Category tree retrieved successfully",
             "content": {
               "application/json": {
                 "schema": {
@@ -1151,7 +1162,73 @@
             }
           },
           "400": {
-            "description": "Invalid request",
+            "description": "Invalid request or root category not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Not authenticated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Error"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/api/v1/restricted/menu/get-breadcrumb": {
+      "get": {
+        "tags": ["Menu"],
+        "summary": "Get breadcrumb",
+        "description": "Returns the breadcrumb path from the root category to the specified category for the current language. Requires authentication.",
+        "operationId": "getBreadcrumb",
+        "security": [
+          {
+            "CookieAuth": [],
+            "BearerAuth": []
+          }
+        ],
+        "parameters": [
+          {
+            "name": "root_category_id",
+            "in": "query",
+            "description": "Root category ID (breadcrumb starting point)",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          },
+          {
+            "name": "category_id",
+            "in": "query",
+            "description": "Target category ID (breadcrumb destination)",
+            "required": true,
+            "schema": {
+              "type": "integer"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Breadcrumb retrieved successfully",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ApiResponse"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid request, category not found, or root never reached",
             "content": {
               "application/json": {
                 "schema": {
@@ -1221,7 +1298,23 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/ApiResponse"
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string"
+                    },
+                    "items": {
+                      "type": "array",
+                      "items": {
+                        "$ref": "#/components/schemas/B2BTopMenu"
+                      },
+                      "description": "Root menu items with nested children"
+                    },
+                    "count": {
+                      "type": "integer",
+                      "description": "Number of root menu items"
+                    }
+                  }
                 }
               }
             }
@@ -1995,46 +2088,6 @@
           }
         }
       },
-      "MenuItem": {
-        "type": "object",
-        "description": "Menu item structure",
-        "properties": {
-          "category_id": {
-            "type": "integer",
-            "format": "uint",
-            "description": "Category ID"
-          },
-          "label": {
-            "type": "string",
-            "description": "Menu item label"
-          },
-          "params": {
-            "$ref": "#/components/schemas/MenuItemParams"
-          },
-          "children": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/MenuItem"
-            },
-            "description": "Child menu items"
-          }
-        }
-      },
-      "MenuItemParams": {
-        "type": "object",
-        "properties": {
-          "category_id": {
-            "type": "integer",
-            "format": "uint"
-          },
-          "link_rewrite": {
-            "type": "string"
-          },
-          "locale": {
-            "type": "string"
-          }
-        }
-      },
       "Route": {
         "type": "object",
         "description": "Application route",
@@ -2338,6 +2391,58 @@
             "description": "Build date in RFC3339 format"
           }
         }
+      },
+      "CategoryInBreadcrumb": {
+        "type": "object",
+        "description": "A single item in a category breadcrumb path",
+        "properties": {
+          "category_id": {
+            "type": "integer",
+            "format": "uint",
+            "description": "Category ID"
+          },
+          "name": {
+            "type": "string",
+            "description": "Category name"
+          }
+        }
+      },
+      "B2BTopMenu": {
+        "type": "object",
+        "description": "Top-level menu item for B2B back-office",
+        "properties": {
+          "menu_id": {
+            "type": "integer",
+            "description": "Menu item ID"
+          },
+          "label": {
+            "type": "object",
+            "description": "Menu label as JSON (multilingual, e.g. {\"en\": \"Dashboard\", \"pl\": \"Panel\"})"
+          },
+          "parent_id": {
+            "type": "integer",
+            "description": "Parent menu ID (null for root items)"
+          },
+          "params": {
+            "type": "object",
+            "description": "Menu item parameters as JSON"
+          },
+          "active": {
+            "type": "integer",
+            "description": "Active status (1 = active, 0 = inactive)"
+          },
+          "position": {
+            "type": "integer",
+            "description": "Sort position"
+          },
+          "children": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/B2BTopMenu"
+            },
+            "description": "Child menu items"
+          }
+        }
       }
     },
     "securitySchemes": {

app/delivery/middleware/auth.go

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

app/delivery/middleware/language.go

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

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

@@ -2,13 +2,17 @@ package public
 
 import (
 	"log"
+	"strconv"
 	"time"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/delivery/middleware"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/authService"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
+	"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"
 
 	"github.com/gofiber/fiber/v3"
@@ -264,15 +268,15 @@ func (h *AuthHandler) RefreshToken(c fiber.Ctx) error {
 
 // Me returns the current user info
 func (h *AuthHandler) Me(c fiber.Ctx) error {
-	user := c.Locals("user")
-	if user == nil {
+	userLocale := c.Locals(constdata.USER_LOCALE).(*model.UserLocale)
+	if userLocale.OriginalUser == nil {
 		return c.Status(fiber.StatusUnauthorized).JSON(fiber.Map{
 			"error": responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated),
 		})
 	}
 
 	return c.JSON(fiber.Map{
-		"user": user,
+		"user": *userLocale.OriginalUser,
 	})
 }
 
@@ -345,9 +349,49 @@ func (h *AuthHandler) CompleteRegistration(c fiber.Ctx) error {
 	return c.Status(fiber.StatusCreated).JSON(response)
 }
 
-// Updates JWT Tokens
+// Updates JWT Tokens. Requires authentication and updates access token only
 func (h *AuthHandler) UpdateJWTToken(c fiber.Ctx) error {
-	return h.authService.UpdateJWTToken(c)
+	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)))
+	}
+
+	// Parse language and country_id from query params
+	langIDStr := c.Query("lang_id")
+
+	if langIDStr != "" {
+		parsedID, err := strconv.ParseUint(langIDStr, 10, 32)
+		if err != nil {
+			return c.Status(fiber.StatusBadRequest).
+				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadLangID)))
+		}
+		userLocale.OriginalUser.LangID = uint(parsedID)
+	}
+
+	countryIDStr := c.Query("country_id")
+
+	if countryIDStr != "" {
+		parsedID, err := strconv.ParseUint(countryIDStr, 10, 32)
+		if err != nil {
+			return c.Status(fiber.StatusBadRequest).
+				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadCountryID)))
+		}
+		userLocale.OriginalUser.CountryID = uint(parsedID)
+	}
+
+	newAccessToken, err := h.authService.UpdateJWTToken(userLocale.OriginalUser)
+
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{
+			"error": responseErrors.GetErrorCode(c, err),
+		})
+	}
+
+	// does not reset refresh token
+	h.setAuthCookies(c, newAccessToken, "")
+
+	return c.JSON(response.Make(&fiber.Map{"token": newAccessToken}, 0, i18n.T_(c, response.Message_OK)))
 }
 
 // GoogleLogin redirects the user to Google's OAuth2 consent page
@@ -414,12 +458,12 @@ func (h *AuthHandler) GoogleCallback(c fiber.Ctx) error {
 
 	// Redirect to the locale-prefixed charts page after successful Google login.
 	// The user's preferred language is stored in the auth response; fall back to "en".
-	lang, err := h.authService.GetLangISOCode(response.User.LangID)
+	lang_iso_code, err := h.authService.GetLangISOCode(response.User.LangID)
 	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadLangID)).JSON(fiber.Map{
-			"error": responseErrors.GetErrorCode(c, responseErrors.ErrBadLangID),
+		return c.Status(responseErrors.GetErrorStatus(err)).JSON(fiber.Map{
+			"error": responseErrors.GetErrorCode(c, err),
 		})
 	}
 
-	return c.Redirect().To(h.config.App.BaseURL + "/" + lang)
+	return c.Redirect().To(h.config.App.BaseURL + "/" + lang_iso_code)
 }

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

@@ -0,0 +1,99 @@
+package restricted
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/config"
+	"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"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+	"github.com/gofiber/fiber/v3"
+)
+
+// ListHandler handles endpoints that list various things (e.g. products or users)
+type ListHandler struct {
+	listService *listService.ListService
+	config      *config.Config
+}
+
+// NewListHandler creates a new ListHandler instance
+func NewListHandler() *ListHandler {
+	listService := listService.New()
+	return &ListHandler{
+		listService: listService,
+		config:      config.Get(),
+	}
+}
+
+func ListHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewListHandler()
+
+	r.Get("/list-products", handler.ListProducts)
+	r.Get("/list-users", handler.ListUsers)
+
+	return r
+}
+
+func (h *ListHandler) ListProducts(c fiber.Ctx) error {
+	paging, filters, err := query_params.ParseFilters[model.Product](c, columnMappingListProducts)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	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)))
+	}
+
+	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(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
+}
+
+var columnMappingListProducts map[string]string = map[string]string{
+	"product_id":    "ps.id_product",
+	"name":          "pl.name",
+	"reference":     "p.reference",
+	"category_name": "cl.name",
+	"category_id":   "cp.id_category",
+	"quantity":      "sa.quantity",
+}
+
+func (h *ListHandler) ListUsers(c fiber.Ctx) error {
+	paging, filters, err := query_params.ParseFilters[model.Customer](c, columnMappingListUsers)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	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)))
+	}
+
+	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(&list.Items, int(list.Count), i18n.T_(c, response.Message_OK)))
+}
+
+var columnMappingListUsers map[string]string = map[string]string{
+	"user_id":     "users.id",
+	"email":       "users.email",
+	"first_name":  "users.first_name",
+	"second_name": "users.second_name",
+	"role":        "users.role",
+}

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

@@ -1,67 +0,0 @@
-package restricted
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/service/listProductsService"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
-	"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"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
-	"github.com/gofiber/fiber/v3"
-)
-
-// ListProductsHandler handles endpoints that receive, save and translate product descriptions.
-type ListProductsHandler struct {
-	listProductsService *listProductsService.ListProductsService
-	config              *config.Config
-}
-
-// NewListProductsHandler creates a new ListProductsHandler instance
-func NewListProductsHandler() *ListProductsHandler {
-	listProductsService := listProductsService.New()
-	return &ListProductsHandler{
-		listProductsService: listProductsService,
-		config:              config.Get(),
-	}
-}
-
-func ListProductsHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewListProductsHandler()
-
-	r.Get("/get-listing", handler.GetListing)
-
-	return r
-}
-
-func (h *ListProductsHandler) GetListing(c fiber.Ctx) error {
-	paging, filters, err := query_params.ParseFilters[model.Product](c, columnMappingGetListing)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	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)))
-	}
-
-	listing, err := h.listProductsService.GetListing(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)))
-}
-
-var columnMappingGetListing map[string]string = map[string]string{
-	"product_id":    "ps.id_product",
-	"name":          "pl.name",
-	"reference":     "p.reference",
-	"category_name": "cl.name",
-	"category_id":   "cp.id_category",
-	"quantity":      "sa.quantity",
-}

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

@@ -1,8 +1,11 @@
 package restricted
 
 import (
+	"strconv"
+
 	"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"
@@ -23,29 +26,68 @@ func NewMenuHandler() *MenuHandler {
 func MenuHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewMenuHandler()
 
-	r.Get("/get-menu", handler.GetMenu)
+	r.Get("/get-category-tree", handler.GetCategoryTree)
+	r.Get("/get-breadcrumb", handler.GetBreadcrumb)
 	r.Get("/get-top-menu", handler.GetTopMenu)
 
 	return r
 }
 
-func (h *MenuHandler) GetMenu(c fiber.Ctx) error {
-	lang_id, ok := c.Locals("langID").(uint)
+func (h *MenuHandler) GetCategoryTree(c fiber.Ctx) error {
+	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)))
 	}
-	menu, err := h.menuService.GetMenu(lang_id)
+
+	root_category_id_attribute := c.Query("root_category_id")
+	root_category_id, err := strconv.Atoi(root_category_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	category_tree, err := h.menuService.GetCategoryTree(uint(root_category_id), lang_id)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
 	}
 
-	return c.JSON(response.Make(&menu, 0, i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(&category_tree, 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *MenuHandler) GetBreadcrumb(c fiber.Ctx) error {
+	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)))
+	}
+
+	root_category_id_attribute := c.Query("root_category_id")
+	root_category_id, err := strconv.Atoi(root_category_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	category_id_attribute := c.Query("category_id")
+	category_id, err := strconv.Atoi(category_id_attribute)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	breadcrumb, err := h.menuService.GetBreadcrumb(uint(root_category_id), uint(category_id), lang_id)
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&breadcrumb, 0, i18n.T_(c, response.Message_OK)))
 }
 
 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(&nothing, 0, i18n.T_(c, response.Message_OK)))
+	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
 }
 
 func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
@@ -88,7 +88,7 @@ func (h *MeiliSearchHandler) Search(c fiber.Ctx) error {
 }
 
 func (h *MeiliSearchHandler) GetSettings(c fiber.Ctx) error {
-	id_lang, ok := c.Locals("langID").(uint)
+	id_lang, ok := localeExtractor.GetLangID(c)
 	if !ok {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))

app/delivery/web/api/settings.go

@@ -21,10 +21,12 @@ type SettingsResponse struct {
 
 // AppSettings represents app configuration
 type AppSettings struct {
-	Name          string `json:"name"`
-	Environment   string `json:"environment"`
-	BaseURL       string `json:"base_url"`
-	PasswordRegex string `json:"password_regex"`
+	Name                string `json:"name"`
+	Environment         string `json:"environment"`
+	BaseURL             string `json:"base_url"`
+	PasswordRegex       string `json:"password_regex"`
+	CategoryTreeRootID  uint   `json:"category_tree_root_id"`
+	ShopDefaultLanguage uint   `json:"shop_default_language"`
 	// Config        config.Config `json:"config"`
 }
 
@@ -65,10 +67,12 @@ func (h *SettingsHandler) GetSettings(cfg *config.Config) fiber.Handler {
 	return func(c fiber.Ctx) error {
 		settings := SettingsResponse{
 			App: AppSettings{
-				Name:          cfg.App.Name,
-				Environment:   cfg.App.Environment,
-				BaseURL:       cfg.App.BaseURL,
-				PasswordRegex: constdata.PASSWORD_VALIDATION_REGEX,
+				Name:                cfg.App.Name,
+				Environment:         cfg.App.Environment,
+				BaseURL:             cfg.App.BaseURL,
+				PasswordRegex:       constdata.PASSWORD_VALIDATION_REGEX,
+				CategoryTreeRootID:  constdata.CATEGORY_TREE_ROOT_ID,
+				ShopDefaultLanguage: constdata.SHOP_DEFAULT_LANGUAGE,
 				// Config:        *config.Get(),
 			},
 			Server: ServerSettings{

app/delivery/web/init.go

@@ -94,9 +94,9 @@ func (s *Server) Setup() error {
 	productTranslation := s.restricted.Group("/product-translation")
 	restricted.ProductTranslationHandlerRoutes(productTranslation)
 
-	// listing products routes (restricted)
-	listProducts := s.restricted.Group("/list-products")
-	restricted.ListProductsHandlerRoutes(listProducts)
+	// lists of things routes (restricted)
+	list := s.restricted.Group("/list")
+	restricted.ListHandlerRoutes(list)
 
 	// locale selector (restricted)
 	// this is basically for changing user's selected language and country

app/model/category.go

@@ -0,0 +1,33 @@
+package model
+
+type ScannedCategory struct {
+	CategoryID  uint   `gorm:"column:category_id;primaryKey"`
+	Name        string `gorm:"column:name"`
+	Active      uint   `gorm:"column:active"`
+	Position    uint   `gorm:"column:position"`
+	ParentID    uint   `gorm:"column:id_parent"`
+	IsRoot      uint   `gorm:"column:is_root_category"`
+	LinkRewrite string `gorm:"column:link_rewrite"`
+	IsoCode     string `gorm:"column:iso_code"`
+
+	Visited bool //this is for internal backend use only
+}
+
+type Category struct {
+	CategoryID uint   `json:"category_id" form:"category_id"`
+	Label      string `json:"label" form:"label"`
+	// Active     bool           `json:"active" form:"active"`
+	Params   CategoryParams `json:"params" form:"params"`
+	Children []Category     `json:"children" form:"children"`
+}
+
+type CategoryParams struct {
+	CategoryID  uint   `json:"category_id" form:"category_id"`
+	LinkRewrite string `json:"link_rewrite" form:"link_rewrite"`
+	Locale      string `json:"locale" form:"locale"`
+}
+
+type CategoryInBreadcrumb struct {
+	CategoryID uint   `json:"category_id" form:"category_id"`
+	Name       string `json:"name" form:"name"`
+}

app/model/countries.go

@@ -1,31 +1,17 @@
 package model
 
+import "git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
+
 // Represents a country together with its associated currency
 type Country struct {
-	ID              uint   `gorm:"primaryKey;column:id" json:"id"`
-	Name            string `gorm:"column:name" json:"name"`
-	Flag            string `gorm:"size:16;not null;column:flag" json:"flag"`
-	CurrencyID      uint   `gorm:"column:id_currency" json:"currency_id"`
-	CurrencyISOCode string `gorm:"column:iso_code" json:"currency_iso_code"`
-	CurrencyName    string `gorm:"column:name" json:"currency_name"`
-	// PSCountryID     int         `gorm:"column:id_country" json:"ps_country_id"`
-	// PSCountry       *PSCountry  `gorm:"foreignKey:PSCountryID;references:ID" json:"ps_country"`
-	PSCurrencyID uint        `gorm:"column:currency" json:"currency"`
-	PSCurrency   *PSCurrency `gorm:"foreignKey:PSCurrencyID;references:currency_id" json:"ps_currency"`
+	ID   uint   `gorm:"primaryKey;column:id" json:"id"`
+	Name string `gorm:"column:name" json:"name"`
+	Flag string `gorm:"size:16;not null;column:flag" json:"flag"`
+
+	PSCurrencyID uint                `gorm:"column:currency_id" json:"currency_id"`
+	PSCurrency   *dbmodel.PsCurrency `gorm:"foreignKey:PSCurrencyID;references:IDCurrency" json:"ps_currency"`
 }
 
 func (Country) TableName() string {
 	return "b2b_countries"
 }
-
-type PSCountry struct {
-	CurrencyID uint `gorm:"column:id_currency" json:"currency_id"`
-}
-
-func (PSCountry) TableName() string {
-	return "ps_country"
-}
-
-type PSCurrency struct {
-	Currency int `gorm:"column:currency" json:"currency"`
-}

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
@@ -144,3 +154,11 @@ type RefreshToken struct {
 func (RefreshToken) TableName() string {
 	return "b2b_refresh_tokens"
 }
+
+type UserInList struct {
+	UserID    uint   `gorm:"primaryKey;column:id" json:"user_id"`
+	Email     string `gorm:"column:email" json:"email"`
+	FirstName string `gorm:"column:first_name" json:"first_name"`
+	LastName  string `gorm:"column:last_name" json:"last_name"`
+	Role      string `gorm:"column:role" json:"role"`
+}

app/model/dbmodel/ps_group_reduction.go

@@ -21,12 +21,12 @@ func (*PsGroupReduction) TableName() string {
 
 var PsGroupReductionCols = struct {
 	IDGroupReduction gormcol.Field
-	IDGroup gormcol.Field
-	IDCategory gormcol.Field
-	Reduction gormcol.Field
+	IDGroup          gormcol.Field
+	IDCategory       gormcol.Field
+	Reduction        gormcol.Field
 }{
 	IDGroupReduction: gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "id_group_reduction"),
-	IDGroup: gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "id_group"),
-	IDCategory: gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "id_category"),
-	Reduction: gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "reduction"),
+	IDGroup:          gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "id_group"),
+	IDCategory:       gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "id_category"),
+	Reduction:        gormcol.Field{}.Set((&PsGroupReduction{}).TableName(), "reduction"),
 }

app/model/dbmodel/ps_product_attribute_combination.go

@@ -18,9 +18,9 @@ func (*PsProductAttributeCombination) TableName() string {
 }
 
 var PsProductAttributeCombinationCols = struct {
-	IDAttribute gormcol.Field
+	IDAttribute        gormcol.Field
 	IDProductAttribute gormcol.Field
 }{
-	IDAttribute: gormcol.Field{}.Set((&PsProductAttributeCombination{}).TableName(), "id_attribute"),
+	IDAttribute:        gormcol.Field{}.Set((&PsProductAttributeCombination{}).TableName(), "id_attribute"),
 	IDProductAttribute: gormcol.Field{}.Set((&PsProductAttributeCombination{}).TableName(), "id_product_attribute"),
 }

app/model/dbmodel/ps_product_group_reduction_cache.go

@@ -20,10 +20,10 @@ func (*PsProductGroupReductionCache) TableName() string {
 
 var PsProductGroupReductionCacheCols = struct {
 	IDProduct gormcol.Field
-	IDGroup gormcol.Field
+	IDGroup   gormcol.Field
 	Reduction gormcol.Field
 }{
 	IDProduct: gormcol.Field{}.Set((&PsProductGroupReductionCache{}).TableName(), "id_product"),
-	IDGroup: gormcol.Field{}.Set((&PsProductGroupReductionCache{}).TableName(), "id_group"),
+	IDGroup:   gormcol.Field{}.Set((&PsProductGroupReductionCache{}).TableName(), "id_group"),
 	Reduction: gormcol.Field{}.Set((&PsProductGroupReductionCache{}).TableName(), "reduction"),
 }

app/model/dbmodel/ps_pshow_pshowproducttabs_hook.go

@@ -19,11 +19,11 @@ func (*PsPshowPshowproducttabsHook) TableName() string {
 }
 
 var PsPshowPshowproducttabsHookCols = struct {
-	IDHook gormcol.Field
-	HookName gormcol.Field
+	IDHook       gormcol.Field
+	HookName     gormcol.Field
 	PrestaIDHook gormcol.Field
 }{
-	IDHook: gormcol.Field{}.Set((&PsPshowPshowproducttabsHook{}).TableName(), "id_hook"),
-	HookName: gormcol.Field{}.Set((&PsPshowPshowproducttabsHook{}).TableName(), "hook_name"),
+	IDHook:       gormcol.Field{}.Set((&PsPshowPshowproducttabsHook{}).TableName(), "id_hook"),
+	HookName:     gormcol.Field{}.Set((&PsPshowPshowproducttabsHook{}).TableName(), "hook_name"),
 	PrestaIDHook: gormcol.Field{}.Set((&PsPshowPshowproducttabsHook{}).TableName(), "presta_id_hook"),
 }

app/model/product.go

@@ -84,28 +84,4 @@ type ProductFilters struct {
 	InStock      uint    `query:"stock,omitempty"`
 }
 
-type ScannedCategory struct {
-	CategoryID  uint   `gorm:"column:category_id;primaryKey"`
-	Name        string `gorm:"column:name"`
-	Active      uint   `gorm:"column:active"`
-	Position    uint   `gorm:"column:position"`
-	ParentID    uint   `gorm:"column:id_parent"`
-	IsRoot      uint   `gorm:"column:is_root_category"`
-	LinkRewrite string `gorm:"column:link_rewrite"`
-	IsoCode     string `gorm:"column:iso_code"`
-}
-type Category struct {
-	CategoryID uint   `json:"category_id" form:"category_id"`
-	Label      string `json:"label" form:"label"`
-	// Active     bool           `json:"active" form:"active"`
-	Params   CategpryParams `json:"params" form:"params"`
-	Children []Category     `json:"children" form:"children"`
-}
-
-type CategpryParams struct {
-	CategoryID  uint   `json:"category_id" form:"category_id"`
-	LinkRewrite string `json:"link_rewrite" form:"link_rewrite"`
-	Locale      string `json:"locale" form:"locale"`
-}
-
 type FeatVal = map[uint][]uint

app/model/productDescription.go

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

app/repos/categoriesRepo/categoriesRepo.go

@@ -37,12 +37,11 @@ func (r *CategoriesRepo) GetAllCategories(idLang uint) ([]model.ScannedCategory,
 			ps_category_lang.link_rewrite AS link_rewrite,
 			ps_lang.iso_code AS iso_code
 		`).
-		Joins(`LEFT JOIN ? ON ??.id_category = ??.id_category AND ??.id_shop = ? AND ??.id_lang = ?`,
-			categoryLangTbl, categoryLangTbl, categoryTbl, categoryLangTbl, constdata.SHOP_ID, categoryLangTbl, idLang).
-		Joins(`LEFT JOIN ? ON ??.id_category = ??.id_category AND ??.id_shop = ?`,
-			categoryShopTbl, categoryShopTbl, categoryTbl, categoryShopTbl, constdata.SHOP_ID).
-		Joins(`JOIN ? ON ??.id_lang = ??.id_lang`,
-			langTbl, langTbl, categoryLangTbl).
+		Joins(`LEFT JOIN `+categoryLangTbl+` ON `+categoryLangTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryLangTbl+`.id_shop = ? AND `+categoryLangTbl+`.id_lang = ?`,
+			constdata.SHOP_ID, idLang).
+		Joins(`LEFT JOIN `+categoryShopTbl+` ON `+categoryShopTbl+`.id_category = `+categoryTbl+`.id_category AND `+categoryShopTbl+`.id_shop = ?`,
+			constdata.SHOP_ID).
+		Joins(`JOIN ` + langTbl + ` ON ` + langTbl + `.id_lang = ` + categoryLangTbl + `.id_lang`).
 		Scan(&allCategories).Error
 
 	return allCategories, err

app/repos/listRepo/listRepo.go

@@ -1,4 +1,4 @@
-package listProductsRepo
+package listRepo
 
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/config"
@@ -7,30 +7,32 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
+	"git.ma-al.com/goc_marek/gormcol"
 	"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
 )
 
-type UIListProductsRepo interface {
-	GetListing(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+type UIListRepo interface {
+	ListProducts(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+	ListUsers(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.UserInList], error)
 }
 
-type ListProductsRepo struct{}
+type ListRepo struct{}
 
-func New() UIListProductsRepo {
-	return &ListProductsRepo{}
+func New() UIListRepo {
+	return &ListRepo{}
 }
 
-func (repo *ListProductsRepo) GetListing(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
-	var listing []model.ProductInList
+func (repo *ListRepo) ListProducts(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
+	var list []model.ProductInList
 	var total int64
 
 	query := db.Get().
-		Table("ps_product_shop ps").
+		Table(gormcol.Field.Tab(dbmodel.PsProductShopCols.Active)+" AS ps").
 		Select(`
             ps.id_product AS product_id,
             pl.name AS name,
             pl.link_rewrite AS link_rewrite,
-            CONCAT(?, ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
+            CONCAT(?, '/', ims.id_image, '-small_default/', pl.link_rewrite, '.webp') AS image_link,
             cl.name AS category_name,
             p.reference AS reference,
             COALESCE(v.variants_number, 0) AS variants_number,
@@ -67,13 +69,53 @@ func (repo *ListProductsRepo) GetListing(id_lang uint, p find.Paging, filt *filt
 		Order("ps.id_product DESC").
 		Limit(p.Limit()).
 		Offset(p.Offset()).
-		Find(&listing).Error
+		Find(&list).Error
 	if err != nil {
 		return find.Found[model.ProductInList]{}, err
 	}
 
 	return find.Found[model.ProductInList]{
-		Items: listing,
+		Items: list,
+		Count: uint(total),
+	}, nil
+}
+
+func (repo *ListRepo) ListUsers(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.UserInList], error) {
+	var list []model.UserInList
+	var total int64
+
+	query := db.Get().
+		Table("b2b_customers AS users").
+		Select(`
+			users.id AS id,
+			users.email AS email,
+			users.first_name AS first_name,
+			users.last_name AS last_name,
+			users.role AS role
+		`)
+
+	// Apply all filters
+	if filt != nil {
+		filt.ApplyAll(query)
+	}
+
+	//  run counter first as query is without limit and offset
+	err := query.Count(&total).Error
+	if err != nil {
+		return find.Found[model.UserInList]{}, err
+	}
+
+	err = query.
+		Order("users.id DESC").
+		Limit(p.Limit()).
+		Offset(p.Offset()).
+		Find(&list).Error
+	if err != nil {
+		return find.Found[model.UserInList]{}, err
+	}
+
+	return find.Found[model.UserInList]{
+		Items: list,
 		Count: uint(total),
 	}, nil
 }

app/repos/productDescriptionRepo/productDescriptionRepo.go

@@ -1,13 +1,16 @@
 package productDescriptionRepo
 
 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"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"github.com/WinterYukky/gorm-extra-clause-plugin/exclause"
+	"gorm.io/gorm"
 )
 
 type UIProductDescriptionRepo interface {
@@ -28,14 +31,42 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
 	var ProductDescription model.ProductDescription
 
 	err := db.Get().
+		Model(dbmodel.PsProductLang{}).
 		Where(&dbmodel.PsProductLang{
 			IDProduct: int32(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 err != nil {
+
+	if errors.Is(err, gorm.ErrRecordNotFound) {
+		// handle "not found" case only
+		ProductDescription.ExistsInDatabase = false
+	} else if err != nil {
 		return nil, fmt.Errorf("database error: %w", err)
+	} else {
+		ProductDescription.ExistsInDatabase = true
 	}
 
 	return &ProductDescription, nil
@@ -43,13 +74,14 @@ 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 := model.ProductDescription{
-		ProductID: productID,
-		ShopID:    constdata.SHOP_ID,
-		LangID:    productid_lang,
+	record := dbmodel.PsProductLang{
+		IDProduct: int32(productID),
+		IDShop:    int32(constdata.SHOP_ID),
+		IDLang:    int32(productid_lang),
 	}
 
 	err := db.Get().
+		Model(dbmodel.PsProductLang{}).
 		Where(&dbmodel.PsProductLang{
 			IDProduct: int32(productID),
 			IDShop:    int32(constdata.SHOP_ID),

app/service/authService/auth.go

@@ -6,7 +6,6 @@ import (
 	"encoding/hex"
 	"errors"
 	"fmt"
-	"strconv"
 	"time"
 
 	"git.ma-al.com/goc_daniel/b2b/app/config"
@@ -14,13 +13,9 @@ import (
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/service/emailService"
 	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/i18n"
-	"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"
 
 	"github.com/dlclark/regexp2"
-	"github.com/gofiber/fiber/v3"
 	"github.com/golang-jwt/jwt/v5"
 	"golang.org/x/crypto/bcrypt"
 	"gorm.io/gorm"
@@ -88,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)
@@ -167,7 +171,7 @@ func (s *AuthService) Register(req *model.RegisterRequest) error {
 	baseURL := config.Get().App.BaseURL
 	lang, err := s.GetLangISOCode(req.LangID)
 	if err != nil {
-		return responseErrors.ErrBadLangID
+		return err
 	}
 
 	if err := s.email.SendVerificationEmail(user.Email, user.EmailVerificationToken, baseURL, lang); err != nil {
@@ -276,7 +280,7 @@ func (s *AuthService) RequestPasswordReset(emailAddr string) error {
 	baseURL := config.Get().App.BaseURL
 	lang, err := s.GetLangISOCode(user.LangID)
 	if err != nil {
-		return responseErrors.ErrBadLangID
+		return err
 	}
 
 	if err := s.email.SendPasswordResetEmail(user.Email, user.PasswordResetToken, baseURL, lang); err != nil {
@@ -482,7 +486,7 @@ func hashToken(raw string) string {
 func (s *AuthService) generateAccessToken(user *model.Customer) (string, error) {
 	_, err := s.GetLangISOCode(user.LangID)
 	if err != nil {
-		return "", responseErrors.ErrBadLangID
+		return "", err
 	}
 
 	err = s.CheckIfCountryExists(user.CountryID)
@@ -508,97 +512,19 @@ func (s *AuthService) generateAccessToken(user *model.Customer) (string, error)
 	return token.SignedString([]byte(s.config.JWTSecret))
 }
 
-func (s *AuthService) UpdateJWTToken(c fiber.Ctx) error {
-	// Get user ID from JWT claims in context (set by auth middleware)
-	// claims, ok := c.Locals("jwt_claims").(*JWTClaims)
-	// if !ok || claims == nil {
-	// 	return c.Status(fiber.StatusUnauthorized).
-	// 		JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrNotAuthenticated)))
-	// }
-	// fmt.Printf("claims: %v\n", claims)
-	// var user model.Customer
-	// // Find user by ID
-	// if err := s.db.First(&user, claims.UserID).Error; err != nil {
-	// 	return err
-	// }
-
-	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")
-
-	var langID uint
-	if langIDStr != "" {
-		parsedID, err := strconv.ParseUint(langIDStr, 10, 32)
-		if err != nil {
-			return c.Status(fiber.StatusBadRequest).
-				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadLangID)))
-		}
-		langID = uint(parsedID)
-
-		_, err = s.GetLangISOCode(langID)
-		if err != nil {
-			return responseErrors.ErrBadLangID
-		} else {
-			user.LangID = langID
-		}
-	}
-
-	countryIDStr := c.Query("country_id")
-
-	var countryID uint
-	if countryIDStr != "" {
-		parsedID, err := strconv.ParseUint(countryIDStr, 10, 32)
-		if err != nil {
-			return c.Status(fiber.StatusBadRequest).
-				JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadCountryID)))
-		}
-		countryID = uint(parsedID)
-
-		err = s.CheckIfCountryExists(countryID)
-		if err != nil {
-			return responseErrors.ErrBadCountryID
-		} else {
-			user.CountryID = countryID
-		}
-	}
-
-	// Update choice and get new token using AuthService
-	newToken, err := s.generateAccessToken(&user)
+func (s *AuthService) UpdateJWTToken(user *model.Customer) (string, error) {
+	// Update choice and get new access token using AuthService
+	new_access_token, err := s.generateAccessToken(user)
 	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+		return "", err
 	}
 
 	// Save the updated user
-	if err := s.db.Save(&user).Error; err != nil {
-		return fmt.Errorf("database error: %w", err)
+	if err := s.db.Save(user).Error; err != nil {
+		return "", fmt.Errorf("database error: %w", err)
 	}
 
-	// Set the new JWT cookie
-	cookie := new(fiber.Cookie)
-	cookie.Name = "jwt_token"
-	cookie.Value = newToken
-	cookie.HTTPOnly = true
-	cookie.Secure = true
-	cookie.SameSite = fiber.CookieSameSiteLaxMode
-
-	c.Cookie(cookie)
-
-	return c.JSON(response.Make(&fiber.Map{"token": newToken}, 0, i18n.T_(c, response.Message_OK)))
+	return new_access_token, nil
 }
 
 // generateVerificationToken generates a random verification token
@@ -623,14 +549,20 @@ func validatePassword(password string) error {
 
 func (s *AuthService) GetLangISOCode(langID uint) (string, error) {
 	var lang string
+	var err error
 
 	if langID == 0 { // retrieve the default lang
-		err := db.DB.Table("b2b_language").Where("is_default = ?", 1).Select("iso_code").Scan(&lang).Error
-		return lang, err
+		err = db.DB.Table("b2b_language").Where("is_default = ?", 1).Select("iso_code").Scan(&lang).Error
 	} else {
-		err := db.DB.Table("b2b_language").Where("id = ?", langID).Where("active = ?", 1).Select("iso_code").Scan(&lang).Error
-		return lang, err
+		err = db.DB.Table("b2b_language").Where("id = ?", langID).Where("active = ?", 1).Select("iso_code").Scan(&lang).Error
 	}
+
+	if err != nil {
+		return lang, err
+	} else if lang == "" {
+		return lang, responseErrors.ErrBadLangID
+	}
+	return lang, nil
 }
 
 func (s *AuthService) CheckIfCountryExists(countryID uint) error {

app/service/authService/google_oauth.go

@@ -153,7 +153,8 @@ func (s *AuthService) findOrCreateGoogleUser(info *view.GoogleUserInfo) (*model.
 		Role:          model.RoleUser,
 		IsActive:      true,
 		EmailVerified: true,
-		LangID:        2,
+		LangID:        2, // default is english
+		CountryID:     2, // default is England
 	}
 
 	if err := s.db.Create(&newUser).Error; err != nil {

app/service/listProductsService/listProductsService.go

@@ -1,29 +0,0 @@
-package listProductsService
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/listProductsRepo"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
-)
-
-type ListProductsService struct {
-	listProductsRepo listProductsRepo.UIListProductsRepo
-}
-
-func New() *ListProductsService {
-	return &ListProductsService{
-		listProductsRepo: listProductsRepo.New(),
-	}
-}
-
-func (s *ListProductsService) GetListing(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
-	var products find.Found[model.ProductInList]
-
-	products, err := s.listProductsRepo.GetListing(id_lang, p, filters)
-	if err != nil {
-		return products, err
-	}
-
-	return products, nil
-}

app/service/listService/listService.go

@@ -0,0 +1,26 @@
+package listService
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/listRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
+)
+
+type ListService struct {
+	listRepo listRepo.UIListRepo
+}
+
+func New() *ListService {
+	return &ListService{
+		listRepo: listRepo.New(),
+	}
+}
+
+func (s *ListService) ListProducts(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
+	return s.listRepo.ListProducts(id_lang, p, filters)
+}
+
+func (s *ListService) ListUsers(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.UserInList], error) {
+	return s.listRepo.ListUsers(id_lang, p, filters)
+}

app/service/menuService/menuService.go

@@ -1,6 +1,7 @@
 package menuService
 
 import (
+	"slices"
 	"sort"
 
 	"git.ma-al.com/goc_daniel/b2b/app/model"
@@ -21,7 +22,7 @@ func New() *MenuService {
 	}
 }
 
-func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
+func (s *MenuService) GetCategoryTree(root_category_id uint, id_lang uint) (*model.Category, error) {
 	all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
 	if err != nil {
 		return &model.Category{}, err
@@ -31,7 +32,7 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
 	root_index := 0
 	root_found := false
 	for i := 0; i < len(all_categories); i++ {
-		if all_categories[i].IsRoot == 1 {
+		if all_categories[i].CategoryID == root_category_id {
 			root_index = i
 			root_found = true
 			break
@@ -44,6 +45,7 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
 	// now create the children and reorder them according to position
 	id_to_index := make(map[uint]int)
 	for i := 0; i < len(all_categories); i++ {
+		all_categories[i].Visited = false
 		id_to_index[all_categories[i].CategoryID] = i
 	}
 
@@ -58,19 +60,32 @@ func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
 	}
 
 	// finally, create the tree
-	tree := s.createTree(root_index, &all_categories, &children_indices)
+	tree, success := s.createTree(root_index, &all_categories, &children_indices)
+	if !success {
+		return &tree, responseErrors.ErrCircularDependency
+	}
 
 	return &tree, nil
 }
 
-func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCategory), children_indices *(map[int][]ChildWithPosition)) model.Category {
+func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCategory), children_indices *(map[int][]ChildWithPosition)) (model.Category, bool) {
 	node := s.scannedToNormalCategory((*all_categories)[index])
 
+	if (*all_categories)[index].Visited {
+		return node, false
+	}
+	(*all_categories)[index].Visited = true
+
 	for i := 0; i < len((*children_indices)[index]); i++ {
-		node.Children = append(node.Children, s.createTree((*children_indices)[index][i].Index, all_categories, children_indices))
+		next_child, success := s.createTree((*children_indices)[index][i].Index, all_categories, children_indices)
+		if !success {
+			return node, false
+		}
+		node.Children = append(node.Children, next_child)
 	}
 
-	return node
+	(*all_categories)[index].Visited = false // just in case we have a "diamond" diagram
+	return node, true
 }
 
 func (s *MenuService) GetRoutes(id_lang uint) ([]model.Route, error) {
@@ -83,7 +98,7 @@ func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) mod
 	normal.CategoryID = scanned.CategoryID
 	normal.Label = scanned.Name
 	// normal.Active = scanned.Active == 1
-	normal.Params = model.CategpryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
+	normal.Params = model.CategoryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
 	normal.Children = []model.Category{}
 	return normal
 }
@@ -98,6 +113,69 @@ func (a ByPosition) Len() int           { return len(a) }
 func (a ByPosition) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
 func (a ByPosition) Less(i, j int) bool { return a[i].Position < a[j].Position }
 
+func (s *MenuService) GetBreadcrumb(root_category_id uint, start_category_id uint, id_lang uint) ([]model.CategoryInBreadcrumb, error) {
+	all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
+	if err != nil {
+		return []model.CategoryInBreadcrumb{}, err
+	}
+
+	breadcrumb := []model.CategoryInBreadcrumb{}
+
+	start_index := 0
+	start_found := false
+	for i := 0; i < len(all_categories); i++ {
+		if all_categories[i].CategoryID == start_category_id {
+			start_index = i
+			start_found = true
+			break
+		}
+	}
+	if !start_found {
+		return []model.CategoryInBreadcrumb{}, responseErrors.ErrStartCategoryNotFound
+	}
+
+	// map category ids to indices
+	id_to_index := make(map[uint]int)
+	for i := 0; i < len(all_categories); i++ {
+		all_categories[i].Visited = false
+		id_to_index[all_categories[i].CategoryID] = i
+	}
+
+	// do a simple graph traversal, always jumping from node to its parent
+	index := start_index
+	success := true
+	for {
+		if all_categories[index].Visited {
+			success = false
+			break
+		}
+		all_categories[index].Visited = true
+
+		var next_category model.CategoryInBreadcrumb
+		next_category.CategoryID = all_categories[index].CategoryID
+		next_category.Name = all_categories[index].Name
+		breadcrumb = append(breadcrumb, next_category)
+
+		if all_categories[index].CategoryID == root_category_id {
+			break
+		}
+		next_index, ok := id_to_index[all_categories[index].ParentID]
+		if !ok {
+			success = false
+			break
+		}
+		index = next_index
+	}
+
+	slices.Reverse(breadcrumb)
+
+	if !success {
+		return breadcrumb, responseErrors.ErrRootNeverReached
+	}
+
+	return breadcrumb, nil
+}
+
 func (s *MenuService) GetTopMenu(id uint) ([]*model.B2BTopMenu, error) {
 	items, err := s.routesRepo.GetTopMenu(id)
 	if err != nil {

app/service/productTranslationService/productTranslationService.go

@@ -89,13 +89,24 @@ 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", "meta_description", "meta_title", "name", "available_now", "available_later", "usage"}
+	allowedFields := []string{"description", "description_short", "link_rewrite", "meta_description", "meta_keywords", "meta_title", "name",
+		"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++ {
@@ -136,20 +147,28 @@ 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",
-		"translation_of_product_available_later",
+		"translation_of_product_available_now_message",
+		"translation_of_product_available_later_message",
+		"translation_of_product_delivery_in_stock_message",
+		"translation_of_product_delivery_out_stock_message",
 		"translation_of_product_usage",
 	}
 

app/service/productTranslationService/sanitizeURLSlug.go

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

@@ -3,8 +3,37 @@ package constdata
 // PASSWORD_VALIDATION_REGEX is used by the frontend (JavaScript supports lookaheads).
 const PASSWORD_VALIDATION_REGEX = `^(?=.*[a-z])(?=.*[A-Z])(?=.*\d).{10,}$`
 const SHOP_ID = 1
+const SHOP_DEFAULT_LANGUAGE = 1
+
+// CATEGORY_TREE_ROOT_ID corresponds to id_category in ps_category which has is_root_category=1
+const CATEGORY_TREE_ROOT_ID = 2
+
 const MAX_AMOUNT_OF_CARTS_PER_USER = 10
 const DEFAULT_NEW_CART_NAME = "new cart"
 
-const USER_LOCALES_NAME = "user"
-const USER_LOCALES_ID = "userID"
+const USER_LOCALE = "user"
+
+// 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

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

app/utils/responseErrors/responseErrors.go

@@ -42,6 +42,7 @@ 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")
@@ -50,7 +51,10 @@ var (
 	ErrBadPaging = errors.New("bad or missing paging attribute value in header")
 
 	// Typed errors for menu handler
-	ErrNoRootFound = errors.New("no root found in categories table")
+	ErrNoRootFound           = errors.New("no root found in categories table")
+	ErrCircularDependency    = errors.New("circular dependency structure in tree (could be caused by improper root id)")
+	ErrStartCategoryNotFound = errors.New("the start category has not been found")
+	ErrRootNeverReached      = errors.New("the root category is not an ancestor of start category")
 
 	// Typed errors for carts handler
 	ErrMaxAmtOfCartsReached              = errors.New("maximal amount of carts reached")
@@ -133,6 +137,8 @@ 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):
@@ -145,6 +151,12 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 
 	case errors.Is(err, ErrNoRootFound):
 		return i18n.T_(c, "error.no_root_found")
+	case errors.Is(err, ErrCircularDependency):
+		return i18n.T_(c, "error.circular_dependency")
+	case errors.Is(err, ErrStartCategoryNotFound):
+		return i18n.T_(c, "error.start_category_not_found")
+	case errors.Is(err, ErrRootNeverReached):
+		return i18n.T_(c, "error.root_never_reached")
 
 	case errors.Is(err, ErrMaxAmtOfCartsReached):
 		return i18n.T_(c, "error.max_amt_of_carts_reached")
@@ -186,9 +198,13 @@ 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),
+		errors.Is(err, ErrCircularDependency),
+		errors.Is(err, ErrStartCategoryNotFound),
+		errors.Is(err, ErrRootNeverReached),
 		errors.Is(err, ErrMaxAmtOfCartsReached),
 		errors.Is(err, ErrUserHasNoSuchCart),
 		errors.Is(err, ErrProductOrItsVariationDoesNotExist):

bo/.gitignore

@@ -13,6 +13,7 @@ dist
 dist-ssr
 coverage
 *.local
+/bo/components.d.ts
 
 # Editor directories and files
 .vscode/*

bo/components.d.ts

@@ -11,27 +11,19 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
   export interface GlobalComponents {
-    Cart1: typeof import('./src/components/customer/Cart1.vue')['default']
     CartDetails: typeof import('./src/components/customer/CartDetails.vue')['default']
     CategoryMenu: typeof import('./src/components/inner/categoryMenu.vue')['default']
     CategoryMenuListing: typeof import('./src/components/inner/categoryMenuListing.vue')['default']
-    copy: typeof import('./src/components/customer/PageOrders copy.vue')['default']
     Cs_PrivacyPolicyView: typeof import('./src/components/terms/cs_PrivacyPolicyView.vue')['default']
     Cs_TermsAndConditionsView: typeof import('./src/components/terms/cs_TermsAndConditionsView.vue')['default']
     En_PrivacyPolicyView: typeof import('./src/components/terms/en_PrivacyPolicyView.vue')['default']
     En_TermsAndConditionsView: typeof import('./src/components/terms/en_TermsAndConditionsView.vue')['default']
     LangSwitch: typeof import('./src/components/inner/langSwitch.vue')['default']
-    Page: typeof import('./src/components/customer/Page.vue')['default']
     PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
-    PageCart: typeof import('./src/components/customer/PageCart.vue')['default']
     PageCarts: typeof import('./src/components/customer/PageCarts.vue')['default']
-    PageCreateAccount: typeof import('./src/components/customer/PageCreateAccount.vue')['default']
-    PageCustomerData: typeof import('./src/components/customer/PageCustomerData.vue')['default']
     PageOrders: typeof import('./src/components/customer/PageOrders.vue')['default']
     PageProduct: typeof import('./src/components/customer/PageProduct.vue')['default']
-    PageProductCardFull: typeof import('./src/components/customer/PageProductCardFull.vue')['default']
     PageProducts: typeof import('./src/components/admin/PageProducts.vue')['default']
-    PageProductsList: typeof import('./src/components/admin/PageProductsList.vue')['default']
     PageProfileDetails: typeof import('./src/components/customer/PageProfileDetails.vue')['default']
     PageProfileDetailsAddInfo: typeof import('./src/components/customer/PageProfileDetailsAddInfo.vue')['default']
     PageStatistic: typeof import('./src/components/customer/PageStatistic.vue')['default']
@@ -39,7 +31,6 @@ declare module 'vue' {
     Pl_TermsAndConditionsView: typeof import('./src/components/terms/pl_TermsAndConditionsView.vue')['default']
     ProductCustomization: typeof import('./src/components/customer/components/ProductCustomization.vue')['default']
     ProductDetailView: typeof import('./src/components/admin/ProductDetailView.vue')['default']
-    ProductsView: typeof import('./src/components/admin/ProductsView.vue')['default']
     ProductVariants: typeof import('./src/components/customer/components/ProductVariants.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
@@ -51,13 +42,11 @@ declare module 'vue' {
     UCard: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Card.vue')['default']
     UCheckbox: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Checkbox.vue')['default']
     UDrawer: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Drawer.vue')['default']
-    UDropdownMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/DropdownMenu.vue')['default']
     UForm: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Form.vue')['default']
     UFormField: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/FormField.vue')['default']
     UIcon: typeof import('./node_modules/@nuxt/ui/dist/runtime/vue/components/Icon.vue')['default']
     UInput: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Input.vue')['default']
     UInputNumber: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/InputNumber.vue')['default']
-    ULink: typeof import('./node_modules/@nuxt/ui/dist/runtime/vue/overrides/vue-router/Link.vue')['default']
     UModal: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Modal.vue')['default']
     UNavigationMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/NavigationMenu.vue')['default']
     UPagination: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Pagination.vue')['default']

bo/src/app.config.ts

@@ -1,63 +1,63 @@
-// import type { NuxtUIOptions } from '@nuxt/ui/unplugin'
+import type { NuxtUIOptions } from '@nuxt/ui/unplugin'
 
-// export const uiOptions: NuxtUIOptions = {
-//     ui: {
-//         pagination: {
-//             slots: {
-//                 root: '',
-//             }
-//         },
-//         button: {
-//             slots: {
-//                 base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
-//             },
-//         },
-//         input: {
-//             slots: {
-//                 base: 'text-(--black) dark:text-white border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
-//                 error: 'text-red-600!'
-//             },
-//         },
-//         inputNumber: {
-//             slots: {
-//                 base: 'text-(--black) dark:text-white border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! pt-2 px-1! w-auto!',
-//                 increment: 'border-0! pe-0! ps-0!',
-//                 decrement: 'border-0! pe-0! ps-0!'
-//             },
-//         },
-//         select: {
-//             slots: {
-//                 base: 'w-full! cursor-pointer border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
-//                 itemLabel: 'text-black! dark:text-white!',
-//                 itemTrailingIcon: 'text-black! dark:text-white!'
-//             },
-//         },
-//         formField: {
-//             slots: {
-//                 error: 'mt-1! text-[14px] text-error text-red-600! dark:text-red-400!',
-//                 label: 'text-[16px]'
-//             },
-//         },
-//         selectMenu: {
-//             slots: {
-//                 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!',
-//                 itemLeadingIcon: 'text-(--black)! dark:text-white!'
-//             }
+export const uiOptions: NuxtUIOptions = {
+    ui: {
+        pagination: {
+            slots: {
+                root: '',
+            }
+        },
+        button: {
+            slots: {
+                base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
+            },
+        },
+        input: {
+            slots: {
+                base: 'text-(--black) dark:text-white border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
+                error: 'text-red-600!'
+            },
+        },
+        inputNumber: {
+            slots: {
+                base: 'text-(--black) dark:text-white border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! pt-2 px-1! w-auto!',
+                increment: 'border-0! pe-0! ps-0!',
+                decrement: 'border-0! pe-0! ps-0!'
+            },
+        },
+        select: {
+            slots: {
+                base: 'w-full! cursor-pointer border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0!',
+                itemLabel: 'text-black! dark:text-white!',
+                itemTrailingIcon: 'text-black! dark:text-white!'
+            },
+        },
+        formField: {
+            slots: {
+                error: 'mt-1! text-[14px] text-error text-red-600! dark:text-red-400!',
+                label: 'text-[16px]'
+            },
+        },
+        selectMenu: {
+            slots: {
+                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!',
+                itemLeadingIcon: 'text-(--black)! dark:text-white!'
+            }
 
-//         },
-//         table: {
-//             slots: {
-//                 base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! bg-(--second-light) dark:bg-(--main-dark)',
-//                 tr: 'border-b! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! text-(--black)! dark:text-white!',
-//             }
+        },
+        table: {
+            slots: {
+                base: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! bg-(--second-light) dark:bg-(--main-dark)',
+                tr: 'border-b! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! text-(--black)! dark:text-white!',
+            }
 
-//         },
-//         modal: {
-//             slots: {
-//                 content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! bg-(--second-light) dark:bg-(--main-dark)',
-//             }
+        },
+        modal: {
+            slots: {
+                content: 'border! border-(--border-light)! dark:border-(--border-dark)! outline-0! ring-0! bg-(--second-light) dark:bg-(--main-dark)',
+            }
 
-//         }
-//     }
-// }
+        }
+    }
+}

bo/src/components/admin/PageProducts.vue

@@ -1,39 +1,11 @@
 <template>
     <suspense>
         <component :is="Default || 'div'">
-            <div class="container mx-auto mt-20">
-                <!-- <UNavigationMenu orientation="vertical" :items="listing" class="data-[orientation=vertical]:w-48">
-                    <template #item="{ item, active }">
-                        <div class="flex items-center gap-2 px-3 py-2">
-                            <UIcon name="i-heroicons-book-open" />
-                            <span>{{ item.name }}</span>
-                        </div>
-                    </template>
-</UNavigationMenu> -->
-                <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
-                <div v-if="loading" class="text-center py-8">
-                    <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
-                </div>
-                <div v-else-if="error" class="mb-4 p-3 bg-red-100 text-red-700 rounded">
-                    {{ error }}
-                </div>
-                <div v-else class="overflow-x-auto">
-                    <div class="flex gap-2">
-                        <CategoryMenuListing />
-                        <UTable :data="productsList" :columns="columns" class="flex-1">
-                            <template #expanded="{ row }">
-                                <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
-                                    thead: 'hidden'
-                                }" />
-                            </template>
-                        </UTable>
-                    </div>
-                    <div class="flex justify-center items-center py-8">
-                        <UPagination v-model:page="page" :total="total" :page-size="perPage" />
-                    </div>
-                    <div v-if="productsList.length === 0" class="text-center py-8 text-gray-500 dark:text-gray-400">
-                        No products found
-                    </div>
+            <div class="flex gap-10">
+                <CategoryMenu />
+                <div class="w-full flex flex-col items-center gap-4">
+                    <UTable :data="productsList" :columns="columns" class="flex-1 w-full" />
+                    <UPagination v-model:page="page" :total="total" :items-per-page="perPage" />
                 </div>
             </div>
         </component>
@@ -46,26 +18,20 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenuListing from '../inner/categoryMenuListing.vue'
-
-interface Product {
-    reference: number
-    product_id: number
-    name: string
-    image_link: string
-    link_rewrite: string
-}
+import CategoryMenu from '../inner/categoryMenu.vue'
+import type { Product } from '@/types/product'
 
 const router = useRouter()
 const route = useRoute()
 
+const perPage = ref(15)
 const page = computed({
-    get: () => Number(route.query.page) || 1,
+    get: () => Number(route.query.p) || 1,
     set: (val: number) => {
         router.push({
             query: {
                 ...route.query,
-                page: val
+                p: val
             }
         })
     }
@@ -101,7 +67,6 @@ const sortField = computed({
     }
 })
 
-const perPage = ref(15)
 const total = ref(0)
 
 interface ApiResponse {
@@ -162,17 +127,25 @@ async function fetchProductList() {
     error.value = null
 
     const params = new URLSearchParams()
-
     Object.entries(route.query).forEach(([key, value]) => {
-        if (value) params.append(key, String(value))
+        if (value === undefined || value === null) return
+
+        if (Array.isArray(value)) {
+            value.forEach(v => params.append(key, String(v)))
+        } else {
+            params.append(key, String(value))
+        }
+
     })
 
-    const url = `/api/v1/restricted/list-products/get-listing?${params}`
+    if (route.params.category_id)
+        params.append('category_id', String(route.params.category_id))
 
+    const url = `/api/v1/restricted/list/list-products?elems=${perPage.value}&${params.toString()}`
     try {
         const response = await useFetchJson<ApiResponse>(url)
         productsList.value = response.items || []
-        total.value = response.count || 0
+        total.value = Number(response.count) || 0
     } catch (e: unknown) {
         error.value = e instanceof Error ? e.message : 'Failed to load products'
     } finally {
@@ -182,16 +155,11 @@ async function fetchProductList() {
 
 function goToProduct(productId: number) {
     router.push({
-        name: 'product-detail',
-        params: { id: productId }
+        name: 'customer-product-details',
+        params: { product_id: productId }
     })
 }
 
-const selectedCount = ref({
-    product_id: null,
-    count: 0
-})
-
 function getIcon(name: string) {
     if (sortField.value[0] === name) {
         if (sortField.value[1] === 'asc') return 'i-lucide-arrow-up-narrow-wide'
@@ -205,25 +173,7 @@ const UInput = resolveComponent('UInput')
 const UButton = resolveComponent('UButton')
 const UIcon = resolveComponent('UIcon')
 
-const columns: TableColumn<Payment>[] = [
-    {
-        id: 'expand',
-        cell: ({ row }) =>
-            h(UButton, {
-                color: 'neutral',
-                variant: 'ghost',
-                icon: 'i-lucide-chevron-down',
-                square: true,
-                'aria-label': 'Expand',
-                ui: {
-                    leadingIcon: [
-                        'transition-transform',
-                        row.getIsExpanded() ? 'duration-200 rotate-180' : ''
-                    ]
-                },
-                onClick: () => row.toggleExpanded()
-            })
-    },
+const columns: TableColumn<Product>[] = [
     {
         accessorKey: 'product_id',
         header: ({ column }) => {
@@ -314,108 +264,17 @@ const columns: TableColumn<Payment>[] = [
         },
         cell: ({ row }) => row.getValue('quantity') as number
     },
-    {
-        accessorKey: 'count',
-        header: 'Count',
-        cell: ({ row }) => {
-            return h(UInputNumber, {
-                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
-                'onUpdate:modelValue': (val: number) => {
-                    if (val)
-                        selectedCount.value = {
-                            product_id: row.original.product_id,
-                            count: val
-                        }
-                    else {
-                        selectedCount.value = {
-                            product_id: null,
-                            count: 0
-                        }
-                    }
-                },
-                min: 0,
-                max: row.original.quantity
-            })
-        }
-    },
     {
         accessorKey: 'count',
         header: '',
         cell: ({ row }) => {
             return h(UButton, {
                 onClick: () => {
-                    console.log('Clicked', row.original)
+                    goToProduct(row.original.product_id)
                 },
-                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
+                color: 'primary',
                 variant: 'solid'
-            }, 'Add to cart')
-        },
-    }
-]
-
-const columnsChild: TableColumn<Payment>[] = [
-    {
-        accessorKey: 'product_id',
-        header: '',
-        cell: ({ row }) => `#${row.getValue('product_id') as number}`
-    },
-    {
-        accessorKey: 'image_link',
-        header: '',
-        cell: ({ row }) => {
-            return h('img', {
-                src: row.getValue('image_link') as string,
-                style: 'width:40px;height:40px;object-fit:cover;'
-            })
-        }
-    },
-    {
-        accessorKey: 'name',
-        header: '',
-        cell: ({ row }) => row.getValue('name') as string
-    },
-    {
-        accessorKey: 'quantity',
-        header: '',
-        cell: ({ row }) => row.getValue('quantity') as number
-    },
-    {
-        accessorKey: 'count',
-        header: '',
-        cell: ({ row }) => {
-            return h(UInputNumber, {
-                modelValue: selectedCount.value.product_id === row.original.product_id ? selectedCount.value.count : 0,
-                'onUpdate:modelValue': (val: number) => {
-                    if (val)
-                        selectedCount.value = {
-                            product_id: row.original.product_id,
-                            count: val
-                        }
-                    else {
-                        selectedCount.value = {
-                            product_id: null,
-                            count: 0
-                        }
-                    }
-                },
-                min: 0,
-                max: row.original.quantity
-            })
-        }
-    },
-    {
-        accessorKey: 'count',
-        header: '',
-        cell: ({ row }) => {
-            return h(UButton, {
-                onClick: () => {
-                    console.log('Clicked', row.original)
-                },
-                color: selectedCount.value.product_id !== row.original.product_id ? 'info' : 'primary',
-                disabled: selectedCount.value.product_id !== row.original.product_id,
-                variant: 'solid'
-            }, 'Add to cart')
+            }, () => 'Show product')
         },
     }
 ]
@@ -427,4 +286,4 @@ watch(
     },
     { immediate: true }
 )
-</script>
+</script>

bo/src/components/admin/ProductDetailView.vue

@@ -1,126 +1,130 @@
 <template>
   <component :is="Default || 'div'">
-  <div class="container my-10 mx-auto ">
+    <div class="container my-10 mx-auto ">
 
-    <div
-      class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
-      <div class="flex items-end gap-3">
-        <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!" valueKey="iso_code">
-          <template #default="{ modelValue }">
-            <div class="flex items-center gap-2">
-              <span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span>
-              <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code ==
-                modelValue)?.name}}</span>
-            </div>
-          </template>
-          <template #item-leading="{ item }">
-            <div class="flex items-center rounded-md cursor-pointer transition-colors">
-              <span class="text-md">{{ item.flag }}</span>
-              <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
-            </div>
-          </template>
-        </USelect>
+      <div
+        class="flex items-end justify-between gap-4 mb-6 bg-(--second-light) dark:bg-(--main-dark) border border-(--border-light) dark:border-(--border-dark) p-4 rounded-md">
+        <div class="flex items-end gap-3">
+          <USelect v-model="selectedLanguage" :items="availableLangs" variant="outline" class="w-40!"
+            valueKey="iso_code">
+            <template #default="{ modelValue }">
+              <div class="flex items-center gap-2">
+                <span class="text-md">{{availableLangs.find(x => x.iso_code == modelValue)?.flag}}</span>
+                <span class="font-medium dark:text-white text-black">{{availableLangs.find(x => x.iso_code ==
+                  modelValue)?.name}}</span>
+              </div>
+            </template>
+            <template #item-leading="{ item }">
+              <div class="flex items-center rounded-md cursor-pointer transition-colors">
+                <span class="text-md">{{ item.flag }}</span>
+                <span class="ml-2 dark:text-white text-black font-medium">{{ item.name }}</span>
+              </div>
+            </template>
+          </USelect>
+        </div>
+        <UButton @click="translateToSelectedLanguage" color="primary" :loading="translating"
+          class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!">
+          Translate
+        </UButton>
       </div>
-      <UButton @click="translateToSelectedLanguage" color="primary" :loading="translating"
-        class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) px-12!">
-        Translate
-      </UButton>
-    </div>
 
-    <div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
-      <div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl">
+      <div v-if="translating" class="fixed inset-0 z-50 flex items-center justify-center bg-black/50">
+        <div class="flex flex-col items-center gap-4 p-8 bg-(--main-light) dark:bg-(--main-dark) rounded-lg shadow-xl">
+          <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
+          <p class="text-lg font-medium dark:text-white text-black">Translating...</p>
+        </div>
+      </div>
+
+      <div v-if="productStore.loading" class="flex items-center justify-center py-20">
         <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
-        <p class="text-lg font-medium dark:text-white text-black">Translating...</p>
       </div>
-    </div>
-
-    <div v-if="productStore.loading" class="flex items-center justify-center py-20">
-      <UIcon name="svg-spinners:ring-resize" class="text-4xl text-primary" />
-    </div>
-    <div v-else-if="productStore.error" class="flex items-center justify-center py-20">
-      <p class="text-red-500">{{ productStore.error }}</p>
-    </div>
-    <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
-      <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
-        <span class="text-gray-500 dark:text-gray-400">Product Image</span>
+      <div v-else-if="productStore.error" class="flex items-center justify-center py-20">
+        <p class="text-red-500">{{ productStore.error }}</p>
       </div>
-      <div class="flex flex-col gap-2">
-        <p class="text-[25px] font-bold text-black dark:text-white">
-          {{ productStore.productDescription.name || 'Product Name' }}
-        </p>
-        <p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
-        <div class="space-y-[10px]">
-          <div class="flex items-center gap-1">
-            <UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" />
-            <p class="text-[16px] font-bold text-(--accent-blue-light) dark:text-(--accent-blue-dark)">
-              {{ productStore.productDescription.available_now }}
-            </p>
+      <div v-else-if="productStore.productDescription" class="flex items-start gap-30">
+        <div class="w-80 h-80 bg-(--second-light) dark:bg-gray-700 rounded-lg flex items-center justify-center">
+          <span class="text-gray-500 dark:text-gray-400">Product Image</span>
+        </div>
+        <div class="flex flex-col gap-2">
+          <p class="text-[25px] font-bold text-black dark:text-white">
+            {{ productStore.productDescription.name || 'Product Name' }}
+          </p>
+          <p v-html="productStore.productDescription.description_short" class="text-black dark:text-white"></p>
+          <div class="space-y-[10px]">
+            <div class="flex items-center gap-1">
+              <UIcon name="lets-icons:done-ring-round-fill" class="text-[20px] text-green-600" />
+              <p class="text-[16px] font-bold text-(--accent-blue-light) dark:text-(--accent-blue-dark)">
+                {{ productStore.productDescription.available_now }}
+              </p>
+            </div>
+            <div class="flex items-center gap-1">
+              <UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" />
+              <p class="text-[18px] font-bold text-black dark:text-white">
+                {{ productStore.productDescription.delivery_in_stock || 'Delivery information' }}
+              </p>
+            </div>
           </div>
-          <div class="flex items-center gap-1">
-            <UIcon name="marketeq:car-shipping" class="text-[25px] text-green-600" />
-            <p class="text-[18px] font-bold text-black dark:text-white">
-              {{ productStore.productDescription.delivery_in_stock || 'Delivery information' }}
-            </p>
+        </div>
+      </div>
+
+      <div v-if="productStore.productDescription" class="mt-16">
+        <div class="flex gap-4 my-6">
+          <UButton @click="activeTab = 'description'"
+            :class="['cursor-pointer', activeTab === 'description' ? 'bg-blue-500 text-white' : '']" color="neutral"
+            variant="outline">
+            <p class="dark:text-white">Description</p>
+          </UButton>
+
+          <UButton @click="activeTab = 'usage'"
+            :class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral"
+            variant="outline">
+            <p class="dark:text-white">Usage</p>
+          </UButton>
+        </div>
+
+        <div v-if="activeTab === 'usage'"
+          class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
+
+          <div class="flex justify-end items-center gap-3 mb-4">
+            <UButton v-if="!isEditing" @click="enableEdit"
+              class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
+              <p class="text-white">Change Text</p>
+              <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
+            </UButton>
+            <UButton v-if="isEditing" @click="saveText" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
+              <p class="dark:text-white text-black">Save the edited text</p>
+            </UButton>
+            <UButton v-if="isEditing" @click="cancelEdit" color="neutral" variant="outline"
+              class="p-2.5 cursor-pointer">
+              Cancel
+            </UButton>
+          </div>
+          <p ref="usageRef" v-html="productStore.productDescription.usage"
+            class="flex flex-col justify-center w-full text-start dark:text-white! text-black!"></p>
+
+        </div>
+
+        <div v-if="activeTab === 'description'"
+          class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
+          <div class="flex items-center justify-end gap-3 mb-4">
+            <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit"
+              class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
+              <p class="text-white">Change Text</p>
+              <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
+            </UButton>
+            <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline"
+              class="p-2.5 cursor-pointer">
+              <p class="dark:text-white text-black ">Save the edited text</p>
+            </UButton>
+            <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" color="neutral"
+              variant="outline" class="p-2.5 cursor-pointer">Cancel</UButton>
+          </div>
+          <div ref="descriptionRef" v-html="productStore.productDescription.description"
+            class="flex flex-col justify-center dark:text-white text-black">
           </div>
         </div>
       </div>
     </div>
-
-    <div v-if="productStore.productDescription" class="mt-16">
-      <div class="flex gap-4 my-6">
-        <UButton @click="activeTab = 'description'"
-          :class="['cursor-pointer', activeTab === 'description' ? 'bg-blue-500 text-white' : '']" color="neutral"
-          variant="outline">
-          <p class="dark:text-white">Description</p>
-        </UButton>
-
-        <UButton @click="activeTab = 'usage'"
-          :class="['cursor-pointer', activeTab === 'usage' ? 'bg-blue-500 text-white' : '']" color="neutral"
-          variant="outline">
-          <p class="dark:text-white">Usage</p>
-        </UButton>
-      </div>
-
-      <div v-if="activeTab === 'usage'"
-        class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
-
-        <div class="flex justify-end items-center gap-3 mb-4">
-          <UButton v-if="!isEditing" @click="enableEdit"
-            class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
-            <p class="text-white">Change Text</p>
-            <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
-          </UButton>
-          <UButton v-if="isEditing" @click="saveText" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-            <p class="dark:text-white text-black">Save the edited text</p>
-          </UButton>
-          <UButton v-if="isEditing" @click="cancelEdit" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-            Cancel
-          </UButton>
-        </div>
-        <p ref="usageRef" v-html="productStore.productDescription.usage"
-          class="flex flex-col justify-center w-full text-start dark:text-white! text-black!"></p>
-
-      </div>
-
-      <div v-if="activeTab === 'description'"
-        class="px-8 py-4 border border-(--border-light) dark:border-(--border-dark) rounded-md bg-(--second-light) dark:bg-(--main-dark)">
-        <div class="flex items-center justify-end gap-3 mb-4">
-          <UButton v-if="!descriptionEdit.isEditing.value" @click="enableDescriptionEdit"
-            class="flex items-center gap-2 m-2 cursor-pointer bg-(--accent-blue-light)! dark:bg-(--accent-blue-dark)!">
-            <p class="text-white">Change Text</p>
-            <UIcon name="material-symbols-light:stylus-note-sharp" class="text-[30px] text-white!" />
-          </UButton>
-          <UButton v-if="descriptionEdit.isEditing.value" @click="saveDescription" color="neutral" variant="outline" class="p-2.5 cursor-pointer">
-            <p class="dark:text-white text-black ">Save the edited text</p>
-          </UButton>
-          <UButton v-if="descriptionEdit.isEditing.value" @click="cancelDescriptionEdit" color="neutral" variant="outline" class="p-2.5 cursor-pointer">Cancel</UButton>
-        </div>
-        <div ref="descriptionRef" v-html="productStore.productDescription.description"
-          class="flex flex-col justify-center dark:text-white text-black">
-        </div>
-      </div>
-    </div>
-  </div>
   </component>
 </template>
 
@@ -142,7 +146,7 @@ const isEditing = ref(false)
 
 const availableLangs = computed(() => langs)
 
-const selectedLanguage = ref('pl')
+const selectedLanguage = ref('en')
 
 const currentLangId = ref(2)
 const productID = ref<number>(0)
@@ -176,7 +180,7 @@ const translateToSelectedLanguage = async () => {
 }
 
 onMounted(async () => {
-  const id = route.params.id
+  const id = route.params.product_id
   if (id) {
     productID.value = Number(id)
     await fetchForLanguage(selectedLanguage.value)

bo/src/components/customer/PageProducts.vue

@@ -19,7 +19,7 @@
                 </div>
                 <div v-else class="overflow-x-auto">
                     <div class="flex gap-2">
-                        <CategoryMenuListing />
+                        <CategoryMenu />
                         <UTable :data="productsList" :columns="columns" class="flex-1">
                             <template #expanded="{ row }">
                                 <UTable :data="productsList.slice(0, 3)" :columns="columnsChild" :ui="{
@@ -46,7 +46,7 @@ import { useFetchJson } from '@/composable/useFetchJson'
 import Default from '@/layouts/default.vue'
 import { useRoute, useRouter } from 'vue-router'
 import type { TableColumn } from '@nuxt/ui'
-import CategoryMenuListing from '../inner/categoryMenuListing.vue'
+import CategoryMenu from '../inner/categoryMenu.vue'
 
 interface Product {
     reference: number
@@ -167,7 +167,7 @@ async function fetchProductList() {
         if (value) params.append(key, String(value))
     })
 
-    const url = `/api/v1/restricted/list-products/get-listing?${params}`
+    const url = `/api/v1/restricted/list/list-products?${params}`
 
     try {
         const response = await useFetchJson<ApiResponse>(url)

bo/src/components/inner/categoryMenu.vue

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

bo/src/components/inner/categoryMenuListing.vue

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

bo/src/components/inner/langSwitch.vue

@@ -62,14 +62,6 @@ async function changeLang() {
       method: 'POST'
     })
 
-    if (items?.token) {
-      cookie.setCookie('Aurrie', items.token, {
-        days: 60,
-        secure: true,
-        sameSite: 'Lax'
-      })
-    }
-
   } catch (error) {
     console.log(error)
   }

bo/src/router/index.ts

@@ -59,7 +59,6 @@ async function setRoutes() {
     const componentName = item.component
     const [, folder] = componentName.split('/')
     const componentPath = `/src${componentName}`
-    console.log(componentPath);
     
 
     let modules =

bo/src/router/menu.ts

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

bo/src/stores/category.ts

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

bo/src/stores/product.ts

@@ -34,9 +34,8 @@ export const useProductStore = defineStore('product', () => {
 
     try {
       const response = await useFetchJson<ProductDescription>(
-        `/api/v1/restricted/product-description/get-product-description?productID=${productID}&productLangID=${langId}`
+        `/api/v1/restricted/product-translation/get-product-description?productID=${productID}&productLangID=${langId}`
       )
-      console.log(response, 'dfsfsdf');
       productDescription.value = response.items
       
     } catch (e: unknown) {

bo/src/types/product.d.ts

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

bo/src/types/settings.d.ts

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

bruno/api_v1/Products List.yml

@@ -5,7 +5,7 @@ info:
 
 http:
   method: GET
-  url: "{{bas_url}}/restricted/list-products/get-listing?p=1&elems=30&sort=product_id,asc&category_id_in=243&reference=~62"
+  url: "{{bas_url}}/restricted/list/list-products?p=1&elems=30&sort=product_id,asc&category_id_in=243&reference=~62"
   params:
     - name: p
       value: "1"

bruno/api_v1/Search Items.yml

@@ -10,12 +10,11 @@ http:
     type: json
     data: |-
       {
-        "q": "kinder",
+        "q": "mat",
         "limit": 50,
         "offset": 0,
-      //   "filter": "'attr.10'= 71",
-      //   "facets":["category_ids", "price", "attr"],
-        "attributesToRetrieve" : ["product_id"]
+        "filter": "'category_ids'= 10",
+      //   "facets":["category_ids", "price"]
         "facets": ["category_ids", "attr", "feat", "price"]
       }
   auth:

bruno/b2b-daniel/.gitignore

@@ -0,0 +1,9 @@
+# Secrets
+.env*
+
+# Dependencies
+node_modules
+
+# OS files
+.DS_Store
+Thumbs.db

bruno/b2b-daniel/add-new-cart.yml

@@ -0,0 +1,15 @@
+info:
+  name: add-new-cart
+  type: http
+  seq: 11
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/carts/add-new-cart
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/add-product-to-cart (1).yml

@@ -0,0 +1,25 @@
+info:
+  name: add-product-to-cart (1)
+  type: http
+  seq: 16
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&amount=1
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: product_id
+      value: "51"
+      type: query
+    - name: amount
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/add-product-to-cart.yml

@@ -0,0 +1,28 @@
+info:
+  name: add-product-to-cart
+  type: http
+  seq: 15
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/carts/add-product-to-cart?cart_id=1&product_id=51&product_attribute_id=1115&amount=1
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: product_id
+      value: "51"
+      type: query
+    - name: product_attribute_id
+      value: "1115"
+      type: query
+    - name: amount
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/change-cart-name.yml

@@ -0,0 +1,22 @@
+info:
+  name: change-cart-name
+  type: http
+  seq: 12
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/carts/change-cart-name?cart_id=1&new_name=test
+  params:
+    - name: cart_id
+      value: "1"
+      type: query
+    - name: new_name
+      value: test
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/create-index.yml

@@ -0,0 +1,15 @@
+info:
+  name: create-index
+  type: http
+  seq: 7
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/meili-search/create-index
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/get-breadcrumb.yml

@@ -0,0 +1,22 @@
+info:
+  name: get-breadcrumb
+  type: http
+  seq: 18
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/menu/get-breadcrumb?root_category_id=10&category_id=13
+  params:
+    - name: root_category_id
+      value: "10"
+      type: query
+    - name: category_id
+      value: "13"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/get-category-tree.yml

@@ -0,0 +1,19 @@
+info:
+  name: get-category-tree
+  type: http
+  seq: 5
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/menu/get-category-tree?root_category_id=10
+  params:
+    - name: root_category_id
+      value: "10"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/get-indexes.yml

@@ -0,0 +1,17 @@
+info:
+  name: get-indexes
+  type: http
+  seq: 9
+
+http:
+  method: GET
+  url: http://localhost:7700/indexes
+  auth:
+    type: bearer
+    token: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

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

@@ -0,0 +1,22 @@
+info:
+  name: get-product-description
+  type: http
+  seq: 17
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/product-translation/get-product-description?productID=51&productLangID=1
+  params:
+    - name: productID
+      value: "51"
+      type: query
+    - name: productLangID
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/get_countries.yml

@@ -0,0 +1,15 @@
+info:
+  name: get_countries
+  type: http
+  seq: 4
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/langs-and-countries/get-countries
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/list-products.yml

@@ -0,0 +1,24 @@
+info:
+  name: list-products
+  type: http
+  seq: 1
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/list/list-products?p=1&elems=10&target_user_id=2
+  params:
+    - name: p
+      value: "1"
+      type: query
+    - name: elems
+      value: "10"
+      type: query
+    - name: target_user_id
+      value: "2"
+      type: query
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/list-users.yml

@@ -0,0 +1,21 @@
+info:
+  name: list-users
+  type: http
+  seq: 2
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/list/list-users?p=1&elems=10
+  params:
+    - name: p
+      value: "1"
+      type: query
+    - name: elems
+      value: "10"
+      type: query
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/opencollection.yml

@@ -0,0 +1,21 @@
+opencollection: 1.0.0
+
+info:
+  name: b2b-daniel
+config:
+  proxy:
+    inherit: true
+    config:
+      protocol: http
+      hostname: ""
+      port: ""
+      auth:
+        username: ""
+        password: ""
+      bypassProxy: ""
+bundled: false
+extensions:
+  bruno:
+    ignore:
+      - node_modules
+      - .git

bruno/b2b-daniel/remove-index.yml

@@ -0,0 +1,17 @@
+info:
+  name: remove-index
+  type: http
+  seq: 8
+
+http:
+  method: DELETE
+  url: http://localhost:7700/indexes/meili_products_shop1_lang1
+  auth:
+    type: bearer
+    token: e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/retrieve-cart.yml

@@ -0,0 +1,19 @@
+info:
+  name: retrieve-cart
+  type: http
+  seq: 14
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/carts/retrieve-cart?cart_id=3
+  params:
+    - name: cart_id
+      value: "3"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/retrieve-carts-info.yml

@@ -0,0 +1,15 @@
+info:
+  name: retrieve-carts-info
+  type: http
+  seq: 13
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/carts/retrieve-carts-info
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/search.yml

@@ -0,0 +1,31 @@
+info:
+  name: search
+  type: http
+  seq: 10
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/meili-search/search?query=w&limit=4&id_category=0&price_lower_bound=60.0&price_upper_bound=70.0
+  params:
+    - name: query
+      value: w
+      type: query
+    - name: limit
+      value: "4"
+      type: query
+    - name: id_category
+      value: "0"
+      type: query
+    - name: price_lower_bound
+      value: "60.0"
+      type: query
+    - name: price_upper_bound
+      value: "70.0"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/b2b-daniel/test.yml

@@ -0,0 +1,15 @@
+info:
+  name: test
+  type: http
+  seq: 6
+
+http:
+  method: GET
+  url: http://localhost:3000/api/v1/restricted/meili-search/test
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

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

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

bruno/b2b-daniel/update-choice.yml

@@ -0,0 +1,22 @@
+info:
+  name: update-choice
+  type: http
+  seq: 3
+
+http:
+  method: POST
+  url: http://localhost:3000/api/v1/public/auth/update-choice?lang_id=0&country_id=1
+  params:
+    - name: lang_id
+      value: "0"
+      type: query
+    - name: country_id
+      value: "1"
+      type: query
+  auth: inherit
+
+settings:
+  encodeUrl: true
+  timeout: 0
+  followRedirects: true
+  maxRedirects: 5

bruno/folder.yml

@@ -0,0 +1,4 @@
+info:
+  name: bruno
+  type: folder
+  seq: 18

go.mod

@@ -5,6 +5,7 @@ go 1.26.0
 require (
 	cloud.google.com/go/auth v0.16.4
 	cloud.google.com/go/translate v1.12.7
+	git.ma-al.com/goc_marek/gormcol v1.0.3
 	github.com/WinterYukky/gorm-extra-clause-plugin v0.4.0
 	github.com/a-h/templ v0.3.1001
 	github.com/alecthomas/chroma v0.10.0
@@ -28,7 +29,6 @@ require (
 	cloud.google.com/go v0.121.6 // indirect
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/longrunning v0.6.7 // indirect
-	git.ma-al.com/goc_marek/gormcol v1.0.3 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect

go.sum

@@ -217,17 +217,11 @@ go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.48.0 h1:/VRzVqiRSggnhY7gNRxPauEQ5Drw9haKdM0jqfcCFts=
-golang.org/x/crypto v0.48.0/go.mod h1:r0kV5h3qnFPlQnBSrULhlsRfryS2pmewsg+XfMgkVos=
 golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
 golang.org/x/crypto v0.49.0/go.mod h1:ErX4dUh2UM+CFYiXZRTcMpEcN8b/1gxEuv3nODoYtCA=
-golang.org/x/mod v0.33.0 h1:tHFzIWbBifEmbwtGz65eaWyGiGZatSrT9prnU8DbVL8=
-golang.org/x/mod v0.33.0/go.mod h1:swjeQEj+6r7fODbD2cqrnje9PnziFuw4bmLbBZFrQ5w=
 golang.org/x/mod v0.34.0 h1:xIHgNUUnW6sYkcM5Jleh05DvLOtwc6RitGHbDk4akRI=
 golang.org/x/mod v0.34.0/go.mod h1:ykgH52iCZe79kzLLMhyCUzhMci+nQj+0XkbXpNYtVjY=
 golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.51.0 h1:94R/GTO7mt3/4wIKpcR5gkGmRLOuE/2hNGeWq/GBIFo=
-golang.org/x/net v0.51.0/go.mod h1:aamm+2QF5ogm02fjy5Bb7CQ0WMt1/WVM7FtyaTLlA9Y=
 golang.org/x/net v0.52.0 h1:He/TN1l0e4mmR3QqHMT2Xab3Aj3L9qjbhRm78/6jrW0=
 golang.org/x/net v0.52.0/go.mod h1:R1MAz7uMZxVMualyPXb+VaqGSa3LIaUqk0eEt3w36Sw=
 golang.org/x/oauth2 v0.36.0 h1:peZ/1z27fi9hUOFCAZaHyrpWG5lwe0RJEEEeH0ThlIs=
@@ -244,17 +238,14 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.42.0 h1:omrd2nAlyT5ESRdCLYdm3+fMfNFE/+Rf4bDIQImRJeo=
 golang.org/x/sys v0.42.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.40.0 h1:36e4zGLqU4yhjlmxEaagx2KuYbJq3EwY8K943ZsHcvg=
-golang.org/x/term v0.40.0/go.mod h1:w2P8uVp06p2iyKKuvXIm7N/y0UCRt3UfJTfZ7oOpglM=
 golang.org/x/term v0.41.0 h1:QCgPso/Q3RTJx2Th4bDLqML4W6iJiaXFq2/ftQF13YU=
+golang.org/x/term v0.41.0/go.mod h1:3pfBgksrReYfZ5lvYM0kSO0LIkAl4Yl2bXOkKP7Ec2A=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
 golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
 golang.org/x/time v0.12.0 h1:ScB/8o8olJvc+CQPWrK3fPZNfh7qgwCrY0zJmoEQLSE=
 golang.org/x/time v0.12.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.42.0 h1:uNgphsn75Tdz5Ji2q36v/nsFSfR/9BRFvqhGBaJGd5k=
-golang.org/x/tools v0.42.0/go.mod h1:Ma6lCIwGZvHK6XtgbswSoWroEkhugApmsXyrUmBhfr0=
 golang.org/x/tools v0.43.0 h1:12BdW9CeB3Z+J/I/wj34VMl8X+fEXBxVR90JeMX5E7s=
 golang.org/x/tools v0.43.0/go.mod h1:uHkMso649BX2cZK6+RpuIPXS3ho2hZo4FVwfoy1vIk0=
 google.golang.org/api v0.247.0 h1:tSd/e0QrUlLsrwMKmkbQhYVa109qIintOls2Wh6bngc=

i18n/config_i18n.yaml

@@ -24,6 +24,7 @@ vue:
     - "**/dist/**"
     - "**/.nuxt/**"
     - "**/.output/**"
+  tablename_prefix: "b2b_"
   # Vue scope and components
   scope_id: 3
   language_ids:
@@ -53,6 +54,7 @@ go:
     - "**/vendor/**"
     - "**/.git/**"
     - "**/node_modules/**"
+  tablename_prefix: "b2b_"
   # Go scope and components
   scope_id: 1
   scope_name: "Backend"
@@ -73,6 +75,7 @@ go:
 # Legacy configuration (for backward compatibility)
 # Used when vue/go sections are not present
 save:
+  tablename_prefix: "b2b_"
   scope_id: 1
   scope_name: "Default"
   language_ids:

storage/folder/a.txt

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