diff --git a/frontend/src/components/dashboard/Areachart.jsx b/frontend/src/components/dashboard/Areachart.jsx index 9d0fe41..8ede4d8 100644 --- a/frontend/src/components/dashboard/Areachart.jsx +++ b/frontend/src/components/dashboard/Areachart.jsx @@ -5,43 +5,81 @@ import axiosInstance from "../../api/configs/AxiosConfig"; const fetchAreaChartData = async () => { let res = await axiosInstance.get("/dashboard/weekly/"); console.log(res.data); + // const areaChartData = [ + // { + // date: "Mon", + // "This Week": res.data[0]["This Week"], + // "Last Week": res.data[0]["Last Week"], + // }, + // { + // date: "Tue", + // "This Week": res.data[1]["This Week"], + // "Last Week": res.data[1]["Last Week"], + // }, + // { + // date: "Wed", + // "This Week": res.data[2]["This Week"], + // "Last Week": res.data[2]["Last Week"], + // }, + // { + // date: "Th", + // "This Week": res.data[3]["This Week"], + // "Last Week": res.data[3]["Last Week"], + // }, + // { + // date: "Fri", + // "This Week": res.data[4]["This Week"], + // "Last Week": res.data[4]["Last Week"], + // }, + // { + // date: "Sat", + // "This Week": res.data[5]["This Week"], + // "Last Week": res.data[5]["Last Week"], + // }, + // { + // date: "Sun", + // "This Week": res.data[6]["This Week"], + // "Last Week": res.data[6]["Last Week"], + // }, + // ]; const areaChartData = [ { - date: "Monday", - "This Week": res.data[0]["This Week"], - "Last Week": res.data[0]["Last Week"], + date: "Mon", + "This Week": 1, + "Last Week": 2, }, { - date: "Tuesday", - "This Week": res.data[1]["This Week"], - "Last Week": res.data[1]["Last Week"], + date: "Tue", + "This Week": 5, + "Last Week": 2, }, { - date: "Wednesday", - "This Week": res.data[2]["This Week"], - "Last Week": res.data[2]["Last Week"], + date: "Wed", + "This Week": 7, + "Last Week": 9, }, { - date: "Thursday", - "This Week": res.data[3]["This Week"], - "Last Week": res.data[3]["Last Week"], + date: "Th", + "This Week": 10, + "Last Week": 3, }, { - date: "Friday", - "This Week": res.data[4]["This Week"], - "Last Week": res.data[4]["Last Week"], + date: "Fri", + "This Week": 5, + "Last Week": 1, }, { - date: "Saturday", - "This Week": res.data[5]["This Week"], - "Last Week": res.data[5]["Last Week"], + date: "Sat", + "This Week": 7, + "Last Week": 8, }, { - date: "Sunday", - "This Week": res.data[6]["This Week"], - "Last Week": res.data[6]["Last Week"], + date: "Sun", + "This Week": 3, + "Last Week": 8, }, ]; + return areaChartData; } const areaChartDataArray = await fetchAreaChartData(); diff --git a/frontend/src/components/dashboard/Barchart.jsx b/frontend/src/components/dashboard/Barchart.jsx index fcf9044..18c53fe 100644 --- a/frontend/src/components/dashboard/Barchart.jsx +++ b/frontend/src/components/dashboard/Barchart.jsx @@ -5,62 +5,98 @@ import axiosInstance from "../../api/configs/AxiosConfig"; const fetchBarChartData = async () => { let res = await axiosInstance.get("/dashboard/weekly/"); console.log(res.data); + // const barchartData = [ + // { + // date: "Mon", + // "This Week": res.data[0]["Completed This Week"], + // "Last Week": res.data[0]["Completed Last Week"], + // }, + // { + // date: "Tue", + // "This Week": res.data[1]["Completed This Week"], + // "Last Week": res.data[1]["Completed Last Week"], + // }, + // { + // date: "Wed", + // "This Week": res.data[2]["Completed This Week"], + // "Last Week": res.data[2]["Completed Last Week"], + // }, + // { + // date: "Th", + // "This Week": res.data[3]["Completed This Week"], + // "Last Week": res.data[3]["Completed Last Week"], + // }, + // { + // date: "Fri", + // "This Week": res.data[4]["Completed This Week"], + // "Last Week": res.data[4]["Completed Last Week"], + // }, + // { + // date: "Sat", + // "This Week": res.data[5]["Completed This Week"], + // "Last Week": res.data[5]["Completed Last Week"], + // }, + // { + // date: "Sun", + // "This Week": res.data[6]["Completed This Week"], + // "Last Week": res.data[6]["Completed Last Week"], + // }, + // ]; const barchartData = [ { - date: "Monday", - "This Week": res.data[0]["Completed This Week"], - "Last Week": res.data[0]["Completed Last Week"], + date: "Mon", + "This Week": 1, + "Last Week": 2, }, { - date: "Tuesday", - "This Week": res.data[1]["Completed This Week"], - "Last Week": res.data[1]["Completed Last Week"], + date: "Tue", + "This Week": 5, + "Last Week": 2, }, { - date: "Wednesday", - "This Week": res.data[2]["Completed This Week"], - "Last Week": res.data[2]["Completed Last Week"], + date: "Wed", + "This Week": 7, + "Last Week": 9, }, { - date: "Thursday", - "This Week": res.data[3]["Completed This Week"], - "Last Week": res.data[3]["Completed Last Week"], + date: "Th", + "This Week": 10, + "Last Week": 3, }, { - date: "Friday", - "This Week": res.data[4]["Completed This Week"], - "Last Week": res.data[4]["Completed Last Week"], + date: "Fri", + "This Week": 5, + "Last Week": 1, }, { - date: "Saturday", - "This Week": res.data[5]["Completed This Week"], - "Last Week": res.data[5]["Completed Last Week"], + date: "Sat", + "This Week": 7, + "Last Week": 8, }, { - date: "Sunday", - "This Week": res.data[6]["Completed This Week"], - "Last Week": res.data[6]["Completed Last Week"], + date: "Sun", + "This Week": 3, + "Last Week": 8, }, ]; return barchartData; - }; const barchartDataArray = await fetchBarChartData(); export const BarChartGraph = () => { const [value, setValue] = React.useState(null); return ( <> -