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

review comments

This commit is contained in:
Jonathan Rainville 2018-10-18 16:11:36 -04:00 committed by Pascal Precht
parent 972e0aca40
commit 6150ce0b54
No known key found for this signature in database
GPG Key ID: 0EE28D8D6FD85D7D
5 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
embark-ui/src/components/ExplorerLayout.js
View File

@ -8,21 +8,17 @@ import BlockContainer from '../containers/BlockContainer';
import TransactionsContainer from '../containers/TransactionsContainer'; import TransactionsContainer from '../containers/TransactionsContainer';
import TransactionContainer from '../containers/TransactionContainer'; import TransactionContainer from '../containers/TransactionContainer';
class ExplorerLayout extends React.Component { const ExplorerLayout = () => (
render() { <React.Fragment>
return ( <Switch>
<React.Fragment> <Route exact path="/embark/explorer/accounts" component={AccountsContainer}/>
<Switch> <Route exact path="/embark/explorer/accounts/:address" component={AccountContainer}/>
<Route exact path="/embark/explorer/accounts" component={AccountsContainer}/> <Route exact path="/embark/explorer/blocks" component={BlocksContainer}/>
<Route exact path="/embark/explorer/accounts/:address" component={AccountContainer}/> <Route exact path="/embark/explorer/blocks/:blockNumber" component={BlockContainer}/>
<Route exact path="/embark/explorer/blocks" component={BlocksContainer}/> <Route exact path="/embark/explorer/transactions" component={TransactionsContainer}/>
<Route exact path="/embark/explorer/blocks/:blockNumber" component={BlockContainer}/> <Route exact path="/embark/explorer/transactions/:hash" component={TransactionContainer}/>
<Route exact path="/embark/explorer/transactions" component={TransactionsContainer}/> </Switch>
<Route exact path="/embark/explorer/transactions/:hash" component={TransactionContainer}/> </React.Fragment>
</Switch> );
</React.Fragment>
);
}
}
export default ExplorerLayout; export default ExplorerLayout;

4
embark-ui/src/components/Layout.js
View File

@ -130,7 +130,9 @@ class Layout extends React.Component {
renderRightNav() { renderRightNav() {
return (<Nav className="ml-auto" navbar> return (<Nav className="ml-auto" navbar>
{<SearchBar hidden={this.state.searchLoading} searchSubmit={searchValue => this.searchTheExplorer(searchValue)}/>} {<SearchBar hidden={this.state.searchLoading} searchSubmit={searchValue => this.searchTheExplorer(searchValue)}/>}
{this.state.searchLoading && <p className="search-loading">Searching... <FontAwesome name="spinner" spin /></p>} {this.state.searchLoading && <p className="search-loading">
Searching... <FontAwesome name="spinner" size="2x" spin className="align-middle ml-2"/>
</p>}
{this.renderSettings()} {this.renderSettings()}
</Nav>); </Nav>);

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

@ -7,7 +7,7 @@ import "./Loading.css";
const Loading = () => ( const Loading = () => (
<Row className="align-items-center mt-5"> <Row className="align-items-center mt-5">
<Col className="text-center"> <Col className="text-center">
<FontAwesome name="spinner" spin className="fa-3x fa-fw" /> <FontAwesome name="spinner" spin size="3x" />
</Col> </Col>
</Row> </Row>
); );

24
embark-ui/src/components/SearchBar.js
View File

@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import {Form, FormGroup, Input, Button, Row, Col} from 'reactstrap'; import {Form, FormGroup, Input, Button, Row, Col} from 'reactstrap';
import FontAwesome from 'react-fontawesome'; import FontAwesome from 'react-fontawesome';
import classNames from 'classnames';
import './search.css'; import './search.css';
@ -33,19 +34,16 @@ class SearchBar extends React.Component {
render() { render() {
return ( return (
<Row className={this.props.hidden ? 'hidden' : ''}> <Form inline className={classNames('search-bar', 'float-right', 'my-2', {hidden: this.props.hidden})}>
<Col className="col-sm-12"> <FormGroup>
<Form inline className="search-bar float-right my-2"> <Input type="text" name="search-bar" placeholder="Search by Address / Txhash / Block"
<FormGroup> onChange={(e) => this.onChange(e)}
<Input type="text" name="search-bar" placeholder="Search by Address / Txhash / Block" onChange={(e) => this.onChange(e)} value={this.state.searchValue} onKeyPress={e => this.onKeyPress(e)}/>
value={this.state.searchValue} onKeyPress={e => this.onKeyPress(e)} /> <Button color="secondary" onClick={(e) => this.onSubmit(e)}>
<Button color="secondary" onClick={(e) => this.onSubmit(e)}> <FontAwesome name="search"/>
<FontAwesome name="search"/> </Button>
</Button> </FormGroup>
</FormGroup> </Form>
</Form>
</Col>
</Row>
); );
} }
} }

6
embark-ui/src/components/search.css
View File

@ -22,12 +22,6 @@
margin-top: 16px; margin-top: 16px;
} }
.search-loading .fa-spinner {
font-size: 2em;
vertical-align: middle;
margin-left: 10px;
}
.search-error-close { .search-error-close {
position: absolute; position: absolute;
cursor: pointer; cursor: pointer;