From 629167ad0f6266ee39991b400c905affacdb6ea5 Mon Sep 17 00:00:00 2001 From: Bishwa Thakur Date: Mon, 21 Oct 2024 19:14:58 +0530 Subject: [PATCH] Integrate JSON Data into Dashboard --- src/pages/Dashboardpage.jsx | 86 ++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 50 deletions(-) diff --git a/src/pages/Dashboardpage.jsx b/src/pages/Dashboardpage.jsx index 252d9c7..0ac9a2a 100644 --- a/src/pages/Dashboardpage.jsx +++ b/src/pages/Dashboardpage.jsx @@ -1,10 +1,9 @@ import React, { useState, useEffect } from "react"; import { Avatar } from "@mui/material"; -import pr from '../assets/pr.png' -import star from '../assets/Star.png' -import issue from '../assets/issue.png' -import { styled } from "@mui/material/styles"; -import dev from '../assets/dev.png' +import pr from '../assets/pr.png'; +import star from '../assets/Star.png'; +import issue from '../assets/issue.png'; +import dev from '../assets/dev.png'; import { BarChart } from "@mui/x-charts/BarChart"; import { axisClasses } from "@mui/x-charts/ChartsAxis"; import StatCard from "../components/StatCard"; @@ -22,31 +21,22 @@ const dataset = [ const valueFormatter = (value) => `${value} contributions`; - - const chartSetting = { yAxis: [ { label: "Contributions", - }, - { - fill: 'white' - } + }, ], - series: [ - { dataKey: "seoul", label: "Contribution Activity", valueFormatter }, - ], - + series: [{ dataKey: "seoul", label: "Contribution Activity", valueFormatter }], height: 400, xAxis: [{ dataKey: "day", scaleType: "band", label: "Day of the Week" }], sx: { [`& .${axisClasses.directionY} .${axisClasses.label}`]: { - transform: "translateX(-10px)", - }, + transform: "translateX(-10px)", + }, [`& .${axisClasses.directionX} .${axisClasses.label}`]: { transform: "translateX(-10px)", - }, - + }, }, }; @@ -55,11 +45,12 @@ const DashboardPage = () => { const [stats, setStats] = useState({}); const [error, setError] = useState(null); - // Simulated backend JSON data - const backendData = [ { - contributions: { issues: null, pulls: null }, + contributions: { + issues: null, + pulls: null + }, repo_name: "Hacktoberfest_2024-Android_Plant_Detection", }, { @@ -96,7 +87,6 @@ const DashboardPage = () => { } }); - // Return calculated stats return { pullRequests, issuesRaised, @@ -120,7 +110,7 @@ const DashboardPage = () => { } return ( -
+

@@ -129,11 +119,10 @@ const DashboardPage = () => {

- +
- { - [ + {[ { title: "Pull Requests", icon: pr, @@ -153,16 +142,14 @@ const DashboardPage = () => { title: "Repos Contributed", icon: dev, value: stats.reposContributed, - } + }, ].map((ele, index) => ( - )) - } -
- + ))} +
-
+
{ tickPlacement: "middle", tickLabelPlacement: "middle", label: "Days of the Week", - borderRadius: '10' }, ]} {...chartSetting} />
-
+

Repository Contributions

{data.map((repo, index) => ( -
+

{repo.repo_name}

Issues: {repo.contributions.issues ? ( repo.contributions.issues.map((issue, i) => (
- + {issue.title}

State: {issue.state}

-

- Created:{" "} - {new Date(issue.created_at).toLocaleDateString()} -

-

- Updated:{" "} - {new Date(issue.updated_at).toLocaleDateString()} -

+

Created: {new Date(issue.created_at).toLocaleDateString()}

+

Updated: {new Date(issue.updated_at).toLocaleDateString()}

)) ) : ( @@ -211,9 +188,18 @@ const DashboardPage = () => { )}
- Pulls: + Pull Requests: {repo.contributions.pulls ? ( -

{repo.contributions.pulls}

+ repo.contributions.pulls.map((pull, i) => ( +
+ + {pull.title} + +

State: {pull.state}

+

Created: {new Date(pull.created_at).toLocaleDateString()}

+

Updated: {new Date(pull.updated_at).toLocaleDateString()}

+
+ )) ) : (

No contributions available

)}