diff --git a/webapp/public/lacchain.png b/webapp/public/lacchain.png new file mode 100644 index 00000000..35dafe00 Binary files /dev/null and b/webapp/public/lacchain.png differ diff --git a/webapp/src/components/Icons/.DS_Store b/webapp/src/components/Icons/.DS_Store new file mode 100644 index 00000000..de14222c Binary files /dev/null and b/webapp/src/components/Icons/.DS_Store differ diff --git a/webapp/src/components/Icons/BPJson.js b/webapp/src/components/Icons/BPJson.js new file mode 100644 index 00000000..36a56d09 --- /dev/null +++ b/webapp/src/components/Icons/BPJson.js @@ -0,0 +1,45 @@ +import React from 'react' + +const BPJsonSvg = () => ( + + + + + + + +) + +export default BPJsonSvg diff --git a/webapp/src/components/Icons/BlockDistribution.js b/webapp/src/components/Icons/BlockDistribution.js new file mode 100644 index 00000000..6f1f82ee --- /dev/null +++ b/webapp/src/components/Icons/BlockDistribution.js @@ -0,0 +1,24 @@ +import React from 'react' + +const BlockDistributionSvg = () => ( + + + + +) + +export default BlockDistributionSvg diff --git a/webapp/src/components/Icons/Config.js b/webapp/src/components/Icons/Config.js new file mode 100644 index 00000000..6de4364f --- /dev/null +++ b/webapp/src/components/Icons/Config.js @@ -0,0 +1,26 @@ +import React from 'react' + +const ConfigSvg = () => ( + + + + +) + +export default ConfigSvg diff --git a/webapp/src/components/Icons/Endpoint.js b/webapp/src/components/Icons/Endpoint.js new file mode 100644 index 00000000..05cdfdc9 --- /dev/null +++ b/webapp/src/components/Icons/Endpoint.js @@ -0,0 +1,26 @@ +import React from 'react' + +const EndpointSvg = () => ( + + + + +) + +export default EndpointSvg diff --git a/webapp/src/components/Icons/MissingBlocks.js b/webapp/src/components/Icons/MissingBlocks.js new file mode 100644 index 00000000..94d69ec1 --- /dev/null +++ b/webapp/src/components/Icons/MissingBlocks.js @@ -0,0 +1,64 @@ +import React from 'react' + +const MissingBlocksSvg = () => ( + + + + + + + + + + +) + +export default MissingBlocksSvg diff --git a/webapp/src/components/Icons/RewardsDistribution.js b/webapp/src/components/Icons/RewardsDistribution.js new file mode 100644 index 00000000..56d5fbd8 --- /dev/null +++ b/webapp/src/components/Icons/RewardsDistribution.js @@ -0,0 +1,33 @@ +import React from 'react' + +const RewardsDistributionSvg = () => ( + + + + + +) + +export default RewardsDistributionSvg diff --git a/webapp/src/components/Icons/Topology.js b/webapp/src/components/Icons/Topology.js new file mode 100644 index 00000000..0e3e0a99 --- /dev/null +++ b/webapp/src/components/Icons/Topology.js @@ -0,0 +1,49 @@ +import React from 'react' + +const TopologySvg = () => ( + + + + + + + +) + +export default TopologySvg diff --git a/webapp/src/components/Icons/index.js b/webapp/src/components/Icons/index.js new file mode 100644 index 00000000..d4fa31c2 --- /dev/null +++ b/webapp/src/components/Icons/index.js @@ -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 +} diff --git a/webapp/src/components/TransactionsLineChart.js b/webapp/src/components/TransactionsLineChart.js index 90ac6dae..95cb9f0e 100644 --- a/webapp/src/components/TransactionsLineChart.js +++ b/webapp/src/components/TransactionsLineChart.js @@ -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 @@ -16,7 +16,8 @@ const LineChart = ({ data, xAxisProps, title }) => { credits: { enabled: false }, - xAxis: xAxisProps + xAxis: xAxisProps, + yAxis: yAxisProps } return ( @@ -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: '' } diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index c3417bd4..10056eb1 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -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": { @@ -258,7 +260,7 @@ "updatedAt": "Updated at" }, "cpuBenchmarkRoute": { - "title": "CPU usage in microseconds", + "title": "CPU Usage in Miliseconds", "lowest": "Lowest", "highest": "Highest", "average": "Average" diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index 657dabb2..d61d2b43 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -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": { @@ -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" diff --git a/webapp/src/routes/Home/BlockProducerInfo.js b/webapp/src/routes/Home/BlockProducerInfo.js index 3b4e00cd..d7b41c35 100644 --- a/webapp/src/routes/Home/BlockProducerInfo.js +++ b/webapp/src/routes/Home/BlockProducerInfo.js @@ -69,6 +69,16 @@ const BlockProducerInfo = ({ t, classes }) => { + + + + {t('scheduleVersion')} + + {schedule?.version} + + + + @@ -97,9 +107,6 @@ const BlockProducerInfo = ({ t, classes }) => { {t('bpSchedule')} - - Ver. {schedule?.version} - diff --git a/webapp/src/routes/Home/TransactionInfo.js b/webapp/src/routes/Home/TransactionInfo.js index f247a2db..f6232566 100644 --- a/webapp/src/routes/Home/TransactionInfo.js +++ b/webapp/src/routes/Home/TransactionInfo.js @@ -22,7 +22,7 @@ import EqualIcon from './EqualIcon' import { TRANSACTION_QUERY } from '../../gql' const options = [ - { value: '0', label: 'Live (5 min)' }, + { value: '0', label: 'Live (30s)' }, { value: '1 Hour', label: 'Last Hour' }, { value: '1 Day', label: 'Last Day' }, { value: '1 Week', label: 'Last Week' }, @@ -175,7 +175,28 @@ const TransactionInfo = ({ t, classes }) => { - + ) diff --git a/webapp/src/routes/index.js b/webapp/src/routes/index.js index 49cfb602..00415379 100644 --- a/webapp/src/routes/index.js +++ b/webapp/src/routes/index.js @@ -1,7 +1,4 @@ import React, { lazy } from 'react' -import AccountBalanceWalletIcon from '@material-ui/icons/AccountBalanceWallet' -import FileCopyIcon from '@material-ui/icons/FileCopy' -import SettingsInputAntennaIcon from '@material-ui/icons/SettingsInputAntenna' import { Activity as ActivityIcon, Grid as GridIcon, @@ -19,6 +16,15 @@ import { } from 'react-feather' import { eosConfig, generalConfig } from '../config' +import { + BlockDistributionSvg, + ConfigSvg, + RewardsDistributionSvg, + BPJsonSvg, + EndpointSvg, + MissingBlocksSvg, + TopologySvg +} from '../components/Icons' const Home = lazy(() => import('./Home')) const CPUBenchmark = lazy(() => import('./CPUBenchmark')) @@ -63,7 +69,7 @@ const defaultRoutes = [ }, { name: 'endpointsList', - icon: , + icon: , component: EndpointsList, path: '/endpoints', exact: true @@ -77,14 +83,14 @@ const defaultRoutes = [ }, { name: 'rewardsDistribution', - icon: , + icon: , component: RewardsDistribution, path: '/rewards-distribution', exact: true }, { name: 'blockDistribution', - icon: , + icon: , component: BlockDistribution, path: '/block-distribution', exact: true @@ -113,7 +119,7 @@ const defaultRoutes = [ }, { name: 'bpJson', - icon: , + icon: , component: BPJson, path: '/bpjson', exact: true @@ -151,14 +157,14 @@ const lacchainRoutes = [ }, { name: 'endpointsList', - icon: , + icon: , component: EndpointsList, path: '/endpoints', exact: true }, { name: 'lacchainNetwork', - icon: , + icon: , component: LacchainNetwork, path: '/lacchain/network', exact: true @@ -172,14 +178,14 @@ const lacchainRoutes = [ }, { name: 'blockDistribution', - icon: , + icon: , component: BlockDistribution, path: '/block-distribution', exact: true }, { name: 'missedBlocks', - icon: , + icon: , component: MissedBlocks, path: '/missed-blocks', exact: true @@ -208,7 +214,7 @@ const lacchainRoutes = [ }, { name: 'lacchainNodeConfig', - icon: , + icon: , component: LacchainNodeConfig, path: '/node-config', exact: true diff --git a/webapp/yarn.lock b/webapp/yarn.lock index 57427d81..9a99b71f 100644 --- a/webapp/yarn.lock +++ b/webapp/yarn.lock @@ -10893,11 +10893,6 @@ react-markdown@^4.3.1: unist-util-visit "^1.3.0" xtend "^4.0.1" -react-masonry-css@^1.0.14: - version "1.0.16" - resolved "https://registry.yarnpkg.com/react-masonry-css/-/react-masonry-css-1.0.16.tgz#72b28b4ae3484e250534700860597553a10f1a2c" - integrity sha512-KSW0hR2VQmltt/qAa3eXOctQDyOu7+ZBevtKgpNDSzT7k5LA/0XntNa9z9HKCdz3QlxmJHglTZ18e4sX4V8zZQ== - react-perfect-scrollbar@^1.5.8: version "1.5.8" resolved "https://registry.yarnpkg.com/react-perfect-scrollbar/-/react-perfect-scrollbar-1.5.8.tgz#380959387a325c5c9d0268afc08b3f73ed5b3078"