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}) => (
<Row>
<Col>
<h1>Accounts</h1>
{accounts.map(account => (
<Card key={account.address}>
<CardHeader>
<Card>
<CardHeader>
<h1>Accounts</h1>
</CardHeader>
<CardBody>
{accounts.map(account => (
<div className="explorer-row" key={account.address}>
<CardTitleIdenticon id={account.address}>Account&nbsp;
<Link to={`/embark/explorer/accounts/${account.address}`}>{account.address}</Link>
</CardTitleIdenticon>
</CardHeader>
<CardBody>
<Row>
<Col>
<strong>Balance</strong>
<div>{account.balance} Ether</div>
</Col>
<Col>
<strong>Tx Count</strong>
<div>{account.transactionCount}</div>
</Col>
<Col>
<strong>Index</strong>
<div>{account.index}</div>
</Col>
</Row>
</CardBody>
</Card>
))}
<Row>
<Col>
<strong>Balance</strong>
<div>{account.balance} Ether</div>
</Col>
<Col>
<strong>Tx Count</strong>
<div>{account.transactionCount}</div>
</Col>
<Col>
<strong>Index</strong>
<div>{account.index}</div>
</Col>
</Row>
</div>
))}
</CardBody>
</Card>
</Col>
</Row>
);

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

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

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

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