-
Notifications
You must be signed in to change notification settings - Fork 49
feat: add staked pnk per court chart, slightly modify skeleton size, … #1707
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.
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
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
395c8d8
feat: add staked pnk per court chart, slightly modify skeleton size, …
kemuru 8ad5c9f
fix: format PNK value
kemuru a8314bb
fix: register bar chart
kemuru 07f9f1f
fix: coderabbit ai comments
kemuru c0b259e
chore: add a bit of margin bottom for mobile
kemuru File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,115 @@ | ||
import React, { useCallback } from "react"; | ||
import styled, { useTheme } from "styled-components"; | ||
import { | ||
Chart as ChartJS, | ||
BarElement, | ||
Tooltip, | ||
CategoryScale, | ||
LinearScale, | ||
PointElement, | ||
LineElement, | ||
TimeScale, | ||
ChartOptions, | ||
} from "chart.js"; | ||
import ChartDataLabels from "chartjs-plugin-datalabels"; | ||
import { Bar } from "react-chartjs-2"; | ||
import "chartjs-adapter-moment"; | ||
|
||
ChartJS.register(CategoryScale, LinearScale, PointElement, LineElement, TimeScale, Tooltip); | ||
kemuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
const formatter = new Intl.NumberFormat("en", { notation: "compact" }); | ||
|
||
const BarContainer = styled.div` | ||
height: 220px; | ||
margin-top: 16px; | ||
`; | ||
|
||
ChartJS.register(BarElement); | ||
|
||
export interface IBarChartData { | ||
labels: string[]; | ||
data: number[]; | ||
total: number; | ||
} | ||
|
||
interface IBarChartProps { | ||
chartData: IBarChartData; | ||
} | ||
|
||
const BarChart: React.FC<IBarChartProps> = ({ chartData }) => { | ||
const theme = useTheme(); | ||
const getPercentValue = useCallback( | ||
(value: number) => `${Math.floor((value * 100) / chartData.total)} %`, | ||
[chartData] | ||
kemuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
); | ||
|
||
const formatPNKValue = useCallback((value: number) => formatter.format(value), []); | ||
kemuru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
const tickSize = 5; // suggested, if that many labels can't fit, chart will use even labels | ||
|
||
const options: ChartOptions<"bar"> = { | ||
responsive: true, | ||
maintainAspectRatio: false, | ||
scales: { | ||
x: { | ||
grid: { display: false }, | ||
ticks: { | ||
color: theme.secondaryText, | ||
}, | ||
}, | ||
y: { | ||
grid: { color: theme.stroke, borderDash: [4, 4] }, | ||
ticks: { | ||
color: theme.secondaryText, | ||
stepSize: (chartData.total * tickSize) / 100, | ||
callback: (value) => getPercentValue(value), | ||
}, | ||
max: chartData.total, | ||
}, | ||
}, | ||
plugins: { | ||
datalabels: { | ||
anchor: "end", | ||
align: "top", | ||
offset: -4, | ||
color: theme.primaryText, | ||
font: { | ||
weight: "bold", | ||
}, | ||
formatter: formatPNKValue, | ||
}, | ||
tooltip: { | ||
backgroundColor: theme.whiteBackground, | ||
titleColor: theme.primaryText, | ||
borderColor: theme.stroke, | ||
borderWidth: 1, | ||
displayColors: false, | ||
callbacks: { | ||
label: (context) => getPercentValue(context.parsed.y), | ||
labelTextColor: () => theme.primaryText, | ||
}, | ||
}, | ||
}, | ||
}; | ||
|
||
return ( | ||
<BarContainer> | ||
<Bar | ||
data={{ | ||
labels: chartData.labels, | ||
datasets: [ | ||
{ | ||
data: chartData.data, | ||
backgroundColor: theme.secondaryPurple, | ||
hoverBackgroundColor: theme.primaryBlue, | ||
maxBarThickness: 60, | ||
}, | ||
], | ||
}} | ||
options={options} | ||
plugins={[ChartDataLabels]} | ||
/> | ||
</BarContainer> | ||
); | ||
}; | ||
|
||
export default BarChart; |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
web/src/pages/Home/CourtOverview/StakedPNKByCourtsChart.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import React from "react"; | ||
import BarChart, { IBarChartData } from "./BarChart"; | ||
|
||
export type StakedPNKByCourtsChartData = { labels: string[]; stakes: number[]; totalStake: number }; | ||
|
||
interface IStakedPNKByCourtsChart { | ||
data: StakedPNKByCourtsChartData; | ||
} | ||
|
||
const StakedPNKByCourtsChart: React.FC<IStakedPNKByCourtsChart> = ({ data }) => { | ||
const chartData: IBarChartData = { | ||
labels: data.labels, | ||
data: data.stakes, | ||
total: data.totalStake, | ||
}; | ||
|
||
return <BarChart chartData={chartData} />; | ||
}; | ||
|
||
export default StakedPNKByCourtsChart; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.