From 5bf50ab372a4f53b4e174f42005ea90a81a25833 Mon Sep 17 00:00:00 2001 From: Sibunnayak Date: Fri, 13 Sep 2024 13:02:37 +0530 Subject: [PATCH] Fix the dashboard --- src/views/Leaves/SingleUserLeave.js | 1 - src/views/dashboard/Dashboard.js | 63 ++++--- src/views/widgets/WidgetsDropdown.js | 267 ++++++++++++++------------- 3 files changed, 179 insertions(+), 152 deletions(-) diff --git a/src/views/Leaves/SingleUserLeave.js b/src/views/Leaves/SingleUserLeave.js index 6679194..a4fce93 100644 --- a/src/views/Leaves/SingleUserLeave.js +++ b/src/views/Leaves/SingleUserLeave.js @@ -28,7 +28,6 @@ const [userType, setUserType] = useState(""); show: itemPerPage, }, }); - console.log(res.data); setuser(res.data?.user); setleaveData(res.data?.leave); setUserType(res.data?.userType); diff --git a/src/views/dashboard/Dashboard.js b/src/views/dashboard/Dashboard.js index 244d49e..12122b0 100644 --- a/src/views/dashboard/Dashboard.js +++ b/src/views/dashboard/Dashboard.js @@ -50,28 +50,38 @@ const Dashboard = () => { // console.log(res.data) setRetaildistributor(res.data.total_data); }; - // //2nd - // const [category, setCategory] = useState([]); - // const getAllCategory = async () => { - // let res = await axios.get(`/api/category/getCategories`, { - // headers: { - // Authorization: `Bearer ${token}`, - // }, - // }); - // // console.log(res.data); - // setCategory(res?.data?.categories); - // }; + //2nd + const [category, setCategory] = useState(null); + const getAllCategory = async () => { + let res = await axios.get(`/api/category/getCategories`, { + headers: { + Authorization: `Bearer ${token}`, + }, + }); + // console.log(res.data); + setCategory(res?.data?.total_data); + }; // //3rd - // const [product, setProduct] = useState([]); - // const getAllProduct = async () => { - // let res = await axios.get(`/api/product/getAll/user/`, { - // headers: { - // Authorization: `Bearer ${token}`, - // }, - // }); - // // console.log(res.data); - // setProduct(res?.data?.product); - // }; + const [product, setProduct] = useState(null); + const getAllProduct = async () => { + let res = await axios.get(`/api/product/getAll/user/`, { + headers: { + Authorization: `Bearer ${token}`, + }, + }); + // console.log(res.data); + setProduct(res?.data?.total_data); + }; + const [Brand, setBrand] = useState(null); + const getAllBrands = async () => { + let res = await axios.get(`/api/brand/getBrands`, { + headers: { + Authorization: `Bearer ${token}`, + }, + }); + // console.log(res.data); + setBrand(res?.data?.total_data); + }; // // 3rd // const [Requests, setRequests] = useState([]); // const getAllRequests = async () => { @@ -152,8 +162,9 @@ const Dashboard = () => { getAllsalescoordinator(); getAllterritorymanager(); getAllretaildistributor(); - // getAllCategory(); - // getAllProduct(); + getAllCategory(); + getAllProduct(); + getAllBrands(); // getAllRequests(); }, [token]); return ( @@ -163,9 +174,9 @@ const Dashboard = () => { salescoordinator={salescoordinator} territorymanager={territorymanager} retaildistributor={retaildistributor} - // category={category} - // product={product} - // Requests={Requests} + category={category} + product={product} + Brand={Brand} /> ); diff --git a/src/views/widgets/WidgetsDropdown.js b/src/views/widgets/WidgetsDropdown.js index b22cc63..d280be0 100644 --- a/src/views/widgets/WidgetsDropdown.js +++ b/src/views/widgets/WidgetsDropdown.js @@ -18,116 +18,125 @@ import axios from "axios"; { /* */ } -const WidgetsDropdown = ({ users,salescoordinator,territorymanager,retaildistributor }) => { -// const WidgetsDropdown = ({ users, category, product, Requests }) => { -// const token = isAutheticated(); -// const [orders, setOrders] = useState([]); -// const [todayorders, setTodayOrders] = useState([]); -// const [monthorders, setMonthOrders] = useState([]); -// const [yearorders, setYearOrders] = useState([]); -// const [lastyearorders, setLastYearOrders] = useState([]); -// const [processingorders, setProcessingOrders] = useState([]); -// const [dispatchedorders, setDispatchedOrders] = useState([]); -// const [deliveredorders, setDeliveredOrders] = useState([]); -// const [cancelledorders, setCancelledOrders] = useState([]); -// const getAllOrder = async () => { -// let res = await axios.get(`/api/order/getAll/`, { -// headers: { -// Authorization: `Bearer ${token}`, -// }, -// }); -// // console.log(res.data); -// setOrders(res?.data?.order); -// setTodayOrders( -// res?.data?.order?.filter((order) => { -// return ( -// new Date(order.createdAt).toDateString() === new Date().toDateString() -// ); -// }) -// ); -// setMonthOrders( -// res?.data?.order?.filter((order) => { -// return new Date(order.createdAt).getMonth() === new Date().getMonth(); -// }) -// ); -// setYearOrders( -// res?.data?.order?.filter((order) => { -// return ( -// new Date(order.createdAt).getFullYear() === new Date().getFullYear() -// ); -// }) -// ); -// setLastYearOrders( -// res?.data?.order?.filter((order) => { -// return ( -// new Date(order.createdAt).getFullYear() === -// new Date().getFullYear() - 1 -// ); -// }) -// ); -// }; -// const getProcessingOrder = async () => { -// let res = await axios.get(`/api/order/getAll/processing`, { -// headers: { -// Authorization: `Bearer ${token}`, -// }, -// }); -// // console.log(res.data); -// setProcessingOrders(res?.data?.order); -// }; -// const getDispatchedOrder = async () => { -// let res = await axios.get(`/api/order/getAll/dispatched`, { -// headers: { -// Authorization: `Bearer ${token}`, -// }, -// }); -// // console.log(res.data); -// setDispatchedOrders(res?.data?.order); -// }; -// const getDeliveredOrder = async () => { -// let res = await axios.get(`/api/order/getAll/delivered`, { -// headers: { -// Authorization: `Bearer ${token}`, -// }, -// }); -// // console.log(res.data); -// setDeliveredOrders(res?.data?.order); -// }; -// const getCancelledOrder = async () => { -// let res = await axios.get(`/api/order/getAll/cancelled`, { -// headers: { -// Authorization: `Bearer ${token}`, -// }, -// }); -// // console.log(res.data); -// setCancelledOrders(res?.data?.order); -// }; +const WidgetsDropdown = ({ + users, + salescoordinator, + territorymanager, + retaildistributor, + Brand, + product, + category, +}) => { + // const WidgetsDropdown = ({ users, category, product, Requests }) => { + // const token = isAutheticated(); + // const [orders, setOrders] = useState([]); + // const [todayorders, setTodayOrders] = useState([]); + // const [monthorders, setMonthOrders] = useState([]); + // const [yearorders, setYearOrders] = useState([]); + // const [lastyearorders, setLastYearOrders] = useState([]); + // const [processingorders, setProcessingOrders] = useState([]); + // const [dispatchedorders, setDispatchedOrders] = useState([]); + // const [deliveredorders, setDeliveredOrders] = useState([]); + // const [cancelledorders, setCancelledOrders] = useState([]); + // const getAllOrder = async () => { + // let res = await axios.get(`/api/order/getAll/`, { + // headers: { + // Authorization: `Bearer ${token}`, + // }, + // }); + // // console.log(res.data); + // setOrders(res?.data?.order); + // setTodayOrders( + // res?.data?.order?.filter((order) => { + // return ( + // new Date(order.createdAt).toDateString() === new Date().toDateString() + // ); + // }) + // ); + // setMonthOrders( + // res?.data?.order?.filter((order) => { + // return new Date(order.createdAt).getMonth() === new Date().getMonth(); + // }) + // ); + // setYearOrders( + // res?.data?.order?.filter((order) => { + // return ( + // new Date(order.createdAt).getFullYear() === new Date().getFullYear() + // ); + // }) + // ); + // setLastYearOrders( + // res?.data?.order?.filter((order) => { + // return ( + // new Date(order.createdAt).getFullYear() === + // new Date().getFullYear() - 1 + // ); + // }) + // ); + // }; + // const getProcessingOrder = async () => { + // let res = await axios.get(`/api/order/getAll/processing`, { + // headers: { + // Authorization: `Bearer ${token}`, + // }, + // }); + // // console.log(res.data); + // setProcessingOrders(res?.data?.order); + // }; + // const getDispatchedOrder = async () => { + // let res = await axios.get(`/api/order/getAll/dispatched`, { + // headers: { + // Authorization: `Bearer ${token}`, + // }, + // }); + // // console.log(res.data); + // setDispatchedOrders(res?.data?.order); + // }; + // const getDeliveredOrder = async () => { + // let res = await axios.get(`/api/order/getAll/delivered`, { + // headers: { + // Authorization: `Bearer ${token}`, + // }, + // }); + // // console.log(res.data); + // setDeliveredOrders(res?.data?.order); + // }; + // const getCancelledOrder = async () => { + // let res = await axios.get(`/api/order/getAll/cancelled`, { + // headers: { + // Authorization: `Bearer ${token}`, + // }, + // }); + // // console.log(res.data); + // setCancelledOrders(res?.data?.order); + // }; -// useEffect(() => { -// getAllOrder(); -// getProcessingOrder(); -// getDispatchedOrder(); -// getDeliveredOrder(); -// getCancelledOrder(); -// }, [token]); -// const date = new Date(); -// const day = date.getDate(); -// const suffix = -// day === 1 || day === 21 || day === 31 -// ? "st" -// : day === 2 || day === 22 -// ? "nd" -// : day === 3 || day === 23 -// ? "rd" -// : "th"; -// const month = date.toLocaleDateString("en-US", { month: "long" }); -// const formattedDate = `${day}${suffix} ${month}`; -// // console.log(formattedDate); -// const year = date.toLocaleDateString("en-US", { year: "numeric" }); -// const formattedmonth = `${month} ${year}`; + // useEffect(() => { + // getAllOrder(); + // getProcessingOrder(); + // getDispatchedOrder(); + // getDeliveredOrder(); + // getCancelledOrder(); + // }, [token]); + // const date = new Date(); + // const day = date.getDate(); + // const suffix = + // day === 1 || day === 21 || day === 31 + // ? "st" + // : day === 2 || day === 22 + // ? "nd" + // : day === 3 || day === 23 + // ? "rd" + // : "th"; + // const month = date.toLocaleDateString("en-US", { month: "long" }); + // const formattedDate = `${day}${suffix} ${month}`; + // // console.log(formattedDate); + // const year = date.toLocaleDateString("en-US", { year: "numeric" }); + // const formattedmonth = `${month} ${year}`; return ( <> -

Principal Distributor

+

Users

+ {/*

Principal Distributor

*/} - -

Retail Distributor

- + {/* */} + {/*

Retail Distributor

*/} + {/* */} - -

Sales Coordinator

- + {/* */} + {/*

Sales Coordinator

*/} + {/* */} - -

Territory Manager

- + {/* */} + {/*

Territory Manager

*/} + {/* */} - - {/* + + {/* */} {/* */} - {/* -

Products and Categories

+ {/* */} +

Products, Categories and Brands

{category.length}} + value={<>{product}} + title="Total products" + /> + + + {category}} title="Total Categories" /> @@ -250,12 +267,12 @@ const WidgetsDropdown = ({ users,salescoordinator,territorymanager,retaildistrib {product.length}} - title="Total products" + value={<>{Brand}} + title="Total Brands" />
-

Orders

+ {/*

Orders

- */} + */} ); };