From 58a20ff4b195ab42a1a3b4e8732eb96cefff06d9 Mon Sep 17 00:00:00 2001 From: bvaibhav23 Date: Tue, 30 May 2023 10:38:21 +0530 Subject: [PATCH] update for built --- src/Dynamic Data/dataContext.js | 4 ++- src/Pages/Dashboard/DashboardTable.js | 7 ---- src/Pages/Dashboard/DiscountChart.js | 49 ++++++-------------------- src/Pages/Dashboard/RatingChart.js | 9 +---- src/Pages/Dashboard/index.js | 4 +-- src/Pages/Inventory/InventoryFilter.js | 14 ++++---- src/Pages/Inventory/InventoryTable.js | 1 - src/Pages/Inventory/index.js | 6 ++-- src/Pages/Orders/index.js | 37 +------------------ src/components/SideBar.js | 1 - 10 files changed, 28 insertions(+), 104 deletions(-) diff --git a/src/Dynamic Data/dataContext.js b/src/Dynamic Data/dataContext.js index ef24d01..3a82dc2 100644 --- a/src/Dynamic Data/dataContext.js +++ b/src/Dynamic Data/dataContext.js @@ -15,7 +15,9 @@ const DataContext = ({ children }) => { }); fetchCart() .then(res => setCarts(res)) - }, []) + }, + // eslint-disable-next-line + []) return (<> diff --git a/src/Pages/Dashboard/DashboardTable.js b/src/Pages/Dashboard/DashboardTable.js index 3edca19..7ca2e9d 100644 --- a/src/Pages/Dashboard/DashboardTable.js +++ b/src/Pages/Dashboard/DashboardTable.js @@ -9,19 +9,12 @@ import Paper from '@mui/material/Paper'; const DashboardTable = ({ orders }) => { const [row, setRow] = useState(null); - const [randomIndex, setRandomIndex] = useState(0); - - //Math.floor(Math.random() * arr.length) useEffect(() => { if (orders) { - // setRandomIndex(Math.floor(Math.random() * orders.carts.length)); - // setRow(orders.carts[randomIndex].products) setRow(orders.slice(0, 5)); } }, [orders]) - - function BasicTable() { return (<> diff --git a/src/Pages/Dashboard/DiscountChart.js b/src/Pages/Dashboard/DiscountChart.js index 9a184ca..b5abb37 100644 --- a/src/Pages/Dashboard/DiscountChart.js +++ b/src/Pages/Dashboard/DiscountChart.js @@ -10,7 +10,6 @@ const PriceVsDiscount = ({ chartsData }) => { const [loader, setLoader] = useState(true); useEffect(() => { if (chartsData) { - // console.log("chartsData", chartsData) const labels = chartsData.map((product) => { return `User-${product.id}`; @@ -22,7 +21,6 @@ const PriceVsDiscount = ({ chartsData }) => { const PriceData = chartsData.map((product) => { return product.price; }); - const dataSource = { labels, datasets: [ @@ -44,7 +42,6 @@ const PriceVsDiscount = ({ chartsData }) => { }, ], }; - setRevenueData(dataSource); setLoader(false); } @@ -66,44 +63,18 @@ const PriceVsDiscount = ({ chartsData }) => { }, } - // const options = { - // responsive: true, - // interaction: { - // intersect: false, - // }, - // scales: { - // x: { - // stacked: true, - // }, - // y: { - // stacked: true, - // beginAtZero: true + return (<> + {loader ? + < div style={{ paddingTop: '57%' } + } /> + : + - // } - // }, - // plugins: { - // legend: { - // position: "top", - // }, - // title: { - // display: false, - // text: "Order Revenue", - // }, - // }, - // }; - - return (<> {loader ? - < div style={{ paddingTop: '57%' } - } /> - : - - - - } + + } - ) } diff --git a/src/Pages/Dashboard/RatingChart.js b/src/Pages/Dashboard/RatingChart.js index 2a69999..e68389f 100644 --- a/src/Pages/Dashboard/RatingChart.js +++ b/src/Pages/Dashboard/RatingChart.js @@ -1,5 +1,5 @@ import React, { useState, useEffect } from 'react' -import { Pie, Scatter } from 'react-chartjs-2'; +import { Pie } from 'react-chartjs-2'; import { Skeleton, Box } from '@mui/material'; const RatingChart = ({ chartsData }) => { @@ -11,8 +11,6 @@ const RatingChart = ({ chartsData }) => { useEffect(() => { if (chartsData) { - // console.log("Rating", chartsData.products[0].rating) - // const counts = {}; // for (const num of arr) { // counts[num] = counts[num] ? counts[num] + 1 : 1; //occurrence counter @@ -33,13 +31,9 @@ const RatingChart = ({ chartsData }) => { // counts[num.rating] = counts[num.rating] ? counts[num.rating] + 1 : 1; } - // const data = chartsData.products.map((ele) => { - // return { x: ele.rating, y: ele.rating }; //Scatter - // }); const data = Object.values(counts); const ratingLabels = Object.keys(counts); // console.log("Rating", counts) - const dataSource = { labels: ratingLabels, datasets: [ @@ -73,7 +67,6 @@ const RatingChart = ({ chartsData }) => { - {/* */} } diff --git a/src/Pages/Dashboard/index.js b/src/Pages/Dashboard/index.js index cb6cbd3..bcb3205 100644 --- a/src/Pages/Dashboard/index.js +++ b/src/Pages/Dashboard/index.js @@ -34,7 +34,7 @@ ChartJS.register( const Dashboard = () => { useEffect(() => { document.title = "Admin | Dashboard" }, []); //destructure according to index[products, setProducts, carts, setCarts, filteredProducts, setFilteredProducts] - const [products, , , , filteredProducts, setFilteredProducts] = useContext(productContext); + const [products, , , , filteredProducts] = useContext(productContext); // const [carts, setCarts] = useState(); // const [products, setProducts] = useState(); @@ -55,7 +55,7 @@ const Dashboard = () => { }, // eslint-disable-next-line [filteredProducts]); - console.log(products); + // console.log(products); return (<> diff --git a/src/Pages/Inventory/InventoryFilter.js b/src/Pages/Inventory/InventoryFilter.js index e704b8f..2320292 100644 --- a/src/Pages/Inventory/InventoryFilter.js +++ b/src/Pages/Inventory/InventoryFilter.js @@ -4,18 +4,18 @@ import MenuItem from '@mui/material/MenuItem'; import FormControl from '@mui/material/FormControl'; import Select from '@mui/material/Select'; import { productContext } from '../../Dynamic Data/dataContext'; -import { useNavigate } from 'react-router-dom'; const InventoryFilter = () => { const [data, setData] = useState(''); //destructure according to index[products, setProducts, carts, setCarts, filteredProducts, setFilteredProducts] - const [products, , , , filteredProducts, setFilteredProducts] = useContext(productContext); + const [products, , , , , setFilteredProducts] = useContext(productContext); const [category, setCategory] = useState([]); - const navigate = useNavigate(); useEffect(() => { //let unique = [...new Set(myArray)]; // unique Elements setCategory([...new Set(products.map((ele) => ele.category))]); - }, []) + }, + // eslint-disable-next-line + []) useEffect(() => { if (data === "") { @@ -24,8 +24,10 @@ const InventoryFilter = () => { else { setFilteredProducts(products.filter((ele) => ele.category === data)); } - console.log(filteredProducts); - }, [data]) + // console.log(filteredProducts); + }, + // eslint-disable-next-line + [data]) return ( diff --git a/src/Pages/Inventory/InventoryTable.js b/src/Pages/Inventory/InventoryTable.js index a8330a3..ac0a830 100644 --- a/src/Pages/Inventory/InventoryTable.js +++ b/src/Pages/Inventory/InventoryTable.js @@ -1,5 +1,4 @@ import React, { useContext, useEffect, useState } from 'react' -import { Box } from '@mui/material'; import Table from '@mui/material/Table'; import TableBody from '@mui/material/TableBody'; import TableCell from '@mui/material/TableCell'; diff --git a/src/Pages/Inventory/index.js b/src/Pages/Inventory/index.js index 588b96e..c36d236 100644 --- a/src/Pages/Inventory/index.js +++ b/src/Pages/Inventory/index.js @@ -11,14 +11,14 @@ const Inventory = () => { const [products] = useContext(productContext); const navigate = useNavigate(); - - useEffect(() => { document.title = "Admin | Inventory"; if (!products) { navigate('/'); } - }, []); + }, + // eslint-disable-next-line + []); return ( {products && diff --git a/src/Pages/Orders/index.js b/src/Pages/Orders/index.js index 7fbec85..febe3f6 100644 --- a/src/Pages/Orders/index.js +++ b/src/Pages/Orders/index.js @@ -1,45 +1,10 @@ import { Container } from '@mui/material'; -import React, { useState, useEffect } from 'react' -import { fetchCart, fetchProducts } from '../../Dynamic Data/DynamicData'; - -// import { productContext } from '../../Dynamic Data/dataContext'; +import React, { useEffect } from 'react' const Orders = () => { - // const [products, setProducts, carts, setCarts] = useContext(productContext) useEffect(() => { document.title = "Admin | Orders"; - console.log(products, carts); - - }, []); - const [carts, setCarts] = useState(); - const [products, setProducts] = useState(); - const [orders, setOrders] = useState(0); - const [revenue, setRevenue] = useState(0); - const [loader, setLoader] = useState(true); - - useEffect(() => { - setTimeout(() => {// setTimeout used to test loader - fetchCart().then((res) => { - setCarts(res); - let orders = res.carts.reduce((accumulator, object) => { - // console.log(accumulator) - return accumulator + object.totalQuantity; - }, 0); - setOrders(orders); - - let revenue = res.carts.reduce((accumulator, object) => { - return accumulator + object.discountedTotal; - }, 0);; - setRevenue(revenue); - }); - fetchProducts().then((res) => { - setProducts(res); - // console.log("products", res,products); - }); - setLoader(false); - }, 500); }, - // console.log("cart", carts, "products", products, "orders: ", orders, " inventory: ", products.total, " customers: ", carts.total, " revenue: ", revenue); // eslint-disable-next-line []); diff --git a/src/components/SideBar.js b/src/components/SideBar.js index 14ceeab..aabab6a 100644 --- a/src/components/SideBar.js +++ b/src/components/SideBar.js @@ -23,7 +23,6 @@ import AccountCircleIcon from '@mui/icons-material/AccountCircle'; import { Link, useLocation } from "react-router-dom"; import { Stack } from '@mui/material'; -import Dashboard from '../Pages/Dashboard'; const drawerWidth = 180;