From 48c008c5863371d7ea5a6520cbe6f5b012fb0cce Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Tue, 12 Sep 2023 09:20:53 -0600 Subject: [PATCH 01/18] chore(webapp): add key icon for account keys --- webapp/src/components/AccountInfo/index.js | 5 ++-- webapp/src/components/AccountInfo/styles.js | 7 +++++ webapp/src/components/MoreInfoModal/index.js | 29 +++++++++++++------- webapp/src/components/NodeCard/NodesCard.js | 3 +- 4 files changed, 31 insertions(+), 13 deletions(-) diff --git a/webapp/src/components/AccountInfo/index.js b/webapp/src/components/AccountInfo/index.js index fcc0659c..117daff9 100644 --- a/webapp/src/components/AccountInfo/index.js +++ b/webapp/src/components/AccountInfo/index.js @@ -9,6 +9,7 @@ import Accordion from '@mui/material/Accordion' import AccordionSummary from '@mui/material/AccordionSummary' import AccordionDetails from '@mui/material/AccordionDetails' import ExpandMoreIcon from '@mui/icons-material/ExpandMore' +import KeyOutlinedIcon from '@mui/icons-material/KeyOutlined'; import RicardianContract from '../RicardianContract' import ContractActions from '../ContractActions' @@ -116,7 +117,7 @@ const AccountInfo = ({ {!!info && ( <>
-
+
{key.label} {key.value ? ( - + {key.value} diff --git a/webapp/src/components/AccountInfo/styles.js b/webapp/src/components/AccountInfo/styles.js index 22624f4f..941dae04 100644 --- a/webapp/src/components/AccountInfo/styles.js +++ b/webapp/src/components/AccountInfo/styles.js @@ -28,7 +28,9 @@ export default (theme) => ({ display: 'flex', textTransform: 'capitalize', justifyContent: 'space-between', + alignItems: 'center', minWidth: '100px', + paddingTop: theme.spacing(1), }, keyIcon: { marginRight: theme.spacing(1), @@ -105,4 +107,9 @@ export default (theme) => ({ justifyContent: 'center', alignItems: 'center', }, + cardPadding: { + [theme.breakpoints.up('lg')]: { + paddingRight: theme.spacing(4), + }, + }, }) diff --git a/webapp/src/components/MoreInfoModal/index.js b/webapp/src/components/MoreInfoModal/index.js index 3bbca070..27ba05ab 100644 --- a/webapp/src/components/MoreInfoModal/index.js +++ b/webapp/src/components/MoreInfoModal/index.js @@ -1,4 +1,4 @@ -import React, { useState } from 'react' +import React, { useState, memo } from 'react' import { makeStyles } from '@mui/styles' import { useTranslation } from 'react-i18next' import InfoOutlinedIcon from '@mui/icons-material/InfoOutlined' @@ -10,7 +10,7 @@ import styles from './styles' const useStyles = makeStyles(styles) -const MoreInfoModal = ({ hideCloseButton, children }) => { +const MoreInfoModal = ({ hideCloseButton, Icon, children }) => { const classes = useStyles() const { t } = useTranslation() const [anchorEl, setAnchorEl] = useState(null) @@ -26,12 +26,21 @@ const MoreInfoModal = ({ hideCloseButton, children }) => { return ( <> - { - handlePopoverOpen(e.target) - }} - /> + {Icon ? ( + { + handlePopoverOpen(e.target) + }} + /> + ) : ( + { + handlePopoverOpen(e.target) + }} + /> + )} { ) } -Tooltip.defaultProps = { +MoreInfoModal.defaultProps = { hideCloseButton: false, } -export default MoreInfoModal +export default memo(MoreInfoModal) diff --git a/webapp/src/components/NodeCard/NodesCard.js b/webapp/src/components/NodeCard/NodesCard.js index 3395c38f..02fd61c8 100644 --- a/webapp/src/components/NodeCard/NodesCard.js +++ b/webapp/src/components/NodeCard/NodesCard.js @@ -6,6 +6,7 @@ import { makeStyles } from '@mui/styles' import CardHeader from '@mui/material/CardHeader' import CardContent from '@mui/material/CardContent' import Chip from '@mui/material/Chip' +import KeyOutlinedIcon from '@mui/icons-material/KeyOutlined'; import 'flag-icon-css/css/flag-icons.css' import ChipList from '../ChipList' @@ -51,7 +52,7 @@ const NodesCard = ({ nodes }) => { {Object.keys(keys).map((key, i) => (

{key}:

- +

{keys[key]}

From 2a6bb515dee01e4dde84eddbd5b5474c80d165cc Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Tue, 12 Sep 2023 09:26:54 -0600 Subject: [PATCH 02/18] feat(webapp): change select for autocomplete field --- .../src/components/ContractActions/index.js | 34 +++++++++---------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/webapp/src/components/ContractActions/index.js b/webapp/src/components/ContractActions/index.js index 4838ec26..eea82d4c 100644 --- a/webapp/src/components/ContractActions/index.js +++ b/webapp/src/components/ContractActions/index.js @@ -2,10 +2,9 @@ import React, { useState, useEffect } from 'react' import PropTypes from 'prop-types' import { useTranslation } from 'react-i18next' import { makeStyles } from '@mui/styles' -import MenuItem from '@mui/material/MenuItem' -import Select from '@mui/material/Select' +import Autocomplete from '@mui/material/Autocomplete' import FormControl from '@mui/material/FormControl' -import InputLabel from '@mui/material/InputLabel' +import TextField from '@mui/material/TextField' import ContractActionForm from '../ContractActionForm' @@ -32,25 +31,24 @@ const ContractActions = ({ accountName, abi, onSubmitAction }) => { return (
- {t('action')} - + setAction(value || '')} + onInputChange={(_e, value) => setAction(value || '')} + renderInput={params => ( + + )} + noOptionsText={t('noOptions')} + /> element === action)} abi={abi} onSubmitAction={onSubmitAction} /> From b94dd3df601e2543775cf663791d06c6e1c0c69c Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Tue, 12 Sep 2023 10:05:14 -0600 Subject: [PATCH 03/18] chore(webapp): remove description list and fix label id --- webapp/src/components/AccountInfo/index.js | 34 +++++++++---------- .../src/components/ContractActions/index.js | 2 +- .../src/components/RicardianContract/index.js | 16 +++++---- webapp/src/routes/BlockDistribution/index.js | 4 +-- webapp/src/routes/CPUBenchmark/index.js | 4 +-- webapp/src/routes/MissedBlocks/index.js | 4 +-- 6 files changed, 33 insertions(+), 31 deletions(-) diff --git a/webapp/src/components/AccountInfo/index.js b/webapp/src/components/AccountInfo/index.js index 117daff9..dc483b48 100644 --- a/webapp/src/components/AccountInfo/index.js +++ b/webapp/src/components/AccountInfo/index.js @@ -160,24 +160,22 @@ const AccountInfo = ({ {t('keys')}
-
- {info.keys.map((key) => ( - -
- {key.label} - {key.value ? ( - - - {key.value} - - - ) : ( -

-

- )} -
-
- ))} -
+ {info.keys.map(key => ( + +
+ {key.label} + {key.value ? ( + + + {key.value} + + + ) : ( +

-

+ )} +
+
+ ))}
diff --git a/webapp/src/components/ContractActions/index.js b/webapp/src/components/ContractActions/index.js index eea82d4c..11be6125 100644 --- a/webapp/src/components/ContractActions/index.js +++ b/webapp/src/components/ContractActions/index.js @@ -33,7 +33,7 @@ const ContractActions = ({ accountName, abi, onSubmitAction }) => { { onError={useDefaultLogo} />
- - {_title || name} - - - {version} - + {_title && name && ( + + {_title || name} + + )} + {version && ( + + {version} + + )}
diff --git a/webapp/src/routes/BlockDistribution/index.js b/webapp/src/routes/BlockDistribution/index.js index bb7ae054..eb7068a8 100644 --- a/webapp/src/routes/BlockDistribution/index.js +++ b/webapp/src/routes/BlockDistribution/index.js @@ -103,11 +103,11 @@ const BlockDistribution = () => {
- + {t('timeFrame')} setRange(event.target.value)} fullWidth diff --git a/webapp/src/routes/MissedBlocks/index.js b/webapp/src/routes/MissedBlocks/index.js index caa3cc69..9c86cbd6 100644 --- a/webapp/src/routes/MissedBlocks/index.js +++ b/webapp/src/routes/MissedBlocks/index.js @@ -119,11 +119,11 @@ const BlockDistribution = () => { {t('title')} - + {t('timeFrame')} setRange(e.target.value)} fullWidth diff --git a/webapp/src/routes/CPUBenchmark/index.js b/webapp/src/routes/CPUBenchmark/index.js index 82a56c88..fdbac2dc 100644 --- a/webapp/src/routes/CPUBenchmark/index.js +++ b/webapp/src/routes/CPUBenchmark/index.js @@ -187,11 +187,11 @@ const CPUBenchmark = () => { {t('title')} - + {t('timeFrame')} setRange(e.target.value)} fullWidth From a9483507339605171e8cf053d3a804826950dc0c Mon Sep 17 00:00:00 2001 From: Torresmorah Date: Wed, 13 Sep 2023 10:48:58 -0600 Subject: [PATCH 07/18] feat(webapp): include network name via interpolation --- webapp/src/language/en.json | 40 +++++++++++------------ webapp/src/language/en.telos-testnet.json | 1 - webapp/src/language/en.telos.json | 1 - webapp/src/language/es.json | 35 ++++++++++---------- webapp/src/layouts/Dashboard.js | 29 ++++++++-------- webapp/src/routes/EVMDashboard/index.js | 12 ++++--- 6 files changed, 61 insertions(+), 57 deletions(-) diff --git a/webapp/src/language/en.json b/webapp/src/language/en.json index 064a731b..fd191727 100644 --- a/webapp/src/language/en.json +++ b/webapp/src/language/en.json @@ -53,58 +53,58 @@ "routes": { "/>sidebar": "Dashboard", "/>title": "Antelope Tools", - "/>heading": "Welcome to", + "/>heading": "Welcome to {{networkName}}", "/cpu-benchmark>sidebar": "CPU Benchmarks", "/cpu-benchmark>title": "CPU Benchmarks - EOSIO + Antelope Network Dashboard", - "/cpu-benchmark>heading": "Block Producer Nodes CPU Benchmarks", + "/cpu-benchmark>heading": "Block Producer Nodes CPU Benchmarks in {{networkName}}", "/block-producers>sidebar": "Block Producers", "/block-producers>title": "Block Producers - EOSIO + Antelope Network Dashboard", - "/block-producers>heading": "Block Producers", + "/block-producers>heading": "Block Producers in {{networkName}}", "/undiscoverable-bps>sidebar": "Undiscoverable BPs", "/undiscoverable-bps>title": "Undiscoverable Block Producers or Sock Puppet BPs - EOSIO + Antelope Network Dashboard", - "/undiscoverable-bps>heading": "Undiscoverable Paid Block Producers", + "/undiscoverable-bps>heading": "Undiscoverable Paid Block Producers in {{networkName}}", "/rewards-distribution>sidebar": "Rewards Distribution", "/rewards-distribution>title": "Rewards Distribution - EOSIO + Antelope Network Dashboard", - "/rewards-distribution>heading": "Rewards Distribution", + "/rewards-distribution>heading": "Rewards Distribution of {{networkName}}", "/nodes>sidebar": "Nodes", "/nodes>title": "Nodes - EOSIO + Antelope Network Dashboard", - "/nodes>heading": "Nodes", + "/nodes>heading": "Nodes in {{networkName}}", "/nodes-distribution>sidebar": "Geo Distribution", "/nodes-distribution>title": "Geographic Distribution of Nodes - EOSIO + Antelope Network Dashboard", - "/nodes-distribution>heading": "Geographic Distribution of Nodes", + "/nodes-distribution>heading": "Geographic Distribution of {{networkName}} Nodes", "/accounts>sidebar": "Accounts & Contracts", "/accounts>title": "Accounts and Contracts - EOSIO + Antelope Network Dashboard", - "/accounts>heading": "Accounts and Contracts", + "/accounts>heading": "Accounts and Contracts of {{networkName}}", "/bpjson>sidebar": "BP.json Generator", "/bpjson>title": "BP JSON Generator - EOSIO + Antelope Network Dashboard", "/bpjson>heading": "BP.json Generator", "/faucet>sidebar": "Create Account & Faucet", "/faucet>title": "Faucet and Account Creator - EOSIO + Antelope Network Dashboard", - "/faucet>heading": "Account Creator and Token Faucet", + "/faucet>heading": "{{networkName}} Account Creator and Token Faucet", "/ricardian-contract>sidebar": "BP Agreement", "/ricardian-contract>title": "BP Agreement - EOSIO + Antelope Network Dashboard", "/ricardian-contract>heading": "", "/block-distribution>sidebar": "Block Distribution", "/block-distribution>title": "Block Production Distribution - EOSIO + Antelope Network Dashboard", - "/block-distribution>heading": "Block Production Distribution", + "/block-distribution>heading": "Block Production Distribution in {{networkName}}", "/missed-blocks>sidebar": "Missed Blocks", "/missed-blocks>title": "Missed Blocks - EOSIO + Antelope Network Dashboard", - "/missed-blocks>heading": "Missed Blocks", + "/missed-blocks>heading": "Missed Blocks in {{networkName}}", "/stress-test>title": "Stress Test Dashboard - EOSIO + Antelope Network Dashboard", "/stress-test>sidebar": "Stress Test", - "/stress-test>heading": "Stress Test", + "/stress-test>heading": "{{networkName}} Stress Test", "/evm>title": "EVM Dashboard - EOSIO + Antelope Network Dashboard", "/evm>sidebar": "EVM Dashboard", - "/evm>heading": "EVM Dashboard", + "/evm>heading": "{{networkName}} EVM Dashboard", "/evm-rpc-endpoints>title": "EVM RPC Endpoints - EOSIO + Antelope Network Dashboard", "/evm-rpc-endpoints>sidebar": "EVM RPC Endpoints", - "/evm-rpc-endpoints>heading": "EVM RPC Endpoints", + "/evm-rpc-endpoints>heading": "{{networkName}} EVM RPC Endpoints", "/endpoints>sidebar": "API Endpoints", "/endpoints>title": "API Endpoints - EOSIO + Antelope Network Dashboard", - "/endpoints>heading": "API Endpoints", + "/endpoints>heading": "{{networkName}} API Endpoints", "/endpoints-stats>sidebar": "API Endpoints Stats", "/endpoints-stats>title": "API Endpoints Stats- EOSIO + Antelope Network Dashboard", - "/endpoints-stats>heading": "API Endpoints Stats", + "/endpoints-stats>heading": "{{networkName}} API Endpoints Stats", "/about>sidebar": "About", "/about>title": "About - EOSIO + Antelope Network Dashboard", "/about>heading": "About", @@ -456,8 +456,8 @@ "avgBlockTime": "Average block time", "gasPrice": "Gas price", "avgGasUsage": "Average gas usage", - "totalIncoming": "Total (TOKEN) incoming", - "totalOutgoing": "Total (TOKEN) outgoing", + "totalIncoming": "Total {{token}} incoming", + "totalOutgoing": "Total {{token}} outgoing", "incoming": "Incoming", "outgoing": "Outgoing", "ATH": "TPS All Time High", @@ -468,8 +468,8 @@ "tooltip": { "gasPrice": "Fixed virtual fuel used to execute smart contracts in EVM", "avgGasUsage": "Average gas used in the last 100 blocks", - "totalIncoming": "Amount of transfer transactions to (ACCOUNT)", - "totalOutgoing": "Amount of transfer transactions from (ACCOUNT)", + "totalIncoming": "Amount of transfer transactions to {{accountName}}", + "totalOutgoing": "Amount of transfer transactions from {{accountName}}", "ATH": "Maximum number of transactions per second (TPS)", "lastBlock": "Ethereum block height, the number of confirmed blocks", "totalTxs": "Amount of transactions since the first block" diff --git a/webapp/src/language/en.telos-testnet.json b/webapp/src/language/en.telos-testnet.json index 881f04e5..7a03322d 100644 --- a/webapp/src/language/en.telos-testnet.json +++ b/webapp/src/language/en.telos-testnet.json @@ -31,7 +31,6 @@ "/accounts>moreDescription": "This tool helps find information about accounts and interact with contracts on the network. Enter an account name and obtain account information, smart contract actions, and table data.", "/block-distribution>moreDescription": "A visualization of the distribution of blocks produced by the nodes in the network.", "/missed-blocks>moreDescription": "A list of scheduled, produced, and missed blocks by each account in the network.", - "/evm>heading": "Telos EVM Dashboard", "/evm>moreDescription": "Monitor Telos EVM statistics (tEVM), such as transaction amount history, gas price and total wallets created.", "/evm-rpc-endpoints>moreDescription": "A list of Telos EVM endpoints, with their health status and latency in milliseconds." } diff --git a/webapp/src/language/en.telos.json b/webapp/src/language/en.telos.json index 58648221..10a4a79b 100644 --- a/webapp/src/language/en.telos.json +++ b/webapp/src/language/en.telos.json @@ -31,7 +31,6 @@ "/accounts>moreDescription": "This tool helps find information about accounts and interact with contracts on the network. Enter an account name and obtain account information, smart contract actions, and table data.", "/block-distribution>moreDescription": "A visualization of the distribution of blocks produced by the nodes in the network.", "/missed-blocks>moreDescription": "A list of scheduled, produced, and missed blocks by each account in the network.", - "/evm>heading": "Telos EVM Dashboard", "/evm>moreDescription": "Monitor Telos EVM statistics (tEVM), such as transaction amount history, gas price and total wallets created.", "/evm-rpc-endpoints>moreDescription": "A list of Telos EVM endpoints, with their health status and latency in milliseconds." } diff --git a/webapp/src/language/es.json b/webapp/src/language/es.json index b145780e..15a5d1d3 100644 --- a/webapp/src/language/es.json +++ b/webapp/src/language/es.json @@ -64,49 +64,50 @@ "routes": { "/>sidebar": "Panel", "/>title": "EOSIO Panel", - "/>heading": "Bienvenido", + "/>heading": "Bienvenido a {{networkName}}", "/cpu-benchmark>sidebar": "Benchmark de CPU", "/cpu-benchmark>title": "Benchmark de CPU - Panel", - "/cpu-benchmark>heading": "Benchmark de CPU", + "/cpu-benchmark>heading": "Benchmark de CPU en {{networkName}}", "/block-producers>sidebar": "Productores de Bloques", "/block-producers>title": "Productores de Bloques - Panel", - "/block-producers>heading": "Productores de Bloques", + "/block-producers>heading": "Productores de Bloques en {{networkName}}", "/undiscoverable-bps>sidebar": "Productores Indetectables", "/undiscoverable-bps>title": "Productores de Bloques Indetectables - Panel", - "/undiscoverable-bps>heading": "Productores de Bloques Pagados e Indetectables", + "/undiscoverable-bps>heading": "Productores de Bloques Pagados e Indetectables en {{networkName}}", "/rewards-distribution>sidebar": "Distribución de recompensas", "/rewards-distribution>title": "Distribución de recompensas - Panel", - "/rewards-distribution>heading": "Distribución de recompensas", + "/rewards-distribution>heading": "Distribución de recompensas de {{networkName}}", "/nodes>sidebar": "Nodos", "/nodes>title": "Nodos - Panel", - "/nodes>heading": "Nodos", + "/nodes>heading": "Nodos en {{networkName}}", "/nodes-distribution>sidebar": "Geo Distribución", "/nodes-distribution>title": "Distribución Geográfica de Nodos", - "/nodes-distribution>heading": "Distribución Geográfica", + "/nodes-distribution>heading": "Distribución Geográfica de los nodos de {{networkName}}", "/stress-test>title": "Panel de Prueba de Estrés", "/stress-test>sidebar": "Prueba de Estrés", - "/stress-test>heading": "Prueba de Estrés", + "/stress-test>heading": "Prueba de Estrés en {{networkName}}", "/accounts>sidebar": "Cuentas y Contratos", "/accounts>title": "Cuentas y Contratos - Panel", - "/accounts>heading": "Cuentas y Contratos", + "/accounts>heading": "Cuentas y Contratos de {{networkName}}", "/bpjson>sidebar": "BP JSON", "/bpjson>title": "BP JSON - Panel", "/bpjson>heading": "BP JSON", "/faucet>sidebar": "Crear Cuenta y Faucet", "/faucet>title": "Crear una Cuenta y Grifo de Tokens - EOSIO + Antelope Network Dashboard", - "/faucet>heading": "Crear una Cuenta y Obtener Tokens", + "/faucet>heading": "Crear una Cuenta de {{networkName}} y Obtenga Tokens", "/ricardian-contract>sidebar": "Acuerdo de Productor de Bloques", "/ricardian-contract>title": "Acuerdo de Productor de Bloques - Antelope Tools", "/ricardian-contract>heading": "", "/block-distribution>sidebar": "Distribución de bloques", "/block-distribution>title": "Distribución de bloques - Antelope Tools", - "/block-distribution>heading": "Distribución de bloques", + "/block-distribution>heading": "Distribución de bloques en {{networkName}}", + "/missed-blocks>heading": "$t(missedBlocks) en {{networkName}}", "/endpoints>sidebar": "URL's", "/endpoints>title": "URL's - Antelope Tools", - "/endpoints>heading": "URL's", + "/endpoints>heading": "URL's de {{networkName}}", "/endpoints-stats>sidebar": "Estadísticas de URL's", "/endpoints-stats>title": "Estadísticas de URL's - Antelope Tools", - "/endpoints-stats>heading": "Estadísticas de puntos finales", + "/endpoints-stats>heading": "Estadísticas de puntos finales de {{networkName}}", "/about>sidebar": "Acerca de", "/about>title": "Acerca de - Panel", "/about>heading": "Acerca de", @@ -475,8 +476,8 @@ "avgBlockTime": "Tiempo promedio de bloque", "gasPrice": "Precio de gas", "avgGasUsage": "Uso promedio de gas", - "totalIncoming": "Total (TOKEN) entrantes", - "totalOutgoing": "Total (TOKEN) salientes", + "totalIncoming": "Total {{token}} entrantes", + "totalOutgoing": "Total {{token}} salientes", "incoming": "Entrantes", "outgoing": "Salientes", "ATH": "TPS Máximo histórico", @@ -487,8 +488,8 @@ "tooltip": { "gasPrice": "Combustible virtual usado para ejecutar contratos inteligentes en EVM", "avgGasUsage": "Gas promedio utilizado en los últimos 100 bloques", - "totalIncoming": "Cantidad de transacciones transfer hacia (ACCOUNT)", - "totalOutgoing": "Cantidad de transacciones transfer desde (ACCOUNT)", + "totalIncoming": "Cantidad de transacciones transfer hacia {{accountName}}", + "totalOutgoing": "Cantidad de transacciones transfer desde {{accountName}}", "ATH": "Cantidad máxima registrada de transacciones por segundo (TPS)", "lastBlock": "Ethereum block height, el número de bloques confirmados", "totalTxs": "Cantidad de transacciones desde el primer bloque" diff --git a/webapp/src/layouts/Dashboard.js b/webapp/src/layouts/Dashboard.js index a7951426..d5a7b5eb 100644 --- a/webapp/src/layouts/Dashboard.js +++ b/webapp/src/layouts/Dashboard.js @@ -25,7 +25,6 @@ const drawerWidth = 70 const openDrawerWidth = drawerWidth * (24 / 7) const INIT_VALUES = { dynamicTitle: '', - networkTitle: '', pathname: null, } const useStyles = makeStyles((theme) => styles(theme)) @@ -66,8 +65,9 @@ const Dashboard = ({ children }) => { dynamicTitle: location.pathname === '/management' ? managementCardTitle - : t(`${location.pathname}>heading`), - networkTitle: location.pathname === '/' ? eosConfig.networkLabel : '', + : t(`${location.pathname}>heading`, { + networkName: eosConfig.networkLabel, + }), pathname: location.pathname, pageTitle: `${location.pathname}>title`, }) @@ -105,17 +105,18 @@ const Dashboard = ({ children }) => {
- - {routeName.pathname - ? `${routeName.dynamicTitle} ${routeName.networkTitle}` - : ''} - + {routeName.pathname && ( + + {routeName.dynamicTitle} + + )} {i18n.exists(`routes:${location.pathname}>moreDescription`) ? t(`${location.pathname}>moreDescription`) diff --git a/webapp/src/routes/EVMDashboard/index.js b/webapp/src/routes/EVMDashboard/index.js index 38411cb3..6e089ec4 100644 --- a/webapp/src/routes/EVMDashboard/index.js +++ b/webapp/src/routes/EVMDashboard/index.js @@ -158,16 +158,20 @@ const EVMDashboard = () => { loading={loading} /> Date: Wed, 13 Sep 2023 12:01:02 -0600 Subject: [PATCH 08/18] fix(webapp): fix skipped heading level --- webapp/src/components/AccountInfo/index.js | 7 ++++--- webapp/src/layouts/Dashboard.js | 2 +- webapp/src/routes/About/index.js | 6 +++--- webapp/src/routes/BlockDistribution/index.js | 2 +- webapp/src/routes/CPUBenchmark/index.js | 2 +- webapp/src/routes/EVMEndpointsList/index.js | 2 +- webapp/src/routes/EndpointsStats/EndpointStatsTable.js | 2 +- webapp/src/routes/EndpointsStats/index.js | 2 +- webapp/src/routes/Faucet/index.js | 4 ++-- webapp/src/routes/Help/index.js | 2 +- webapp/src/routes/Home/BlockProducerInfo.js | 2 +- webapp/src/routes/MissedBlocks/index.js | 2 +- .../routes/RewardsDistribution/RewardsDistributionStats.js | 6 +++--- webapp/src/routes/RewardsDistribution/styles.js | 4 ++-- 14 files changed, 23 insertions(+), 22 deletions(-) diff --git a/webapp/src/components/AccountInfo/index.js b/webapp/src/components/AccountInfo/index.js index dc483b48..6824f780 100644 --- a/webapp/src/components/AccountInfo/index.js +++ b/webapp/src/components/AccountInfo/index.js @@ -32,7 +32,7 @@ const AccordionWrapper = ({ children, title, ...props }) => { root: classes.accordionSummary, }} > - + {title} @@ -126,6 +126,7 @@ const AccountInfo = ({ />
- + {t('resources')}
@@ -156,7 +157,7 @@ const AccountInfo = ({
- + {t('keys')}
diff --git a/webapp/src/layouts/Dashboard.js b/webapp/src/layouts/Dashboard.js index d5a7b5eb..efd2353f 100644 --- a/webapp/src/layouts/Dashboard.js +++ b/webapp/src/layouts/Dashboard.js @@ -105,7 +105,7 @@ const Dashboard = ({ children }) => {
- {routeName.pathname && ( + {routeName.pathname && routeName.dynamicTitle && ( { {t('body.paragraph1')} - {t('subtitle1')} + {t('subtitle1')} {t('body1.paragraph1')} - {t('subtitle2')} + {t('subtitle2')} {t('body2.paragraph1')} - {t('subtitle3')} + {t('subtitle3')} {eosConfig.networkName !== 'lacchain' ? ( <> diff --git a/webapp/src/routes/BlockDistribution/index.js b/webapp/src/routes/BlockDistribution/index.js index 0af5a059..0ac9e7b3 100644 --- a/webapp/src/routes/BlockDistribution/index.js +++ b/webapp/src/routes/BlockDistribution/index.js @@ -98,7 +98,7 @@ const BlockDistribution = () => {
- + {t('title')}
diff --git a/webapp/src/routes/CPUBenchmark/index.js b/webapp/src/routes/CPUBenchmark/index.js index fdbac2dc..872322a1 100644 --- a/webapp/src/routes/CPUBenchmark/index.js +++ b/webapp/src/routes/CPUBenchmark/index.js @@ -183,7 +183,7 @@ const CPUBenchmark = () => {
- + {t('title')} diff --git a/webapp/src/routes/EVMEndpointsList/index.js b/webapp/src/routes/EVMEndpointsList/index.js index 6f03ba26..35de3ab0 100644 --- a/webapp/src/routes/EVMEndpointsList/index.js +++ b/webapp/src/routes/EVMEndpointsList/index.js @@ -36,7 +36,7 @@ const EVMEndpointsList = () => {
- + {t('title')} diff --git a/webapp/src/routes/EndpointsStats/EndpointStatsTable.js b/webapp/src/routes/EndpointsStats/EndpointStatsTable.js index 7a662bbc..8017fc1c 100644 --- a/webapp/src/routes/EndpointsStats/EndpointStatsTable.js +++ b/webapp/src/routes/EndpointsStats/EndpointStatsTable.js @@ -18,7 +18,7 @@ const EndpointsTable = ({ endpoints, title }) => { return ( <> - + {title} diff --git a/webapp/src/routes/EndpointsStats/index.js b/webapp/src/routes/EndpointsStats/index.js index d5410c00..91002872 100644 --- a/webapp/src/routes/EndpointsStats/index.js +++ b/webapp/src/routes/EndpointsStats/index.js @@ -72,7 +72,7 @@ const EndpointsStats = () => { - + {t('byProducer')} {producersNames?.length && ( diff --git a/webapp/src/routes/Faucet/index.js b/webapp/src/routes/Faucet/index.js index dd7172eb..f3edc6f2 100644 --- a/webapp/src/routes/Faucet/index.js +++ b/webapp/src/routes/Faucet/index.js @@ -170,7 +170,7 @@ const Faucet = () => {
- {t('createAccount')} + {t('createAccount')}
{
- {`${t('issueTokens')} (500 ${eosConfig.tokenSymbol})`} + {`${t('issueTokens')} (500 ${eosConfig.tokenSymbol})`}
{ return ( - + {t('title')} diff --git a/webapp/src/routes/Home/BlockProducerInfo.js b/webapp/src/routes/Home/BlockProducerInfo.js index 9f947d26..85b17ec9 100644 --- a/webapp/src/routes/Home/BlockProducerInfo.js +++ b/webapp/src/routes/Home/BlockProducerInfo.js @@ -114,7 +114,7 @@ const BlockProducerInfo = ({ t, classes }) => { - + {t('bpSchedule')} diff --git a/webapp/src/routes/MissedBlocks/index.js b/webapp/src/routes/MissedBlocks/index.js index b4898feb..15d0068c 100644 --- a/webapp/src/routes/MissedBlocks/index.js +++ b/webapp/src/routes/MissedBlocks/index.js @@ -115,7 +115,7 @@ const BlockDistribution = () => {
- + {t('title')} diff --git a/webapp/src/routes/RewardsDistribution/RewardsDistributionStats.js b/webapp/src/routes/RewardsDistribution/RewardsDistributionStats.js index 698c740a..fb8d601d 100644 --- a/webapp/src/routes/RewardsDistribution/RewardsDistributionStats.js +++ b/webapp/src/routes/RewardsDistribution/RewardsDistributionStats.js @@ -32,7 +32,7 @@ const RewardsDistributionStats = ({ summary, setting, handlePopoverOpen }) => {
- {t('dailyRewards')} + {t('dailyRewards')}
{!summary?.dailyRewards > 0 && ( @@ -67,7 +67,7 @@ const RewardsDistributionStats = ({ summary, setting, handlePopoverOpen }) => {
- + {t('topCountryDailyRewards')} @@ -109,7 +109,7 @@ const RewardsDistributionStats = ({ summary, setting, handlePopoverOpen }) => {
- {t('paidProducers')} + {t('paidProducers')} {!!summary?.producersWithoutProperBpJson.quantity && (