embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

conflict in blocks and accounts

This commit is contained in:
Jonathan Rainville 2018-10-24 10:46:58 -04:00
parent bc0a89fd6d
commit 3a1042d7a9
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
embark-ui/src/components/Accounts.js
View File

@ -8,32 +8,34 @@ import CardTitleIdenticon from './CardTitleIdenticon';
const Accounts = ({accounts}) => ( const Accounts = ({accounts}) => (
<Row> <Row>
<Col> <Col>
<h1>Accounts</h1> <Card>
{accounts.map(account => ( <CardHeader>
<Card key={account.address}> <h1>Accounts</h1>
<CardHeader> </CardHeader>
<CardBody>
{accounts.map(account => (
<div className="explorer-row" key={account.address}>
<CardTitleIdenticon id={account.address}>Account&nbsp; <CardTitleIdenticon id={account.address}>Account&nbsp;
<Link to={`/embark/explorer/accounts/${account.address}`}>{account.address}</Link> <Link to={`/embark/explorer/accounts/${account.address}`}>{account.address}</Link>
</CardTitleIdenticon> </CardTitleIdenticon>
</CardHeader> <Row>
<CardBody> <Col>
<Row> <strong>Balance</strong>
<Col> <div>{account.balance} Ether</div>
<strong>Balance</strong> </Col>
<div>{account.balance} Ether</div> <Col>
</Col> <strong>Tx Count</strong>
<Col> <div>{account.transactionCount}</div>
<strong>Tx Count</strong> </Col>
<div>{account.transactionCount}</div> <Col>
</Col> <strong>Index</strong>
<Col> <div>{account.index}</div>
<strong>Index</strong> </Col>
<div>{account.index}</div> </Row>
</Col> </div>
</Row> ))}
</CardBody> </CardBody>
</Card> </Card>
))}
</Col> </Col>
</Row> </Row>
); );

2
embark-ui/src/components/Blocks.js
View File

@ -37,7 +37,7 @@ const Blocks = ({blocks, showLoadMore, loadMore}) => (
</Row> </Row>
</div> </div>
))} ))}
{showLoadMore && <LoadMore loadMore={() => loadMore()} />} {showLoadMore && <LoadMore loadMore={() => loadMore()}/>}
</CardBody> </CardBody>
</Card> </Card>
</Col> </Col>

10
embark-ui/src/components/Explorer.css
View File

@ -1,11 +1,11 @@
.explorer-row { .explorer-row + .explorer-row {
margin-bottom: 20px; margin-top: 5px;
padding-bottom: 5px; padding-top: 20px;
border-bottom: 1px solid #c8ced3; border-top: 1px solid #c8ced3;
} }
.dark-theme .explorer-row { .dark-theme .explorer-row {
border-bottom-color: #23282c; border-top-color: #23282c;
} }
.explorer-row .text-truncate { .explorer-row .text-truncate {