Index: backend/models/categoryModel.js =================================================================== --- backend/models/categoryModel.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ backend/models/categoryModel.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,19 @@ +import mongoose from "mongoose"; + +const categorySchema = new mongoose.Schema( + { + categoryName: { type: String, required: true, unique: true }, + categorySlug: { type: String, required: true, unique: true }, + subCategories: [ + { + type: String, + }, + ], + }, + { + timestamps: true, + } +); + +const Category = mongoose.model("Category", categorySchema); +export default Category; Index: backend/models/productModel.js =================================================================== --- backend/models/productModel.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ backend/models/productModel.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -5,4 +5,7 @@ name: { type: String, required: true, unique: true }, slug: { type: String, required: true, unique: true }, + height: { type: Number, required: true }, + width: { type: Number, required: true }, + length: { type: Number, required: true }, image: { type: String, required: true }, sideImage: { type: String, required: true }, Index: backend/models/subCategoryModel.js =================================================================== --- backend/models/subCategoryModel.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ backend/models/subCategoryModel.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,14 @@ +import mongoose from "mongoose"; + +const subCategorySchema = new mongoose.Schema( + { + subCategoryName: { type: String, required: true, unique: true }, + subCategorySlug: { type: String, required: true, unique: true }, + }, + { + timestamps: true, + } +); + +const SubCategory = mongoose.model("SubCategory", subCategorySchema); +export default SubCategory; Index: backend/routes/categoryRoutes.js =================================================================== --- backend/routes/categoryRoutes.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ backend/routes/categoryRoutes.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,83 @@ +import express from "express"; +import expressAsyncHandler from "express-async-handler"; +import Category from "../models/categoryModel.js"; +import SubCategory from "../models/subCategoryModel.js"; + +const categoryRouter = express.Router(); + +categoryRouter.post( + "/addCategory", + expressAsyncHandler(async (req, res) => { + const newCategory = new Category({ + categoryName: req.body.category, + categorySlug: req.body.categorySlug, + subCategories: req.body.categories, + }); + const category = await newCategory.save(); + if (category) + res.status(201).send({ message: "New Category Created", category }); + else res.status(404).send({ message: "Error creating category" }); + }) +); + +categoryRouter.put( + "/updateCategory", + expressAsyncHandler(async (req, res) => { + const category = await Category.findOne({ + categorySlug: req.body.category, + }); + + if (category) { + category.categoryName = category.categoryName; + category.categorySlug = category.categorySlug; + category.subCategories = req.body.categories; + + const updatedCategory = await category.save(); + res.send(updatedCategory); + } else { + res.status(404).send({ message: "Category Not Found" }); + } + }) +); + +categoryRouter.get( + "/getCategories", + expressAsyncHandler(async (req, res) => { + const categories = await Category.find(); + res.send(categories); + }) +); + +categoryRouter.get( + "/getCategory", + expressAsyncHandler(async (req, res) => { + const category = await Category.find({ categorySlug: req.query.category }); + res.send(category); + }) +); + +categoryRouter.post( + "/addSubCategory", + expressAsyncHandler(async (req, res) => { + const newSubCategory = new SubCategory({ + subCategoryName: req.body.subCategory, + subCategorySlug: req.body.subCategorySlug, + }); + const subCategory = await newSubCategory.save(); + if (subCategory) + res.status(201).send({ message: "New Category Created", subCategory }); + else res.status(404).send({ message: "Error creating category" }); + }) +); + +categoryRouter.get( + "/getSubCategory", + expressAsyncHandler(async (req, res) => { + const subCategory = await SubCategory.find({ + subCategorySlug: req.query.subCategory, + }); + res.send(subCategory); + }) +); + +export default categoryRouter; Index: backend/routes/productRoutes.js =================================================================== --- backend/routes/productRoutes.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ backend/routes/productRoutes.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -42,4 +42,7 @@ priceMontaza: req.body.priceMontaza, countInStock: req.body.countInStock, + height: req.body.H, + width: req.body.W, + length: req.body.L, }); @@ -52,4 +55,50 @@ const PAGE_SIZE = 7; + +productRouter.get( + "/search", + expressAsyncHandler(async (req, res) => { + const { query } = req; + const pageSize = query.pageSize || PAGE_SIZE; + const page = query.page || 1; + const searchQuery = query.text; + console.log("HEEEY: " + searchQuery); + const queryFilter = + searchQuery && searchQuery !== "all" + ? { name: { $regex: searchQuery, $options: "i" } } + : {}; + const descriptionFilter = + searchQuery && searchQuery !== "all" + ? { description: { $regex: searchQuery, $options: "i" } } + : {}; + const slug = + searchQuery && searchQuery !== "all" + ? { slug: { $regex: searchQuery, $options: "i" } } + : {}; + const products = await Product.find({ + $or: [ + { name: { $regex: searchQuery, $options: "i" } }, + { slug: { $regex: searchQuery, $options: "i" } }, + { description: { $regex: searchQuery, $options: "i" } }, + ], + }) + .skip(pageSize * (page - 1)) + .limit(pageSize); + const countProducts = await Product.countDocuments({ + $or: [ + { name: { $regex: searchQuery, $options: "i" } }, + { slug: { $regex: searchQuery, $options: "i" } }, + { description: { $regex: searchQuery, $options: "i" } }, + ], + }); + res.send({ + products, + countProducts, + page, + pages: Math.ceil(countProducts / pageSize), + }); + }) +); + productRouter.get( "/", @@ -62,4 +111,10 @@ const order = query.order || ""; const searchQuery = query.query || ""; + const HF = query.HF || 0; + const HT = query.HT || 1000; + const WF = query.WF || 0; + const WT = query.WT || 1000; + const LF = query.LF || 0; + const LT = query.LT || 1000; const queryFilter = @@ -80,4 +135,12 @@ ...categoryFilter, ...subCategoryFilter, + $and: [ + { height: { $gte: HF } }, + { height: { $lte: HT } }, + { width: { $gte: WF } }, + { width: { $lte: WT } }, + { length: { $gte: LF } }, + { length: { $lte: LT } }, + ], }) .sort(sortOrder) Index: backend/server.js =================================================================== --- backend/server.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ backend/server.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -7,4 +7,5 @@ import userRouter from "./routes/userRoutes.js"; import orderRouter from "./routes/orderRoutes.js"; +import categoryRouter from "./routes/categoryRoutes.js"; dotenv.config(); @@ -28,4 +29,5 @@ app.use("/api/users", userRouter); app.use("/api/orders", orderRouter); +app.use("/api/category", categoryRouter); app.use((err, req, res, next) => { Index: frontend/src/App.js =================================================================== --- frontend/src/App.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ frontend/src/App.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -28,4 +28,6 @@ import AdminOrdersScreen from "./screens/AdminOrdersScreen"; import AdminOrderScreen from "./screens/AdminOrderScreen"; +import AdminAddCategoryScreen from "./screens/AdminAddCategoryScreen"; +import SearchScreen from "./screens/SearchScreen"; function App() { const { state } = useContext(Store); @@ -54,6 +56,11 @@ element={} /> + } /> } /> } /> + } + > } /> } /> Index: frontend/src/components/CategoryMenu.js =================================================================== --- frontend/src/components/CategoryMenu.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ frontend/src/components/CategoryMenu.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,30 @@ +import React from "react"; +import { Link } from "react-router-dom"; +import SubCategoryMenu from "./SubCategoryMenu"; + +function CategoryMenu(props) { + let ul = document.getElementById("subCategoryList"); + + const result = []; + + props.category.subCategories.forEach((sub) => { + result.push( + + ); + }); + + const categoryUrl = `/products/${props.category.categorySlug}/all`; + return ( +
+ + {props.category.categoryName} + +
    {result}
+
+ ); +} + +export default CategoryMenu; Index: frontend/src/components/Header.js =================================================================== --- frontend/src/components/Header.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ frontend/src/components/Header.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -1,3 +1,3 @@ -import React from "react"; +import React, { useEffect, useState } from "react"; import logo from "../Images/logo.png"; import "../styles/Header.css"; @@ -24,4 +24,6 @@ import NavDropdown from "react-bootstrap/NavDropdown"; import { height } from "@mui/system"; +import Axios from "axios"; +import CategoryMenu from "./CategoryMenu"; const toggleMenu = (event) => { @@ -76,4 +78,7 @@ const navigate = useNavigate(); + const [categories, setCategories] = useState([]); + //const [] + const signoutHandler = () => { ctxDispatch({ type: "USER_SIGNOUT" }); @@ -83,4 +88,49 @@ window.location.href = "/signin"; }; + + const searchHandler = () => { + let text = document.querySelector(".header__searchInput").value; + console.log(text); + navigate(`/products/search?text=${text}`); + }; + + useEffect(() => { + const fetchData = async () => { + const cat = await Axios.get(`/api/category/getCategories`); + categories.splice(0, categories.length); + for (let i = 0; i < cat.data.length; i++) { + categories.push(cat.data[i]); + } + console.log(categories[0]); + }; + fetchData(); + }, [categories]); + const results = []; + const results1 = []; + const results2 = []; + const results3 = []; + if (categories) createMenu(categories); + function createMenu(categories) { + /* + let ul = document.getElementById("category-ul-1"); + for(let i=0;i { + results.push(); + }); + for (let i = 0; i < categories.length; i++) { + if (i < 3) { + results1.push(); + } else if (i < 5) { + results2.push(); + } else { + results3.push(); + } + } + console.log("Results:"); + console.log(categories); + } return ( @@ -839,5 +889,7 @@
-
    +
      +
    • {categories[0] && results1}
      • + {/*
    • @@ -916,9 +968,11 @@
    - + */}
    +
  • {categories[0] && results2}
    • + {/*
  • @@ -998,8 +1052,11 @@
+ */}
    +
  • {categories[0] && results3}
    • + {/*
  • @@ -1083,4 +1140,5 @@
+ */}
@@ -1201,6 +1259,8 @@
- - + +
Index: frontend/src/components/Product.js =================================================================== --- frontend/src/components/Product.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ frontend/src/components/Product.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -54,24 +54,39 @@
- {product.countInStock > 0 ? ( - - Залиха - - ) : ( - - Залиха - - )} +
H: {product.height}
+
W: {product.width}
+
L: {product.length}
-
+
+
+ {product.countInStock > 0 ? ( + + Залиха + + ) : ( + + Залиха + + )} +
Index: frontend/src/components/SubCategoryMenu.js =================================================================== --- frontend/src/components/SubCategoryMenu.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ frontend/src/components/SubCategoryMenu.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,56 @@ +import axios from "axios"; +import React, { useEffect, useReducer } from "react"; +import { Link } from "react-router-dom"; + +const reducer = (state, action) => { + switch (action.type) { + case "FETCH_REQUEST": + return { ...state, loading: true }; + case "FETCH_SUCCESS": + return { + ...state, + getCategories: action.payload, + loading: false, + }; + case "FETCH_FAIL": + return { ...state, loading: false, error: action.payload }; + default: + return state; + } +}; + +function SubCategoryMenu(props) { + const [{ loading, getCategories }, dispatch] = useReducer(reducer, { + loading: true, + error: "", + }); + + useEffect(() => { + const fetchData = async () => { + try { + dispatch({ type: "FETCH_REQUEST" }); + const { data } = await axios.get( + `/api/category/getSubCategory?subCategory=${props.subCategory}` + ); + dispatch({ type: "FETCH_SUCCESS", payload: data }); + } catch (err) { + dispatch({ type: "FETCH_FAIL", payload: err }); + } + }; + fetchData(); + }, [props.subCategory]); + + return ( +
  • + {getCategories && ( + + {getCategories && getCategories[0].subCategoryName} + + )} +
    • + ); +} + +export default SubCategoryMenu; Index: frontend/src/screens/AdminAddCategoryScreen.js =================================================================== --- frontend/src/screens/AdminAddCategoryScreen.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ frontend/src/screens/AdminAddCategoryScreen.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,282 @@ +import React, { useContext, useEffect, useReducer, useState } from "react"; +import Button from "react-bootstrap/Button"; +import "../styles/AdminDashboard.css"; +import { Store } from "../Store"; +import { useNavigate, Link } from "react-router-dom"; +import { Helmet } from "react-helmet-async"; +import Form from "react-bootstrap/Form"; +import Axios from "axios"; +import { toast } from "react-toastify"; +import axios from "axios"; + +// Mesto podkategorii cuvaj stringovi od slugovite na podkategoriite vo kategoriite. Posle koga ce treba da gi stavas +//ce pravis get povik i ce gi zemis site podkategorii so tia slugovi zacuvani u kategorijata, i vnesi gi vo lista i vrati +//gi kako objekti (podkategorija) + +const reducer = (state, action) => { + switch (action.type) { + case "FETCH_REQUEST": + return { ...state, loading: true }; + case "FETCH_SUCCESS": + return { + ...state, + getCategories: action.payload, + loading: false, + }; + case "FETCH_FAIL": + return { ...state, loading: false, error: action.payload }; + default: + return state; + } +}; + +function AdminDashboardScreen() { + const navigate = useNavigate(); + const { state } = useContext(Store); + const { userInfo } = state; + useEffect(() => { + if (!userInfo || !userInfo.isAdmin) { + return navigate("/"); + } + }, [userInfo, navigate]); + + const [category, setCategory] = useState(""); + const [categorySlug, setCategorySlug] = useState(""); + const [categories, setCategories] = useState([]); + const [subCategory, setSubCategory] = useState(""); + const [subCategorySlug, setSubCategorySlug] = useState(""); + let counter = 0; + const addCategoryHandler = async (e) => { + e.preventDefault(); + setCategories([]); + try { + const { data } = await Axios.post("/api/category/addCategory", { + category, + categorySlug, + categories, + }); + toast.success("Категоријата е додадена"); + counter++; + } catch (err) { + console.log(err); + toast.error("Грешка"); + } + }; + + const addSubCategoryHandler = async (e) => { + e.preventDefault(); + + try { + const data3 = await Axios.get( + `/api/category/getCategory?category=${category}` + ); + + //console.log("<=============KATEGORII POCETNA SOSTOJBA==============>"); + //console.log(categories); + let subcategoriesSlugs = data3.data[0].subCategories; + for (let i = 0; i < subcategoriesSlugs.length; i++) { + categories.push(subcategoriesSlugs[i]); + } + + console.log( + "<=============KATEGORII PO DOBIVANJETO NA PODKATEGORIITE==============>" + ); + console.log(categories); + + const { data } = await Axios.post("/api/category/addSubCategory", { + subCategory, + subCategorySlug, + }); + + categories.push(data.subCategory.subCategorySlug); + console.log("<=============KATEGORII POSLE PUSH==============>"); + console.log(categories); + + //categories.push(data.subCategory); + //console.log(categories); + + const { data1 } = await Axios.put("/api/category/updateCategory", { + category, + //categorySlug, + categories, + }); + toast.success("Категоријата е додадена"); + categories.splice(0, categories.length); + + counter++; + } catch (err) { + console.log(err); + toast.error("Грешка"); + } finally { + } + }; + + const [{ loading, getCategories }, dispatch] = useReducer(reducer, { + loading: true, + error: "", + }); + + const flag = 1; + useEffect(() => { + const fetchData = async () => { + try { + dispatch({ type: "FETCH_REQUEST" }); + /* + const { data } = await axios.get( + `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}` + );*/ + const { data } = await Axios.get(`/api/category/getCategories`); + dispatch({ type: "FETCH_SUCCESS", payload: data }); + } catch (err) { + dispatch({ type: "FETCH_FAIL", payload: err }); + } + console.log(counter); + }; + fetchData(); + }, [counter]); + if (getCategories) foo(getCategories); + function foo(getCategories) { + let container = document.getElementById("selectContainer"); + container.innerHTML = ""; + for (let i = 0; i < getCategories.length; i++) { + let option = document.createElement("option"); + option.setAttribute("value", getCategories[i].categorySlug); + option.innerHTML = getCategories[i].categoryName; + container.appendChild(option); + } + } + + return ( +
    + + Dashboard + +
    + +
    + Додади нов производ +
    + + +
    Додади категорија
    + + +
    Производи
    + + +
    Нарачки
    + +
    +
    +
    +

    Додади категорија

    +
    + + setCategory(e.target.value)} + /> + + + setCategorySlug(e.target.value)} + /> + +
    + +
    +
    +
    +
    +

    Додади подкатегорија

    +
    + + { + setCategory(e.target.value); + }} + > + + + setSubCategory(e.target.value)} + /> + + + setSubCategorySlug(e.target.value)} + /> + +
    + +
    +
    +
    +
    +
    + ); +} + +export default AdminDashboardScreen; Index: frontend/src/screens/AdminAddProductScreen.js =================================================================== --- frontend/src/screens/AdminAddProductScreen.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ frontend/src/screens/AdminAddProductScreen.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -20,4 +20,7 @@ const [dimension, setDimension] = useState(""); const [scheme, setScheme] = useState(""); + const [H, setH] = useState(""); + const [W, setW] = useState(""); + const [L, setL] = useState(""); const [message, setMessage] = useState(""); @@ -56,5 +59,7 @@ formData.append("dimension", dimension); formData.append("scheme", scheme); - + formData.append("H", H); + formData.append("W", W); + formData.append("L", L); try { const result = await axios.post("/api/products/add", formData); @@ -76,4 +81,10 @@ Додади нов производ + + +
    Додади категорија
    + +
    + H: + setH(e.target.value)} + required + > +
    +
    + W: + setW(e.target.value)} + style={{ width: "60px" }} + required + > +
    +
    + L: + setL(e.target.value)} + required + > +
    +     Слика со димензии Index: frontend/src/screens/AdminDashboardScreen.js =================================================================== --- frontend/src/screens/AdminDashboardScreen.js (revision 113029bbf1a9831d3ae8fae3e6e1d250ae725493) +++ frontend/src/screens/AdminDashboardScreen.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -6,4 +6,5 @@ import { useNavigate, Link } from "react-router-dom"; import ListProducts from "../components/ListProducts"; +import { Helmet } from "react-helmet-async"; function AdminDashboardScreen() { @@ -19,4 +20,7 @@ return (
    + + Dashboard +
    + + +
    Додади категорија
    + + +
    Додади категорија
    + + +
    Додади категорија
    + + +
    Додади категорија
    { @@ -72,5 +95,38 @@ const filterSubCategory = filter.subCategory || subCategory; const sortOrder = filter.order || order; - return `?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&page=${filterPage}&order=${sortOrder}`; + const filterHF = filter.HF || HF; + const filterHT = filter.HT || HT; + const filterWF = filter.WF || WF; + const filterWT = filter.WT || WT; + const filterLF = filter.LF || LF; + const filterLT = filter.LT || LT; + return `?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&page=${filterPage}&order=${sortOrder}&HF=${filterHF}&HT=${filterHT}&WF=${filterWF}&WT=${filterWT}&LF=${filterLF}<=${filterLT}`; + }; + + const filterHandler = (e) => { + e.preventDefault(); + HF = document.getElementById("HF").value; + HT = document.getElementById("HT").value; + WF = document.getElementById("WF").value; + WT = document.getElementById("WT").value; + LF = document.getElementById("LF").value; + LT = document.getElementById("LT").value; + console.log(HT); + const fetchData = async () => { + try { + dispatch({ type: "FETCH_REQUEST" }); + /* + const { data } = await axios.get( + `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}` + );*/ + const { data } = await axios.get( + `/api/products?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}&HF=${HF}&HT=${HT}&WF=${WF}&WT=${WT}&LF=${LF}<=${LT}` + ); + dispatch({ type: "FETCH_SUCCESS", payload: data }); + } catch (err) { + dispatch({ type: "FETCH_FAIL", payload: getError(err) }); + } + }; + fetchData(); }; @@ -124,12 +180,55 @@ >
    + + H: + setHF(e.target.value)} + /> + - + setHT(e.target.value)} + /> + + + W: + setWF(e.target.value)} + /> + - + setWT(e.target.value)} + /> + + + L: + setLF(e.target.value)} + /> + - + setLT(e.target.value)} + /> + {/*} @@ -292,4 +391,9 @@ + + +
    Index: frontend/src/screens/SearchScreen.js =================================================================== --- frontend/src/screens/SearchScreen.js (revision a2e57352512ead87a9738f42509448ff26fdd514) +++ frontend/src/screens/SearchScreen.js (revision a2e57352512ead87a9738f42509448ff26fdd514) @@ -0,0 +1,157 @@ +import React, { useEffect, useReducer, useState } from "react"; +import "../styles/Home.css"; +// import data from "./data"; +import Product from "../components/Product"; +import axios from "axios"; +import { Helmet } from "react-helmet-async"; +import { getError } from "../components/utils"; +import { useLocation, useNavigate, useParams } from "react-router-dom"; +import Form from "react-bootstrap/Form"; +import Button from "react-bootstrap/Button"; +import LinkContainer from "react-router-bootstrap/LinkContainer"; + +const reducer = (state, action) => { + switch (action.type) { + case "FETCH_REQUEST": + return { ...state, loading: true }; + case "FETCH_SUCCESS": + return { + ...state, + products: action.payload.products, + page: action.payload.page, + pages: action.payload.pages, + countProducts: action.payload.countProducts, + loading: false, + }; + case "FETCH_FAIL": + return { ...state, loading: false, error: action.payload }; + default: + return state; + } +}; + +function Home() { + const params = useParams(); + + const navigate = useNavigate(); + const { search } = useLocation(); + const sp = new URLSearchParams(search); + const text = sp.get("text") || ""; + const page = sp.get("page") || 1; + const [{ loading, error, products, pages, countProducts }, dispatch] = + useReducer(reducer, { loading: true, error: "" }); + + useEffect(() => { + const fetchData = async () => { + try { + dispatch({ type: "FETCH_REQUEST" }); + /* + const { data } = await axios.get( + `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}` + );*/ + const { data } = await axios.get( + `/api/products/search?page=${page}&text=${text}` + ); + dispatch({ type: "FETCH_SUCCESS", payload: data }); + } catch (err) { + dispatch({ type: "FETCH_FAIL", payload: getError(err) }); + } + }; + fetchData(); + }, [page, error, text]); + + const getFilterUrl = (filter) => { + const filterPage = filter.page || page; + const filterText = filter.text || text; + return `?page=${filterPage}&text=${filterText}`; + }; + + const filterHandler = (e) => { + e.preventDefault(); + + const fetchData = async () => { + try { + dispatch({ type: "FETCH_REQUEST" }); + /* + const { data } = await axios.get( + `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}` + );*/ + const { data } = await axios.get( + `/api/products/search?page=${page}&text=${text}` + ); + dispatch({ type: "FETCH_SUCCESS", payload: data }); + } catch (err) { + dispatch({ type: "FETCH_FAIL", payload: getError(err) }); + } + }; + fetchData(); + }; + + return ( +
    + + MebelCity + + +
    + {loading ? ( +
    Loading...
    + ) : error ? ( +
    {error}
    + ) : ( +
    +

    Резултати од пребарување

    + +
    +
    + {products.map((product) => ( + + ))} +
    +
    + {[...Array(pages).keys()].map((x) => ( + + + + ))} +
    +
    + )} +
    +
    + ); +} + +export default Home;