+
+
+
+ );
+}
+
+export default AddProductForm;
Index: frontend/src/components/Header.js
===================================================================
--- frontend/src/components/Header.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/components/Header.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -518,5 +518,5 @@
Додади нов продукт
+ +
- {userInfo ? (
+ {userInfo && userInfo.isAdmin && (
{
- navigate("/orderhistory");
+ navigate("/admin/dashboard");
}}
>
- Нарачки
+ Dashboard
@@ -556,5 +556,45 @@
- ) : (
+ )}
+ {userInfo && !userInfo.isAdmin && (
+
+ {
+ navigate("/profile");
+ }}
+ >
+ Профил
+
+
+ {
+ navigate("/orderhistory");
+ }}
+ >
+ Нарачки
+
+
+
+ Одјави се
+
+
+ )}
+ {!userInfo && (
{
+ 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 ListProducts() {
+ const navigate = useNavigate();
+ const { search } = useLocation();
+ const sp = new URLSearchParams(search);
+ const category = sp.get("category") || "all";
+ const query = sp.get("query") || "all";
+ const subCategory = sp.get("subCategory") || "all";
+ const name = sp.get("name") || "all";
+ const order = sp.get("order") || "newest";
+ const page = sp.get("page") || 1;
+
+ const [{ loading, error, products, pages, countProducts }, dispatch] =
+ useReducer(reducer, { loading: true, error: "" });
+
+ useEffect(() => {
+ const fetchData = async () => {
+ try {
+ const { data } = await axios.get(
+ `/api/products/search?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
+ );
+ dispatch({ type: "FETCH_SUCCSS", payload: data });
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL", payload: getError(error) });
+ }
+ };
+ fetchData();
+ }, [category, order, page, query, subCategory, error]);
+ /*
+ const [categories, setCategories] = useState([]);
+ useEffect(() => {
+ const fetchCategories = async () => {
+ try {
+ const { data } = await axios.get(`api/products/categories`);
+ setCategories(data);
+ } catch (err) {
+ toast.error(getError(err));
+ }
+ };
+ fetchCategories();
+ }, [dispatch]);
+
+ const getFilterUrl = (filter) => {
+ const filterPage = filter.page || page;
+ const filterCategorry = filter.category || category;
+ const filterQuery = filter.query || query;
+ const filterSubCategory = filter.subCategory || subCategory;
+ const sortOrder = filter.order || order;
+ return `/search?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&order=${sortOrder}&page=${filterPage}`;
+ };
+
+ return (
+
{userInfo.name}
+ + } + id="basic-nav-dropdown" + > +
+ {loading ? (
+ {error}
+ ) : (
+
+ );
+}
+
+export default ListProducts;
+*/
Index: frontend/src/components/Product.js
===================================================================
--- frontend/src/components/Product.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/components/Product.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -15,7 +15,11 @@
return (
+
+ {products.map((item) => (
+
+
+ ))}
+
+
+ )}
+ Производи
+
+
+
+
+
+
+ 
+ {item.name}
+
+ {item.category}
+ {item.subCategory}
+ {item.countInStock}
+
+ {item.price} ден
+
+
+ {[...Array(pages).keys()].map((x) => (
+
+
+
+ ))}
+
+ {/*products.map((product) => (
+
-
- 
Index: frontend/src/screens/SigninScreen.js
===================================================================
--- frontend/src/screens/SigninScreen.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/screens/SigninScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -32,5 +32,6 @@
ctxDispatch({ type: "USER_SIGNIN", payload: data });
localStorage.setItem("userInfo", JSON.stringify(data));
- navigate(redirect || "/");
+ if (data.isAdmin) navigate("/admin/dashboard");
+ else navigate(redirect || "/");
} catch (err) {
toast.error(getError(err));
Index: frontend/src/styles/AdminDashboard.css
===================================================================
--- frontend/src/styles/AdminDashboard.css (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/styles/AdminDashboard.css (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,76 @@
+#pgContainer {
+ display: flex;
+ width: 100vw;
+ height: 850px;
+}
+
+#sidebarMenu {
+ height: 100%;
+ background-color: rgb(66, 63, 72);
+ display: flex;
+ flex-direction: column;
+ width: 18%;
+ align-items: center;
+ padding-top: 30px;
+ overflow-x: hidden;
+}
+
+#mainScreen {
+ flex: 1;
+}
+
+.taskContainer {
+ width: 90%;
+ margin-top: 20px;
+ flex: 1;
+ display: flex;
+ flex-direction: column;
+ justify-content: center;
+ align-items: center;
+}
+
+.dashboard-btn {
+ width: 100%;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 20px;
+ height: 40px;
+ color: white;
+}
+
+.dashboard-btn:hover {
+ background-color: #0d6efd;
+ cursor: pointer;
+}
+
+.newProductFormCointainer {
+ margin-top: 20px;
+ width: 90%;
+ display: flex;
+ flex-direction: column;
+}
+
+.firstRow {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.secondRow {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+}
+
+.thirdRow {
+ margin-top: 30px;
+ display: flex;
+ justify-content: space-around;
+ margin-bottom: 20px;
+ align-items: center;
+}
+
+#textArea {
+ height: 200px;
+}
- 
+
+ {error}
+ ) : (
+
Име и Презиме
- setHolderName(e.target.value)}
- required
- >
+
@@ -106,6 +119,8 @@
setCardNumber(e.target.value)}
+ minLength="16"
+ maxLength="16"
+ value={cardNumber}
+ onChange={handleChange}
required
>
@@ -115,6 +130,8 @@
setCvv(e.target.value)}
+ minLength={3}
+ maxLength={3}
+ value={ccvNumber}
+ onChange={handleChangeCCV}
required
>
Index: frontend/src/screens/OrderHistoryScreen.js
===================================================================
--- frontend/src/screens/OrderHistoryScreen.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/screens/OrderHistoryScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -10,4 +10,6 @@
import CheckIcon from "@mui/icons-material/Check";
import ClearIcon from "@mui/icons-material/Clear";
+import PhonePausedIcon from "@mui/icons-material/PhonePaused";
+import LocalShippingIcon from "@mui/icons-material/LocalShipping";
const reducer = (state, action) => {
switch (action.type) {
@@ -49,5 +51,5 @@
return (
-
Index: frontend/src/screens/ProductScreenBootstrap.js
===================================================================
--- frontend/src/screens/ProductScreenBootstrap.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/screens/ProductScreenBootstrap.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -165,4 +165,11 @@
onClick={changePhoto}
>
+
+
+
Index: frontend/src/screens/AdminAddProductScreen.js
===================================================================
--- frontend/src/screens/AdminAddProductScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/screens/AdminAddProductScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,386 @@
+import axios from "axios";
+import React, { useState } from "react";
+import { Link } from "react-router-dom";
+import { toast } from "react-toastify";
+import Button from "react-bootstrap/Button";
+import Form from "react-bootstrap/Form";
+
+function AdminAddProductScreen() {
+ const [name, setName] = useState("");
+ const [slug, setSlug] = useState("");
+ const [category, setCategory] = useState("dnevna");
+ const [subCategory, setSubCategory] = useState("");
+ const [description, setDescription] = useState("");
+ const [price, setPrice] = useState("");
+ const [priceMontaza, setPriceMontaza] = useState("");
+ const [countInStock, setCountInStock] = useState("");
+ const [image, setImage] = useState("");
+ const [sideImage, setSideImage] = useState("");
+ const [sideImage2, setSideImage2] = useState("");
+ const [dimension, setDimension] = useState("");
+ const [scheme, setScheme] = useState("");
+ const [message, setMessage] = useState("");
+
+ const onChangeImage = (e) => {
+ setImage(e.target.files[0]);
+ };
+ const onChangeSideImage = (e) => {
+ setSideImage(e.target.files[0]);
+ };
+ const onChangeSideImage2 = (e) => {
+ setSideImage2(e.target.files[0]);
+ };
+ const onChangeDimension = (e) => {
+ setDimension(e.target.files[0]);
+ };
+ const onChangeScheme = (e) => {
+ setScheme(e.target.files[0]);
+ };
+
+ const submitHandler = async (e) => {
+ e.preventDefault();
+
+ const formData = new FormData();
+
+ formData.append("name", name);
+ formData.append("slug", slug);
+ formData.append("category", category);
+ formData.append("subCategory", subCategory);
+ formData.append("description", description);
+ formData.append("price", price);
+ formData.append("priceMontaza", priceMontaza);
+ formData.append("countInStock", countInStock);
+ formData.append("image", image);
+ formData.append("sideImage", sideImage);
+ formData.append("sideImage2", sideImage2);
+ formData.append("dimension", dimension);
+ formData.append("scheme", scheme);
+
+ try {
+ const result = await axios.post("/api/products/add", formData);
+ if (result) toast.success("Product Added");
+ return;
+ } catch (error) {
+ console.log(error);
+ }
+ };
+
+ return (
+
+
+
+ );
+}
+
+export default AdminAddProductScreen;
Index: frontend/src/screens/AdminDashboardScreen.js
===================================================================
--- frontend/src/screens/AdminDashboardScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/screens/AdminDashboardScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,47 @@
+import React, { useContext, useEffect, useState } from "react";
+import Button from "react-bootstrap/Button";
+import "../styles/AdminDashboard.css";
+import AddProductForm from "../components/AddProductForm";
+import { Store } from "../Store";
+import { useNavigate, Link } from "react-router-dom";
+import ListProducts from "../components/ListProducts";
+
+function AdminDashboardScreen() {
+ const navigate = useNavigate();
+ const { state } = useContext(Store);
+ const { userInfo } = state;
+ useEffect(() => {
+ if (!userInfo || !userInfo.isAdmin) {
+ return navigate("/");
+ }
+ }, [userInfo, navigate]);
+
+ return (
+
+
+
+
+
+ );
+}
+
+export default AdminDashboardScreen;
Index: frontend/src/screens/AdminEditProductScreen.js
===================================================================
--- frontend/src/screens/AdminEditProductScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/screens/AdminEditProductScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,339 @@
+import axios from "axios";
+import React, { useEffect, useReducer, useState } from "react";
+import { Link, useParams } from "react-router-dom";
+import { toast } from "react-toastify";
+import Button from "react-bootstrap/Button";
+import Form from "react-bootstrap/Form";
+
+const reducer = (state, action) => {
+ switch (action.type) {
+ case "FETCH_REQUEST":
+ return { ...state, loading: true };
+ case "FETCH_SUCCESS":
+ return { ...state, product: action.payload, loading: false };
+ case "FETCH_FAIL":
+ return { ...state, loading: false, error: action.payload };
+ default:
+ return state;
+ }
+};
+
+function AdminEditProductScreen() {
+ const params = useParams();
+ const { slug } = params;
+
+ const [{ loading, error, product }, dispatch] = useReducer(reducer, {
+ product: [],
+ loading: true,
+ error: "",
+ });
+
+ useEffect(() => {
+ const fetchData = async () => {
+ dispatch({ type: "FETCH_REQUEST" });
+ try {
+ const result = await axios.get(`/api/products/slug/${slug}`);
+ dispatch({ type: "FETCH_SUCCESS", payload: result.data });
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL", payload: err.message });
+ }
+ };
+ fetchData();
+ }, [slug]);
+
+ const [category, setCategory] = useState("all");
+ const [subCategory, setSubCategory] = useState("all");
+
+ const submitHandler = async (e) => {
+ e.preventDefault();
+ let name = document.getElementById("name").value;
+ let slug = document.getElementById("slug").value;
+ let price = document.getElementById("price").value;
+ let priceMontaza = document.getElementById("priceMontaza").value;
+ let countInStock = document.getElementById("stock").value;
+ let description = document.getElementById("textArea").value;
+
+ try {
+ const { data } = await axios.put("/api/products/edit", {
+ name,
+ slug,
+ category,
+ subCategory,
+ description,
+ price,
+ priceMontaza,
+ countInStock,
+ });
+
+ toast.success("Успешно ажурирање");
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL" });
+ toast.error("Грешка");
+ }
+ };
+
+ return (
+
+
+
+ );
+}
+
+export default AdminEditProductScreen;
Index: frontend/src/screens/AdminOrderScreen.js
===================================================================
--- frontend/src/screens/AdminOrderScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/screens/AdminOrderScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,277 @@
+import axios from "axios";
+import React, { useContext, useEffect, useReducer } from "react";
+import { Link, useNavigate, useParams } from "react-router-dom";
+import LoadingBox from "../components/LoadingBox";
+import MessageBox from "../components/MessageBox";
+import { Store } from "../Store";
+import { getError } from "../components/utils";
+import { Helmet } from "react-helmet-async";
+import Row from "react-bootstrap/Row";
+import Card from "react-bootstrap/Card";
+import Col from "react-bootstrap/Col";
+import ListGroup from "react-bootstrap/ListGroup";
+import Button from "react-bootstrap/Button";
+import { toast } from "react-toastify";
+
+function reducer(state, action) {
+ switch (action.type) {
+ case "FETCH_REQUEST":
+ return { ...state, loading: true, error: "" };
+ case "FETCH_SUCCESS":
+ return { ...state, loading: false, order: action.payload, error: "" };
+ case "FETCH_FAIL":
+ return { ...state, loading: false, error: action.payload };
+ default:
+ return state;
+ }
+}
+
+export default function OrderScreen() {
+ const { state } = useContext(Store);
+ const { userInfo } = state;
+ const params = useParams();
+ const { id: orderId } = params;
+ const navigate = useNavigate();
+
+ const [{ loading, error, order }, dispatch] = useReducer(reducer, {
+ loading: true,
+ order: {},
+ error: "",
+ });
+
+ useEffect(() => {
+ const fetchOrder = async () => {
+ try {
+ dispatch({ type: "FETCH_REQUEST" });
+ const { data } = await axios.get(`/api/orders/${orderId}`, {
+ headers: { authorization: `Bearer ${userInfo.token}` },
+ });
+ dispatch({ type: "FETCH_SUCCESS", payload: data });
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL", payload: getError(err) });
+ }
+ };
+ if (!userInfo) {
+ return navigate("/login");
+ }
+ if (!order._id || (order._id && order._id !== orderId)) {
+ fetchOrder();
+ }
+ }, [order, userInfo, orderId, navigate]);
+
+ const confirmOrderHandler = async () => {
+ let isConfirmed = true;
+ let _id = order._id;
+ try {
+ const { data } = await axios.put("/api/orders/action", {
+ isConfirmed,
+ _id,
+ });
+
+ toast.success("Нарачката е потврдена");
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL" });
+ toast.error("Грешка");
+ }
+ };
+ const sendOrderHandler = async () => {
+ let isShipped = true;
+ let shippedAt = Date();
+ let _id = order._id;
+ try {
+ const { data } = await axios.put("/api/orders/action", {
+ isShipped,
+ shippedAt,
+ _id,
+ });
+
+ toast.success("Нарачката е испратена");
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL" });
+ toast.error("Грешка");
+ }
+ };
+ const finishOrderHandler = async () => {
+ let isDelivered = true;
+ let deliveredAt = Date();
+ let _id = order._id;
+ try {
+ if (order.isPaid) {
+ const { data } = await axios.put("/api/orders/action", {
+ isDelivered,
+ deliveredAt,
+ _id,
+ });
+ } else {
+ let isPaid = true;
+ let paidAt = Date();
+ const { data } = await axios.put("/api/orders/action", {
+ _id,
+ isDelivered,
+ deliveredAt,
+ isPaid,
+ paidAt,
+ });
+ }
+
+ toast.success("Нарачката е пристигната");
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL" });
+ toast.error("Грешка");
+ }
+ };
+
+ return loading ? (
+
+
+
+
+ Ажурирај продукт
+ +
+
+ Нарачка {orderId}
+
+
+
+
+ Испорака
+
+ Име: {order.shippingAddress.fullName}
+
+ Адреса: {order.shippingAddress.address}, + {order.shippingAddress.city},{order.shippingAddress.postalCode}, + {order.shippingAddress.country} +
+ Телефон: {order.contactNumber} +
+
+
+
+
+
+ Плаќање
+
+ Начин:{" "}
+ {order.paymentMethod === "Karticka"
+ ? "Со платежна картичка"
+ : "Во готово при достава"}
+
+ {order.isPaid ? (
+
+ Платено на {order.paidAt}
+
+ ) : (
+ Не е платено
+ )}
+
+
+
+
+ Продукти
+
+ {order.orderItems.map((item) => (
+
+
+ ))}
+
+
+
+
+
+
+ Нарачка
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Акции
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
Index: frontend/src/screens/AdminOrdersScreen.js
===================================================================
--- frontend/src/screens/AdminOrdersScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/screens/AdminOrdersScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,214 @@
+import axios from "axios";
+import React, { useEffect, useReducer } from "react";
+import { Link, useLocation, useNavigate } from "react-router-dom";
+import { getError } from "../components/utils";
+import Button from "react-bootstrap/Button";
+import LoadingBox from "../components/LoadingBox";
+import MessageBox from "../components/MessageBox";
+import CheckIcon from "@mui/icons-material/Check";
+import ClearIcon from "@mui/icons-material/Clear";
+import PhonePausedIcon from "@mui/icons-material/PhonePaused";
+import HourglassBottomIcon from "@mui/icons-material/HourglassBottom";
+import LocalShippingIcon from "@mui/icons-material/LocalShipping";
+import LinkContainer from "react-router-bootstrap/LinkContainer";
+import Form from "react-bootstrap/Form";
+const reducer = (state, action) => {
+ switch (action.type) {
+ case "FETCH_REQUEST":
+ return { ...state, loading: true };
+ case "FETCH_SUCCESS":
+ console.log(action.payload);
+ return {
+ ...state,
+ //orders: action.payload,
+
+ orders: action.payload.orders,
+ 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 AdminOrdersScreen() {
+ const navigate = useNavigate();
+ const { search } = useLocation();
+ const sp = new URLSearchParams(search);
+ const isConfirmed = sp.get("isConfirmed") || "all";
+ const isShipped = sp.get("isShipped") || "all";
+ const query = sp.get("query") || "all";
+ const page = sp.get("page") || 1;
+ const [{ loading, error, orders, pages, countProducts }, dispatch] =
+ useReducer(reducer, {
+ loading: true,
+ error: "",
+ });
+
+ useEffect(() => {
+ const fetchData = async () => {
+ dispatch({ type: "FETCH_REQUEST" });
+ try {
+ const { data } = await axios.get(
+ `/api/orders?page=${page}&isConfirmed=${isConfirmed}&isShipped=${isShipped}&query=${query}`
+ );
+ dispatch({ type: "FETCH_SUCCESS", payload: data });
+ } catch (error) {
+ dispatch({ type: "FETCH_FAIL", payload: getError(error) });
+ }
+ };
+ fetchData();
+ }, [isConfirmed, isShipped, page, query]);
+ const getFilterUrl = (filter) => {
+ const filterPage = filter.page || page;
+ const filterIsConfirmed = filter.isConfirmed || isConfirmed;
+ const filterIsShipped = filter.isShipped || isShipped;
+ const filterQuery = filter.query || query;
+ return `?page=${filterPage}&isConfirmed=${filterIsConfirmed}&isShipped=${filterIsShipped}&query=${filterQuery}`;
+ };
+
+ return (
+ Нарачка {orderId}
++ Адреса: {order.shippingAddress.address}, + {order.shippingAddress.city},{order.shippingAddress.postalCode}, + {order.shippingAddress.country} +
+ Телефон: {order.contactNumber} +
+
+
+
+
+ {item.name}
+
+
+ {item.quantity}
+
+ {item.price} ден
+
+
+
+ );
+}
+
+export default AdminOrdersScreen;
Index: frontend/src/screens/AdminProductsScreen.js
===================================================================
--- frontend/src/screens/AdminProductsScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
+++ frontend/src/screens/AdminProductsScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -0,0 +1,389 @@
+import axios from "axios";
+import React, { useEffect, useReducer, useState } from "react";
+import { Link, useNavigate, useLocation } from "react-router-dom";
+import ListGroup from "react-bootstrap/ListGroup";
+import Button from "react-bootstrap/Button";
+import Form from "react-bootstrap/Form";
+import { getError } from "../components/utils";
+import { toast } from "react-toastify";
+import LoadingBox from "../components/LoadingBox";
+import MessageBox from "../components/MessageBox";
+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 AdminProductsScreen() {
+ const navigate = useNavigate();
+ const { search } = useLocation();
+ const sp = new URLSearchParams(search);
+ const category = sp.get("category") || "all";
+ const query = sp.get("query") || "all";
+ const subCategory = sp.get("subCategory") || "all";
+ //const name = sp.get("name") || "all";
+ const order = sp.get("order") || "newest";
+ 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?page=${page}&query=${query}&category=${category}&subCategory=${subCategory}&order=${order}`
+ );
+ dispatch({ type: "FETCH_SUCCESS", payload: data });
+ } catch (err) {
+ dispatch({ type: "FETCH_FAIL", payload: getError(err) });
+ }
+ };
+ fetchData();
+ }, [category, page, query, order, subCategory, error]);
+
+ const getFilterUrl = (filter) => {
+ const filterPage = filter.page || page;
+ const filterCategorry = filter.category || category;
+ const filterQuery = filter.query || query;
+ const filterSubCategory = filter.subCategory || subCategory;
+ const sortOrder = filter.order || order;
+ return `?category=${filterCategorry}&query=${filterQuery}&subCategory=${filterSubCategory}&page=${filterPage}&order=${sortOrder}`;
+ };
+
+ return (
+
+
+
+ {error}
+ ) : (
+
+
+
+ )}
+
+ Нарачки
+
+
+
+
+
+ {loading ? (
+ | ID | +Дата | +Вкупно | +Статус | +Акции | +
|---|---|---|---|---|
| {order._id.substring(0, 7)} | +{order.createdAt.substring(0, 10)} | +{order.totalPrice.toFixed(2)} | + +
+ {order.isDelivered ? (
+ |
+ + + | +
+ {[...Array(pages).keys()].map((x) => (
+
+
+
+ ))}
+
+
+ {loading ? (
+ {error}
+ ) : (
+
+ );
+}
+
+export default AdminProductsScreen;
Index: frontend/src/screens/CardPaymentScreen.js
===================================================================
--- frontend/src/screens/CardPaymentScreen.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/screens/CardPaymentScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -41,8 +41,24 @@
cart.totalPrice = cart.itemsPrice + cart.shippingPrice;
+ const [cardNumber, setCardNumber] = useState("");
+ const handleChange = (event) => {
+ const result = event.target.value.replace(/[^0-9]/gi, "");
+ setCardNumber(result);
+ };
+ const [ccvNumber, setCcvNumber] = useState("");
+ const handleChangeCCV = (event) => {
+ const result = event.target.value.replace(/[^0-9]/gi, "");
+ console.log(event.currentTarget.validity.valid);
+
+ setCcvNumber(result);
+ };
const paymentHandler = async (event) => {
event.preventDefault();
const form = event.currentTarget;
if (form.checkValidity() === false) {
+ event.preventDefault();
+ event.stopPropagation();
+ }
+ if (cardNumber.length !== 16) {
event.preventDefault();
event.stopPropagation();
@@ -63,4 +79,6 @@
isPaid: true,
paidAt: Date.now(),
+ isConfirmed: true,
+ contactNumber: userInfo.contact,
},
{
@@ -95,10 +113,5 @@
+
+
+ )}
+
+
+ {products.map((item) => (
+
+
+ ))}
+
+
+ Производи
+
+
+
+
+
+
+
+ {item.name}
+
+ {item.category}
+ {item.subCategory}
+ {item.countInStock}
+
+ {item.price} ден
+
+
+ {[...Array(pages).keys()].map((x) => (
+
+
+
+ ))}
+
+
+
Историја на нарачки
@@ -82,6 +84,8 @@
{order.isDelivered ? (
+ Вашата нарачка е испратена.
+
+ ) : order.isConfirmed ? (
+
+ Вашата нарачка се процесира.
+
) : (
- Не е доставено
+
+ Потребно е да ја потврдите нарачката. Ќе бидете контактирани
+ преку телефонскиот број оставен за контакт.
+
)}
Index: frontend/src/screens/PlaceOrderScreen.js
===================================================================
--- frontend/src/screens/PlaceOrderScreen.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/screens/PlaceOrderScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -60,4 +60,6 @@
shippingPrice: cart.shippingPrice,
totalPrice: cart.totalPrice,
+ isConfirmed: false,
+ contactNumber: userInfo.contact,
},
{
Index: frontend/src/screens/ProductScreen.js
===================================================================
--- frontend/src/screens/ProductScreen.js (revision ee056633af77f8879114a594a34f49f87fdf0765)
+++ frontend/src/screens/ProductScreen.js (revision 55ed1718e29f3bb840f3e7b798f4728e2b431499)
@@ -72,4 +72,7 @@
+
+
+