diff --git a/embark-ui/package.json b/embark-ui/package.json index f61590f6..4850d07f 100644 --- a/embark-ui/package.json +++ b/embark-ui/package.json @@ -55,6 +55,7 @@ "react-router-dom": "^4.3.1", "react-scroll-to-component": "^1.0.2", "react-treebeard": "^2.1.0", + "reactstrap": "^6.5.0", "redux": "^4.0.0", "redux-saga": "^0.16.0", "resolve": "1.6.0", diff --git a/embark-ui/src/components/Converter.js b/embark-ui/src/components/Converter.js index 89c909a4..ee420d4c 100644 --- a/embark-ui/src/components/Converter.js +++ b/embark-ui/src/components/Converter.js @@ -1,9 +1,22 @@ import PropTypes from "prop-types"; import React from 'react'; -import {Page, Form, Button, Icon} from "tabler-react"; +import { + Button, + InputGroup, + Card, + CardBody, + CardHeader, + Col, + FormGroup, + Input, + Row, + InputGroupAddon, + Label +} from 'reactstrap'; import {CopyToClipboard} from 'react-copy-to-clipboard'; import { calculateUnits } from '../services/unitConverter'; + class Converter extends React.Component { constructor(props) { super(props); @@ -23,22 +36,32 @@ class Converter extends React.Component { render() { return( - - - { - this.state.etherConversions.map(unit => { - return ( - - this.handleOnChange(e, unit.key)} /> - - - - - ) - }) - } - - + + + + + Ether Converter + + + { + this.state.etherConversions.map(unit => ( + + + + this.handleOnChange(e, unit.key)} /> + + + + + + + + )) + } + + + + ); } } diff --git a/embark-ui/src/components/UtilsLayout.js b/embark-ui/src/components/UtilsLayout.js index 3dde0164..531fe805 100644 --- a/embark-ui/src/components/UtilsLayout.js +++ b/embark-ui/src/components/UtilsLayout.js @@ -1,45 +1,12 @@ import React from 'react'; -import {Page, Grid, List} from 'tabler-react' -import {NavLink, Route, Switch} from 'react-router-dom'; +import {Route, Switch} from 'react-router-dom'; import ConverterContainer from '../containers/ConverterContainer'; -const groupItems = [ - {to: "/embark/utilities/converter", icon: "dollar-sign", value: "Ether Converter"} -]; - -const className = "d-flex align-items-center"; - -class UtilsLayout extends React.Component { - render() { - return ( - - - Utilities -
- - {groupItems.map((groupItem) => ( - - {groupItem.value} - - ))} - -
-
- - - - - -
- ); - } -} +const UtilsLayout = () => ( + + + +); export default UtilsLayout; diff --git a/embark-ui/src/containers/ConverterContainer.js b/embark-ui/src/containers/ConverterContainer.js index b4dfb045..5b6a7539 100644 --- a/embark-ui/src/containers/ConverterContainer.js +++ b/embark-ui/src/containers/ConverterContainer.js @@ -9,7 +9,7 @@ import Converter from '../components/Converter'; class ConverterContainer extends React.Component { render() { return ; + updateBaseEther={this.props.updateBaseEther} />; } }