Skip to content

Commit

Permalink
Merge pull request #511 from eoscostarica/fix/graphs
Browse files Browse the repository at this point in the history 
Change linear labels values (highcharts)
  • Loading branch information
@xavier506
xavier506 authored May 21, 2021
2 parents ffeecba + 6f93231 commit 60c7b45
Show file tree
Hide file tree
Showing 17 changed files with 348 additions and 28 deletions.
Binary file added webapp/public/lacchain.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added webapp/src/components/Icons/.DS_Store
View file
Binary file not shown.
45 changes: 45 additions & 0 deletions webapp/src/components/Icons/BPJson.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
import React from 'react'

const BPJsonSvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M14 2H6C4.89543 2 4 2.89543 4 4V20C4 21.1046 4.89543 22 6 22H18C19.1046 22 20 21.1046 20 20V8L14 2Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M14 2V8H20"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M16 13H8"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M16 17H8"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M10 9H9H8"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default BPJsonSvg
24 changes: 24 additions & 0 deletions webapp/src/components/Icons/BlockDistribution.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react'

const BlockDistributionSvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
d="M21.21 15.89C19.4598 20.0289 15.1638 22.492 10.7077 21.9115C6.25168 21.331 2.7301 17.8494 2.09874 13.4003C1.46738 8.95116 3.88133 4.62729 7.99995 2.82999"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M22 12C22 9.34784 20.9464 6.8043 19.0711 4.92893C17.1957 3.05357 14.6522 2 12 2V12H22Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default BlockDistributionSvg
26 changes: 26 additions & 0 deletions webapp/src/components/Icons/Config.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from 'react'

const ConfigSvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M19.4 15C19.1277 15.6171 19.2583 16.3378 19.73 16.82L19.79 16.88C20.1656 17.2551 20.3766 17.7642 20.3766 18.295C20.3766 18.8258 20.1656 19.3349 19.79 19.71C19.4149 20.0856 18.9058 20.2966 18.375 20.2966C17.8442 20.2966 17.3351 20.0856 16.96 19.71L16.9 19.65C16.4178 19.1783 15.6971 19.0477 15.08 19.32C14.4755 19.5791 14.0826 20.1724 14.08 20.83V21C14.08 22.1046 13.1846 23 12.08 23C10.9754 23 10.08 22.1046 10.08 21V20.91C10.0642 20.2327 9.63587 19.6339 9 19.4C8.38291 19.1277 7.66219 19.2583 7.18 19.73L7.12 19.79C6.74486 20.1656 6.23582 20.3766 5.705 20.3766C5.17418 20.3766 4.66514 20.1656 4.29 19.79C3.91445 19.4149 3.70343 18.9058 3.70343 18.375C3.70343 17.8442 3.91445 17.3351 4.29 16.96L4.35 16.9C4.82167 16.4178 4.95235 15.6971 4.68 15.08C4.42093 14.4755 3.82764 14.0826 3.17 14.08H3C1.89543 14.08 1 13.1846 1 12.08C1 10.9754 1.89543 10.08 3 10.08H3.09C3.76733 10.0642 4.36613 9.63587 4.6 9C4.87235 8.38291 4.74167 7.66219 4.27 7.18L4.21 7.12C3.83445 6.74486 3.62343 6.23582 3.62343 5.705C3.62343 5.17418 3.83445 4.66514 4.21 4.29C4.58514 3.91445 5.09418 3.70343 5.625 3.70343C6.15582 3.70343 6.66486 3.91445 7.04 4.29L7.1 4.35C7.58219 4.82167 8.30291 4.95235 8.92 4.68H9C9.60447 4.42093 9.99738 3.82764 10 3.17V3C10 1.89543 10.8954 1 12 1C13.1046 1 14 1.89543 14 3V3.09C14.0026 3.74764 14.3955 4.34093 15 4.6C15.6171 4.87235 16.3378 4.74167 16.82 4.27L16.88 4.21C17.2551 3.83445 17.7642 3.62343 18.295 3.62343C18.8258 3.62343 19.3349 3.83445 19.71 4.21C20.0856 4.58514 20.2966 5.09418 20.2966 5.625C20.2966 6.15582 20.0856 6.66486 19.71 7.04L19.65 7.1C19.1783 7.58219 19.0477 8.30291 19.32 8.92V9C19.5791 9.60447 20.1724 9.99738 20.83 10H21C22.1046 10 23 10.8954 23 12C23 13.1046 22.1046 14 21 14H20.91C20.2524 14.0026 19.6591 14.3955 19.4 15Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default ConfigSvg
26 changes: 26 additions & 0 deletions webapp/src/components/Icons/Endpoint.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
import React from 'react'

const EndpointSvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 15C13.6569 15 15 13.6569 15 12C15 10.3431 13.6569 9 12 9C10.3431 9 9 10.3431 9 12C9 13.6569 10.3431 15 12 15Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default EndpointSvg
64 changes: 64 additions & 0 deletions webapp/src/components/Icons/MissingBlocks.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
import React from 'react'

const MissingBlocksSvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
d="M12 2V6"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M12 18V22"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M4.93005 4.92999L7.76005 7.75999"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M16.24 16.24L19.07 19.07"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M2 12H6"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M18 12H22"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M4.93005 19.07L7.76005 16.24"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M16.24 7.75999L19.07 4.92999"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default MissingBlocksSvg
33 changes: 33 additions & 0 deletions webapp/src/components/Icons/RewardsDistribution.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import React from 'react'

const RewardsDistributionSvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M2 12H22"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M12 2C14.5013 4.73835 15.9228 8.29203 16 12C15.9228 15.708 14.5013 19.2616 12 22C9.49872 19.2616 8.07725 15.708 8 12C8.07725 8.29203 9.49872 4.73835 12 2V2Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default RewardsDistributionSvg
49 changes: 49 additions & 0 deletions webapp/src/components/Icons/Topology.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import React from 'react'

const TopologySvg = () => (
<svg width="24" height="24" viewBox="0 0 24 24" fill="none">
<path
fillRule="evenodd"
clipRule="evenodd"
d="M16 18C16 19.6569 17.3431 21 19 21C20.6569 21 22 19.6569 22 18C22 16.3431 20.6569 15 19 15C17.3431 15 16 16.3431 16 18Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M9 6C9 7.65685 10.3431 9 12 9C13.6569 9 15 7.65685 15 6C15 4.34315 13.6569 3 12 3C10.3431 3 9 4.34315 9 6Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
fillRule="evenodd"
clipRule="evenodd"
d="M2 18C2 19.6569 3.34315 21 5 21C6.65685 21 8 19.6569 8 18C8 16.3431 6.65685 15 5 15C3.34315 15 2 16.3431 2 18Z"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M10.49 8.58997L6.50999 15.42"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
<path
d="M17.49 15.41L13.51 8.58997"
stroke="black"
strokeWidth="2"
strokeLinecap="round"
strokeLinejoin="round"
/>
</svg>
)

export default TopologySvg
17 changes: 17 additions & 0 deletions webapp/src/components/Icons/index.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import BlockDistributionSvg from './BlockDistribution'
import ConfigSvg from './Config'
import RewardsDistributionSvg from './RewardsDistribution'
import BPJsonSvg from './BPJson'
import EndpointSvg from './Endpoint'
import MissingBlocksSvg from './MissingBlocks'
import TopologySvg from './Topology'

export {
BlockDistributionSvg,
ConfigSvg,
RewardsDistributionSvg,
BPJsonSvg,
EndpointSvg,
MissingBlocksSvg,
TopologySvg
}
7 changes: 5 additions & 2 deletions webapp/src/components/TransactionsLineChart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'
import Highcharts from 'highcharts'
import Box from '@material-ui/core/Box'

const LineChart = ({ data, xAxisProps, title }) => {
const LineChart = ({ data, xAxisProps, title, yAxisProps }) => {
const options = {
title: {
text: title
Expand All @@ -16,7 +16,8 @@ const LineChart = ({ data, xAxisProps, title }) => {
credits: {
enabled: false
},
xAxis: xAxisProps
xAxis: xAxisProps,
yAxis: yAxisProps
}

return (
Expand All @@ -32,12 +33,14 @@ const LineChart = ({ data, xAxisProps, title }) => {
LineChart.propTypes = {
data: PropTypes.array,
xAxisProps: PropTypes.object,
yAxisProps: PropTypes.object,
title: PropTypes.string
}

LineChart.defaultProps = {
data: [],
xAxisProps: { xAxisVisible: false },
yAxisProps: {},
title: ''
}

Expand Down
6 changes: 4 additions & 2 deletions webapp/src/language/en.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
"Last Hour": "Last Hour",
"Last Day": "Last Day",
"Last Week": "Last Week",
"Last Year": "Last Year"
"Last Year": "Last Year",
"scheduleVersion": "Schedule Version",
"secondsAgo": "Seconds Ago"
},
"blockProducersRoute": {},
"rewardsDistributionRoute": {
Expand Down Expand Up @@ -258,7 +260,7 @@
"updatedAt": "Updated at"
},
"cpuBenchmarkRoute": {
"title": "CPU usage in microseconds",
"title": "CPU Usage in Miliseconds",
"lowest": "Lowest",
"highest": "Highest",
"average": "Average"
Expand Down
6 changes: 4 additions & 2 deletions webapp/src/language/es.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,9 @@
"Last Hour": "Última Hora",
"Last Day": "Última Día",
"Last Week": "Última Semana",
"Last Year": "Último Año"
"Last Year": "Último Año",
"scheduleVersion": "Versión de Programa",
"secondsAgo": "Hace Segundos"
},
"blockProducersRoute": {},
"rewardsDistributionRoute": {
Expand Down Expand Up @@ -258,7 +260,7 @@
"updatedAt": "Actualizado por última vez"
},
"cpuBenchmarkRoute": {
"title": "Resumen del uso de la CPU en microsegundos",
"title": "Resumen del uso de la CPU en Milisegundos",
"lowest": "Más bajo",
"highest": "Más alto",
"average": "Promedio"
Expand Down
13 changes: 10 additions & 3 deletions webapp/src/routes/Home/BlockProducerInfo.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,16 @@ const BlockProducerInfo = ({ t, classes }) => {
</CardContent>
</Card>
</Grid>
<Grid item xs={12} sm={4} lg={3}>
<Card>
<CardContent className={classes.cards}>
<Typography>{t('scheduleVersion')}</Typography>
<Typography component="p" variant="h6">
{schedule?.version}
</Typography>
</CardContent>
</Card>
</Grid>
<Grid item xs={12} sm={4} lg={3}>
<Card>
<CardContent className={classes.cards}>
Expand Down Expand Up @@ -97,9 +107,6 @@ const BlockProducerInfo = ({ t, classes }) => {
<Typography component="p" variant="h6">
{t('bpSchedule')}
</Typography>
<Typography variant="caption">
Ver. {schedule?.version}
</Typography>
<ProducersChart info={info} producers={schedule.producers} />
</CardContent>
</Card>
Expand Down
Loading

0 comments on commit 60c7b45

Please sign in to comment.