fix: create Account Page

fix: style
2026-03-23 16:14:43 +01:00 · 2026-03-23 11:04:41 +01:00 · 2026-03-23 10:12:55 +01:00 · 2026-03-23 09:37:18 +01:00 · 2026-03-23 09:35:20 +01:00 · 2026-03-20 15:57:50 +01:00
47 changed files with 1173 additions and 287 deletions
--- a/.env
+++ b/.env
@@ -21,6 +21,10 @@ AUTH_JWT_SECRET=5c020e6ed3d8d6e67e5804d67c83c4bd5ae474df749af6d63d8f20e7e2ba29b3
 AUTH_JWT_EXPIRATION=86400
 AUTH_REFRESH_EXPIRATION=604800

+# Meili search
+MEILISEARCH_URL=http://localhost:7700
+MEILISEARCH_API_KEY=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+
 # Google Translate Client
 GOOGLE_APPLICATION_CREDENTIALS=./google-cred.json
 GOOGLE_CLOUD_PROJECT_ID=translation-343517
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ bin/
 i18n/*.json
 *_templ.go
 tmp/main
+test.go
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -73,10 +73,22 @@ vars:
          MP_SMTP_AUTH_ALLOW_INSECURE: true
          MP_ENABLE_SPAMASSASSIN: postmark
          MP_VERBOSE: true
+      meilisearch:
+        image: getmeili/meilisearch:latest
+        container_name: meilisearch
+        restart: unless-stopped
+        ports:
+          - 7700:7700
+        volumes:
+          - meilisearch:/data.ms
+        environment:
+          MEILI_MASTER_KEY: "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+         

    volumes:
      db_data:
      mailpit_data:
+      meilisearch:  


 includes:
--- a/app/delivery/web/api/restricted/langsAndCountries.go
+++ b/app/delivery/web/api/restricted/langsAndCountries.go
@@ -1,52 +0,0 @@
-package restricted
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/service/langsAndCountriesService"
-	"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"
-)
-
-// LangsAndCountriesHandler for getting languages and countries data
-type LangsAndCountriesHandler struct {
-	langsAndCountriesService *langsAndCountriesService.LangsAndCountriesService
-}
-
-// NewLangsAndCountriesHandler creates a new LangsAndCountriesHandler instance
-func NewLangsAndCountriesHandler() *LangsAndCountriesHandler {
-	langsAndCountriesService := langsAndCountriesService.New()
-	return &LangsAndCountriesHandler{
-		langsAndCountriesService: langsAndCountriesService,
-	}
-}
-
-func LangsAndCountriesHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewLangsAndCountriesHandler()
-
-	r.Get("/get-languages", handler.GetLanguages)
-	r.Get("/get-countries", handler.GetCountries)
-
-	return r
-}
-
-func (h *LangsAndCountriesHandler) GetLanguages(c fiber.Ctx) error {
-	languages, err := h.langsAndCountriesService.GetLanguages()
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(&languages, 0, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *LangsAndCountriesHandler) GetCountries(c fiber.Ctx) error {
-	countries, err := h.langsAndCountriesService.GetCountriesAndCurrencies()
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(&countries, 0, i18n.T_(c, response.Message_OK)))
-}
--- a/app/delivery/web/api/restricted/listProducts.go
+++ b/app/delivery/web/api/restricted/listProducts.go
@@ -52,20 +52,13 @@ func (h *ListProductsHandler) GetListing(c fiber.Ctx) error {
 	// 	"override_currency": c.Query("override_currency", ""),
 	// }

-	id_shop_attribute := c.Query("shopID")
-	id_shop, err := strconv.Atoi(id_shop_attribute)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
-	}
-
 	id_lang, err := strconv.Atoi(c.Cookies("lang_id", "2"))
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	listing, err := h.listProductsService.GetListing(uint(id_shop), uint(id_lang), paging, filters)
+	listing, err := h.listProductsService.GetListing(uint(id_lang), paging, filters)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
--- a/app/delivery/web/api/restricted/localeSelector.go
+++ b/app/delivery/web/api/restricted/localeSelector.go
@@ -0,0 +1,52 @@
+package restricted
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/service/localeSelectorService"
+	"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"
+)
+
+// LocaleSelectorHandler for getting languages and countries data
+type LocaleSelectorHandler struct {
+	localeSelectorService *localeSelectorService.LocaleSelectorService
+}
+
+// NewLocaleSelectorHandler creates a new LocaleSelectorHandler instance
+func NewLocaleSelectorHandler() *LocaleSelectorHandler {
+	localeSelectorService := localeSelectorService.New()
+	return &LocaleSelectorHandler{
+		localeSelectorService: localeSelectorService,
+	}
+}
+
+func LocaleSelectorHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewLocaleSelectorHandler()
+
+	r.Get("/get-languages", handler.GetLanguages)
+	r.Get("/get-countries", handler.GetCountries)
+
+	return r
+}
+
+func (h *LocaleSelectorHandler) GetLanguages(c fiber.Ctx) error {
+	languages, err := h.localeSelectorService.GetLanguages()
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&languages, 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *LocaleSelectorHandler) GetCountries(c fiber.Ctx) error {
+	countries, err := h.localeSelectorService.GetCountriesAndCurrencies()
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&countries, 0, i18n.T_(c, response.Message_OK)))
+}
--- a/app/delivery/web/api/restricted/meiliSearch.go
+++ b/app/delivery/web/api/restricted/meiliSearch.go
@@ -0,0 +1,65 @@
+package restricted
+
+import (
+	"strconv"
+
+	"git.ma-al.com/goc_daniel/b2b/app/service/meiliService"
+	"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"
+)
+
+type MeiliSearchHandler struct {
+	meiliService *meiliService.MeiliService
+}
+
+func NewMeiliSearchHandler() *MeiliSearchHandler {
+	meiliService := meiliService.New()
+	return &MeiliSearchHandler{
+		meiliService: meiliService,
+	}
+}
+
+func MeiliSearchHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewMeiliSearchHandler()
+
+	r.Get("/test", handler.Test)
+	r.Get("/create-index", handler.CreateIndex)
+
+	return r
+}
+
+func (h *MeiliSearchHandler) CreateIndex(c fiber.Ctx) error {
+	id_lang, err := strconv.Atoi(c.Cookies("lang_id", "2"))
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	err = h.meiliService.CreateIndex(uint(id_lang))
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	nothing := ""
+	return c.JSON(response.Make(&nothing, 0, i18n.T_(c, response.Message_OK)))
+}
+
+func (h *MeiliSearchHandler) Test(c fiber.Ctx) error {
+	id_lang, err := strconv.Atoi(c.Cookies("lang_id", "2"))
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	test, err := h.meiliService.Test(uint(id_lang))
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
+	}
+
+	return c.JSON(response.Make(&test, 0, i18n.T_(c, response.Message_OK)))
+}
--- a/app/delivery/web/api/restricted/menu.go
+++ b/app/delivery/web/api/restricted/menu.go
@@ -0,0 +1,47 @@
+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/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"
+)
+
+type MenuHandler struct {
+	menuService *menuService.MenuService
+}
+
+func NewMenuHandler() *MenuHandler {
+	menuService := menuService.New()
+	return &MenuHandler{
+		menuService: menuService,
+	}
+}
+
+func MenuHandlerRoutes(r fiber.Router) fiber.Router {
+	handler := NewMenuHandler()
+
+	r.Get("/get-menu", handler.GetMenu)
+
+	return r
+}
+
+func (h *MenuHandler) GetMenu(c fiber.Ctx) error {
+	id_lang, err := strconv.Atoi(c.Cookies("lang_id", "2"))
+	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+
+	menu, err := h.menuService.GetMenu(uint(id_lang))
+	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)))
+}
--- a/app/delivery/web/api/restricted/productDescription.go
+++ b/app/delivery/web/api/restricted/productDescription.go
@@ -54,13 +54,6 @@ func (h *ProductDescriptionHandler) GetProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	productShopID_attribute := c.Query("productShopID")
-	productShopID, err := strconv.Atoi(productShopID_attribute)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
-	}
-
 	productLangID_attribute := c.Query("productLangID")
 	productLangID, err := strconv.Atoi(productLangID_attribute)
 	if err != nil {
@@ -68,7 +61,7 @@ func (h *ProductDescriptionHandler) GetProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	description, err := h.productDescriptionService.GetProductDescription(userID, uint(productID), uint(productShopID), uint(productLangID))
+	description, err := h.productDescriptionService.GetProductDescription(userID, uint(productID), uint(productLangID))
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
@@ -77,7 +70,7 @@ func (h *ProductDescriptionHandler) GetProductDescription(c fiber.Ctx) error {
 	return c.JSON(response.Make(description, 1, i18n.T_(c, response.Message_OK)))
 }

-// SaveProductDescription saves the description for a given product ID, in given shop and language
+// SaveProductDescription saves the description for a given product ID, in given language
 func (h *ProductDescriptionHandler) SaveProductDescription(c fiber.Ctx) error {
 	userID, ok := c.Locals("userID").(uint)
 	if !ok {
@@ -92,13 +85,6 @@ func (h *ProductDescriptionHandler) SaveProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	productShopID_attribute := c.Query("productShopID")
-	productShopID, err := strconv.Atoi(productShopID_attribute)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
-	}
-
 	productLangID_attribute := c.Query("productLangID")
 	productLangID, err := strconv.Atoi(productLangID_attribute)
 	if err != nil {
@@ -112,7 +98,7 @@ func (h *ProductDescriptionHandler) SaveProductDescription(c fiber.Ctx) error {
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrInvalidBody)))
 	}

-	err = h.productDescriptionService.SaveProductDescription(userID, uint(productID), uint(productShopID), uint(productLangID), updates)
+	err = h.productDescriptionService.SaveProductDescription(userID, uint(productID), uint(productLangID), updates)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
@@ -136,13 +122,6 @@ func (h *ProductDescriptionHandler) TranslateProductDescription(c fiber.Ctx) err
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	productShopID_attribute := c.Query("productShopID")
-	productShopID, err := strconv.Atoi(productShopID_attribute)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
-	}
-
 	productFromLangID_attribute := c.Query("productFromLangID")
 	productFromLangID, err := strconv.Atoi(productFromLangID_attribute)
 	if err != nil {
@@ -163,7 +142,7 @@ func (h *ProductDescriptionHandler) TranslateProductDescription(c fiber.Ctx) err
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
 	}

-	description, err := h.productDescriptionService.TranslateProductDescription(userID, uint(productID), uint(productShopID), uint(productFromLangID), uint(productToLangID), aiModel)
+	description, err := h.productDescriptionService.TranslateProductDescription(userID, uint(productID), uint(productFromLangID), uint(productToLangID), aiModel)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
--- a/app/delivery/web/init.go
+++ b/app/delivery/web/init.go
@@ -97,10 +97,18 @@ func (s *Server) Setup() error {
 	listProducts := s.restricted.Group("/list-products")
 	restricted.ListProductsHandlerRoutes(listProducts)

-	// changing the JWT cookies routes (restricted)
-	// in reality it just handles changing user's country and language
-	langsAndCountries := s.restricted.Group("/langs-and-countries")
-	restricted.LangsAndCountriesHandlerRoutes(langsAndCountries)
+	// locale selector (restricted)
+	// this is basically for changing user's selected language and country
+	localeSelector := s.restricted.Group("/langs-and-countries")
+	restricted.LocaleSelectorHandlerRoutes(localeSelector)
+
+	// menu (restricted)
+	menu := s.restricted.Group("/menu")
+	restricted.MenuHandlerRoutes(menu)
+
+	// meili search (restricted)
+	meiliSearch := s.restricted.Group("/meili-search")
+	restricted.MeiliSearchHandlerRoutes(meiliSearch)

 	// // Restricted routes example
 	// restricted := s.api.Group("/restricted")
--- a/app/model/product.go
+++ b/app/model/product.go
@@ -62,11 +62,11 @@ type Product struct {
 	DeliveryDays            uint   `gorm:"column:delivery_days" json:"delivery_days" form:"delivery_days"`
 }
 type ProductInList struct {
-	ID              uint    `gorm:"column:id_product;primaryKey" json:"product_id" form:"product_id"`
-	Name            string  `gorm:"column:name;default:'no name'" json:"name" form:"name"`
-	Price           float64 `gorm:"column:price;default:0.0" json:"price" form:"price"`
-	ActiveAsProduct uint    `gorm:"column:active;default:0" json:"active_as_product" form:"active_as_product"`
-	ActiveInShop    uint    `gorm:"column:active;default:0" json:"active_in_shop" form:"active_in_shop"`
+	ProductID   uint   `gorm:"column:ID;primaryKey" json:"product_id" form:"product_id"`
+	Name        string `gorm:"column:name" json:"name" form:"name"`
+	ImageID     uint   `gorm:"column:id_image"`
+	LinkRewrite string `gorm:"column:link_rewrite"`
+	Active      uint   `gorm:"column:active" json:"active" form:"active"`
 }

 type ProductFilters struct {
@@ -81,4 +81,19 @@ type ProductFilters struct {
 	InStock      uint    `query:"stock,omitempty"`
 }

+type ScannedCategory struct {
+	CategoryID uint   `gorm:"column: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"`
+}
+type Category struct {
+	CategoryID    uint       `json:"category_id" form:"category_id"`
+	Name          string     `json:"name" form:"name"`
+	Active        uint       `json:"active" form:"active"`
+	Subcategories []Category `json:"subcategories" form:"subcategories"`
+}
+
 type FeatVal = map[uint][]uint
--- a/app/model/productDescription.go
+++ b/app/model/productDescription.go
@@ -18,3 +18,11 @@ type ProductDescription struct {
 	DeliveryOutStock string `gorm:"column:delivery_out_stock;type:varchar(255)" json:"delivery_out_stock" form:"delivery_out_stock"`
 	Usage            string `gorm:"column:usage;type:text" json:"usage" form:"usage"`
 }
+
+type MeiliSearchProduct struct {
+	ProductID        uint
+	Name             string
+	Description      string
+	DescriptionShort string
+	Usage            string
+}
--- a/app/repos/categoriesRepo/categoriesRepo.go
+++ b/app/repos/categoriesRepo/categoriesRepo.go
@@ -0,0 +1,42 @@
+package categoriesRepo
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/db"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+)
+
+type UICategoriesRepo interface {
+	GetAllCategories(id_lang uint) ([]model.ScannedCategory, error)
+}
+
+type CategoriesRepo struct{}
+
+func New() UICategoriesRepo {
+	return &CategoriesRepo{}
+}
+
+func (repo *CategoriesRepo) GetAllCategories(id_lang uint) ([]model.ScannedCategory, error) {
+	var allCategories []model.ScannedCategory
+
+	err := db.DB.Raw(`
+		SELECT
+			ps_category.id_category AS ID,
+			ps_category_lang.name AS name,
+			ps_category.active AS active,
+			ps_category_shop.position AS position,
+			ps_category.id_parent AS id_parent,
+			ps_category.is_root_category AS is_root_category
+		FROM ps_category
+		LEFT JOIN ps_category_lang
+			ON ps_category_lang.id_category = ps_category.id_category
+			AND ps_category_lang.id_shop = ?
+			AND ps_category_lang.id_lang = ?
+		LEFT JOIN ps_category_shop
+			ON ps_category_shop.id_category = ps_category.id_category
+			AND ps_category_shop.id_shop = ?`,
+		constdata.SHOP_ID, id_lang, constdata.SHOP_ID).
+		Scan(&allCategories).Error
+
+	return allCategories, err
+}
--- a/app/repos/langsRepo/langsRepo.go
+++ b/app/repos/langsRepo/langsRepo.go
--- a/repository/listProductsRepo/listProductsRepo.go
+++ b/repository/listProductsRepo/listProductsRepo.go
@@ -3,12 +3,13 @@ package listProductsRepo
 import (
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/filters"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/query/find"
 )

 type UIListProductsRepo interface {
-	GetListing(id_shop uint, id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
+	GetListing(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error)
 }

 type ListProductsRepo struct{}
@@ -17,19 +18,10 @@ func New() UIListProductsRepo {
 	return &ListProductsRepo{}
 }

-func (repo *ListProductsRepo) GetListing(id_shop uint, id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
+func (repo *ListProductsRepo) GetListing(id_lang uint, p find.Paging, filt *filters.FiltersList) (find.Found[model.ProductInList], error) {
 	var listing []model.ProductInList
 	var total int64

-	// Apply filters here
-	q := db.DB.Table("ps_product").
-		Select("ps_product.id_product AS id_product", "ps_product_lang.name AS name", "ps_product_shop.price AS price", "ps_product.active AS active_as_product", "ps_product_shop.active AS active_in_shop").
-		Joins("LEFT JOIN ps_product_shop ON ps_product.id_product = ps_product_shop.id_product").
-		Joins("LEFT JOIN ps_product_lang ON ps_product.id_product = ps_product_lang.id_product").
-		Where("ps_product_shop.id_shop = ?", id_shop).
-		Where("ps_product_lang.id_shop = ?", id_shop).
-		Where("ps_product_lang.id_lang = ?", id_lang)
-
 	// var resultIDs []uint
 	// q := db.DB.
 	// 	// SQL_CALC_FOUND_ROWS is a neat trick which works on MariaDB and
@@ -44,15 +36,41 @@ func (repo *ListProductsRepo) GetListing(id_shop uint, id_lang uint, p find.Pagi
 	// 	Limit(p.Limit()).
 	// 	Offset(p.Offset())

-	err := q.Count(&total).Error
+	err := db.DB.Raw(`
+		SELECT 
+			ps_product.id_product AS ID,
+			ps_product_lang.name AS name,
+			ps_product.active AS active,
+			ps_product_lang.link_rewrite AS link_rewrite,
+			COALESCE (  
+				ps_image_shop.id_image, any_image.id_image
+			) AS id_image
+		FROM ps_product
+			LEFT JOIN ps_product_lang
+				ON ps_product_lang.id_product = ps_product.id_product 
+				AND ps_product_lang.id_shop = ? 
+				AND ps_product_lang.id_lang = ?
+			LEFT JOIN ps_image_shop
+				ON ps_image_shop.id_product = ps_product.id_product 
+				AND ps_image_shop.id_shop = ? 
+				AND ps_image_shop.cover = 1
+			LEFT JOIN (
+				SELECT id_product, MIN(id_image) AS id_image
+				FROM ps_image
+				GROUP BY id_product
+			) any_image
+				ON ps_product.id_product = any_image.id_product
+		LIMIT ? OFFSET ?`,
+		constdata.SHOP_ID, id_lang, constdata.SHOP_ID, p.Limit(), p.Offset()).
+		Scan(&listing).Error
 	if err != nil {
 		return find.Found[model.ProductInList]{}, err
 	}

-	err = q.
-		Limit(p.Limit()).
-		Offset(p.Offset()).
-		Scan(&listing).Error
+	err = db.DB.Raw(`
+		SELECT COUNT(*)
+		FROM ps_product`).
+		Scan(&total).Error
 	if err != nil {
 		return find.Found[model.ProductInList]{}, err
 	}
--- a/repository/langsAndCountriesRepo/langsAndCountriesRepo.go
+++ b/repository/langsAndCountriesRepo/langsAndCountriesRepo.go
@@ -1,22 +1,22 @@
-package langsAndCountriesRepo
+package localeSelectorRepo

 import (
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 )

-type UILangsAndCountriesRepo interface {
+type UILocaleSelectorRepo interface {
 	GetLanguages() ([]model.Language, error)
 	GetCountriesAndCurrencies() ([]model.Country, error)
 }

-type LangsAndCountriesRepo struct{}
+type LocaleSelectorRepo struct{}

-func New() UILangsAndCountriesRepo {
-	return &LangsAndCountriesRepo{}
+func New() UILocaleSelectorRepo {
+	return &LocaleSelectorRepo{}
 }

-func (repo *LangsAndCountriesRepo) GetLanguages() ([]model.Language, error) {
+func (repo *LocaleSelectorRepo) GetLanguages() ([]model.Language, error) {
 	var languages []model.Language

 	err := db.DB.Table("b2b_language").Scan(&languages).Error
@@ -24,7 +24,7 @@ func (repo *LangsAndCountriesRepo) GetLanguages() ([]model.Language, error) {
 	return languages, err
 }

-func (repo *LangsAndCountriesRepo) GetCountriesAndCurrencies() ([]model.Country, error) {
+func (repo *LocaleSelectorRepo) GetCountriesAndCurrencies() ([]model.Country, error) {
 	var countries []model.Country

 	err := db.DB.Table("b2b_countries").
--- a/repository/productDescriptionRepo/productDescriptionRepo.go
+++ b/repository/productDescriptionRepo/productDescriptionRepo.go
@@ -5,12 +5,13 @@ import (

 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
 )

 type UIProductDescriptionRepo interface {
-	GetProductDescription(productID uint, productShopID uint, productLangID uint) (*model.ProductDescription, error)
-	CreateIfDoesNotExist(productID uint, productShopID uint, productLangID uint) error
-	UpdateFields(productID uint, productShopID uint, productLangID uint, updates map[string]string) error
+	GetProductDescription(productID uint, productLangID uint) (*model.ProductDescription, error)
+	CreateIfDoesNotExist(productID uint, productLangID uint) error
+	UpdateFields(productID uint, productLangID uint, updates map[string]string) error
 }

 type ProductDescriptionRepo struct{}
@@ -20,12 +21,12 @@ func New() UIProductDescriptionRepo {
 }

 // We assume that any user has access to all product descriptions
-func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productShopID uint, productLangID uint) (*model.ProductDescription, error) {
+func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productLangID uint) (*model.ProductDescription, error) {
 	var ProductDescription model.ProductDescription

 	err := db.DB.
 		Table("ps_product_lang").
-		Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, productShopID, productLangID).
+		Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productLangID).
 		First(&ProductDescription).Error
 	if err != nil {
 		return nil, fmt.Errorf("database error: %w", err)
@@ -35,16 +36,16 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productSh
 }

 // If it doesn't exist, returns an error.
-func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productShopID uint, productLangID uint) error {
+func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productLangID uint) error {
 	record := model.ProductDescription{
 		ProductID: productID,
-		ShopID:    productShopID,
+		ShopID:    constdata.SHOP_ID,
 		LangID:    productLangID,
 	}

 	err := db.DB.
 		Table("ps_product_lang").
-		Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, productShopID, productLangID).
+		Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productLangID).
 		FirstOrCreate(&record).Error
 	if err != nil {
 		return fmt.Errorf("database error: %w", err)
@@ -53,7 +54,7 @@ func (r *ProductDescriptionRepo) CreateIfDoesNotExist(productID uint, productSho
 	return nil
 }

-func (r *ProductDescriptionRepo) UpdateFields(productID uint, productShopID uint, productLangID uint, updates map[string]string) error {
+func (r *ProductDescriptionRepo) UpdateFields(productID uint, productLangID uint, updates map[string]string) error {
 	if len(updates) == 0 {
 		return nil
 	}
@@ -64,7 +65,7 @@ func (r *ProductDescriptionRepo) UpdateFields(productID uint, productShopID uint

 	err := db.DB.
 		Table("ps_product_lang").
-		Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, productShopID, productLangID).
+		Where("id_product = ? AND id_shop = ? AND id_lang = ?", productID, constdata.SHOP_ID, productLangID).
 		Updates(updatesIface).Error
 	if err != nil {
 		return fmt.Errorf("database error: %w", err)
--- a/app/service/langsAndCountriesService/langsAndCountriesService.go
+++ b/app/service/langsAndCountriesService/langsAndCountriesService.go
@@ -1,26 +0,0 @@
-package langsAndCountriesService
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/repository/langsAndCountriesRepo"
-)
-
-// LangsAndCountriesService literally sends back language and countries information.
-type LangsAndCountriesService struct {
-	repo langsAndCountriesRepo.UILangsAndCountriesRepo
-}
-
-// NewLangsAndCountriesService creates a new LangsAndCountries service
-func New() *LangsAndCountriesService {
-	return &LangsAndCountriesService{
-		repo: langsAndCountriesRepo.New(),
-	}
-}
-
-func (s *LangsAndCountriesService) GetLanguages() ([]model.Language, error) {
-	return s.repo.GetLanguages()
-}
-
-func (s *LangsAndCountriesService) GetCountriesAndCurrencies() ([]model.Country, error) {
-	return s.repo.GetCountriesAndCurrencies()
-}
--- a/app/service/langsService/service.go
+++ b/app/service/langsService/service.go
@@ -1,7 +1,7 @@
 package langsService

 import (
-	langs_repo "git.ma-al.com/goc_daniel/b2b/app/langs"
+	langs_repo "git.ma-al.com/goc_daniel/b2b/app/repos/langsRepo"
 	"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"
--- a/app/service/listProductsService/listProductsService.go
+++ b/app/service/listProductsService/listProductsService.go
@@ -2,9 +2,9 @@ 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"
-	"git.ma-al.com/goc_daniel/b2b/repository/listProductsRepo"
 )

 type ListProductsService struct {
@@ -17,7 +17,7 @@ func New() *ListProductsService {
 	}
 }

-func (s *ListProductsService) GetListing(id_shop uint, id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
+func (s *ListProductsService) GetListing(id_lang uint, p find.Paging, filters *filters.FiltersList) (find.Found[model.ProductInList], error) {
 	var products find.Found[model.ProductInList]

 	// currencyIso := c.Cookies("currency_iso", "")
@@ -30,7 +30,7 @@ func (s *ListProductsService) GetListing(id_shop uint, id_lang uint, p find.Pagi
 	// 	countryIso = overrides["override_country"]
 	// }

-	products, err := s.listProductsRepo.GetListing(id_shop, id_lang, p, filters)
+	products, err := s.listProductsRepo.GetListing(id_lang, p, filters)
 	if err != nil {
 		return products, err
 	}
--- a/app/service/localeSelectorService/localeSelectorService.go
+++ b/app/service/localeSelectorService/localeSelectorService.go
@@ -0,0 +1,26 @@
+package localeSelectorService
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/localeSelectorRepo"
+)
+
+// LocaleSelectorService literally sends back language and countries information.
+type LocaleSelectorService struct {
+	repo localeSelectorRepo.UILocaleSelectorRepo
+}
+
+// NewLocaleSelectorService creates a new LocaleSelector service
+func New() *LocaleSelectorService {
+	return &LocaleSelectorService{
+		repo: localeSelectorRepo.New(),
+	}
+}
+
+func (s *LocaleSelectorService) GetLanguages() ([]model.Language, error) {
+	return s.repo.GetLanguages()
+}
+
+func (s *LocaleSelectorService) GetCountriesAndCurrencies() ([]model.Country, error) {
+	return s.repo.GetCountriesAndCurrencies()
+}
--- a/app/service/meiliService/meiliService.go
+++ b/app/service/meiliService/meiliService.go
@@ -0,0 +1,155 @@
+package meiliService
+
+import (
+	"encoding/xml"
+	"fmt"
+	"io"
+	"os"
+	"strconv"
+	"strings"
+	"time"
+
+	"git.ma-al.com/goc_daniel/b2b/app/db"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	constdata "git.ma-al.com/goc_daniel/b2b/app/utils/const_data"
+	"github.com/meilisearch/meilisearch-go"
+)
+
+type MeiliService struct {
+	meiliClient meilisearch.ServiceManager
+}
+
+func New() *MeiliService {
+	meiliURL := os.Getenv("MEILISEARCH_URL")
+	meiliAPIKey := os.Getenv("MEILISEARCH_API_KEY")
+
+	client := meilisearch.New(
+		meiliURL,
+		meilisearch.WithAPIKey(meiliAPIKey),
+	)
+
+	return &MeiliService{
+		meiliClient: client,
+	}
+}
+
+// ====================================   FOR SUPERADMIN ONLY   ====================================
+func (s *MeiliService) CreateIndex(id_lang uint) error {
+	var products []model.ProductDescription
+
+	err := db.DB.
+		Table("ps_product_lang").
+		Where("id_shop = ? AND id_lang = ?", constdata.SHOP_ID, id_lang).
+		Scan(&products).Error
+	if err != nil {
+		return fmt.Errorf("database error: %w", err)
+	}
+
+	var meiliProducts []model.MeiliSearchProduct
+	for i := 0; i < len(products); i++ {
+		var nextMeiliProduct model.MeiliSearchProduct
+
+		nextMeiliProduct.ProductID = products[i].ProductID
+		nextMeiliProduct.Name = products[i].Name
+		nextMeiliProduct.Description = cleanHTML(products[i].Description)
+		nextMeiliProduct.DescriptionShort = cleanHTML(products[i].DescriptionShort)
+		nextMeiliProduct.Usage = cleanHTML(products[i].Usage)
+
+		meiliProducts = append(meiliProducts, nextMeiliProduct)
+	}
+
+	indexName := "meili_products_shop" + strconv.FormatInt(constdata.SHOP_ID, 10) + "_lang" + strconv.FormatInt(int64(id_lang), 10)
+	primaryKey := "product_id"
+	docOptions := &meilisearch.DocumentOptions{
+		PrimaryKey:   &primaryKey,
+		SkipCreation: false,
+	}
+
+	task, err := s.meiliClient.Index(indexName).AddDocuments(meiliProducts, docOptions)
+	if err != nil {
+		return fmt.Errorf("meili AddDocuments error: %w", err)
+	}
+
+	finishedTask, err := s.meiliClient.WaitForTask(task.TaskUID, 500*time.Millisecond)
+	fmt.Printf("Task status: %s\n", finishedTask.Status)
+	fmt.Printf("Task error: %s\n", finishedTask.Error)
+
+	return err
+}
+
+// ====================================   FOR DEBUG ONLY   ====================================
+func (s *MeiliService) Test(id_lang uint) (meilisearch.SearchResponse, error) {
+	indexName := "meili_products_shop" + strconv.FormatInt(constdata.SHOP_ID, 10) + "_lang" + strconv.FormatInt(int64(id_lang), 10)
+
+	searchReq := &meilisearch.SearchRequest{
+		Limit: 3,
+	}
+
+	// Perform search
+	results, err := s.meiliClient.Index(indexName).Search("walek", searchReq)
+	if err != nil {
+		fmt.Printf("Meilisearch error: %v\n", err)
+		return meilisearch.SearchResponse{}, err
+	}
+
+	fmt.Printf("Search results for query 'walek' in %s: %d hits\n", indexName, len(results.Hits))
+
+	return *results, nil
+}
+
+// Search performs a full-text search on the specified index
+func (s *MeiliService) Search(indexName string, query string, limit int) (meilisearch.SearchResponse, error) {
+	searchReq := &meilisearch.SearchRequest{
+		Limit: int64(limit),
+	}
+
+	results, err := s.meiliClient.Index(indexName).Search(query, searchReq)
+	if err != nil {
+		fmt.Printf("Meilisearch search error: %v\n", err)
+		return meilisearch.SearchResponse{}, err
+	}
+
+	return *results, nil
+}
+
+// HealthCheck checks if Meilisearch is healthy and accessible
+func (s *MeiliService) HealthCheck() (*meilisearch.Health, error) {
+	health, err := s.meiliClient.Health()
+	if err != nil {
+		return nil, fmt.Errorf("meilisearch health check failed: %w", err)
+	}
+
+	return health, nil
+}
+
+// remove all tags from HTML text
+func cleanHTML(s string) string {
+	r := strings.NewReader(s)
+	d := xml.NewDecoder(r)
+
+	text := ""
+
+	// Configure the decoder for HTML; leave off strict and autoclose for XHTML
+	d.Strict = true
+	d.AutoClose = xml.HTMLAutoClose
+	d.Entity = xml.HTMLEntity
+	for {
+		token, err := d.Token()
+		if err == io.EOF {
+			break
+		}
+
+		switch v := token.(type) {
+		case xml.StartElement:
+			text += "\n"
+		case xml.EndElement:
+		case xml.CharData:
+			text += string(v)
+		case xml.Comment:
+		case xml.ProcInst:
+		case xml.Directive:
+		}
+	}
+
+	return text
+}
--- a/app/service/menuService/menuService.go
+++ b/app/service/menuService/menuService.go
@@ -0,0 +1,90 @@
+package menuService
+
+import (
+	"sort"
+
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/categoriesRepo"
+	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
+)
+
+type MenuService struct {
+	categoriesRepo categoriesRepo.UICategoriesRepo
+}
+
+func New() *MenuService {
+	return &MenuService{
+		categoriesRepo: categoriesRepo.New(),
+	}
+}
+
+func (s *MenuService) GetMenu(id_lang uint) (model.Category, error) {
+	all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
+	if err != nil {
+		return model.Category{}, err
+	}
+
+	// find the root
+	root_index := 0
+	root_found := false
+	for i := 0; i < len(all_categories); i++ {
+		if all_categories[i].IsRoot == 1 {
+			root_index = i
+			root_found = true
+			break
+		}
+	}
+	if !root_found {
+		return model.Category{}, responseErrors.ErrNoRootFound
+	}
+
+	// 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++ {
+		id_to_index[all_categories[i].CategoryID] = i
+	}
+
+	children_indices := make(map[int][]ChildWithPosition)
+	for i := 0; i < len(all_categories); i++ {
+		parent_index := id_to_index[all_categories[i].ParentID]
+		children_indices[parent_index] = append(children_indices[parent_index], ChildWithPosition{Index: i, Position: all_categories[i].Position})
+	}
+
+	for key := range children_indices {
+		sort.Sort(ByPosition(children_indices[key]))
+	}
+
+	// finally, create the tree
+	tree := s.createTree(root_index, &all_categories, &children_indices)
+
+	return tree, nil
+}
+
+func (s *MenuService) createTree(index int, all_categories *([]model.ScannedCategory), children_indices *(map[int][]ChildWithPosition)) model.Category {
+	node := s.scannedToNormalCategory((*all_categories)[index])
+
+	for i := 0; i < len((*children_indices)[index]); i++ {
+		node.Subcategories = append(node.Subcategories, s.createTree((*children_indices)[index][i].Index, all_categories, children_indices))
+	}
+
+	return node
+}
+
+func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) model.Category {
+	var normal model.Category
+	normal.Active = scanned.Active
+	normal.CategoryID = scanned.CategoryID
+	normal.Name = scanned.Name
+	normal.Subcategories = []model.Category{}
+	return normal
+}
+
+type ChildWithPosition struct {
+	Index    int
+	Position uint
+}
+type ByPosition []ChildWithPosition
+
+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 }
--- a/app/service/productDescriptionService/productDescriptionService.go
+++ b/app/service/productDescriptionService/productDescriptionService.go
@@ -17,9 +17,9 @@ import (
 	"cloud.google.com/go/translate/apiv3/translatepb"
 	"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/repos/productDescriptionRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/service/langsService"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
-	"git.ma-al.com/goc_daniel/b2b/repository/productDescriptionRepo"
 	"github.com/openai/openai-go/v3"
 	"github.com/openai/openai-go/v3/option"
 	"github.com/openai/openai-go/v3/responses"
@@ -82,12 +82,12 @@ func New() *ProductDescriptionService {
 	}
 }

-func (s *ProductDescriptionService) GetProductDescription(userID uint, productID uint, productShopID uint, productLangID uint) (*model.ProductDescription, error) {
-	return s.productDescriptionRepo.GetProductDescription(productID, productShopID, productLangID)
+func (s *ProductDescriptionService) GetProductDescription(userID uint, productID uint, productLangID uint) (*model.ProductDescription, error) {
+	return s.productDescriptionRepo.GetProductDescription(productID, productLangID)
 }

 // Updates relevant fields with the "updates" map
-func (s *ProductDescriptionService) SaveProductDescription(userID uint, productID uint, productShopID uint, productLangID uint, updates map[string]string) error {
+func (s *ProductDescriptionService) 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"}
 	for key := range updates {
@@ -106,12 +106,12 @@ func (s *ProductDescriptionService) SaveProductDescription(userID uint, productI
 		}
 	}

-	err := s.productDescriptionRepo.CreateIfDoesNotExist(productID, productShopID, productLangID)
+	err := s.productDescriptionRepo.CreateIfDoesNotExist(productID, productLangID)
 	if err != nil {
 		return err
 	}

-	return s.productDescriptionRepo.UpdateFields(productID, productShopID, productLangID, updates)
+	return s.productDescriptionRepo.UpdateFields(productID, productLangID, updates)
 }

 // TranslateProductDescription fetches the product description for productFromLangID,
@@ -120,9 +120,9 @@ func (s *ProductDescriptionService) SaveProductDescription(userID uint, productI
 //
 // The Google Cloud project must have the Cloud Translation API enabled and the
 // service account must hold the "Cloud Translation API User" role.
-func (s *ProductDescriptionService) TranslateProductDescription(userID uint, productID uint, productShopID uint, productFromLangID uint, productToLangID uint, aiModel string) (*model.ProductDescription, error) {
+func (s *ProductDescriptionService) TranslateProductDescription(userID uint, productID uint, productFromLangID uint, productToLangID uint, aiModel string) (*model.ProductDescription, error) {

-	productDescription, err := s.productDescriptionRepo.GetProductDescription(productID, productShopID, productFromLangID)
+	productDescription, err := s.productDescriptionRepo.GetProductDescription(productID, productFromLangID)
 	if err != nil {
 		return nil, err
 	}
--- a/app/utils/const_data/consts.go
+++ b/app/utils/const_data/consts.go
@@ -2,3 +2,4 @@ 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
--- a/app/utils/responseErrors/responseErrors.go
+++ b/app/utils/responseErrors/responseErrors.go
@@ -48,6 +48,9 @@ var (

 	// Typed errors for product list handler
 	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")
 )

 // Error represents an error with HTTP status code
@@ -135,6 +138,9 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 	case errors.Is(err, ErrBadPaging):
 		return i18n.T_(c, "error.err_bad_paging")

+	case errors.Is(err, ErrNoRootFound):
+		return i18n.T_(c, "error.no_root_found")
+
 	default:
 		return i18n.T_(c, "error.err_internal_server_error")
 	}
@@ -169,7 +175,8 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrBadAttribute),
 		errors.Is(err, ErrBadField),
 		errors.Is(err, ErrInvalidXHTML),
-		errors.Is(err, ErrBadPaging):
+		errors.Is(err, ErrBadPaging),
+		errors.Is(err, ErrNoRootFound):
 		return fiber.StatusBadRequest
 	case errors.Is(err, ErrEmailExists):
 		return fiber.StatusConflict
--- a/bo/components.d.ts
+++ b/bo/components.d.ts
@@ -11,13 +11,18 @@ export {}
 /* prettier-ignore */
 declare module 'vue' {
  export interface GlobalComponents {
+    Cart1: typeof import('./src/components/customer/Cart1.vue')['default']
+    CompanyAccountView: typeof import('./src/components/customer/CompanyAccountView.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']
+    PageAccount: typeof import('./src/components/customer/PageAccount.vue')['default']
    PageAddresses: typeof import('./src/components/customer/PageAddresses.vue')['default']
    PageCart: typeof import('./src/components/customer/PageCart.vue')['default']
+    PageCreateAccount: typeof import('./src/components/customer/PageCreateAccount.vue')['default']
+    PageCustomerData: typeof import('./src/components/customer/PageCustomerData.vue')['default']
    PageProductCardFull: typeof import('./src/components/customer/PageProductCardFull.vue')['default']
    PageProductsList: typeof import('./src/components/customer/PageProductsList.vue')['default']
    Pl_PrivacyPolicyView: typeof import('./src/components/terms/pl_PrivacyPolicyView.vue')['default']
--- a/bo/src/components/TopBar.vue
+++ b/bo/src/components/TopBar.vue
@@ -28,9 +28,15 @@ const authStore = useAuthStore()
        <RouterLink :to="{ name: 'addresses' }">
          Addresses
        </RouterLink>
+        <RouterLink :to="{ name: 'customer-data' }">
+          Customer Data
+        </RouterLink>
        <RouterLink :to="{ name: 'cart' }">
          Cart
        </RouterLink>
+        <RouterLink :to="{ name: 'cart1' }">
+          Cart1
+        </RouterLink>
        <RouterLink :to="{ name: 'products-list' }">
          Products List
        </RouterLink>
--- a/bo/src/components/admin/ProductDetailView.vue
+++ b/bo/src/components/admin/ProductDetailView.vue
@@ -26,7 +26,6 @@
      </UButton>
    </div>

-    <!-- Loading Overlay -->
    <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" />
--- a/bo/src/components/customer/Cart1.vue
+++ b/bo/src/components/customer/Cart1.vue
@@ -0,0 +1,72 @@
+<template>
+  <div class="container mx-auto mt-20">
+    <h2
+      class="font-semibold text-black dark:text-white pb-6 text-2xl">
+      {{ t('Cart Items') }}
+    </h2>
+    <div
+      class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
+      <div v-if="cartStore.items.length > 0" class="divide-y divide-(--border-light) dark:divide-(--border-dark)">
+        <div v-for="item in cartStore.items" :key="item.id" class="flex items-center justify-between p-4 gap-4">
+          <div class="grid grid-cols-5 w-[100%]">
+            <div
+              class="w-20 bg-(--second-light) dark:bg-(--main-dark) rounded flex items-center justify-center overflow-hidden">
+              <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
+              <UIcon v-else name="mdi:package-variant" class="text-xl text-gray-400" />
+            </div>
+            <p class="text-black dark:text-white text-sm font-medium truncate">{{ item.name }}</p>
+            <p class="text-black dark:text-white text-sm font-medium truncate">{{ item.product_number }}</p>
+            <p class="text-black dark:text-white font-medium">${{ (item.price * item.quantity).toFixed(2) }}</p>
+            <div class="flex items-center justify-end gap-10">
+              <UInputNumber v-model="item.quantity" class="text-gray-500 dark:text-gray-400 text-sm" />
+              <div class="flex justify-center">
+                <button @click="removeItem(item.id)"
+                  class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
+                  :title="t('Remove')">
+                  <UIcon name="material-symbols:delete" class="text-[20px]" />
+                </button>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div v-else class="p-8 text-center">
+        <UIcon name="mdi:cart-outline" class="text-5xl text-gray-300 dark:text-gray-600 mb-4 mx-auto" />
+        <p class="text-gray-500 dark:text-gray-400">{{ t('Your cart is empty') }}</p>
+      </div>
+    </div>
+    <div v-if="cartStore.items.length > 0" class="flex gap-4 justify-end items-center pt-6">
+      <UButton color="primary" @click="handleContinueToCheckout"
+        class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+        {{ t('Continue to Checkout') }}
+      </UButton>
+      <UButton variant="outline" color="neutral" @click="handleCancel"
+        class="text-black dark:text-white border-(--border-light) dark:border-(--border-dark) hover:bg-gray-100 dark:hover:bg-gray-700">
+        {{ t('Cancel') }}
+      </UButton>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useCartStore } from '@/stores/cart'
+import { ref } from 'vue'
+import { useI18n } from 'vue-i18n'
+import { useRouter } from 'vue-router'
+
+const cartStore = useCartStore()
+const { t } = useI18n()
+const router = useRouter()
+function handleCancel() {
+  router.back()
+}
+
+function handleContinueToCheckout() {
+  router.push({ name: 'cart' })
+}
+
+function removeItem(itemId: number) {
+  cartStore.removeItem(itemId)
+}
+</script>
--- a/bo/src/components/customer/PageAddresses.vue
+++ b/bo/src/components/customer/PageAddresses.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="container mx-auto mt-10">
+    <div class="container mx-auto mt-20">
        <div class="flex flex-col gap-5 mb-6">
            <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Addresses') }}</h1>
            <div class="flex md:flex-row flex-col justify-between items-start md:items-center gap-5 md:gap-0">
@@ -18,18 +18,23 @@
        </div>
        <div v-if="paginatedAddresses.length" class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-4 gap-6">
            <div v-for="address in paginatedAddresses" :key="address.id"
-                class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) hover:shadow-md transition-shadow">
-                <p class="text-black dark:text-white">{{ address.street }}</p>
-                <p class="text-black dark:text-white">{{ address.zipCode }}, {{ address.city }}</p>
-                <p class="text-black dark:text-white">{{ address.country }}</p>
-                <div class="flex gap-2 mt-2">
-                    <UButton size="sm" color="neutral" variant="outline" @click="openEditModal(address)"
-                        class="text-(--accent-blue-light) dark:text-(--accent-blue-dark)">{{ t('edit') }}
-                    </UButton>
-                    <button size="sm" color="destructive" variant="outline" @click="confirmDelete(address.id)"
-                        class="text-red-500 hover:bg-red-100 dark:hover:bg-red-900 dark:hover:text-red-100 rounded transition-colors p-2">
-                        <UIcon name="material-symbols:delete" class="text-[16px]" />
-                    </button>
+                class="border border-(--border-light) dark:border-(--border-dark) rounded-md p-4 bg-(--second-light) dark:bg-(--main-dark) hover:shadow-md transition-shadow flex justify-between">
+                <div class="flex flex-col gap-2 items-strat justify-end">
+                    <p class="text-black dark:text-white">{{ address.street }}</p>
+                    <p class="text-black dark:text-white">{{ address.zipCode }}, {{ address.city }}</p>
+                    <p class="text-black dark:text-white">{{ address.country }}</p>
+                </div>
+                <div class="flex flex-col items-end justify-between gap-2">
+                    <button @click="confirmDelete(address.id)"
+                    class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
+                    :title="t('Remove')">
+                    <UIcon name="material-symbols:delete" class="text-[18px]" />
+                </button>
+                <UButton size="sm" color="neutral" variant="outline" @click="openEditModal(address)"
+                    class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) text-[13px]">
+                    {{ t('edit') }}
+                    <UIcon name="ic:sharp-edit" class="text-[15px]" />
+                </UButton>
                </div>
            </div>
        </div>
@@ -161,14 +166,6 @@ function saveAddress() {
    }
    closeModal()
 }
-// const Lera = ref('')
-// function run (){
-//     if(Lera.value==='lera'){
-//         console.log('Leraa okokok')
-//     }else{
-//         console.log('LEra nonono')
-//     }
-// }
 function confirmDelete(id: number) {
    addressToDelete.value = id
    showDeleteConfirm.value = true
--- a/bo/src/components/customer/PageCart.vue
+++ b/bo/src/components/customer/PageCart.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="container mx-auto mt-20 px-4 py-8">
-    <h1 class="text-2xl font-bold text-black dark:text-white mb-8">{{ t('Shopping Cart') }}</h1>
-    <div class="flex flex-col lg:flex-row gap-8 mb-8">
+  <div class="container mx-auto mt-20 flex flex-col gap-5 md:gap-10">
+    <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Shopping Cart') }}</h1>
+    <div class="flex flex-col lg:flex-row gap-5 md:gap-10">
      <div class="flex-1">
        <div
          class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) overflow-hidden">
@@ -9,44 +9,29 @@
            class="text-lg font-semibold text-black dark:text-white p-4 border-b border-(--border-light) dark:border-(--border-dark)">
            {{ t('Selected Products') }}
          </h2>
-          <div
-            class="hidden md:grid grid-cols-12 gap-4 p-4 bg-(--second-light) dark:bg-(--main-dark) text-sm font-medium text-gray-600 dark:text-gray-300 border-b border-(--border-light) dark:border-(--border-dark)">
-            <div class="col-span-4">{{ t('Product') }}</div>
-            <div class="col-span-2 text-right">{{ t('Price') }}</div>
-            <div class="col-span-3 text-center">{{ t('Quantity') }}</div>
-            <div class="col-span-2 text-right">{{ t('Total') }}</div>
-            <div class="col-span-1 text-center">{{ t('Actions') }}</div>
-          </div>
          <div v-if="cartStore.items.length > 0">
            <div v-for="item in cartStore.items" :key="item.id"
-              class="grid grid-cols-1 md:grid-cols-12 gap-4 p-4 border-b border-(--border-light) dark:border-(--border-dark) items-center">
-              <div class="col-span-4 flex items-center gap-4">
-                <div
-                  class="w-16 h-16 bg-(--second-light) dark:bg-(--main-dark) rounded flex items-center justify-center overflow-hidden">
-                  <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
-                  <UIcon v-else name="mdi:package-variant" class="text-2xl text-gray-400" />
-                </div>
-                <span class="text-black dark:text-white text-sm font-medium">{{ item.name }}</span>
+              class="grid grid-cols-5 items-center p-4 border-b border-(--border-light) dark:border-(--border-dark) w-[100%]">
+              <div
+                class="bg-(--second-light) dark:bg-(--main-dark) rounded flex items-center justify-center overflow-hidden">
+                <img v-if="item.image" :src="item.image" :alt="item.name" class="w-full h-full object-cover" />
+                <UIcon v-else name="mdi:package-variant" class="text-2xl text-gray-400" />
              </div>
-              <div class="col-span-2 text-right">
-                <span class="md:hidden text-gray-500 dark:text-gray-400 text-sm">{{ t('Price') }}: </span>
-                <span class="text-black dark:text-white">${{ item.price.toFixed(2) }}</span>
-              </div>
-              <div class="col-span-3 flex items-center justify-center">
+              <p class="text-black dark:text-white text-sm font-medium">{{ item.name }}</p>
+              <p class="text-black dark:text-white">${{ item.price.toFixed(2) }}</p>
+              <p class="text-black dark:text-white font-medium">${{ (item.price * item.quantity).toFixed(2)
+              }}</p>
+
+              <div class="flex items-center justify-end gap-10">
                <UInputNumber v-model="item.quantity" :min="1"
                  @update:model-value="(val: number) => cartStore.updateQuantity(item.id, val)" />
-              </div>
-              <div class="col-span-2 text-right">
-                <span class="md:hidden text-gray-500 dark:text-gray-400 text-sm">{{ t('Total') }}: </span>
-                <span class="text-black dark:text-white font-medium">${{ (item.price * item.quantity).toFixed(2)
-                  }}</span>
-              </div>
-              <div class="col-span-1 flex justify-center">
-                <button @click="removeItem(item.id)"
-                  class="p-2 text-red-500 hover:bg-red-50 dark:hover:bg-red-900/20 rounded transition-colors"
-                  :title="t('Remove')">
-                  <UIcon name="material-symbols:delete" class="text-[20px]" />
-                </button>
+                <div class="flex justify-center">
+                  <button @click="removeItem(item.id)"
+                    class="p-2 text-red-500 bg-red-100 dark:bg-(--main-dark)  rounded transition-colors"
+                    :title="t('Remove')">
+                    <UIcon name="material-symbols:delete" class="text-[20px]" />
+                  </button>
+                </div>
              </div>
            </div>
          </div>
@@ -99,7 +84,7 @@
        </div>
      </div>
    </div>
-    <div class="flex flex-col lg:flex-row gap-8">
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-5 md:gap-10">
      <div class="flex-1">
        <div
          class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-6">
--- a/bo/src/components/customer/PageCreateAccount.vue
+++ b/bo/src/components/customer/PageCreateAccount.vue
@@ -0,0 +1,178 @@
+<template>
+    <div class="container mx-auto mt-20">
+        <div class="max-w-2xl mx-auto">
+            <div class="flex flex-col gap-5 mb-6">
+                <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Create Account') }}</h1>
+                <div
+                    class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-4">
+                    <UForm @submit.prevent="saveAccount" :validate="validate" class="space-y-6">
+                        <div>
+                            <h2 class="text-lg font-semibold text-black dark:text-white mb-4 flex items-center gap-2">
+                                <UIcon name="mdi:domain"
+                                    class="text-[20px] text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
+                                {{ t('Company Information') }}
+                            </h2>
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+                                <div class="md:col-span-2">
+                                    <label class="block text-sm font-medium text-black dark:text-white mb-1">{{
+                                        t('Company Name') }} *</label>
+                                    <UInput v-model="formData.companyName" :placeholder="t('Enter company name')"
+                                        name="companyName" class="w-full" />
+                                </div>
+                                <div class="md:col-span-2">
+                                    <label class="block text-sm font-medium text-black dark:text-white mb-1">{{
+                                        t('Company Email') }} *</label>
+                                    <UInput v-model="formData.companyEmail" type="email"
+                                        :placeholder="t('Enter company email')" name="companyEmail" class="w-full" />
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium text-black dark:text-white mb-1">{{
+                                        t('REGON') }}</label>
+                                    <UInput v-model="formData.regon" :placeholder="t('Enter REGON')" name="regon"
+                                        class="w-full" />
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium text-black dark:text-white mb-1">{{ t('NIP')
+                                    }}</label>
+                                    <UInput v-model="formData.nip" :placeholder="t('Enter NIP')" name="nip"
+                                        class="w-full" />
+                                </div>
+                                <div>
+                                    <label class="block text-sm font-medium text-black dark:text-white mb-1">{{ t('VAT')
+                                    }}</label>
+                                    <UInput v-model="formData.vat" :placeholder="t('Enter VAT')" name="vat"
+                                        class="w-full" />
+                                </div>
+                            </div>
+                        </div>
+                        <div>
+                            <h2 class="text-lg font-semibold text-black dark:text-white mb-4 flex items-center gap-2">
+                                <UIcon name="mdi:map-marker"
+                                    class="text-[20px] text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
+                                {{ t('Select Addresses') }}
+                            </h2>
+                            <div
+                                class="bg-(--second-light) dark:bg-(--main-dark)">
+                                <div class="mb-4">
+                                    <UInput v-model="addressSearchQuery" type="text" :placeholder="t('Search address')"
+                                        class="w-full bg-white dark:bg-(--black) text-black dark:text-white" />
+                                </div>
+                                <div v-if="addressStore.filteredAddresses.length > 0" class="space-y-3">
+                                    <label v-for="address in addressStore.filteredAddresses" :key="address.id"
+                                        class="flex items-start gap-3 p-4 border rounded-lg cursor-pointer transition-colors"
+                                        :class="cartStore.selectedAddressId === address.id
+                                            ? 'border-(--accent-blue-light) dark:border-(--accent-blue-dark) bg-blue-50 dark:bg-blue-900/20'
+                                            : 'border-(--border-light) dark:border-(--border-dark) hover:border-gray-400'">
+                                        <input type="radio" :value="address.id" v-model="selectedAddress"
+                                            class="mt-1 w-4 h-4 text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
+                                        <div class="flex-1">
+                                            <p class="text-black dark:text-white font-medium">{{ address.street }}</p>
+                                            <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.zipCode }},
+                                                {{ address.city }}</p>
+                                            <p class="text-gray-600 dark:text-gray-400 text-sm">{{ address.country }}
+                                            </p>
+                                        </div>
+                                    </label>
+                                </div>
+                                <div v-else class="text-center py-6">
+                                    <UIcon name="mdi:map-marker-outline" class="text-4xl text-gray-400 mb-2" />
+                                    <p class="text-gray-500 dark:text-gray-400">{{ t('No addresses found') }}</p>
+                                    <RouterLink :to="{ name: 'addresses' }"
+                                        class="inline-block mt-2 text-(--accent-blue-light) dark:text-(--accent-blue-dark) hover:underline">
+                                        {{ t('Add Address') }}
+                                    </RouterLink>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="flex justify-end gap-3 pt-4">
+                            <UButton variant="outline" color="neutral" @click="goBack"
+                                class="text-black dark:text-white">
+                                {{ t('Cancel') }}
+                            </UButton>
+                            <UButton type="submit" color="primary"
+                                class="text-white bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+                                <UIcon name="mdi:content-save" />
+                                {{ t('Save') }}
+                            </UButton>
+                        </div>
+                    </UForm>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from 'vue'
+import { useRouter } from 'vue-router'
+import { useCustomerStore } from '@/stores/customer'
+import { useAddressStore } from '@/stores/address'
+import { useI18n } from 'vue-i18n'
+import { useCartStore } from '@/stores/cart'
+
+const router = useRouter()
+const customerStore = useCustomerStore()
+const addressStore = useAddressStore()
+const { t } = useI18n()
+const cartStore = useCartStore()
+const formData = ref({
+    companyName: customerStore.customer?.companyName || '',
+    companyEmail: customerStore.customer?.companyEmail || '',
+    regon: customerStore.customer?.regon || '',
+    nip: customerStore.customer?.nip || '',
+    vat: customerStore.customer?.vat || '',
+    companyAddressId: customerStore.customer?.companyAddressId || null,
+    billingAddressId: customerStore.customer?.billingAddressId || null
+})
+
+const addressSearchQuery = ref('')
+
+watch(addressSearchQuery, (val) => {
+    addressStore.setSearchQuery(val)
+})
+
+const selectedAddress = ref<number | null>(formData.value.companyAddressId)
+
+watch(selectedAddress, (newValue) => {
+    formData.value.companyAddressId = newValue
+})
+
+function validate() {
+    const errors: { name: string; message: string }[] = []
+
+    if (!formData.value.companyName?.trim()) {
+        errors.push({ name: 'companyName', message: t('Company name is required') })
+    }
+
+    if (!formData.value.companyEmail?.trim()) {
+        errors.push({ name: 'companyEmail', message: t('Company email is required') })
+    }
+
+    return errors
+}
+
+function saveAccount() {
+    const errors = validate()
+    if (errors.length) return
+
+    const selectedAddr = addressStore.addresses.find(
+        addr => addr.id === formData.value.companyAddressId
+    )
+
+    customerStore.setCustomer({
+        companyName: formData.value.companyName,
+        companyEmail: formData.value.companyEmail,
+        regon: formData.value.regon,
+        nip: formData.value.nip,
+        vat: formData.value.vat,
+        companyAddressId: formData.value.companyAddressId,
+        billingAddressId: formData.value.billingAddressId,
+        companyAddress: selectedAddr || null
+    })
+
+    router.push({ name: 'customer-data' })
+}
+function goBack() {
+    router.push({ name: 'customer-data' })
+}
+</script>
--- a/bo/src/components/customer/PageCustomerData.vue
+++ b/bo/src/components/customer/PageCustomerData.vue
@@ -0,0 +1,108 @@
+<template>
+    <div class="container mx-auto mt-20">
+        <div class="flex flex-col gap-5 mb-6">
+            <h1 class="text-2xl font-bold text-black dark:text-white">{{ t('Customer Data') }}</h1>
+
+            <div v-if="!customerStore.hasAccount" class="flex flex-col items-center justify-center py-12">
+                <div class="text-center flex flex-col items-center justify-center mb-6">
+                    <UIcon name="mdi:domain" class="text-[60px] text-gray-400 dark:text-gray-500" />
+                    <p class="mt-4 text-lg text-gray-600 dark:text-gray-400">{{ t('No customer account found') }}</p>
+                    <p class="text-sm text-gray-500 dark:text-gray-500">{{ t('Create an account to manage your company data') }}</p>
+                </div>
+                <UButton color="primary" @click="goToCreateAccount"
+                    class="bg-(--accent-blue-light) dark:bg-(--accent-blue-dark) text-white hover:bg-(--accent-blue-dark) dark:hover:bg-(--accent-blue-light)">
+                    <UIcon name="mdi:add-bold" />
+                    {{ t('Create Account') }}
+                </UButton>
+            </div>
+
+            <div v-else class="flex flex-col gap-3">
+                <div class="grid grid-cols-2 gap-5">
+                    <div
+                        class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-4">
+                        <h2 class="text-xl font-semibold text-black dark:text-white mb-4 flex items-center gap-2">
+                            <UIcon name="mdi:domain"
+                                class="text-[24px] text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
+                            {{ t('Company Information') }}
+                        </h2>
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-2">
+                            <div>
+                                <label
+                                    class="block text-sm font-medium text-gray-500 dark:text-gray-400 mb-1">{{ t('Company Name') }}</label>
+                                <p class="text-black dark:text-white">{{ customerStore.customer?.companyName || '-' }}
+                                </p>
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium text-gray-500 dark:text-gray-400 mb-1">{{t('Company Email') }}</label>
+                                <p class="text-black dark:text-white">{{ customerStore.customer?.companyEmail || '-' }}
+                                </p>
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium text-gray-500 dark:text-gray-400 mb-1">{{t('REGON') }}</label>
+                                <p class="text-black dark:text-white">{{ customerStore.customer?.regon || '-' }}</p>
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium text-gray-500 dark:text-gray-400 mb-1">{{t('NIP') }}</label>
+                                <p class="text-black dark:text-white">{{ customerStore.customer?.nip || '-' }}</p>
+                            </div>
+                            <div>
+                                <label class="block text-sm font-medium text-gray-500 dark:text-gray-400 mb-1">{{t('VAT') }}</label>
+                                <p class="text-black dark:text-white">{{ customerStore.customer?.vat || '-' }}</p>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="bg-(--second-light) dark:bg-(--main-dark) rounded-lg border border-(--border-light) dark:border-(--border-dark) p-4">
+                        <h2 class="text-xl font-semibold text-black dark:text-white mb-4 flex items-center gap-2">
+                            <UIcon name="mdi:map-marker"
+                                class="text-[24px] text-(--accent-blue-light) dark:text-(--accent-blue-dark)" />
+                            {{ t('Addresses') }}
+                        </h2>
+                        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                            <div>
+                                <label class="block text-sm font-medium text-gray-500 dark:text-gray-400 mb-2">{{ t('Company Address') }}</label>
+                                <div v-if="companyAddress"
+                                    class="p-4 bg-white dark:bg-(--black) rounded-md border border-(--border-light) dark:border-(--border-dark)">
+                                    <p class="text-black dark:text-white">{{ companyAddress.street }}</p>
+                                    <p class="text-black dark:text-white">{{ companyAddress.zipCode }}, {{
+                                        companyAddress.city }}</p>
+                                    <p class="text-black dark:text-white">{{ companyAddress.country }}</p>
+                                </div>
+                                <p v-else class="text-gray-400 dark:text-gray-500">-</p>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="flex justify-end">
+                    <UButton color="primary" variant="outline"
+                        class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) border-(--accent-blue-light) dark:border-(--accent-blue-dark)"
+                        @click="goToCreateAccount">
+                        <UIcon name="ic:sharp-edit" />
+                        {{ t('Edit Account') }}
+                    </UButton>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+import { useRouter } from 'vue-router'
+import { useCustomerStore } from '@/stores/customer'
+import { useAddressStore } from '@/stores/address'
+import { useI18n } from 'vue-i18n'
+
+const router = useRouter()
+const customerStore = useCustomerStore()
+const addressStore = useAddressStore()
+const { t } = useI18n()
+
+const companyAddress = computed(() => {
+    const id = customerStore.customer?.companyAddressId
+    return id ? addressStore.getAddressById(id) : null
+})
+
+function goToCreateAccount() {
+    router.push({ name: 'create-account' })
+}
+</script>
--- a/bo/src/components/customer/PageProductCardFull.vue
+++ b/bo/src/components/customer/PageProductCardFull.vue
@@ -1,8 +1,8 @@
 <template>
-    <div class="container mt-14 mx-auto">
-        <div class="flex md:flex-row flex-col justify-between gap-8 mb-6">
+    <div class="container mt-20 mx-auto">
+        <div class="flex md:flex-row flex-col justify-between gap-8 my-6">
            <div class="flex-1">
-                <div class="bg-gray-100 dark:bg-gray-800 rounded-lg p-8 flex items-center justify-center min-h-[300px]">
+                <div class="bg-gray-100 dark:bg-gray-800 rounded-lg p-8 flex items-center justify-center min-h-[300px] ">
                    <img :src="selectedColor?.image || productData.image" :alt="productData.name"
                        class="max-w-full h-auto object-contain" />
                </div>
--- a/bo/src/components/customer/PageProductsList.vue
+++ b/bo/src/components/customer/PageProductsList.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="container mx-auto p-6">
+    <div class="container mx-auto mt-20">
        <h1 class="text-2xl font-bold mb-6 text-gray-900 dark:text-white">Products</h1>
        <div v-if="loading" class="text-center py-8">
            <span class="text-gray-600 dark:text-gray-400">Loading products...</span>
@@ -13,35 +13,36 @@
                    <tr>
                        <th
                            class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                            Product ID
-                        </th>
+                            Image</th>
                        <th
                            class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                            Reference
-                        </th>
+                            Product ID</th>
                        <th
                            class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
-                            Price
-                        </th>
+                            Name</th>
+                        <th
+                            class="px-6 py-3 text-left text-xs font-medium text-gray-500 dark:text-gray-400 uppercase tracking-wider">
+                            Link</th>
                    </tr>
                </thead>
                <tbody class="bg-white dark:bg-gray-900 divide-y divide-gray-200 dark:divide-gray-700">
-                    <tr v-for="product in products" :key="product.product_id"
+                    <tr v-for="product in productsList" :key="product.product_id"
                        class="hover:bg-gray-50 dark:hover:bg-gray-800">
-                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">
-                            {{ product.product_id }}
+                        <td class="px-6 py-4 whitespace-nowrap">
+                            <img :src="getImageUrl(product.ImageID, product.LinkRewrite,)" alt="product image"
+                                class="w-16 h-16 object-cover rounded" />
                        </td>
-                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">
-                            {{ product.reference }}
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">{{
+                            product.product_id }}</td>
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">{{ product.name }}
                        </td>
-                        <td class="px-6 py-4 whitespace-nowrap text-sm text-gray-900 dark:text-white">
-                            {{ product.price.toFixed(2) }}
+                        <td class="px-6 py-4 whitespace-nowrap text-sm text-blue-600 dark:text-blue-400">
+                            {{ product.LinkRewrite }}
                        </td>
                    </tr>
                </tbody>
            </table>
-
-            <div v-if="products.length === 0" class="text-center py-8 text-gray-500 dark:text-gray-400">
+            <div v-if="productsList.length === 0" class="text-center py-8 text-gray-500 dark:text-gray-400">
                No products found
            </div>
        </div>
@@ -54,36 +55,36 @@ import { useFetchJson } from '@/composable/useFetchJson'

 interface Product {
    product_id: number
-    reference: string
-    price: number
+    name: string
+    ImageID: number
+    LinkRewrite: string
 }

 interface ApiResponse {
+    message: string
    items: Product[]
    count: number
-    message: string
 }

-const products = ref<Product[]>([])
+const productsList = ref<Product[]>([])
 const loading = ref(true)
 const error = ref<string | null>(null)

-async function fetchProducts() {
+function getImageUrl(imageID: number, linkRewrite: string, size: string = 'small_default') {
+    return `https://www.naluconcept.com/${imageID}-${size}/${linkRewrite}.webp`
+}
+async function fetchProductList() {
    loading.value = true
    error.value = null
-
    try {
-        const response = await useFetchJson<ApiResponse>('/api/v1/restricted/list-products/get-listing?p=3&elems') as unknown as { items: Product[] }
-        products.value = response.items || []
-    } catch (e: any) {
-        error.value = e.message || 'Failed to load products'
-        console.error('Error fetching products:', e)
+        const response = await useFetchJson('/api/v1/restricted/list-products/get-listing?p&elems&shopID=1') as ApiResponse
+        productsList.value = response.items || []
+    } catch (e: unknown) {
+        error.value = e instanceof Error ? e.message : 'Failed to load products'
+        console.error(e)
    } finally {
        loading.value = false
    }
 }
-
-onMounted(() => {
-    fetchProducts()
-})
+onMounted(fetchProductList)
 </script>
--- a/bo/src/layouts/default.vue
+++ b/bo/src/layouts/default.vue
@@ -4,7 +4,7 @@ import TopBar from '@/components/TopBar.vue';
 <template>
  <div class="h-screen grid grid-rows-[auto_1fr_auto]">
    <!-- <header class="w-full bg-gray-100 text-primary shadow border-b-gray-300 p-4 mb-8">Header</header> -->
-      <main class="p-10">
+      <main class="px-4 sm:px-6 lg:px-8">
        <TopBar/>
        <router-view />
      </main>
--- a/bo/src/router/index.ts
+++ b/bo/src/router/index.ts
@@ -29,7 +29,10 @@ const router = createRouter({
            { path: 'products-datail/', component: () => import('../components/admin/ProductDetailView.vue'), name: 'product-detail' },
            { path: 'product-card-full/', component: () => import('../components/customer/PageProductCardFull.vue'), name: 'product-card-full' },
            { path: 'addresses', component: () => import('../components/customer/PageAddresses.vue'), name: 'addresses' },
+            { path: 'customer-data', component: () => import('../components/customer/PageCustomerData.vue'), name: 'customer-data' },
+            { path: 'create-account', component: () => import('../components/customer/PageCreateAccount.vue'), name: 'create-account' },
            { path: 'cart', component: () => import('../components/customer/PageCart.vue'), name: 'cart' },
+            { path: 'cart1', component: () => import('../components/customer/Cart1.vue'), name: 'cart1' },
            { path: 'products-list', component: () => import('../components/customer/PageProductsList.vue'), name: 'products-list' },
          ],
        },
--- a/bo/src/stores/auth.ts
+++ b/bo/src/stores/auth.ts
@@ -77,14 +77,42 @@ export const useAuthStore = defineStore('auth', () => {
    password: string,
    confirm_password: string,
    lang?: string,
+    company_name?: string,
+    company_email?: string,
+    company_address?: {
+      street: string
+      zipCode: string
+      city: string
+      country: string
+    },
+    regon?: string,
+    nip?: string,
+    vat?: string,
+    billing_address?: {
+      street: string
+      zipCode: string
+      city: string
+      country: string
+    },
  ) {
    loading.value = true
    error.value = null
    try {
+      const body: any = { first_name, last_name, email, password, confirm_password, lang: lang || 'en' }
+      
+      // Add company information if provided
+      if (company_name) body.company_name = company_name
+      if (company_email) body.company_email = company_email
+      if (company_address) body.company_address = company_address
+      if (regon) body.regon = regon
+      if (nip) body.nip = nip
+      if (vat) body.vat = vat
+      if (billing_address) body.billing_address = billing_address
+
      await useFetchJson('/api/v1/public/auth/register', {
        method: 'POST',
        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ first_name, last_name, email, password, confirm_password, lang: lang || 'en' }),
+        body: JSON.stringify(body),
      })

      return { success: true, requiresVerification: true }
--- a/bo/src/stores/cart.ts
+++ b/bo/src/stores/cart.ts
@@ -8,6 +8,7 @@ export interface CartItem {
  image: string
  price: number
  quantity: number
+  product_number: string
 }

 export interface DeliveryMethod {
@@ -23,7 +24,7 @@ export const useCartStore = defineStore('cart', () => {
  const selectedDeliveryMethodId = ref<number | null>(null)
  const shippingCost = ref(0)
  const vatRate = ref(0.23) // 23% VAT
-
+  const currentPage = ref(1)
  const deliveryMethods = ref<DeliveryMethod[]>([
    { id: 1, name: 'Standard Delivery', price: 0, description: '5-7 business days' },
    { id: 2, name: 'Express Delivery', price: 15, description: '2-3 business days' },
@@ -32,9 +33,9 @@ export const useCartStore = defineStore('cart', () => {

  function initMockData() {
    items.value = [
-      { id: 1, productId: 101, name: 'Premium Widget Pro', image: '/img/product-1.jpg', price: 129.99, quantity: 2 },
-      { id: 2, productId: 102, name: 'Ultra Gadget X', image: '/img/product-2.jpg', price: 89.50, quantity: 1 },
-      { id: 3, productId: 103, name: 'Mega Tool Set', image: '/img/product-3.jpg', price: 249.00, quantity: 3 }
+      { id: 1, productId: 101, name: 'Premium Widget Pro', product_number: 'NC209/7000', image: '/img/product-1.jpg', price: 129.99, quantity: 2 },
+      { id: 2, productId: 102, name: 'Ultra Gadget X', product_number: 'NC234/6453', image: '/img/product-2.jpg', price: 89.50, quantity: 1 },
+      { id: 3, productId: 103, name: 'Mega Tool Set', product_number: 'NC324/9030', image: '/img/product-3.jpg', price: 249.00, quantity: 3 }
    ]
  }

@@ -65,6 +66,20 @@ export const useCartStore = defineStore('cart', () => {
    }
  }

+  function deleteProduct(id: number): boolean {
+    const index = items.value.findIndex(a => a.id === id)
+    if (index === -1) return false
+
+    items.value.splice(index, 1)
+    resetProductPagination()
+
+    return true
+  }
+
+  function resetProductPagination() {
+    currentPage.value = 1
+  }
+
  function removeItem(itemId: number) {
    const index = items.value.findIndex(i => i.id === itemId)
    if (index !== -1) {
@@ -104,6 +119,7 @@ export const useCartStore = defineStore('cart', () => {
    vatAmount,
    orderTotal,
    itemCount,
+    deleteProduct,
    updateQuantity,
    removeItem,
    clearCart,
--- a/bo/src/stores/customer.ts
+++ b/bo/src/stores/customer.ts
@@ -0,0 +1,46 @@
+import { defineStore } from 'pinia'
+import { ref, computed } from 'vue'
+import type { Address } from './address'
+
+export interface CustomerData {
+  companyName: string
+  companyEmail: string
+  companyAddress: string
+  regon: string
+  nip: string
+  vat: string
+  billingAddressId: number | null
+  companyAddressId: number | null
+}
+
+export const useCustomerStore = defineStore('customer', () => {
+  const customer = ref<CustomerData | null>(null)
+  const loading = ref(false)
+  const error = ref<string | null>(null)
+
+  const hasAccount = computed(() => customer.value !== null)
+
+  function setCustomer(data: CustomerData) {
+    customer.value = data
+  }
+
+  function clearCustomer() {
+    customer.value = null
+  }
+
+  function updateCustomer(data: Partial<CustomerData>) {
+    if (customer.value) {
+      customer.value = { ...customer.value, ...data }
+    }
+  }
+
+  return {
+    customer,
+    loading,
+    error,
+    hasAccount,
+    setCustomer,
+    clearCustomer,
+    updateCustomer
+  }
+})
--- a/bo/src/stores/product.ts
+++ b/bo/src/stores/product.ts
@@ -42,7 +42,7 @@ export const useProductStore = defineStore('product', () => {
    }
  }

-    async function saveProductDescription() {
+  async function saveProductDescription() {
    try {
      const data = await useFetchJson(
        `/api/v1/restricted/product-description/save-product-description?productID=1&productShopID=1&productLangID=1`,
@@ -92,6 +92,6 @@ export const useProductStore = defineStore('product', () => {
    getProductDescription,
    clearCurrentProduct,
    saveProductDescription,
-    translateProductDescription
+    translateProductDescription,
  }
 })
--- a/go.mod
+++ b/go.mod
@@ -29,6 +29,7 @@ require (
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
 	github.com/googleapis/gax-go/v2 v2.15.0 // indirect
+	github.com/meilisearch/meilisearch-go v0.36.1 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -109,6 +109,8 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/meilisearch/meilisearch-go v0.36.1 h1:mJTCJE5g7tRvaqKco6DfqOuJEjX+rRltDEnkEC02Y0M=
+github.com/meilisearch/meilisearch-go v0.36.1/go.mod h1:hWcR0MuWLSzHfbz9GGzIr3s9rnXLm1jqkmHkJPbUSvM=
 github.com/onsi/gomega v1.39.1 h1:1IJLAad4zjPn2PsnhH70V4DKRFlrCzGBNrNaru+Vf28=
 github.com/onsi/gomega v1.39.1/go.mod h1:hL6yVALoTOxeWudERyfppUcZXjMwIMLnuSfruD2lcfg=
 github.com/openai/openai-go/v3 v3.28.0 h1:2+FfrCVMdGXSQrBv1tLWtokm+BU7+3hJ/8rAHPQ63KM=
--- a/i18n/migrations/20260302163100_routes.sql
+++ b/i18n/migrations/20260302163100_routes.sql
@@ -6,16 +6,16 @@ CREATE TABLE IF NOT EXISTS b2b_tracker_routes (
  path        VARCHAR(255) NULL,
  component   VARCHAR(255) NOT NULL COMMENT 'path to component file',
  layout      VARCHAR(50) DEFAULT 'default' COMMENT "'default' | 'empty'",
-  meta        JSON DEFAULT '{}' ,
+  meta        JSON DEFAULT '{}',
  is_active   BOOLEAN DEFAULT TRUE,
  sort_order  INT DEFAULT 0,
-  parent_id   INT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
+  parent_id   INT NULL,

-ALTER TABLE b2b_tracker_routes
-  ADD CONSTRAINT fk_parent
-  FOREIGN KEY (parent_id) REFERENCES b2b_tracker_routes(id)
-  ON DELETE SET NULL;
+  CONSTRAINT fk_parent
+    FOREIGN KEY (parent_id)
+    REFERENCES b2b_tracker_routes(id)
+    ON DELETE SET NULL
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

 INSERT IGNORE INTO b2b_tracker_routes
  (name, path, component, layout, meta, is_active, sort_order, parent_id)
--- a/i18n/migrations/20260302163122_create_tables.sql
+++ b/i18n/migrations/20260302163122_create_tables.sql
@@ -113,13 +113,6 @@ CREATE UNIQUE INDEX IF NOT EXISTS uk_refresh_tokens_token_hash ON b2b_refresh_to
 CREATE INDEX IF NOT EXISTS idx_refresh_tokens_customer_id ON b2b_refresh_tokens (customer_id);


-- insert sample admin user admin@ma-al.com/Maal12345678
-
-INSERT IGNORE INTO b2b_customers (id, email, password, first_name, last_name, role, provider, provider_id, avatar_url, is_active, email_verified, email_verification_token, email_verification_expires, password_reset_token, password_reset_expires, last_password_reset_request, last_login_at, lang_id, country_id, created_at, updated_at, deleted_at)
-VALUES
-  (1, 'admin@ma-al.com', '$2a$10$Owy9DjrS0l3Fz4XoOvh5pulgmOMqdwXmb7hYE9BovnSuWS2plGr82', 'Super', 'Admin', 'admin', 'local', '', '', 1, 1, NULL, NULL, '', NULL, NULL, NULL, 1, 1, '2026-03-02 16:55:10.252740', '2026-03-02 16:55:10.252740', NULL);
-ALTER TABLE b2b_customers AUTO_INCREMENT = 1;
-
 -- countries
 CREATE TABLE IF NOT EXISTS b2b_countries (
  id          INT AUTO_INCREMENT PRIMARY KEY,
Author	SHA1	Message	Date
Yakovenko Valeriia	d0c1f49d3e	fix: create Account Page	2026-03-23 16:14:43 +01:00
Yakovenko Valeriia	508418523f	fix: style	2026-03-23 11:04:41 +01:00
Yakovenko Valeriia	0853424c4e	fix: style	2026-03-23 10:12:55 +01:00
Yakovenko Valeriia	12e9e49f9b	Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test	2026-03-23 09:37:18 +01:00
Daniel Goc	25ad592be3	rename and move folders and files	2026-03-23 09:35:20 +01:00
Yakovenko Valeriia	a984d2ac0d	Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test	2026-03-20 15:57:50 +01:00
Daniel Goc	26e6a3c384	setup meili search	2026-03-20 15:18:27 +01:00
Marek Goc	a4c1773415	Merge pull request 'fix migrations' (#15 ) from mailisearch into main Reviewed-on: #15	2026-03-20 14:02:45 +00:00
Marek Goc	8e07daac66	fix migrations	2026-03-20 14:57:50 +01:00
Marek Goc	6408b93e5c	Merge pull request 'meilisearch' (#14 ) from mailisearch into main Reviewed-on: #14	2026-03-20 12:55:52 +00:00
Marek Goc	27fa88b076	meilisearch	2026-03-20 13:55:20 +01:00
Yakovenko Valeriia	f60d1bb6de	Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test	2026-03-20 13:42:32 +01:00
Daniel Goc	b67c4e3aef	endpoint returning tree of categories	2026-03-20 12:38:41 +01:00
Yakovenko Valeriia	95b73b9836	Merge branch 'main' of ssh://git.ma-al.com:8822/goc_daniel/b2b into test	2026-03-20 10:19:06 +01:00
Daniel Goc	0d29d8f6a2	debug	2026-03-20 09:57:20 +01:00
Daniel Goc	884e15bb8a	added ImageID and LinkRewrite	2026-03-20 09:31:08 +01:00