add image link (large_default) to product description

Reviewed-on: #44

.env

@@ -48,10 +48,6 @@ EMAIL_FROM=test@ma-al.com
 EMAIL_FROM_NAME=Gitea Manager
 EMAIL_ADMIN=goc_marek@ma-al.pl
 
-# STORAGE
-STORAGE_ROOT=./storage
-
-
 I18N_LANGS=en,pl,cs
 
 PDF_SERVER_URL=http://localhost:8000

app/config/config.go

@@ -2,10 +2,8 @@ package config
 
 import (
 	"fmt"
-	"log"
 	"log/slog"
 	"os"
-	"path/filepath"
 	"reflect"
 	"strconv"
 	"strings"
@@ -26,8 +24,7 @@ type Config struct {
 	GoogleTranslate GoogleTranslateConfig
 	Image           ImageConfig
 	Cors            CorsConfig
-	MeiliSearch     MeiliSearchConfig
-	Storage         StorageConfig
+	MailiSearch     MeiliSearchConfig
 }
 
 type I18n struct {
@@ -98,10 +95,6 @@ type EmailConfig struct {
 	Enabled      bool   `env:"EMAIL_ENABLED,false"`
 }
 
-type StorageConfig struct {
-	RootFolder string `env:"STORAGE_ROOT"`
-}
-
 type PdfPrinter struct {
 	ServerUrl string `env:"PDF_SERVER_URL,http://localhost:8000"`
 }
@@ -162,7 +155,7 @@ func load() *Config {
 
 	err = loadEnv(&cfg.OAuth.Google)
 	if err != nil {
-		slog.Error("not possible to load env variables for oauth google : ", err.Error(), "")
+		slog.Error("not possible to load env variables for outh google : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.App)
@@ -177,12 +170,12 @@ func load() *Config {
 
 	err = loadEnv(&cfg.I18n)
 	if err != nil {
-		slog.Error("not possible to load env variables for i18n : ", err.Error(), "")
+		slog.Error("not possible to load env variables for email : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.Pdf)
 	if err != nil {
-		slog.Error("not possible to load env variables for pdf : ", err.Error(), "")
+		slog.Error("not possible to load env variables for email : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.GoogleTranslate)
@@ -192,25 +185,19 @@ func load() *Config {
 
 	err = loadEnv(&cfg.Image)
 	if err != nil {
-		slog.Error("not possible to load env variables for image : ", err.Error(), "")
+		slog.Error("not possible to load env variables for google translate : ", err.Error(), "")
 	}
 
 	err = loadEnv(&cfg.Cors)
 	if err != nil {
-		slog.Error("not possible to load env variables for cors : ", err.Error(), "")
+		slog.Error("not possible to load env variables for google translate : ", err.Error(), "")
 	}
 
-	err = loadEnv(&cfg.MeiliSearch)
+	err = loadEnv(&cfg.MailiSearch)
 	if err != nil {
-		slog.Error("not possible to load env variables for meili search : ", err.Error(), "")
+		slog.Error("not possible to load env variables for google translate : ", err.Error(), "")
 	}
 
-	err = loadEnv(&cfg.Storage)
-	if err != nil {
-		slog.Error("not possible to load env variables for storage : ", err.Error(), "")
-	}
-	cfg.Storage.RootFolder = ResolveRelativePath(cfg.Storage.RootFolder)
-
 	return cfg
 }
 
@@ -321,22 +308,6 @@ func setValue(field reflect.Value, val string, key string) error {
 	return nil
 }
 
-func ResolveRelativePath(relativePath string) string {
-	// get working directory (where program was started)
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// convert to absolute path
-	absPath := relativePath
-	if !filepath.IsAbs(absPath) {
-		absPath = filepath.Join(wd, absPath)
-	}
-
-	return filepath.Clean(absPath)
-}
-
 func parseEnvTag(tag string) (key string, def *string) {
 	if tag == "" {
 		return "", nil

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

@@ -1,146 +0,0 @@
-package restricted
-
-import (
-	"strconv"
-
-	"git.ma-al.com/goc_daniel/b2b/app/config"
-	"git.ma-al.com/goc_daniel/b2b/app/service/storageService"
-	"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 StorageHandler struct {
-	storageService *storageService.StorageService
-	config         *config.Config
-}
-
-func NewStorageHandler() *StorageHandler {
-	return &StorageHandler{
-		storageService: storageService.New(),
-		config:         config.Get(),
-	}
-}
-
-func StorageHandlerRoutes(r fiber.Router) fiber.Router {
-	handler := NewStorageHandler()
-
-	r.Get("/list-content", handler.ListContent)
-	r.Get("/download-file", handler.DownloadFile)
-
-	r.Post("/upload-file", handler.UploadFile)
-	r.Get("/create-folder", handler.CreateFolder)
-	r.Delete("/delete-file", handler.DeleteFile)
-	r.Delete("/delete-folder", handler.DeleteFolder)
-
-	return r
-}
-
-// accepted path looks like e.g. "/folder1/" or "folder1"
-func (h *StorageHandler) ListContent(c fiber.Ctx) error {
-	// relative path defaults to root directory
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Query("path"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	entries_in_list, err := h.storageService.ListContent(abs_path)
-
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(entries_in_list, 0, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *StorageHandler) DownloadFile(c fiber.Ctx) error {
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Query("path"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	f, filename, filesize, err := h.storageService.DownloadFilePrep(abs_path)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	c.Attachment(filename)
-	c.Set("Content-Length", strconv.FormatInt(filesize, 10))
-	return c.SendStream(f, int(filesize))
-}
-
-func (h *StorageHandler) UploadFile(c fiber.Ctx) error {
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Query("path"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	f, err := c.FormFile("document")
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(responseErrors.ErrMissingFileFieldDocument)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, responseErrors.ErrMissingFileFieldDocument)))
-	}
-
-	err = h.storageService.UploadFile(c, abs_path, f)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *StorageHandler) CreateFolder(c fiber.Ctx) error {
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Query("path"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	err = h.storageService.CreateFolder(abs_path, c.Query("name"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *StorageHandler) DeleteFile(c fiber.Ctx) error {
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Query("path"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	err = h.storageService.DeleteFile(abs_path)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
-}
-
-func (h *StorageHandler) DeleteFolder(c fiber.Ctx) error {
-	abs_path, err := h.storageService.AbsPath(h.config.Storage.RootFolder, c.Query("path"))
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	err = h.storageService.DeleteFolder(abs_path)
-	if err != nil {
-		return c.Status(responseErrors.GetErrorStatus(err)).
-			JSON(response.Make(nullable.GetNil(""), 0, responseErrors.GetErrorCode(c, err)))
-	}
-
-	return c.JSON(response.Make(nullable.GetNil(""), 0, i18n.T_(c, response.Message_OK)))
-}

app/delivery/web/init.go

@@ -115,10 +115,6 @@ func (s *Server) Setup() error {
 	carts := s.restricted.Group("/carts")
 	restricted.CartsHandlerRoutes(carts)
 
-	// storage (restricted)
-	storage := s.restricted.Group("/storage")
-	restricted.StorageHandlerRoutes(storage)
-
 	s.api.All("*", func(c fiber.Ctx) error {
 		return c.SendStatus(fiber.StatusNotFound)
 	})

app/model/entry.go

@@ -1,6 +0,0 @@
-package model
-
-type EntryInList struct {
-	Name     string
-	IsFolder bool
-}

app/model/productDescription.go

@@ -18,9 +18,10 @@ type ProductDescription struct {
 	AvailableLater   string `gorm:"column:available_later;type:varchar(255)" json:"available_later" form:"available_later"`
 	DeliveryInStock  string `gorm:"column:delivery_in_stock;type:varchar(255)" json:"delivery_in_stock" form:"delivery_in_stock"`
 	DeliveryOutStock string `gorm:"column:delivery_out_stock;type:varchar(255)" json:"delivery_out_stock" form:"delivery_out_stock"`
-	Usage            string `gorm:"column:usage;type:text" json:"usage" form:"usage"`
+	Usage            string `gorm:"column:_usage_;type:text" json:"usage" form:"usage"`
 
-	ExistsInDatabase bool `gorm:"-" json:"exists_in_database"`
+	ImageLink        string `gorm:"column:image_link" json:"image_link"`
+	ExistsInDatabase bool   `gorm:"-" json:"exists_in_database"`
 }
 
 type ProductRow struct {

app/repos/productDescriptionRepo/productDescriptionRepo.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 
+	"git.ma-al.com/goc_daniel/b2b/app/config"
 	"git.ma-al.com/goc_daniel/b2b/app/db"
 	"git.ma-al.com/goc_daniel/b2b/app/model"
 	"git.ma-al.com/goc_daniel/b2b/app/model/dbmodel"
@@ -36,6 +37,27 @@ func (r *ProductDescriptionRepo) GetProductDescription(productID uint, productid
 			IDShop:    int32(constdata.SHOP_ID),
 			IDLang:    int32(productid_lang),
 		}).
+		Select(`
+			`+dbmodel.PsProductLangCols.IDProduct.TabCol()+` AS id_product,
+			`+dbmodel.PsProductLangCols.IDShop.TabCol()+` AS id_shop,
+			`+dbmodel.PsProductLangCols.IDLang.TabCol()+` AS id_lang,
+			`+dbmodel.PsProductLangCols.Description.TabCol()+` AS description,
+			`+dbmodel.PsProductLangCols.DescriptionShort.TabCol()+` AS description_short,
+			`+dbmodel.PsProductLangCols.LinkRewrite.TabCol()+` AS link_rewrite,
+			`+dbmodel.PsProductLangCols.MetaDescription.TabCol()+` AS meta_description,
+			`+dbmodel.PsProductLangCols.MetaKeywords.TabCol()+` AS meta_keywords,
+			`+dbmodel.PsProductLangCols.MetaTitle.TabCol()+` AS meta_title,
+			`+dbmodel.PsProductLangCols.Name.TabCol()+` AS name,
+			`+dbmodel.PsProductLangCols.AvailableNow.TabCol()+` AS available_now,
+			`+dbmodel.PsProductLangCols.AvailableLater.TabCol()+` AS available_later,
+			`+dbmodel.PsProductLangCols.DeliveryInStock.TabCol()+` AS delivery_in_stock,
+			`+dbmodel.PsProductLangCols.DeliveryOutStock.TabCol()+` AS delivery_out_stock,
+			`+dbmodel.PsProductLangCols.Usage.TabCol()+` AS _usage_,
+			CONCAT(?, '/', `+dbmodel.PsImageShopCols.IDImage.TabCol()+`, '-large_default/', `+dbmodel.PsProductLangCols.LinkRewrite.TabCol()+`, '.webp') AS image_link
+		`, config.Get().Image.ImagePrefix).
+		Joins("JOIN " + dbmodel.TableNamePsImageShop +
+			" ON " + dbmodel.PsImageShopCols.IDProduct.TabCol() + "=" + dbmodel.PsProductLangCols.IDProduct.TabCol() +
+			" AND " + dbmodel.PsImageShopCols.Cover.TabCol() + " = 1").
 		First(&ProductDescription).Error
 
 	if errors.Is(err, gorm.ErrRecordNotFound) {

app/repos/searchRepo/searchRepo.go

@@ -32,12 +32,12 @@ func New() UISearchRepo {
 }
 
 func (r *SearchRepo) Search(index string, body []byte) (*SearchProxyResponse, error) {
-	url := fmt.Sprintf("%s/indexes/%s/search", r.cfg.MeiliSearch.ServerURL, index)
+	url := fmt.Sprintf("%s/indexes/%s/search", r.cfg.MailiSearch.ServerURL, index)
 	return r.doRequest(http.MethodPost, url, body)
 }
 
 func (r *SearchRepo) GetIndexSettings(index string) (*SearchProxyResponse, error) {
-	url := fmt.Sprintf("%s/indexes/%s/settings", r.cfg.MeiliSearch.ServerURL, index)
+	url := fmt.Sprintf("%s/indexes/%s/settings", r.cfg.MailiSearch.ServerURL, index)
 	return r.doRequest(http.MethodGet, url, nil)
 }
 
@@ -55,8 +55,8 @@ func (r *SearchRepo) doRequest(method, url string, body []byte) (*SearchProxyRes
 	}
 
 	req.Header.Set("Content-Type", "application/json")
-	if r.cfg.MeiliSearch.ApiKey != "" {
-		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", r.cfg.MeiliSearch.ApiKey))
+	if r.cfg.MailiSearch.ApiKey != "" {
+		req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", r.cfg.MailiSearch.ApiKey))
 	}
 
 	client := &http.Client{}

app/repos/storageRepo/storageRepo.go

@@ -1,68 +0,0 @@
-package storageRepo
-
-import (
-	"mime/multipart"
-	"os"
-
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"github.com/gofiber/fiber/v3"
-)
-
-type UIStorageRepo interface {
-	EntryInfo(abs_path string) (os.FileInfo, error)
-	ListContent(abs_path string) (*[]model.EntryInList, error)
-	OpenFile(abs_path string) (*os.File, error)
-	UploadFile(c fiber.Ctx, abs_path string, f *multipart.FileHeader) error
-	CreateFolder(abs_path string) error
-	DeleteFile(abs_path string) error
-	DeleteFolder(abs_path string) error
-}
-
-type StorageRepo struct{}
-
-func New() UIStorageRepo {
-	return &StorageRepo{}
-}
-
-func (r *StorageRepo) EntryInfo(abs_path string) (os.FileInfo, error) {
-	return os.Stat(abs_path)
-}
-
-func (r *StorageRepo) ListContent(abs_path string) (*[]model.EntryInList, error) {
-	entries, err := os.ReadDir(abs_path)
-	if err != nil {
-		return nil, err
-	}
-
-	var entries_in_list []model.EntryInList
-
-	for _, entry := range entries {
-		var next_entry_in_list model.EntryInList
-		next_entry_in_list.Name = entry.Name()
-		next_entry_in_list.IsFolder = entry.IsDir()
-
-		entries_in_list = append(entries_in_list, next_entry_in_list)
-	}
-
-	return &entries_in_list, nil
-}
-
-func (r *StorageRepo) OpenFile(abs_path string) (*os.File, error) {
-	return os.Open(abs_path)
-}
-
-func (r *StorageRepo) UploadFile(c fiber.Ctx, abs_path string, f *multipart.FileHeader) error {
-	return c.SaveFile(f, abs_path)
-}
-
-func (r *StorageRepo) CreateFolder(abs_path string) error {
-	return os.Mkdir(abs_path, 0755)
-}
-
-func (r *StorageRepo) DeleteFile(abs_path string) error {
-	return os.Remove(abs_path)
-}
-
-func (r *StorageRepo) DeleteFolder(abs_path string) error {
-	return os.RemoveAll(abs_path)
-}

app/service/meiliService/meiliService.go

@@ -27,8 +27,8 @@ type MeiliService struct {
 func New() *MeiliService {
 
 	client := meilisearch.New(
-		config.Get().MeiliSearch.ServerURL,
-		meilisearch.WithAPIKey(config.Get().MeiliSearch.ApiKey),
+		config.Get().MailiSearch.ServerURL,
+		meilisearch.WithAPIKey(config.Get().MailiSearch.ApiKey),
 	)
 
 	return &MeiliService{

app/service/storageService/storageService.go

@@ -1,132 +0,0 @@
-package storageService
-
-import (
-	"mime/multipart"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"git.ma-al.com/goc_daniel/b2b/app/model"
-	"git.ma-al.com/goc_daniel/b2b/app/repos/storageRepo"
-	"git.ma-al.com/goc_daniel/b2b/app/utils/responseErrors"
-	"github.com/gofiber/fiber/v3"
-)
-
-type StorageService struct {
-	storageRepo storageRepo.UIStorageRepo
-}
-
-func New() *StorageService {
-	return &StorageService{
-		storageRepo: storageRepo.New(),
-	}
-}
-
-func (s *StorageService) ListContent(abs_path string) (*[]model.EntryInList, error) {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || !info.IsDir() {
-		return nil, responseErrors.ErrFolderDoesNotExist
-	}
-
-	entries_in_list, err := s.storageRepo.ListContent(abs_path)
-	return entries_in_list, err
-}
-
-func (s *StorageService) DownloadFilePrep(abs_path string) (*os.File, string, int64, error) {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || info.IsDir() {
-		return nil, "", 0, responseErrors.ErrFileDoesNotExist
-	}
-
-	f, err := s.storageRepo.OpenFile(abs_path)
-	if err != nil {
-		return nil, "", 0, err
-	}
-
-	return f, filepath.Base(abs_path), info.Size(), nil
-}
-
-func (s *StorageService) UploadFile(c fiber.Ctx, abs_path string, f *multipart.FileHeader) error {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || !info.IsDir() {
-		return responseErrors.ErrFolderDoesNotExist
-	}
-
-	name := f.Filename
-	if name == "" || name == "." || name == ".." || filepath.Base(name) != name {
-		return responseErrors.ErrBadAttribute
-	}
-	abs_file_path, err := s.AbsPath(abs_path, name)
-	if err != nil {
-		return err
-	}
-	if abs_file_path == abs_path {
-		return responseErrors.ErrBadAttribute
-	}
-
-	info, err = s.storageRepo.EntryInfo(abs_file_path)
-	if err == nil {
-		return responseErrors.ErrNameTaken
-	} else if os.IsNotExist(err) {
-		return s.storageRepo.UploadFile(c, abs_file_path, f)
-	} else {
-		return err
-	}
-}
-
-func (s *StorageService) CreateFolder(abs_path string, name string) error {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || !info.IsDir() {
-		return responseErrors.ErrFolderDoesNotExist
-	}
-
-	if name == "" || name == "." || name == ".." || filepath.Base(name) != name {
-		return responseErrors.ErrBadAttribute
-	}
-	abs_folder_path, err := s.AbsPath(abs_path, name)
-	if err != nil {
-		return err
-	}
-	if abs_folder_path == abs_path {
-		return responseErrors.ErrBadAttribute
-	}
-
-	info, err = s.storageRepo.EntryInfo(abs_folder_path)
-	if err == nil {
-		return responseErrors.ErrNameTaken
-	} else if os.IsNotExist(err) {
-		return s.storageRepo.CreateFolder(abs_folder_path)
-	} else {
-		return err
-	}
-}
-
-func (s *StorageService) DeleteFile(abs_path string) error {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || info.IsDir() {
-		return responseErrors.ErrFileDoesNotExist
-	}
-
-	return s.storageRepo.DeleteFile(abs_path)
-}
-
-func (s *StorageService) DeleteFolder(abs_path string) error {
-	info, err := s.storageRepo.EntryInfo(abs_path)
-	if err != nil || !info.IsDir() {
-		return responseErrors.ErrFolderDoesNotExist
-	}
-
-	return s.storageRepo.DeleteFolder(abs_path)
-}
-
-// AbsPath extracts an absolute path and validates it
-func (s *StorageService) AbsPath(root string, relativePath string) (string, error) {
-	clean_name := filepath.Clean(relativePath)
-	full_path := filepath.Join(root, clean_name)
-
-	if full_path != root && !strings.HasPrefix(full_path, root+string(os.PathSeparator)) {
-		return "", responseErrors.ErrAccessDenied
-	}
-
-	return full_path, nil
-}

app/utils/responseErrors/responseErrors.go

@@ -59,13 +59,6 @@ var (
 	ErrMaxAmtOfCartsReached              = errors.New("maximal amount of carts reached")
 	ErrUserHasNoSuchCart                 = errors.New("user does not have cart with given id")
 	ErrProductOrItsVariationDoesNotExist = errors.New("product or its variation with given ids does not exist")
-
-	// Typed errors for storage
-	ErrAccessDenied             = errors.New("access denied!")
-	ErrFolderDoesNotExist       = errors.New("folder does not exist")
-	ErrFileDoesNotExist         = errors.New("file does not exist")
-	ErrNameTaken                = errors.New("name taken")
-	ErrMissingFileFieldDocument = errors.New("missing file field 'document'")
 )
 
 // Error represents an error with HTTP status code
@@ -169,17 +162,6 @@ func GetErrorCode(c fiber.Ctx, err error) string {
 	case errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return i18n.T_(c, "error.product_or_its_variation_does_not_exist")
 
-	case errors.Is(err, ErrAccessDenied):
-		return i18n.T_(c, "error.access_denied")
-	case errors.Is(err, ErrFolderDoesNotExist):
-		return i18n.T_(c, "error.folder_does_not_exist")
-	case errors.Is(err, ErrFileDoesNotExist):
-		return i18n.T_(c, "error.file_does_not_exist")
-	case errors.Is(err, ErrNameTaken):
-		return i18n.T_(c, "error.name_taken")
-	case errors.Is(err, ErrMissingFileFieldDocument):
-		return i18n.T_(c, "error.missing_file_field_document")
-
 	default:
 		return i18n.T_(c, "error.err_internal_server_error")
 	}
@@ -221,12 +203,7 @@ func GetErrorStatus(err error) int {
 		errors.Is(err, ErrRootNeverReached),
 		errors.Is(err, ErrMaxAmtOfCartsReached),
 		errors.Is(err, ErrUserHasNoSuchCart),
-		errors.Is(err, ErrProductOrItsVariationDoesNotExist),
-		errors.Is(err, ErrAccessDenied),
-		errors.Is(err, ErrFolderDoesNotExist),
-		errors.Is(err, ErrFileDoesNotExist),
-		errors.Is(err, ErrNameTaken),
-		errors.Is(err, ErrMissingFileFieldDocument):
+		errors.Is(err, ErrProductOrItsVariationDoesNotExist):
 		return fiber.StatusBadRequest
 	case errors.Is(err, ErrEmailExists):
 		return fiber.StatusConflict

bo/src/components/admin/PageProducts.vue

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

bo/src/components/admin/ProductDetailView.vue

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

bo/src/components/customer/PageProducts.vue

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

bo/src/components/inner/categoryMenu.vue

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

bo/src/components/inner/categoryMenuListing.vue

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

bo/src/router/index.ts

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

bo/src/router/menu.ts

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

bo/src/stores/category.ts

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

bo/src/stores/product.ts

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

bo/src/types/product.d.ts

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

bo/src/types/settings.d.ts

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

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

@@ -1,7 +1,7 @@
 info:
   name: add-new-cart
   type: http
-  seq: 14
+  seq: 11
 
 http:
   method: GET

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

@@ -1,7 +1,7 @@
 info:
   name: add-product-to-cart (1)
   type: http
-  seq: 19
+  seq: 16
 
 http:
   method: GET

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

@@ -1,7 +1,7 @@
 info:
   name: add-product-to-cart
   type: http
-  seq: 18
+  seq: 15
 
 http:
   method: GET

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

@@ -1,7 +1,7 @@
 info:
   name: change-cart-name
   type: http
-  seq: 15
+  seq: 12
 
 http:
   method: GET

bruno/b2b-daniel/create-folder.yml

@@ -1,22 +0,0 @@
-info:
-  name: create-folder
-  type: http
-  seq: 24
-
-http:
-  method: GET
-  url: http://localhost:3000/api/v1/restricted/storage/create-folder?path=&name=folder
-  params:
-    - name: path
-      value: ""
-      type: query
-    - name: name
-      value: folder
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b-daniel/create-index.yml

@@ -1,7 +1,7 @@
 info:
   name: create-index
   type: http
-  seq: 10
+  seq: 7
 
 http:
   method: GET

bruno/b2b-daniel/delete-file.yml

@@ -1,19 +0,0 @@
-info:
-  name: delete-file
-  type: http
-  seq: 25
-
-http:
-  method: DELETE
-  url: http://localhost:3000/api/v1/restricted/storage/delete-file?path=/folder/test.txt
-  params:
-    - name: path
-      value: /folder/test.txt
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b-daniel/delete-folder.yml

@@ -1,19 +0,0 @@
-info:
-  name: delete-folder
-  type: http
-  seq: 26
-
-http:
-  method: DELETE
-  url: http://localhost:3000/api/v1/restricted/storage/delete-folder?path=/folder/
-  params:
-    - name: path
-      value: /folder/
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b-daniel/download-file.yml

@@ -1,19 +0,0 @@
-info:
-  name: download-file
-  type: http
-  seq: 22
-
-http:
-  method: GET
-  url: http://localhost:3000/api/v1/restricted/storage/download-file?path=/folder1/test.txt
-  params:
-    - name: path
-      value: /folder1/test.txt
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b-daniel/get-breadcrumb.yml

@@ -1,7 +1,7 @@
 info:
   name: get-breadcrumb
   type: http
-  seq: 20
+  seq: 18
 
 http:
   method: GET

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

@@ -1,7 +1,7 @@
 info:
   name: get-category-tree
   type: http
-  seq: 8
+  seq: 5
 
 http:
   method: GET

bruno/b2b-daniel/get-indexes.yml

@@ -1,7 +1,7 @@
 info:
   name: get-indexes
   type: http
-  seq: 12
+  seq: 9
 
 http:
   method: GET

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

@@ -1,7 +1,7 @@
 info:
   name: get-product-description
   type: http
-  seq: 1
+  seq: 17
 
 http:
   method: GET

bruno/b2b-daniel/get_countries.yml

@@ -1,7 +1,7 @@
 info:
   name: get_countries
   type: http
-  seq: 7
+  seq: 4
 
 http:
   method: GET

bruno/b2b-daniel/list-content.yml

@@ -1,19 +0,0 @@
-info:
-  name: list-content
-  type: http
-  seq: 21
-
-http:
-  method: GET
-  url: http://localhost:3000/api/v1/restricted/storage/list-content?path=/folder1
-  params:
-    - name: path
-      value: /folder1
-      type: query
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

bruno/b2b-daniel/list-products.yml

@@ -1,7 +1,7 @@
 info:
   name: list-products
   type: http
-  seq: 4
+  seq: 1
 
 http:
   method: GET

bruno/b2b-daniel/list-users.yml

@@ -1,7 +1,7 @@
 info:
   name: list-users
   type: http
-  seq: 5
+  seq: 2
 
 http:
   method: GET

bruno/b2b-daniel/remove-index.yml

@@ -1,7 +1,7 @@
 info:
   name: remove-index
   type: http
-  seq: 11
+  seq: 8
 
 http:
   method: DELETE

bruno/b2b-daniel/retrieve-cart.yml

@@ -1,7 +1,7 @@
 info:
   name: retrieve-cart
   type: http
-  seq: 17
+  seq: 14
 
 http:
   method: GET

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

@@ -1,7 +1,7 @@
 info:
   name: retrieve-carts-info
   type: http
-  seq: 16
+  seq: 13
 
 http:
   method: GET

bruno/b2b-daniel/search.yml

@@ -1,7 +1,7 @@
 info:
   name: search
   type: http
-  seq: 13
+  seq: 10
 
 http:
   method: GET

bruno/b2b-daniel/test.yml

@@ -1,7 +1,7 @@
 info:
   name: test
   type: http
-  seq: 9
+  seq: 6
 
 http:
   method: GET

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

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

bruno/b2b-daniel/update-choice.yml

@@ -1,7 +1,7 @@
 info:
   name: update-choice
   type: http
-  seq: 6
+  seq: 3
 
 http:
   method: POST

bruno/b2b-daniel/upload-file.yml

@@ -1,26 +0,0 @@
-info:
-  name: upload-file
-  type: http
-  seq: 23
-
-http:
-  method: POST
-  url: http://localhost:3000/api/v1/restricted/storage/upload-file?path=folder/
-  params:
-    - name: path
-      value: folder/
-      type: query
-  body:
-    type: multipart-form
-    data:
-      - name: document
-        type: file
-        value:
-          - /home/daniel/coding/work/b2b/storage/folder1/test.txt
-  auth: inherit
-
-settings:
-  encodeUrl: true
-  timeout: 0
-  followRedirects: true
-  maxRedirects: 5

storage/folder1/test.txt

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

storage/test.txt

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