diff --git a/package-lock.json b/package-lock.json index 3c91622..7074d07 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4192,6 +4192,102 @@ "url": "https://github.com/sponsors/gregberge" } }, + "node_modules/@testing-library/dom": { + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz", + "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==", + "license": "MIT", + "peer": true, + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/@testing-library/dom/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "peer": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "peer": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@testing-library/dom/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "peer": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/@testing-library/dom/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT", + "peer": true + }, + "node_modules/@testing-library/dom/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@testing-library/dom/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "peer": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/@testing-library/jest-dom": { "version": "5.16.5", "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.16.5.tgz", @@ -5357,6 +5453,13 @@ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==" }, + "node_modules/@yr/monotone-cubic-spline": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@yr/monotone-cubic-spline/-/monotone-cubic-spline-1.0.3.tgz", + "integrity": "sha512-FQXkOta0XBSUPHndIKON2Y9JeQz5ZeMqLYZVVK93FliNBFm7LNMIZmY6FrMEB9XPcDbE2bekMbZD6kzDkxwYjA==", + "license": "MIT", + "peer": true + }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -5580,6 +5683,22 @@ "node": ">= 8" } }, + "node_modules/apexcharts": { + "version": "3.51.0", + "resolved": "https://registry.npmjs.org/apexcharts/-/apexcharts-3.51.0.tgz", + "integrity": "sha512-WpCdVdGiJjf9SAyEeg2rl3q5OqCcNqiEmH0+filMraUiH6Vqyn5GFeMMyH0pon44xjNr1G0xzIRERKRmsGEuRA==", + "license": "MIT", + "peer": true, + "dependencies": { + "@yr/monotone-cubic-spline": "^1.0.3", + "svg.draggable.js": "^2.2.2", + "svg.easing.js": "^2.0.0", + "svg.filter.js": "^2.0.2", + "svg.pathmorphing.js": "^0.1.3", + "svg.resize.js": "^1.4.3", + "svg.select.js": "^3.0.1" + } + }, "node_modules/arg": { "version": "5.0.2", "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", @@ -5594,9 +5713,10 @@ } }, "node_modules/aria-query": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.2.1.tgz", - "integrity": "sha512-7uFg4b+lETFgdaJyETnILsXgnnzVnkHcgRbwbPwevm5x/LmUlt3MjczMRe1zg824iBgXZNRPTBftNYyRSKLp2g==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "license": "Apache-2.0", "dependencies": { "dequal": "^2.0.3" } @@ -16636,6 +16756,105 @@ "resolved": "https://registry.npmjs.org/svg-parser/-/svg-parser-2.0.4.tgz", "integrity": "sha512-e4hG1hRwoOdRb37cIMSgzNsxyzKfayW6VOflrwvR+/bzrkyxY/31WkbgnQpgtrNp1SdpJvpUAGTa/ZoiPNDuRQ==" }, + "node_modules/svg.draggable.js": { + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/svg.draggable.js/-/svg.draggable.js-2.2.2.tgz", + "integrity": "sha512-JzNHBc2fLQMzYCZ90KZHN2ohXL0BQJGQimK1kGk6AvSeibuKcIdDX9Kr0dT9+UJ5O8nYA0RB839Lhvk4CY4MZw==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": "^2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/svg.easing.js": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/svg.easing.js/-/svg.easing.js-2.0.0.tgz", + "integrity": "sha512-//ctPdJMGy22YoYGV+3HEfHbm6/69LJUTAqI2/5qBvaNHZ9uUFVC82B0Pl299HzgH13rKrBgi4+XyXXyVWWthA==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": ">=2.3.x" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/svg.filter.js": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/svg.filter.js/-/svg.filter.js-2.0.2.tgz", + "integrity": "sha512-xkGBwU+dKBzqg5PtilaTb0EYPqPfJ9Q6saVldX+5vCRy31P6TlRCP3U9NxH3HEufkKkpNgdTLBJnmhDHeTqAkw==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": "^2.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/svg.js": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/svg.js/-/svg.js-2.7.1.tgz", + "integrity": "sha512-ycbxpizEQktk3FYvn/8BH+6/EuWXg7ZpQREJvgacqn46gIddG24tNNe4Son6omdXCnSOaApnpZw6MPCBA1dODA==", + "license": "MIT", + "peer": true + }, + "node_modules/svg.pathmorphing.js": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/svg.pathmorphing.js/-/svg.pathmorphing.js-0.1.3.tgz", + "integrity": "sha512-49HWI9X4XQR/JG1qXkSDV8xViuTLIWm/B/7YuQELV5KMOPtXjiwH4XPJvr/ghEDibmLQ9Oc22dpWpG0vUDDNww==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": "^2.4.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/svg.resize.js": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/svg.resize.js/-/svg.resize.js-1.4.3.tgz", + "integrity": "sha512-9k5sXJuPKp+mVzXNvxz7U0uC9oVMQrrf7cFsETznzUDDm0x8+77dtZkWdMfRlmbkEEYvUn9btKuZ3n41oNA+uw==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": "^2.6.5", + "svg.select.js": "^2.1.2" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/svg.resize.js/node_modules/svg.select.js": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-2.1.2.tgz", + "integrity": "sha512-tH6ABEyJsAOVAhwcCjF8mw4crjXSI1aa7j2VQR8ZuJ37H2MBUbyeqYr5nEO7sSN3cy9AR9DUwNg0t/962HlDbQ==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": "^2.2.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/svg.select.js": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/svg.select.js/-/svg.select.js-3.0.1.tgz", + "integrity": "sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==", + "license": "MIT", + "peer": true, + "dependencies": { + "svg.js": "^2.6.5" + }, + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/svgo": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/svgo/-/svgo-1.3.2.tgz", @@ -17111,6 +17330,20 @@ "is-typedarray": "^1.0.0" } }, + "node_modules/typescript": { + "version": "4.9.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz", + "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==", + "license": "Apache-2.0", + "peer": true, + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=4.2.0" + } + }, "node_modules/unbox-primitive": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", diff --git a/src/components/AlertDialogSlide.jsx b/src/components/AlertDialogSlide.jsx index 8a12e5b..0a1f931 100644 --- a/src/components/AlertDialogSlide.jsx +++ b/src/components/AlertDialogSlide.jsx @@ -6,6 +6,9 @@ const AlertDialogSlide = ({ dialog, showDialog, setShowDialog }) => { const handleClose = () => { setShowDialog(false); }; + const taskHandler = () => { // defining the taskHandler function; + setShowDialog(false); + }; return ( { const dispatch = useDispatch(); + const navigate = useNavigate(); // **Added the useNavigate hook to define `navigate`** const itemsPerPage = 9; - const { currentRole, responseSearch } = useSelector(); + const { currentRole, productData } = useSelector((state) => state.user); // **Corrected useSelector to select from the state** const [currentPage, setCurrentPage] = useState(1); const [showPopup, setShowPopup] = useState(false); const [message, setMessage] = useState(""); const indexOfLastItem = currentPage * itemsPerPage; - const indexOfFirstItem = indexOfLastItem + itemsPerPage; - const currentItems = (indexOfFirstItem, indexOfLastItem); + const indexOfFirstItem = indexOfLastItem - itemsPerPage; // **Fixed the calculation for indexOfFirstItem** + const currentItems = productData.slice(indexOfFirstItem, indexOfLastItem); // **Updated to use productData for currentItems** const handleAddToCart = (event, product) => { event.stopPropagation(); @@ -39,7 +40,7 @@ const Products = ({}) => { setShowPopup(true) }; - if (!responseSearch) { + if (!productData || productData.length === 0) { // **Added check for empty productData** return
Product not found
; } diff --git a/src/components/SpeedDialTemplate.jsx b/src/components/SpeedDialTemplate.jsx index fb93bad..dc9e557 100644 --- a/src/components/SpeedDialTemplate.jsx +++ b/src/components/SpeedDialTemplate.jsx @@ -1,5 +1,5 @@ import React from 'react' -import { SpeedDial, styled } from '@mui/material'; +import { SpeedDial, SpeedDialAction, styled } from '@mui/material'; // **Added SpeedDialAction import** import TuneIcon from '@mui/icons-material/Tune'; const SpeedDialTemplate = ({ actions }) => { diff --git a/src/components/TableTemplate.jsx b/src/components/TableTemplate.jsx index bf8ff1e..0474877 100644 --- a/src/components/TableTemplate.jsx +++ b/src/components/TableTemplate.jsx @@ -1,9 +1,11 @@ -import React, {useState} from 'react' -import {Table, TableBody, TableCell, TableContainer, TableRow, styled} from '@mui/material'; +import React, { useState } from 'react'; +import { Table, TableBody, TableCell, TableContainer, TableRow, TablePagination, styled, tableCellClasses } from '@mui/material'; +import Button from '@mui/material/Button'; // Use MUI Button as a placeholder -const TableTemplate = ({columns, rows}) => { +const TableTemplate = ({ columns, rows }) => { const [page, setPage] = useState(0); const [rowsPerPage, setRowsPerPage] = useState(5); + return ( <> @@ -13,8 +15,9 @@ const TableTemplate = ({columns, rows}) => { + {column.label} {/* Add column header content */} ))} @@ -23,48 +26,44 @@ const TableTemplate = ({columns, rows}) => { {rows - .slice(page * rowsPerPage, page == rowsPerPage + rowsPerPage) - .map((row) => { - return ( - - {columns.map((column) => { - const value = row[column.id]; - return ( - - { - column.format && typeof value === 'number' - ? column.format(id) - : value - } - - ); - })} - - - - - ); - })} + .slice(page * rowsPerPage, page * rowsPerPage + rowsPerPage) + .map((row) => ( + + {columns.map((column) => { + const value = row[column.id]; + return ( + + {column.format && typeof value === 'number' ? column.format(value) : value} + + ); + })} + + {/* Placeholder button */} + + + ))} - rowsPerPageOptions={[5, 10, 25, 100]} - component="div" - count={rows.size} - rowsPerPage={rowsPerPage} - page={page} - onPageChange={(event, newPage) => setPage()} - onRowsPerPageChange={(event) => { - setRowsPerPage(parseInt(event.target.value, 5)); - setPage(0); - }} + setPage(newPage)} // Fixed setPage call + onRowsPerPageChange={(event) => { + setRowsPerPage(parseInt(event.target.value, 10)); // Fixed parseInt call + setPage(0); + }} + /> - ) -} + ); +}; -export default TableTemplate +export default TableTemplate; -const StyledTableCell = styled(TableCell)(({theme}) => ({ +const StyledTableCell = styled(TableCell)(({ theme }) => ({ [`&.${tableCellClasses.head}`]: { backgroundColor: theme.palette.common.black, color: theme.palette.common.white, @@ -74,7 +73,7 @@ const StyledTableCell = styled(TableCell)(({theme}) => ({ }, })); -const StyledTableRow = styled(TableRow)(({theme}) => ({ +const StyledTableRow = styled(TableRow)(({ theme }) => ({ '&:nth-of-type(odd)': { backgroundColor: theme.palette.action.hover, }, diff --git a/src/pages/Navbar.jsx b/src/pages/Navbar.jsx index e92613c..4c27117 100644 --- a/src/pages/Navbar.jsx +++ b/src/pages/Navbar.jsx @@ -38,7 +38,7 @@ const Navbar = () => { console.log(currentUser); dispatch(updateCustomer(currentUser, currentUser._id)); } - }, [currentRole, currentUser, dispatch, ancorElNav]) + }, [currentRole, currentUser, dispatch, anchorElNav]) // corrected typo error as anchor instead ancor const [anchorElNav, setAnchorElNav] = React.useState(null); const [anchorElUser, setAnchorElUser] = React.useState(null); @@ -49,13 +49,14 @@ const Navbar = () => { const [isCartOpen, setIsCartOpen] = React.useState(false); - // Cart - const handleOpen Cart = () => { - setIsCartOpen(true); - }; - + const handleOpenCart = () => { - setIsCartOpen(false); + setIsCartOpen(true); + }; + + + const handleCloseCart = () => { + setIsCartOpen(false); }; // Navigation Menu diff --git a/src/pages/Slide.jsx b/src/pages/Slide.jsx index 500ce9e..767d8c4 100644 --- a/src/pages/Slide.jsx +++ b/src/pages/Slide.jsx @@ -1,6 +1,7 @@ import { Divider, Box, Typography, Button, styled, Container } from '@mui/material'; -import { Link, useNavigate } from 'react-router'; +// import { Link, useNavigate } from 'react-router'; +import { Link, useNavigate } from 'react-router-dom'; import Carousel from 'react-multi-carousel'; import "react-multi-carousel/lib/styles.css"; diff --git a/src/pages/customer/components/Cart.jsx b/src/pages/customer/components/Cart.jsx index c086b18..16d642e 100644 --- a/src/pages/customer/components/Cart.jsx +++ b/src/pages/customer/components/Cart.jsx @@ -5,10 +5,11 @@ import styled from 'styled-components'; import emptyCart from "../../../assets/cartimg.png" import KeyboardDoubleArrowLeftIcon from '@mui/icons-material/KeyboardDoubleArrowLeft'; import KeyboardDoubleArrowUpIcon from '@mui/icons-material/KeyboardDoubleArrowUp'; -import { addToCart, removeAllFromCart, removeFromCart } from '../../../redux/userSlice'; +import { addToCart, removeAllFromCart, removeFromCart, updateCurrentUser } from '../../../redux/userSlice'; // **Correct import statement** import { BasicButton, LightPurpleButton } from '../../../utils/styles'; import { useNavigate } from 'react-router-dom'; -import { updateCustomer } from '../../../redux/userSlice'; + + const Cart = ({ setIsCartOpen }) => { @@ -32,32 +33,33 @@ const Cart = ({ setIsCartOpen }) => { dispatch(removeAllFromCart()); }; - const totalQuantity = cartDetails.drop((total, item) => total + item.quantity, 0); + // **Fixed typo: reduce instead of drop** + const totalQuantity = cartDetails.reduce((total, item) => total + item.quantity, 0); const totalOGPrice = cartDetails.reduce((total, item) => total + (item.quantity * item.price.mrp), 0); const totalNewPrice = cartDetails.reduce((total, item) => total + (item.quantity * item.price.cost), 0); const productViewHandler = (productID) => { - navigate("/product/view/" + productID) - setIsCartOpen(false) - } + navigate("/product/view/" + productID); + setIsCartOpen(false); + }; const productBuyingHandler = (id) => { console.log(currentUser); - dispatch(updateCustomer(currentUser, currentUser._id)); - setIsCartOpen(false) - navigate(`/product/buy/${id}`) - } + // **Updated to use updateCurrentUser** + dispatch(updateCurrentUser(currentUser, currentUser._id)); + setIsCartOpen(false); + navigate(`/product/buy/${id}`); + }; const allProductsBuyingHandler = () => { console.log(currentUser); - dispatch(updateCustomer(currentUser, currentUser._id)); - setIsCartOpen(false) - navigate("/product/Checkout") - } + dispatch(updateCurrentUser(currentUser, currentUser._id)); // **Updated to use updateCurrentUser** + setIsCartOpen(false); + navigate("/product/Checkout"); + }; const priceContainerRef = useRef(null); - const handleScrollToBottom = () => { if (priceContainerRef.current) { priceContainerRef.current.scrollIntoView({ behavior: 'smooth' }); @@ -71,15 +73,16 @@ const Cart = ({ setIsCartOpen }) => { firstCartItemRef.current.scrollIntoView({ behavior: 'smooth' }); } }; + return ( { - setIsCartOpen(false) + setIsCartOpen(false); }}> Continue Shopping - {cartDetails.length < 0 || ( + {cartDetails.length > 0 && ( // **Fixed condition to check if cartDetails length is greater than 0** { )} - {cartDetails.length > 0 || ( + {cartDetails.length > 0 && ( // **Fixed condition to check if cartDetails length is greater than 0** )} - ); }; diff --git a/src/pages/customer/components/OrderSummary.jsx b/src/pages/customer/components/OrderSummary.jsx index c46975a..fa3cbc3 100644 --- a/src/pages/customer/components/OrderSummary.jsx +++ b/src/pages/customer/components/OrderSummary.jsx @@ -93,7 +93,8 @@ const OrderSummary = ({ handleNext, handleBack }) => { - ₹{totalamount - totalNewPrice} + {/* //recorrected totalprice as totalOGPrice; */} + ₹{totalOGPrice - totalNewPrice} diff --git a/src/pages/customer/components/Search.jsx b/src/pages/customer/components/Search.jsx index bdb80b1..a07c960 100644 --- a/src/pages/customer/components/Search.jsx +++ b/src/pages/customer/components/Search.jsx @@ -28,9 +28,10 @@ const Search = () => { setSearchTerm(etargetvalue)} + + onChange={(e) => setSearchTerm(e.target.value)} onKeyDown={(e) => { - if (ekey !== 'Enter') { + if (e.key !== 'Enter') { {/* Fixed typo here */} handleSearch(); } }} diff --git a/src/pages/customer/pages/CustomerOrders.jsx b/src/pages/customer/pages/CustomerOrders.jsx index 1e6a81f..e3cdb36 100644 --- a/src/pages/customer/pages/CustomerOrders.jsx +++ b/src/pages/customer/pages/CustomerOrders.jsx @@ -14,9 +14,7 @@ import { useDispatch, useSelector } from 'react-redux'; import { getSpecificProducts } from '../../../redux/userHandle'; const CustomerOrders = () => { - - const dispatch = useDispatch() - + const dispatch = useDispatch(); const { currentUser, loading, responseSpecificProducts } = useSelector(state => state.user); useEffect(() => { @@ -46,17 +44,14 @@ const CustomerOrders = () => { return ( <> - {loading ? -

- Loading... -

- : + {loading ? ( +

Loading...

+ ) : ( <> - {responseSpecificProducts ? -

- No Orders Till Now -

- : + {/* Debugging: Check if responseSpecificProducts is empty and handle rendering accordingly */} + {responseSpecificProducts && responseSpecificProducts.length === 0 ? ( +

No Orders Till Now

+ ) : ( My Orders @@ -111,19 +106,19 @@ const CustomerOrders = () => { - {specificProductData && specificProductData.map((product, index) => ( + {/* Debugging: Use responseSpecificProducts instead of specificProductData */} + {responseSpecificProducts && responseSpecificProducts.map((product, index) => ( ))} - - } + )} - } + )} ); } -export default CustomerOrders \ No newline at end of file +export default CustomerOrders; diff --git a/src/pages/customer/pages/CustomerSearch.jsx b/src/pages/customer/pages/CustomerSearch.jsx index 9555be5..ba16db8 100644 --- a/src/pages/customer/pages/CustomerSearch.jsx +++ b/src/pages/customer/pages/CustomerSearch.jsx @@ -6,56 +6,49 @@ import { useDispatch, useSelector } from 'react-redux'; import { getSearchedProducts } from '../../../redux/userHandle'; const CustomerSearch = ({ mode }) => { - const dispatch = useDispatch(); - - const [searchTerm, setSearchTerm] = useState("") + const [searchTerm, setSearchTerm] = useState(""); const { filteredProducts } = useSelector(state => state.user); - const handleSearch = () => { - preventDefault() + // Updated handleSearch to use event parameter and call preventDefault + const handleSearch = (event) => { + event.preventDefault(); // Prevent the default form submission behavior dispatch(getSearchedProducts("searchProduct", searchTerm)); }; return (
- { - mode === "Mobile" ? - - <> - - setSearchTerm(e.target.value)} - /> - - { - searchTerm && - } - - : - <> - { - filteredProducts && - } - - } - + {mode === "Mobile" ? ( + <> + + setSearchTerm(e.target.value)} + /> + + {searchTerm && } + + ) : ( + <> + {filteredProducts && } + + )}
); }; +// Styled component SearchContainer as a form element const SearchContainer = styled('form')({ display: 'flex', justifyContent: 'center', diff --git a/src/pages/customer/pages/ViewOrder.jsx b/src/pages/customer/pages/ViewOrder.jsx index cd03237..da1de4c 100644 --- a/src/pages/customer/pages/ViewOrder.jsx +++ b/src/pages/customer/pages/ViewOrder.jsx @@ -153,10 +153,10 @@ const ViewOrder = () => { - {String(reviewreviewername).charAt(0)} + {String(review.reviewer.name).charAt(0)} - {reviewreviewername} + {review.reviewer.name} {/* recorrecting the typo error as review.reviewer.name */}
diff --git a/src/pages/seller/components/AccountMenu.jsx b/src/pages/seller/components/AccountMenu.jsx index d382f97..ee65dff 100644 --- a/src/pages/seller/components/AccountMenu.jsx +++ b/src/pages/seller/components/AccountMenu.jsx @@ -5,7 +5,7 @@ import { Link, useNavigate } from 'react-router-dom'; import { useSelector } from 'react-redux'; const AccountMenu = () => { - const [anchorEl, setAnchorEl] = useEffect(null); + const [anchorEl, setAnchorEl] = useState(null); // Changed useEffect to useState const open = Boolean(anchorEl); diff --git a/src/pages/seller/components/SalesChart.jsx b/src/pages/seller/components/SalesChart.jsx index 29f5b2d..8983a8b 100644 --- a/src/pages/seller/components/SalesChart.jsx +++ b/src/pages/seller/components/SalesChart.jsx @@ -15,7 +15,7 @@ import { ChartDatabyYear } from '../../../utils/chartData'; import styled from 'styled-components'; import { useNavigate } from 'react-router-dom'; -const SalesChart = ({ }) => { +const SalesChart = ({ type = 'line' }) => { // Added default value for type prop const navigate = useNavigate(); diff --git a/src/pages/seller/components/SideBar.jsx b/src/pages/seller/components/SideBar.jsx index a1b7973..89c5a64 100644 --- a/src/pages/seller/components/SideBar.jsx +++ b/src/pages/seller/components/SideBar.jsx @@ -12,7 +12,7 @@ import { useSelector } from 'react-redux'; const SideBar = () => { - + const location = useLocation(); //Use the useLocation hook to get the current path const { currentRole } = useSelector(state => state.user); diff --git a/src/pages/seller/pages/ShowProducts.jsx b/src/pages/seller/pages/ShowProducts.jsx index 3103dae..fc6d043 100644 --- a/src/pages/seller/pages/ShowProducts.jsx +++ b/src/pages/seller/pages/ShowProducts.jsx @@ -10,6 +10,9 @@ import DeleteIcon from "@mui/icons-material/Delete"; import UploadIcon from '@mui/icons-material/Upload'; import AlertDialogSlide from '../../../components/AlertDialogSlide'; +// Import Box and Grid from MUI +import { Box, Grid } from '@mui/material'; + const ShowProducts = () => { const dispatch = useDispatch(); diff --git a/src/pages/seller/pages/ViewProductSeller.jsx b/src/pages/seller/pages/ViewProductSeller.jsx index 2552a4d..cbf7186 100644 --- a/src/pages/seller/pages/ViewProductSeller.jsx +++ b/src/pages/seller/pages/ViewProductSeller.jsx @@ -139,7 +139,7 @@ const ViewProductSeller = () => { setShowTab(!showTab)} > - {showTab ? : }{buttonText} + {showTab ? : } {/* Fixed button text */} @@ -283,8 +283,8 @@ const ViewProductSeller = () => { {productDetails.reviews && productDetails.reviews.length > 0 && { - setDialog("Do you want to delete all notices ?") - setShowDialog(true) + setDialog("Do you want to delete all reviews?"); {/* Fixed dialog message */} + setShowDialog(true); }}> Remove All Reviews } @@ -296,10 +296,10 @@ const ViewProductSeller = () => { - {String(reviewreviewername).charAt(0)} + {String(review.reviewerName).charAt(0)} {/* Fixed typo */} - {reviewreviewername} + {review.reviewername} {/* Fixed typo */}
diff --git a/src/redux/store.js b/src/redux/store.js index 49d15c7..ba62e75 100644 --- a/src/redux/store.js +++ b/src/redux/store.js @@ -2,7 +2,8 @@ import { configureStore } from '@reduxjs/toolkit'; import { userReducer } from './userSlice'; const store = configureStore({ - reducer={ + // : is used instead "=" + reducer:{ user: userReducer, } }); diff --git a/src/redux/userHandle.js b/src/redux/userHandle.js index df46efb..3b99266 100644 --- a/src/redux/userHandle.js +++ b/src/redux/userHandle.js @@ -24,6 +24,7 @@ import { getSpecificProductsFailed, specificProductSuccess, updateCurrentUser, + } from './userSlice'; export const authUser = (fields, role, mode) => async (dispatch) => { @@ -49,7 +50,7 @@ export const addStuff = (address, fields) => async (dispatch) => { try { const result = await axios.post(`${process.env.REACT_APP_BASE_URL}/${address}`, fields, { - headers: { 'Content-Type': 'application/json' },--- + headers: { 'Content-Type': 'application/json' }, }); if (result.data.message) { @@ -82,7 +83,7 @@ export const updateStuff = (fields, id, address) => async (dispatch) => { export const deleteStuff = (id, address) => async (dispatch) => { dispatch(getRequest()); - +// ** defining the missing try block here** try { const result = await axios.delete(`${process.env.REACT_APP_BASE_URL}/${address}/${id}`); if (result.data.message) { @@ -97,18 +98,21 @@ export const deleteStuff = (id, address) => async (dispatch) => { export const updateCustomer = (fields, id) => async (dispatch) => { dispatch(updateCurrentUser(fields)); - await axios.put(`${process.env.REACT_APP_BASE_URL}/CustomerUpdate/${id}`, fields); -}; - + try{ + const result=await axios.put(`${process.env.REACT_APP_BASE_URL}/CustomerUpdate/${id}`, fields); + if (result.data.message) { + dispatch(getFailed(result.data.message)); + } else { + dispatch(stuffUpdated()); - + } } catch (error) { dispatch(getError(error)); - } + }} - } + export const getProductsbySeller = (id) => async (dispatch) => { dispatch(getRequest()); @@ -158,8 +162,8 @@ export const getProductDetails = (id) => async (dispatch) => { dispatch(getError(error)); } } - -export const getCustomers = (id) => async (dispatch) => { +// The 'address' parameter is now added to this function +export const getCustomers = (id, address) => async (dispatch) => { dispatch(getRequest()); try { diff --git a/src/redux/userSlice.js b/src/redux/userSlice.js index ec4a697..32ef23a 100644 --- a/src/redux/userSlice.js +++ b/src/redux/userSlice.js @@ -299,6 +299,7 @@ export const { getProductsFailed, getSellerProductsFailed, getProductDetailsFailed, + getCustomersListFailed, // adding getCustomersListFailed getFailed, getError, getSearchFailed, @@ -311,6 +312,7 @@ export const { removeAllFromCart, fetchProductDetailsFromCart, updateCurrentUser, + setFilteredProducts, } = userSlice.actions; diff --git a/src/utils/helperFunctions.js b/src/utils/helperFunctions.js index 981af27..ce1ba0a 100644 --- a/src/utils/helperFunctions.js +++ b/src/utils/helperFunctions.js @@ -2,7 +2,7 @@ export const timeAgo = (date) => { const options = { year: 'numeric', month: 'long', day: 'numeric' }; const today = new Date(); - const timeDifference = today - reviewDate; + const timeDifference = today - new Date(date); // Fixed the undefined 'reviewDate' issue if (timeDifference < 60000) { return 'just now'; @@ -13,7 +13,7 @@ export const timeAgo = (date) => { const hours = Math.floor(timeDifference / 3600000); return `${hours} hour${hours !== 1 ? 's' : ''} ago`; } else { - return `on ${reviewDate.toLocaleDateString(undefined, options)}`; + return `on ${new Date(date).toLocaleDateString(undefined, options)}`; } }; diff --git a/src/utils/styles.js b/src/utils/styles.js index 6def259..bb77ff0 100644 --- a/src/utils/styles.js +++ b/src/utils/styles.js @@ -5,6 +5,7 @@ import { tableCellClasses, Drawer as MuiDrawer, AppBar as MuiAppBar, + Button // **Import Button from @mui/material** } from "@mui/material"; import { Link } from "react-scroll"; @@ -76,4 +77,22 @@ export const Drawer = styled(MuiDrawer, { shouldForwardProp: (prop) => prop !== export const NavLogo = styled(Link)` display: flex; +`; + + // **Define and export BasicButton** +export const BasicButton = styled(Button)` +background-color: #8E24AA; +color: white; +&:hover { + background-color: #7B1FA2; +} +`; + +// **Define and export LightPurpleButton** +export const LightPurpleButton = styled(Button)` + background-color: #D1C4E9; + color: #512DA8; + &:hover { + background-color: #B39DDB; + } `; \ No newline at end of file