Skip to content

kathy/Updated dashboard #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jinghaoong wants to merge 2 commits into
base: master
Choose a base branch
from
Open

kathy/Updated dashboard #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fe02e10
dashboard chart
ktliu135 Nov 12, 2022
76d0992
minor edits
ktliu135 Nov 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 131 additions & 0 deletions apps/site-main/src/components/dashboard/chart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,131 @@
import { Autocomplete, Card, CardContent, CardHeader, Divider, FormControl, Grid, InputLabel, MenuItem, Select, TextField, useTheme } from "@mui/material";
import { Box } from "@mui/system";
import Dayjs from 'dayjs';
import { useEffect, useState } from 'react';
import { Bar } from "react-chartjs-2";

export const Chart = (props) => {
const{
dropDown,
dateLabels,
graphDataThisYear,
graphDataLastYear,
graphTitle
}= props;

const theme = useTheme();

// const dateRange = [
// { label: 'Last 7 days', value:7 },
// { label: 'Last 14 days',value:14},
// { label: 'Last 21 days',value:21 }
// ];

const data = {
datasets: [{
backgroundColor: '#3F51B5',
barPercentage: 0.5,
barThickness: 12,
borderRadius: 4,
categoryPercentage: 0.5,
maxBarThickness: 10,
label: 'This year',
data: graphDataThisYear,
},
{
backgroundColor: '#EEEEEE',
barPercentage: 0.5,
barThickness: 12,
borderRadius: 4,
categoryPercentage: 0.5,
data: graphDataLastYear,
label: 'Last year',
maxBarThickness: 10
}
],
labels: dateLabels,
};
const options = {
animation: false,
cornerRadius: 20,
layout: { padding: 0 },
legend: { display: false },
maintainAspectRatio: false,
responsive: true,
xAxes: [
{
ticks: {
fontColor: theme.palette.text.secondary
},
gridLines: {
display: false,
drawBorder: false
}
}
],
yAxes: [
{
ticks: {
fontColor: theme.palette.text.secondary,
beginAtZero: true,
min: 0
},
gridLines: {
borderDash: [2],
borderDashOffset: [2],
color: theme.palette.divider,
drawBorder: false,
zeroLineBorderDash: [2],
zeroLineBorderDashOffset: [2],
zeroLineColor: theme.palette.divider
}
}
],
tooltips: {
backgroundColor: theme.palette.background.paper,
bodyFontColor: theme.palette.text.secondary,
borderColor: theme.palette.divider,
borderWidth: 1,
enabled: true,
footerFontColor: theme.palette.text.secondary,
intersect: false,
mode: 'index',
titleFontColor: theme.palette.text.primary
}
};

return (
<Card {...props}>

<CardHeader
title = {`${graphTitle}`}
action={(
<Box
width={200}
>
{dropDown}
</Box>
)}
/>


<Divider />
<CardContent>
<Box
sx={{
height: 400,
position: 'relative'
}}
>
<Bar
data={data}
options={options}
/>
</Box>
</CardContent>

</Card>
);
};


158 changes: 158 additions & 0 deletions apps/site-main/src/components/dashboard/horizontalChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
import { Bar } from 'react-chartjs-2';
import { Box, Button, Card, CardContent, CardHeader, Divider, TextField, useTheme} from '@mui/material';
import { useEffect, useState } from 'react';
import { useFormik } from 'formik';
import * as Yup from 'yup';


export const HorizontalChart = (props) => {
const{
counter,
graphLabels,
graphData,
graphTitle
}= props;

const theme = useTheme();


const data ={
labels: graphLabels,
datasets: [{
label: graphLabels,
axis: 'y',
data: graphData,
fill: false,
backgroundColor: [
'rgba(255, 99, 132, 0.2)',
'rgba(255, 159, 64, 0.2)',
'rgba(255, 205, 86, 0.2)',
'rgba(75, 192, 192, 0.2)',
'rgba(54, 162, 235, 0.2)',
'rgba(255, 99, 132, 0.2)',
'rgba(255, 159, 64, 0.2)',
'rgba(255, 205, 86, 0.2)',
'rgba(75, 192, 192, 0.2)',
'rgba(54, 162, 235, 0.2)',
'rgba(255, 99, 132, 0.2)',
'rgba(255, 159, 64, 0.2)',
'rgba(255, 205, 86, 0.2)',
'rgba(75, 192, 192, 0.2)',
'rgba(54, 162, 235, 0.2)',
'rgba(255, 99, 132, 0.2)',
'rgba(255, 159, 64, 0.2)',
'rgba(255, 205, 86, 0.2)',
'rgba(75, 192, 192, 0.2)',
'rgba(54, 162, 235, 0.2)',
],
borderColor: [
'rgb(255, 99, 132)',
'rgb(255, 159, 64)',
'rgb(255, 205, 86)',
'rgb(75, 192, 192)',
'rgb(54, 162, 235)',
'rgb(255, 99, 132)',
'rgb(255, 159, 64)',
'rgb(255, 205, 86)',
'rgb(75, 192, 192)',
'rgb(54, 162, 235)',
'rgb(255, 99, 132)',
'rgb(255, 159, 64)',
'rgb(255, 205, 86)',
'rgb(75, 192, 192)',
'rgb(54, 162, 235)',
'rgb(255, 99, 132)',
'rgb(255, 159, 64)',
'rgb(255, 205, 86)',
'rgb(75, 192, 192)',
'rgb(54, 162, 235)',
],
borderWidth: 1
}]
};

const options = {
indexAxis: 'y',
animation: false,
cornerRadius: 20,
layout: { padding: 0 },
legend: {
display: true,
position: 'right',
align: 'start',
},
maintainAspectRatio: false,
responsive: true,
xAxes: [
{
ticks: {
fontColor: theme.palette.text.secondary
},
gridLines: {
display: false,
drawBorder: false
}
}
],
yAxes: [
{
ticks: {
fontColor: theme.palette.text.secondary,
beginAtZero: true,
min: 0
},
gridLines: {
borderDash: [2],
borderDashOffset: [2],
color: theme.palette.divider,
drawBorder: false,
zeroLineBorderDash: [2],
zeroLineBorderDashOffset: [2],
zeroLineColor: theme.palette.divider
}
}
],
tooltips: {
backgroundColor: theme.palette.background.paper,
bodyFontColor: theme.palette.text.secondary,
borderColor: theme.palette.divider,
borderWidth: 1,
enabled: true,
footerFontColor: theme.palette.text.secondary,
intersect: false,
mode: 'index',
titleFontColor: theme.palette.text.primary
}
};

return (
<Card {...props}>
<CardHeader
title = {`${graphTitle}`}
action={(
<Box
width={100}
>
{counter}
</Box>
)}
/>

<Divider />
<CardContent>
<Box
sx={{
height: 400,
position: 'relative'
}}
>
<Bar
data={data}
options={options}
/>
</Box>
</CardContent>
<Divider />
</Card>
);
};
Loading