routing

Reviewed-on: #15

.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

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)))
-}

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)))

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

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

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

@@ -1,8 +1,6 @@
 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"
@@ -26,26 +24,33 @@ func MenuHandlerRoutes(r fiber.Router) fiber.Router {
 	handler := NewMenuHandler()
 
 	r.Get("/get-menu", handler.GetMenu)
+	r.Get("/get-routes", handler.GetRouting)
 
 	return r
 }
 
 func (h *MenuHandler) GetMenu(c fiber.Ctx) error {
-
+	lang_id, ok := c.Locals("langID").(uint)
-	id_shop_attribute := c.Query("shopID")
+	if !ok {
-	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)))
 	}
-
+	menu, err := h.menuService.GetMenu(lang_id)
-	id_lang, err := strconv.Atoi(c.Cookies("lang_id", "2"))
+	if err != nil {
-	if err != nil {
+		return c.Status(responseErrors.GetErrorStatus(err)).
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
-	}
+
-
+	return c.JSON(response.Make(&menu, 0, i18n.T_(c, response.Message_OK)))
-	menu, err := h.menuService.GetMenu(uint(id_shop), uint(id_lang))
+}
+
+func (h *MenuHandler) GetRouting(c fiber.Ctx) error {
+	lang_id, ok := c.Locals("langID").(uint)
+	if !ok {
+		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrBadAttribute)).
+			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrBadAttribute)))
+	}
+	menu, err := h.menuService.GetRoutes(lang_id)
 	if err != nil {
 		return c.Status(responseErrors.GetErrorStatus(err)).
 			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))

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)))

app/delivery/web/init.go

@@ -97,15 +97,23 @@ func (s *Server) Setup() error {
 	listProducts := s.restricted.Group("/list-products")
 	restricted.ListProductsHandlerRoutes(listProducts)
 
-	// changing the JWT cookies routes (restricted)
+	// locale selector (restricted)
-	// in reality it just handles changing user's country and language
+	// this is basically for changing user's selected language and country
-	langsAndCountries := s.restricted.Group("/langs-and-countries")
+	localeSelector := s.restricted.Group("/langs-and-countries")
-	restricted.LangsAndCountriesHandlerRoutes(langsAndCountries)
+	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)
+
+	s.api.All("*", func(c fiber.Ctx) error {
+		return c.SendStatus(fiber.StatusNotFound)
+	})
+
 	// // Restricted routes example
 	// restricted := s.api.Group("/restricted")
 	// restricted.Use(middleware.AuthMiddleware())

app/model/product.go

@@ -88,12 +88,21 @@ type ScannedCategory struct {
 	Position    uint   `gorm:"column:position"`
 	ParentID    uint   `gorm:"column:id_parent"`
 	IsRoot      uint   `gorm:"column:is_root_category"`
+	LinkRewrite string `gorm:"column:link_rewrite"`
+	IsoCode     string `gorm:"column:iso_code"`
 }
 type Category struct {
 	CategoryID uint   `json:"category_id" form:"category_id"`
-	Name          string     `json:"name" form:"name"`
+	Label      string `json:"label" form:"label"`
-	Active        uint       `json:"active" form:"active"`
+	// Active     bool           `json:"active" form:"active"`
-	Subcategories []Category `json:"subcategories" form:"subcategories"`
+	Params   CategpryParams `json:"params" form:"params"`
+	Children []Category     `json:"children" form:"children"`
+}
+
+type CategpryParams struct {
+	CategoryID  uint   `json:"category_id" form:"category_id"`
+	LinkRewrite string `json:"link_rewrite" form:"link_rewrite"`
+	Locale      string `json:"locale" form:"locale"`
 }
 
 type FeatVal = map[uint][]uint

app/model/productDescription.go

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

app/model/routing.go

@@ -0,0 +1,21 @@
+package model
+
+type Route struct {
+	ID        uint    `gorm:"primaryKey;autoIncrement"`
+	Name      string  `gorm:"type:varchar(255);not null;unique"`
+	Path      *string `gorm:"type:varchar(255);default:null"`
+	Component string  `gorm:"type:varchar(255);not null;comment:path to component file"`
+	Layout    *string `gorm:"type:varchar(50);default:'default';comment:'default | empty'"`
+	Meta      *string `gorm:"type:longtext;default:'{}'"`
+	IsActive  *bool   `gorm:"type:tinyint;default:1"`
+	SortOrder *int    `gorm:"type:int;default:0"`
+
+	ParentID *uint  `gorm:"index"`
+	Parent   *Route `gorm:"constraint:OnUpdate:RESTRICT,OnDelete:SET NULL;foreignKey:ParentID"`
+
+	Children []Route `gorm:"foreignKey:ParentID"`
+}
+
+func (Route) TableName() string {
+	return "b2b_routes"
+}

app/repos/categoriesRepo/categoriesRepo.go

@@ -0,0 +1,41 @@
+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,
+			ps_category_lang.link_rewrite AS link_rewrite,
+			ps_lang.iso_code AS iso_code
+		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 = ?
+		JOIN ps_lang ON ps_lang.id_lang = ps_category_lang.id_lang 
+		`,
+		constdata.SHOP_ID, id_lang, constdata.SHOP_ID).
+		Scan(&allCategories).Error
+
+	return allCategories, err
+}

app/repos/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,7 +18,7 @@ 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
 
@@ -60,7 +61,7 @@ func (repo *ListProductsRepo) GetListing(id_shop uint, id_lang uint, p find.Pagi
 			) any_image
 				ON ps_product.id_product = any_image.id_product
 		LIMIT ? OFFSET ?`,
-		id_shop, id_lang, id_shop, p.Limit(), p.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

app/repos/localeSelectorRepo/localeSelectorRepo.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 {
+func New() UILocaleSelectorRepo {
-	return &LangsAndCountriesRepo{}
+	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").

app/repos/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)
+	GetProductDescription(productID uint, productLangID uint) (*model.ProductDescription, error)
-	CreateIfDoesNotExist(productID uint, productShopID uint, productLangID uint) error
+	CreateIfDoesNotExist(productID uint, productLangID uint) error
-	UpdateFields(productID uint, productShopID uint, productLangID uint, updates map[string]string) 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)

app/repos/routesRepo/routesRepo.go

@@ -0,0 +1,25 @@
+package routesrepo
+
+import (
+	"git.ma-al.com/goc_daniel/b2b/app/db"
+	"git.ma-al.com/goc_daniel/b2b/app/model"
+)
+
+type UIRoutesRepo interface {
+	GetRoutes(langId uint) ([]model.Route, error)
+}
+
+type RoutesRepo struct{}
+
+func New() UIRoutesRepo {
+	return &RoutesRepo{}
+}
+
+func (p *RoutesRepo) GetRoutes(langId uint) ([]model.Route, error) {
+	routes := []model.Route{}
+	err := db.DB.Find(&routes).Error
+	if err != nil {
+		return nil, err
+	}
+	return routes, nil
+}

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()
-}

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"

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
 	}

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()
+}

app/service/meiliService/meiliService.go

@@ -0,0 +1,185 @@
+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, err = cleanHTML(products[i].Description)
+		if err != nil {
+			fmt.Printf("nextMeiliProduct.Description: %v\n", nextMeiliProduct.Description)
+			fmt.Printf("products[i].ProductID: %v\n", products[i].ProductID)
+			fmt.Println("failed at description")
+			fmt.Printf("err: %v\n", err)
+			return err
+		}
+
+		nextMeiliProduct.DescriptionShort, err = cleanHTML(products[i].DescriptionShort)
+		if err != nil {
+			fmt.Printf("nextMeiliProduct.DescriptionShort: %v\n", nextMeiliProduct.DescriptionShort)
+			fmt.Printf("products[i].ProductID: %v\n", products[i].ProductID)
+			fmt.Println("failed at description short")
+			fmt.Printf("err: %v\n", err)
+			return err
+		}
+
+		nextMeiliProduct.Usage, err = cleanHTML(products[i].Usage)
+		if err != nil {
+			fmt.Printf("nextMeiliProduct.Usage: %v\n", nextMeiliProduct.Usage)
+			fmt.Printf("products[i].ProductID: %v\n", products[i].ProductID)
+			fmt.Println("failed at usage")
+			fmt.Printf("err: %v\n", err)
+			return err
+		}
+
+		meiliProducts = append(meiliProducts, nextMeiliProduct)
+	}
+
+	indexName := "meili_products_shop" + strconv.FormatInt(constdata.SHOP_ID, 10) + "_lang" + strconv.FormatInt(int64(id_lang), 10)
+	primaryKey := "ProductID"
+	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, error) {
+	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
+		} else if err != nil {
+			return text, err
+		}
+
+		switch v := token.(type) {
+		case xml.StartElement:
+			if len(text) > 0 && text[len(text)-1] != '\n' {
+				text += " \n "
+			}
+		case xml.EndElement:
+		case xml.CharData:
+			if strings.TrimSpace(string(v)) != "" {
+				text += string(v)
+			}
+		case xml.Comment:
+		case xml.ProcInst:
+		case xml.Directive:
+		}
+	}
+
+	return text, nil
+}

app/service/menuService/menuService.go

@@ -4,24 +4,27 @@ import (
 	"sort"
 
 	"git.ma-al.com/goc_daniel/b2b/app/model"
+	"git.ma-al.com/goc_daniel/b2b/app/repos/categoriesRepo"
+	routesRepo "git.ma-al.com/goc_daniel/b2b/app/repos/routesRepo"
 	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
-	"git.ma-al.com/goc_daniel/b2b/repository/categoriesRepo"
 )
 
 type MenuService struct {
 	categoriesRepo categoriesRepo.UICategoriesRepo
+	routesRepo     routesRepo.UIRoutesRepo
 }
 
 func New() *MenuService {
 	return &MenuService{
 		categoriesRepo: categoriesRepo.New(),
+		routesRepo:     routesRepo.New(),
 	}
 }
 
-func (s *MenuService) GetMenu(id_shop uint, id_lang uint) (model.Category, error) {
+func (s *MenuService) GetMenu(id_lang uint) (*model.Category, error) {
-	all_categories, err := s.categoriesRepo.GetAllCategories(id_shop, id_lang)
+	all_categories, err := s.categoriesRepo.GetAllCategories(id_lang)
 	if err != nil {
-		return model.Category{}, err
+		return &model.Category{}, err
 	}
 
 	// find the root
@@ -35,7 +38,7 @@ func (s *MenuService) GetMenu(id_shop uint, id_lang uint) (model.Category, error
 		}
 	}
 	if !root_found {
-		return model.Category{}, responseErrors.ErrNoRootFound
+		return &model.Category{}, responseErrors.ErrNoRootFound
 	}
 
 	// now create the children and reorder them according to position
@@ -57,25 +60,31 @@ func (s *MenuService) GetMenu(id_shop uint, id_lang uint) (model.Category, error
 	// finally, create the tree
 	tree := s.createTree(root_index, &all_categories, &children_indices)
 
-	return tree, nil
+	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))
+		node.Children = append(node.Children, s.createTree((*children_indices)[index][i].Index, all_categories, children_indices))
 	}
 
 	return node
 }
 
+func (s *MenuService) GetRoutes(id_lang uint) ([]model.Route, error) {
+	return s.routesRepo.GetRoutes(id_lang)
+}
+
 func (s *MenuService) scannedToNormalCategory(scanned model.ScannedCategory) model.Category {
 	var normal model.Category
-	normal.Active = scanned.Active
+	// normal.Active = scanned.Active
 	normal.CategoryID = scanned.CategoryID
-	normal.Name = scanned.Name
+	normal.Label = scanned.Name
-	normal.Subcategories = []model.Category{}
+	// normal.Active = scanned.Active == 1
+	normal.Params = model.CategpryParams{CategoryID: normal.CategoryID, LinkRewrite: scanned.LinkRewrite, Locale: scanned.IsoCode}
+	normal.Children = []model.Category{}
 	return normal
 }
 

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) {
+func (s *ProductDescriptionService) GetProductDescription(userID uint, productID uint, productLangID uint) (*model.ProductDescription, error) {
-	return s.productDescriptionRepo.GetProductDescription(productID, productShopID, productLangID)
+	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
 	}

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

bo/components.d.ts

@@ -41,6 +41,7 @@ declare module 'vue' {
     UInput: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Input.vue')['default']
     UInputNumber: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/InputNumber.vue')['default']
     UModal: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Modal.vue')['default']
+    UNavigationMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/NavigationMenu.vue')['default']
     UPagination: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Pagination.vue')['default']
     USelect: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/Select.vue')['default']
     USelectMenu: typeof import('./node_modules/@nuxt/ui/dist/runtime/components/SelectMenu.vue')['default']

bo/src/layouts/default.vue

@@ -1,14 +1,51 @@
 <script setup lang="ts">
 import TopBar from '@/components/TopBar.vue';
+import { getMenu } from '@/router/menu'
+import type { NavigationMenuItem } from '@nuxt/ui';
+import { ref } from 'vue';
+let menu = await getMenu() as NavigationMenuItem[]
+
+const openAll = ref(false)
+
+function adaptMenu(menu: NavigationMenuItem[]) {
+  for (const item of menu) {
+    if(item.children && item.children.length > 0){
+      console.log(item);
+      adaptMenu(item.children);
+      item.open = openAll.value
+      item.children.unshift({ label: item.label, icon: 'i-lucide-book-open', popover: item.label ,to: { name: 'category', params: item.params }})
+    } else {
+      item.to = { name: 'category', params: item.params };
+      item.icon = 'i-lucide-file-text'
+    }
+  }
+  return menu;
+}
+
+menu = adaptMenu(menu)
+
+const items = ref<NavigationMenuItem[][]>([
+  [
+    
+    ...menu as NavigationMenuItem[]
+  ],
+ 
+])
+
 
 </script>
 
 <template>
   <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">
       <TopBar/>
-        <router-view />
+      <div class="mt-24 w-1/4 bg-accented rounded-2xl">
+        <button @click="openAll = !openAll">open all</button>
+        <UNavigationMenu arrow orientation="vertical" :items="items" class="p-4" :key="openAll">
+        </UNavigationMenu>
+
+      </div>
+      <slot></slot>
     </main>
   </div>
 </template>

bo/src/layouts/empty.vue

@@ -1,7 +1,7 @@
 <template>
   <main :key="i18n.locale.value">
     <TopBarLogin />
-    <router-view />
+    <slot></slot>
   </main>
 </template>
 <script setup lang="ts">

bo/src/router/index.ts

@@ -1,9 +1,9 @@
 import { createRouter, createWebHistory } from 'vue-router'
-import Empty from '@/layouts/empty.vue'
 import { currentLang, langs } from './langs'
 import { getSettings } from './settings'
 import { useAuthStore } from '@/stores/auth'
 import Default from '@/layouts/default.vue'
+import { getMenu } from './menu'
 
 function isAuthenticated(): boolean {
   if (typeof document === 'undefined') return false
@@ -12,6 +12,7 @@ function isAuthenticated(): boolean {
 
 
 await getSettings()
+const routes = await getMenu()
 
 
 const router = createRouter({
@@ -24,6 +25,7 @@ const router = createRouter({
     {
       path: '/:locale',
       children: [
+        { path: 'category/:category_id-:link_rewrite', component: () => import('../views/CategoryView.vue'), name: 'category' },
         {
           path: '',
           component: Default,
@@ -36,49 +38,88 @@ const router = createRouter({
             { path: 'cart', component: () => import('../components/customer/PageCart.vue'), name: 'cart' },
           ],
         },
-        {
+        { path: 'login', component: () => import('@/views/LoginView.vue'), name: 'login', meta: { guest: true, } },
-          path: '',
-          component: Empty,
-          children: [
-            { path: 'login', component: () => import('@/views/LoginView.vue'), name: 'login', meta: { guest: true } },
         { path: 'register', component: () => import('@/views/RegisterView.vue'), name: 'register', meta: { guest: true } },
         { path: 'password-recovery', component: () => import('@/views/PasswordRecoveryView.vue'), name: 'password-recovery', meta: { guest: true } },
         { path: 'reset-password', component: () => import('@/views/ResetPasswordForm.vue'), name: 'reset-password', meta: { guest: true } },
         { path: 'verify-email', component: () => import('@/views/VerifyEmailView.vue'), name: 'verify-email', meta: { guest: true } },
-          ],
+        // {
+        //   path: '',
+        //   component: Empty,
+        //   children: [
+        //   ],
+        // },
+        {
+          path: '/:pathMatch(.*)*',
+          component: () => import('@/views/NotFoundView.vue'),
+          name: 'not-found',
         },
       ],
     },
+    {
+      path: '/:pathMatch(.*)*',
+      component: () => import('@/views/NotFoundView.vue'),
+      name: 'not-found',
+    },
   ],
 })
 
-router.beforeEach((to, from, next) => {
+// router.beforeEach((to, from, next) => {
+//   const locale = to.params.locale as string
+//   const localeLang = langs.find((x) => x.iso_code == locale)
+
+//   if (locale && langs.length > 0) {
+//     const authStore = useAuthStore()
+//     // console.log(authStore.isAuthenticated, to, from)
+//     // if()
+//     const validLocale = langs.find((l) => l.lang_code === locale)
+
+//     if (validLocale) {
+//       currentLang.value = localeLang
+//       if (!to.meta?.guest && !isAuthenticated()) {
+//         return next({ name: 'login', params: { locale } })
+//       }
+
+//       // return next()
+//       return next()
+//     } else if (locale) {
+//       return next(`/${currentLang.value?.iso_code}${to.path.replace(`/${locale}`, '') || '/'}`)
+//     }
+//   }
+
+//   if (!locale && to.path !== '/') {
+//     return next(`/${currentLang.value?.iso_code}${to.path}`)
+//   }
+
+//   next()
+// })
+
+router.beforeEach((to, from) => {
   const locale = to.params.locale as string
-  const localeLang = langs.find((x) => x.iso_code == locale)
+  const localeLang = langs.find((x) => x.iso_code === locale)
 
   if (locale && langs.length > 0) {
     const authStore = useAuthStore()
-    console.log(authStore.isAuthenticated, to, from)
-    // if()
     const validLocale = langs.find((l) => l.lang_code === locale)
 
     if (validLocale) {
       currentLang.value = localeLang
-      if (!to.meta?.guest && !isAuthenticated()) {
+
-        return next({ name: 'login', params: { locale } })
+      if (!to.meta?.guest && !authStore.isAuthenticated) {
+        return { name: 'login', params: { locale } }
       }
 
-      return next()
+      return true
     } else if (locale) {
-      return next(`/${currentLang.value?.iso_code}${to.path.replace(`/${locale}`, '') || '/'}`)
+      return `/${currentLang.value?.iso_code}${to.path.replace(`/${locale}`, '') || '/'}`
     }
   }
 
   if (!locale && to.path !== '/') {
-    return next(`/${currentLang.value?.iso_code}${to.path}`)
+    return `/${currentLang.value?.iso_code}${to.path}`
   }
 
-  next()
+  return true
 })
 
 export default router

bo/src/router/menu.ts

@@ -0,0 +1,17 @@
+import { useFetchJson } from "@/composable/useFetchJson";
+import type { MenuItem, Route } from "@/types/menu";
+
+export const getMenu = async () => {
+    const resp = await useFetchJson<MenuItem>('/api/v1/restricted/menu/get-menu');
+
+    return resp.items.children
+    
+}
+
+
+export const getRoutes = async () => {
+    const resp = await useFetchJson<Route[]>('/api/v1/restricted/menu/get-routes');
+
+    return resp.items
+    
+}

bo/src/types/menu.d.ts

@@ -0,0 +1,26 @@
+export interface MenuItem {
+  category_id: number
+  label: string
+  params: Params
+  children: MenuItem[]
+}
+
+export interface Params {
+  category_id?: number
+  link_rewrite?: string
+  locale?: string
+}
+
+export interface Route {
+  ID: number
+  Name: string
+  Path: string
+  Component: string
+  Layout: string
+  Meta: string
+  IsActive: boolean
+  SortOrder: number
+  ParentID: any
+  Parent: any
+  Children: any
+}

bo/src/views/CategoryView.vue

@@ -0,0 +1,21 @@
+<template>
+    <component :is="Default || 'div'">
+        <div class="container mt-24">
+            <div class="row">
+                <div class="col-12">
+                    <h1>Category</h1>
+                    {{ $route.params }}
+                </div>
+            </div>
+        </div>
+    </component>
+</template>
+
+
+<script setup lang="ts">
+// import { useRoute } from 'vue-router';
+import Default from '@/layouts/default.vue';
+// const route = useRoute()
+// console.log(route);
+
+</script>

bo/src/views/LoginView.vue

@@ -4,8 +4,8 @@ import { useRouter, useRoute } from 'vue-router'
 import { useAuthStore } from '@/stores/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
-import { useI18n } from 'vue-i18n'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const router = useRouter()
 const route = useRoute()
@@ -52,9 +52,11 @@ const PrivacyComponent = computed(() =>
     import(`@/components/terms/${i18n.locale.value}_PrivacyPolicyView.vue`).catch(() => import('@/components/terms/en_PrivacyPolicyView.vue')),
   ),
 )
+
 </script>
 
 <template>
+<component :is="Empty || 'div'">
   <UDrawer v-model:open="showTherms" :overlay="false">
     <template #body>
       <component :is="TermsComponent" />
@@ -163,4 +165,5 @@ const PrivacyComponent = computed(() =>
       </p>
     </div>
   </div>
+  </component>
 </template>

bo/src/views/NotFoundView.vue

@@ -0,0 +1,7 @@
+<template>
+    <div class="flex flex-col items-center justify-center h-screen">
+      <h1 class="text-4xl font-bold text-gray-800">404</h1>
+      <p class="mt-4 text-lg text-gray-600">Page not found</p>
+      <router-link to="/" class="mt-6 text-blue-500 hover:underline">Go back home</router-link>
+    </div>
+</template>

bo/src/views/PasswordRecoveryView.vue

@@ -5,6 +5,7 @@ import { useAuthStore } from '@/stores/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const router = useRouter()
 const authStore = useAuthStore()
@@ -36,6 +37,7 @@ function validate(): FormError[] {
 </script>
 
 <template>
+  <component :is="Empty || 'div'">
     <div class="h-[100vh] flex flex-col items-center justify-center px-4 sm:px-6 lg:px-8">
       <div class="text-center mb-15">
         <div
@@ -84,11 +86,13 @@ function validate(): FormError[] {
             </UButton>
           </UForm>
 
-        <div class="text-center flex flex-col gap-3 border-t dark:border-(--border-dark) border-(--border-light) pt-4">
+          <div
+            class="text-center flex flex-col gap-3 border-t dark:border-(--border-dark) border-(--border-light) pt-4">
             <button color="neutral" variant="outline" :loading="authStore.loading"
               class="w-full flex items-center gap-2 justify-center text-[15px] dark:text-white text-black cursor-pointer"
               @click="goToLogin">
-            <UIcon name="mingcute:arrow-left-line" class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) text-[16px]" />
+              <UIcon name="mingcute:arrow-left-line"
+                class="text-(--accent-blue-light) dark:text-(--accent-blue-dark) text-[16px]" />
               {{ $t('general.back_to_sign_in') }}
             </button>
             <p class="text-sm text-gray-600 dark:text-gray-400">
@@ -102,4 +106,5 @@ function validate(): FormError[] {
         </template>
       </div>
     </div>
+  </component>
 </template>

bo/src/views/RegisterView.vue

@@ -1,4 +1,5 @@
 <template>
+  <component :is="Empty || 'div'">
   <UDrawer v-model:open="showTherms" :overlay="false">
     <template #body>
       <component :is="TermsComponent" />
@@ -110,6 +111,7 @@
       </UForm>
     </div>
   </div>
+  </component>
 </template>
 
 <script setup lang="ts">
@@ -120,6 +122,8 @@ import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { useI18n } from 'vue-i18n'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
+
 
 const { locale } = useI18n()
 const router = useRouter()

bo/src/views/ResetPasswordForm.vue

@@ -5,6 +5,7 @@ import { useAuthStore } from '@/stores/auth'
 import { useValidation } from '@/composable/useValidation'
 import type { FormError } from '@nuxt/ui'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const router = useRouter()
 const route = useRoute()
@@ -49,6 +50,7 @@ function validate(): FormError[] {
 </script>
 
 <template>
+    <component :is="Empty || 'div'">
         <div class="h-[100vh] flex flex-col items-center justify-center px-4 sm:px-6 lg:px-8">
             <div class="text-center mb-15">
                 <div
@@ -85,7 +87,8 @@ function validate(): FormError[] {
                             class="w-full dark:text-white text-black">
                             <UInput v-model="new_password" :type="showNewPassword ? 'text' : 'password'"
                                 :placeholder="$t('general.enter_your_new_password')" :disabled="authStore.loading"
-                            class="w-full dark:text-white text-black placeholder:text-(--placeholder)" :ui="{ trailing: 'pe-1' }">
+                                class="w-full dark:text-white text-black placeholder:text-(--placeholder)"
+                                :ui="{ trailing: 'pe-1' }">
                                 <template #trailing>
                                     <UIcon color="neutral" variant="link" size="sm"
                                         :name="showNewPassword ? 'i-lucide-eye-off' : 'i-lucide-eye'"
@@ -100,7 +103,8 @@ function validate(): FormError[] {
                             class="w-full dark:text-white text-black">
                             <UInput v-model="confirm_new_password" :type="showConfirmPassword ? 'text' : 'password'"
                                 :placeholder="$t('general.confirm_your_new_password')" :disabled="authStore.loading"
-                            class="w-full dark:text-white text-black placeholder:text-(--placeholder)" :ui="{ trailing: 'pe-1' }">
+                                class="w-full dark:text-white text-black placeholder:text-(--placeholder)"
+                                :ui="{ trailing: 'pe-1' }">
                                 <template #trailing>
                                     <UIcon color="neutral" variant="ghost" size="sm"
                                         :name="showConfirmPassword ? 'i-lucide-eye-off' : 'i-lucide-eye'"
@@ -125,4 +129,5 @@ function validate(): FormError[] {
                 </template>
             </div>
         </div>
+    </component>
 </template>

bo/src/views/VerifyEmailView.vue

@@ -4,6 +4,7 @@ import { useRouter, useRoute } from 'vue-router'
 import { useI18n } from 'vue-i18n'
 import { useFetchJson } from '@/composable/useFetchJson'
 import { i18n } from '@/plugins/02_i18n'
+import Empty from '@/layouts/empty.vue'
 
 const { t, te } = useI18n()
 const router = useRouter()
@@ -66,6 +67,7 @@ function goToLogin() {
 </script>
 
 <template>
+  <component :is="Empty || 'div'">
     <div
       class="min-h-screen bg-gradient-to-br from-primary-50 via-white to-primary-100 dark:from-gray-900 dark:via-gray-800 dark:to-gray-900">
       <div class="pt-20 pb-8 flex items-center justify-center px-4 sm:px-6 lg:px-8">
@@ -133,7 +135,8 @@ function goToLogin() {
                 <p class="text-sm text-gray-600 dark:text-gray-400">
                   {{ $t('verify_email.already_registered') }}
                   <button variant="link" size="sm" @click="goToLogin"
-                  class="cursor-pointer text-(--accent-blue-light) dark:text-(--accent-blue-dark)"> {{ $t('general.sign_in')
+                    class="cursor-pointer text-(--accent-blue-light) dark:text-(--accent-blue-dark)"> {{
+                      $t('general.sign_in')
                     }}
                   </button>
                 </p>
@@ -143,4 +146,5 @@ function goToLogin() {
         </div>
       </div>
     </div>
+  </component>
 </template>

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/gofiber/fiber/v3 v3.1.0
 	github.com/golang-jwt/jwt/v5 v5.3.1
 	github.com/joho/godotenv v1.5.1
+	github.com/meilisearch/meilisearch-go v0.36.1
 	github.com/openai/openai-go/v3 v3.28.0
 	github.com/samber/lo v1.53.0
 	golang.org/x/crypto v0.48.0

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=

i18n/migrations/20260302163100_routes.sql

@@ -1,6 +1,6 @@
 -- +goose Up
 -- create routes table
-CREATE TABLE IF NOT EXISTS b2b_tracker_routes (
+CREATE TABLE IF NOT EXISTS b2b_routes (
   id          INT AUTO_INCREMENT PRIMARY KEY,
   name        VARCHAR(255) NOT NULL UNIQUE,
   path        VARCHAR(255) NULL,
@@ -13,11 +13,11 @@ CREATE TABLE IF NOT EXISTS b2b_tracker_routes (
 
   CONSTRAINT fk_parent
     FOREIGN KEY (parent_id)
-    REFERENCES b2b_tracker_routes(id)
+    REFERENCES b2b_routes(id)
     ON DELETE SET NULL
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-INSERT IGNORE INTO b2b_tracker_routes
+INSERT IGNORE INTO b2b_routes
   (name, path, component, layout, meta, is_active, sort_order, parent_id)
 VALUES
   ('root', '', '', 'default', '{"trans": "route.root"}', 0, 0, 0),
@@ -30,5 +30,5 @@ VALUES
 
 -- +goose Down
 
-DROP TABLE IF EXISTS b2b_tracker_routes;
+DROP TABLE IF EXISTS b2b_routes;
 

repository/categoriesRepo/categoriesRepo.go

@@ -1,41 +0,0 @@
-package categoriesRepo
-
-import (
-	"git.ma-al.com/goc_daniel/b2b/app/db"
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-)
-
-type UICategoriesRepo interface {
-	GetAllCategories(id_shop uint, id_lang uint) ([]model.ScannedCategory, error)
-}
-
-type CategoriesRepo struct{}
-
-func New() UICategoriesRepo {
-	return &CategoriesRepo{}
-}
-
-func (repo *CategoriesRepo) GetAllCategories(id_shop uint, 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 = ?`,
-		id_shop, id_lang, id_shop).
-		Scan(&allCategories).Error
-
-	return allCategories, err
-}