diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js index a273875d80..977c4ee7dc 100644 --- a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js +++ b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js @@ -1,18 +1,20 @@ import React from 'react'; -import classes from './accounts.css'; +import classes from './table.css'; import { Link } from 'react-router-dom' const AccountsTable = (props) => { return ( - - {props.Rank} - props.detailAccountHandler(props.Addr)}> + + {props.Rank} + + props.detailAccountHandler(props.Addr)}> {props.Addr} - - {props.Balance} - {props.Percentage}% - {props.AccountNonce} + + + {props.Balance} + {props.Percentage}% + {props.AccountNonce} ) diff --git a/shyftBlockExplorerUI/src/components/table/accounts/table.css b/shyftBlockExplorerUI/src/components/table/accounts/table.css index 5f7c847b1f..01d7360aa6 100644 --- a/shyftBlockExplorerUI/src/components/table/accounts/table.css +++ b/shyftBlockExplorerUI/src/components/table/accounts/table.css @@ -1,52 +1,49 @@ .table { - border-spacing: 100rem; width: 95%; margin: 0 auto; background-color: white; top: 107pt; left: 2.5%; position: absolute; + table-layout:fixed; } th { - background-color: aliceblue; - padding-right: 10px; + background-color: white; + padding: 15pt 30pt ; + color: #593c83; + font-family: 'Open Sans', sans-serif; +} + +.thItem { + font-size: 8pt; + background-color: white; + color: #4f2e7e; } td { font-size: 6pt; background-color: white; font-family: 'Open Sans', sans-serif; + text-overflow: ellipsis; + overflow: hidden; +} + +.tdItem { + padding-left: 30pt; + padding-bottom: 7.5pt; + padding-top: 7.5pt; +} + +.tdLink { + color: #8f67c9; +} + +.border { + border-top: 1px solid #e0defb; } .disabled { pointer-events: none; color: black; -} - -.incoming { - height: 25px; - width: 35px; - border: 1px forestgreen; - border-radius: 5px; - background-color: #4f2e7e; - color: white; - font-size: 1rem; - text-transform: uppercase; - text-align: center; - vertical-align: middle; -} - -.out { - height: 25px; - width: 35px; - border: 1px orangered; - border-radius: 5px; - background-color: orangered; - color: white; - font-size: .8rem; - text-transform: uppercase; - text-align: center; - vertical-align: middle; -} - +} diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js index 741b1668e4..1648390287 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js +++ b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js @@ -45,18 +45,18 @@ class BlocksTable extends Component {
- - - - - - - - - - - - + + + + + + + + + + + + {table}
HeightBlock HashAgeTxnUnclesCoinbaseGasUsedGasLimitAvg.GasPriceReward
Height Block Hash Age Txn Uncles Coinbase GasUsed GasLimit Avg.GasPrice Reward
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js index c6df7862eb..b3ab4d5081 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js +++ b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js @@ -5,17 +5,23 @@ import { Link } from 'react-router-dom' const BlockTable = (props) => { return ( - - props.detailBlockHandler(props.Number)}> - {props.Number} - - {props.Hash} - {props.AgeGet} - {props.TxCount} - {props.UncleCount} - props.getBlocksMined(props.Coinbase)}>{props.Coinbase} - {props.GasUsed} - {props.GasLimit} + + + props.detailBlockHandler(props.Number)}> + {props.Number} + + + {props.Hash} + {props.AgeGet} + {props.TxCount} + {props.UncleCount} + + props.getBlocksMined(props.Coinbase)}> + {props.Coinbase} + + + {props.GasUsed} + {props.GasLimit} TBD {props.Reward} diff --git a/shyftBlockExplorerUI/src/components/table/blocks/table.css b/shyftBlockExplorerUI/src/components/table/blocks/table.css index 1fb7111b91..105222dc24 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/table.css +++ b/shyftBlockExplorerUI/src/components/table/blocks/table.css @@ -1,11 +1,11 @@ .table { - border-spacing: 100rem; width: 95%; margin: 0 auto; background-color: white; top: 107pt; left: 2.5%; position: absolute; + table-layout:fixed; } th { @@ -15,8 +15,35 @@ th { font-family: 'Open Sans', sans-serif; } +.thItem { + font-size: 8pt; + background-color: white; + color: #4f2e7e; +} + td { font-size: 6pt; background-color: white; font-family: 'Open Sans', sans-serif; + text-overflow: ellipsis; + overflow: hidden; } + +.tdItem { + padding-left: 30pt; + padding-bottom: 7.5pt; + padding-top: 7.5pt; +} + +.tdLink { + color: #8f67c9; +} + +.border { + border-top: 1px solid #e0defb; +} + +.disabled { + pointer-events: none; + color: black; +} \ No newline at end of file diff --git a/shyftBlockExplorerUI/src/components/table/internalTransactions/internalRow.js b/shyftBlockExplorerUI/src/components/table/internalTransactions/internalRow.js index bc7dac8533..bb3f41ae27 100644 --- a/shyftBlockExplorerUI/src/components/table/internalTransactions/internalRow.js +++ b/shyftBlockExplorerUI/src/components/table/internalTransactions/internalRow.js @@ -13,9 +13,6 @@ class InternalTransactionsTable extends Component { } async componentDidMount() { - - console.log("in table row component"); - try { const response = await axios.get("http://localhost:8080/api/get_internal_transactions/"); await this.setState({data: response.data}); @@ -50,17 +47,17 @@ class InternalTransactionsTable extends Component { - - - - - - - - - - - + + + + + + + + + + + {table} diff --git a/shyftBlockExplorerUI/src/components/table/internalTransactions/internalTable.js b/shyftBlockExplorerUI/src/components/table/internalTransactions/internalTable.js index 8959a749fe..9bb65a3928 100644 --- a/shyftBlockExplorerUI/src/components/table/internalTransactions/internalTable.js +++ b/shyftBlockExplorerUI/src/components/table/internalTransactions/internalTable.js @@ -6,28 +6,28 @@ import Button from 'react-bootstrap/lib/Button'; const InternalTable = (props) => { return ( - - + - - - - - - - + + + + + + - - - - - + + ) diff --git a/shyftBlockExplorerUI/src/components/table/internalTransactions/table.css b/shyftBlockExplorerUI/src/components/table/internalTransactions/table.css index f66aa76930..231c950c0b 100644 --- a/shyftBlockExplorerUI/src/components/table/internalTransactions/table.css +++ b/shyftBlockExplorerUI/src/components/table/internalTransactions/table.css @@ -1,11 +1,11 @@ .table { - border-spacing: 100rem; width: 95%; margin: 0 auto; background-color: white; top: 107pt; left: 2.5%; position: absolute; + table-layout:fixed; } th { @@ -15,10 +15,32 @@ th { font-family: 'Open Sans', sans-serif; } +.thItem { + font-size: 8pt; + background-color: white; + color: #4f2e7e; +} + td { font-size: 6pt; background-color: white; font-family: 'Open Sans', sans-serif; + text-overflow: ellipsis; + overflow: hidden; +} + +.tdItem { + padding-left: 30pt; + padding-bottom: 7.5pt; + padding-top: 7.5pt; +} + +.tdLink { + color: #8f67c9; +} + +.border { + border-top: 1px solid #e0defb; } .disabled { diff --git a/shyftBlockExplorerUI/src/components/table/transactions/table.css b/shyftBlockExplorerUI/src/components/table/transactions/table.css index 782c63a445..231c950c0b 100644 --- a/shyftBlockExplorerUI/src/components/table/transactions/table.css +++ b/shyftBlockExplorerUI/src/components/table/transactions/table.css @@ -1,14 +1,13 @@ - .table { - border-spacing: 100rem; +.table { width: 95%; margin: 0 auto; background-color: white; top: 107pt; left: 2.5%; position: absolute; + table-layout:fixed; } - th { background-color: white; padding: 15pt 30pt ; @@ -16,10 +15,32 @@ th { font-family: 'Open Sans', sans-serif; } +.thItem { + font-size: 8pt; + background-color: white; + color: #4f2e7e; +} + td { font-size: 6pt; background-color: white; font-family: 'Open Sans', sans-serif; + text-overflow: ellipsis; + overflow: hidden; +} + +.tdItem { + padding-left: 30pt; + padding-bottom: 7.5pt; + padding-top: 7.5pt; +} + +.tdLink { + color: #8f67c9; +} + +.border { + border-top: 1px solid #e0defb; } .disabled { diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js index 19c3ca1bc3..bd4068cc60 100644 --- a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js +++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js @@ -45,13 +45,13 @@ class TransactionTable extends Component {
Block HashActionToFromGasGas UsedIDInputOutputTimeValue Block Hash Action To From Gas Gas Used ID Input Output Time Value
-
props.detailInternalHandler(props.Hash)}> +
+
props.detailInternalHandler(props.Hash)}> {props.Hash}
{props.Action}{props.To}{props.From}{props.Gas}{props.ID} - + {props.Action}{props.To}{props.From}{props.Gas} {props.GasUsed} {props.ID} +
alert( props.Input )}> Show Input +
- + +
alert(props.Output)}> Show Output +
{props.Time}{props.Value}{props.Time}{props.Value}
- - - - - - - + + + + + + + {table} diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js index bb62a01cff..baeafe849d 100644 --- a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js +++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js @@ -1,6 +1,5 @@ import React from 'react'; import classes from './table.css'; -import arrow from '../../assets/arrow_right_black.png'; import { Link } from 'react-router-dom' const TransactionTable = (props) => { @@ -16,17 +15,30 @@ const TransactionTable = (props) => { return ( - - + - - - - - - + + + + + + ) diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js index 59a61c56c7..0b43126790 100644 --- a/shyftBlockExplorerUI/src/containers/App.js +++ b/shyftBlockExplorerUI/src/containers/App.js @@ -147,7 +147,7 @@ class App extends Component { if (dataEntry["To"] === null) { delete dataEntry["To"] } - if( key === "Input" || key === "Output") { + if( key === "Input" || key === "Output" || key === "Data") { components.push( @@ -179,12 +179,10 @@ class App extends Component { } renderOverlay = () => { - const page = this.state.overlayContent; let data, title; let keys = []; let values = []; - switch (page) { case "block" : title = "BLOCK OVERVIEW"; @@ -204,7 +202,6 @@ class App extends Component { break; default: console.log("error"); } - return (
@@ -233,11 +230,11 @@ class App extends Component { this.state.overlayTriggered ? this.renderOverlay() : null } -
+
} /> +
- - + ); } }
TxHashBlockAgeFromToValueTxFee TxHash Block Age From To Value TxFee
+
props.detailTransactionHandler(props.txHash)}> - {props.txHash} + {props.txHash} + props.getBlockTransactions(props.blockNumber)}>{props.blockNumber}{props.age} props.detailAccountHandler(props.from)}>{props.from} props.detailAccountHandler(props.to)}>{props.to}{props.value}{props.cost} + props.getBlockTransactions(props.blockNumber)}> + {props.blockNumber} + + {props.age} + props.detailAccountHandler(props.from)}> + {props.from} + + + props.detailAccountHandler(props.to)}> + {props.to} + + {props.value} {props.cost}