diff --git a/shyftBlockExplorerUI/public/index.html b/shyftBlockExplorerUI/public/index.html index d4b9ff03aa..d7f549976a 100644 --- a/shyftBlockExplorerUI/public/index.html +++ b/shyftBlockExplorerUI/public/index.html @@ -9,6 +9,7 @@ homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/ --> + diff --git a/shyftBlockExplorerUI/src/components/home/home.js b/shyftBlockExplorerUI/src/components/home/home.js index 46d25fe9d4..5826cff404 100644 --- a/shyftBlockExplorerUI/src/components/home/home.js +++ b/shyftBlockExplorerUI/src/components/home/home.js @@ -6,21 +6,23 @@ const home = props => { const combinedClasses = ["btn", "btn-primary", classes.BlockButton] const conjoinecdClasses = ["btn", "btn-primary", classes.AccountButton] + return ( -
- THIS IS A WIP -
-
- -
-
- -
-
- -
-
-
+
+ //
+ // THIS IS A WIP + //
+ //
+ // + //
+ //
+ // + //
+ //
+ // + //
+ //
+ //
); }; diff --git a/shyftBlockExplorerUI/src/components/nav/nav.css b/shyftBlockExplorerUI/src/components/nav/nav.css index 3df567bc57..039a15fd7c 100644 --- a/shyftBlockExplorerUI/src/components/nav/nav.css +++ b/shyftBlockExplorerUI/src/components/nav/nav.css @@ -1,21 +1,51 @@ -.Secondary { - display: block; - width:100%; - height: 100px; - background-color: rgb(244, 244, 244); +.navHeader { + height: 25vh; + background-color: #4f2e7e; + padding-top: 30pt; + padding-left: 2.5%; + z-index: -10000; + width: 100%; } -.Transactions { - font-size: 20px; - padding-top: 25px; - padding-left: 15px; - float: left; +.headerText { + color: white; + letter-spacing: 1.7px; + font-family: 'Open Sans', sans-serif; + font-size: 15px; + text-transform: uppercase; + } -.bg-light { - background-color: #fff !important; +.buttonContainer { + flex: 1; + flex-direction: row; + padding-top: 20pt; } -.TopBar { - font-size: 1.5rem; -} \ No newline at end of file +.btn { + color: white; + background-color: transparent; + font-size: 8px; + letter-spacing: 1.6px; + font-family: 'Open Sans', sans-serif; + width: 120px; + height: 32px; + margin-right: 1%; + font-weight: 300; +} + +.btn:hover { + color: #4f2e7e; + background-color: #ffffff; + font-size: 8px; + + +} +/* +button:active{ + background-color: white; +} + +button:focus { + background-color: white; +} */ diff --git a/shyftBlockExplorerUI/src/components/nav/nav.js b/shyftBlockExplorerUI/src/components/nav/nav.js index b65ee09db1..b34ed7e819 100644 --- a/shyftBlockExplorerUI/src/components/nav/nav.js +++ b/shyftBlockExplorerUI/src/components/nav/nav.js @@ -1,24 +1,63 @@ import React from "react"; import classes from './nav.css'; +import { Link } from 'react-router-dom' -const navBar = props => { - let combinedClasses = ["navbar-brand", classes.TopBar]; - return ( - */ + ) + }; }; export default navBar; diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js index dca2922e04..5b2d911c57 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js +++ b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js @@ -21,7 +21,6 @@ class BlocksTable extends Component { } } - render() { const table = this.state.data.map((data, i) => { const conversion = data.Rewards / 10000000000000000000; @@ -43,23 +42,25 @@ class BlocksTable extends Component { let combinedClasses = ['responsive-table', classes.table]; return ( - - - - - - - - - - - - - - - - {table} -
HeightBlock HashAgeTxnUnclesCoinbaseGasUsedGasLimitAvg.GasPriceReward
+
+ + + + + + + + + + + + + + + + {table} +
HeightBlock HashAgeTxnUnclesCoinbaseGasUsedGasLimitAvg.GasPriceReward
+
); } } diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js index 174acc3b68..729985833f 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js +++ b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js @@ -6,18 +6,18 @@ const BlockTable = (props) => { return ( - props.detailBlockHandler(props.Number)}> + 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} + {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 8aa8995a54..94bb2c4d6a 100644 --- a/shyftBlockExplorerUI/src/components/table/blocks/table.css +++ b/shyftBlockExplorerUI/src/components/table/blocks/table.css @@ -1,21 +1,34 @@ .table { border-spacing: 100rem; - width: 100%; - margin-top: 50px; + width: 95%; + margin: 0 auto; + margin-top: -4%; + background-color: white; } -.tHead { - font-size: 1rem; +thead { + font-size: 7pt; + background-color: white; + font-family: 'Open Sans', sans-serif; + color: #593c83; + } th { - background-color: aliceblue; + background-color: white; padding-right: 10px; + padding: 25pt 30pt ; + color: #593c83; + font-family: 'Open Sans', sans-serif; } td { - padding-left: 5px; - font-size: .5rem; + font-size: 6pt; + background-color: white; + font-family: 'Open Sans', sans-serif; + + /* padding: 25px; + margin-left: 25px; */ } .addressTag { @@ -23,7 +36,7 @@ td { vertical-align: bottom; text-overflow: ellipsis; overflow: hidden; - width: 132px; + width: 100px; } .ageTag{ diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js index 043f430d14..6d7b30e440 100644 --- a/shyftBlockExplorerUI/src/containers/App.js +++ b/shyftBlockExplorerUI/src/containers/App.js @@ -3,6 +3,9 @@ import axios from 'axios'; import Nav from "../components/nav/nav"; import { BrowserRouter, Route } from 'react-router-dom' +import { Link } from 'react-router-dom' + + ///**LANDING PAGE**/// import Home from '../components/home/home'; @@ -26,6 +29,7 @@ import DetailAccountsTable from "../components/table/accounts/detailAccountsRow" import AccountHeader from "../components/nav/accountHeaders/accountHeader"; import AccountDetailHeader from "../components/nav/accountHeaders/accountDetailHeader"; +import classes from './App.css'; class App extends Component { constructor(props) { @@ -93,14 +97,15 @@ class App extends Component { render() { return ( -
-
+
); } }