diff --git a/.eslintrc b/.eslintrc index f022f0dd..f64ba51d 100644 --- a/.eslintrc +++ b/.eslintrc @@ -10,6 +10,7 @@ "rules": { "camelcase": 0, "no-shadow": 0, + "no-void": 0, "new-cap": 0, "no-return-assign": 0, "no-nested-ternary": 0, diff --git a/src/components/AccountPage.js b/src/components/AccountPage.js new file mode 100644 index 00000000..50b14595 --- /dev/null +++ b/src/components/AccountPage.js @@ -0,0 +1,15 @@ +// @flow + +import React, { PureComponent } from 'react' + +import Box from 'components/base/Box' + +type Props = {} + +class AccountPage extends PureComponent { + render() { + return {'account'} + } +} + +export default AccountPage diff --git a/src/components/Home.js b/src/components/DashboardPage.js similarity index 86% rename from src/components/Home.js rename to src/components/DashboardPage.js index 0d37bf87..1544391a 100644 --- a/src/components/Home.js +++ b/src/components/DashboardPage.js @@ -18,7 +18,7 @@ type Props = { currentDevice: Device | null, } -class Home extends PureComponent { +class DashboardPage extends PureComponent { render() { const { currentDevice } = this.props return currentDevice !== null ? ( @@ -29,4 +29,4 @@ class Home extends PureComponent { } } -export default connect(mapStateToProps)(Home) +export default connect(mapStateToProps)(DashboardPage) diff --git a/src/components/SettingsPage.js b/src/components/SettingsPage.js new file mode 100644 index 00000000..7e947b98 --- /dev/null +++ b/src/components/SettingsPage.js @@ -0,0 +1,15 @@ +// @flow + +import React, { PureComponent } from 'react' + +import Box from 'components/base/Box' + +type Props = {} + +class SettingsPage extends PureComponent { + render() { + return {'settings'} + } +} + +export default SettingsPage diff --git a/src/components/SideBar/Item.js b/src/components/SideBar/Item.js index fc44577a..93459b88 100644 --- a/src/components/SideBar/Item.js +++ b/src/components/SideBar/Item.js @@ -1,16 +1,25 @@ // @flow import React from 'react' -import type { Element } from 'react' import styled from 'styled-components' +import { push } from 'react-router-redux' +import { connect } from 'react-redux' + +import type { Element } from 'react' import Box from 'components/base/Box' import Text from 'components/base/Text' type Props = { children: string, + linkTo?: string | null, desc?: string | null, icon?: Element<*> | null, + push: Function, +} + +const mapDispatchToProps = { + push, } const Container = styled(Box).attrs({ @@ -32,9 +41,9 @@ const IconWrapper = styled(Box)` border: 2px solid rgba(255, 255, 255, 0.1); ` -export default function Item({ children, desc, icon }: Props) { +function Item({ children, desc, icon, linkTo, push }: Props) { return ( - + push(linkTo) : void 0}> {icon || null}
@@ -53,4 +62,7 @@ export default function Item({ children, desc, icon }: Props) { Item.defaultProps = { icon: null, desc: null, + linkTo: null, } + +export default connect(null, mapDispatchToProps)(Item) diff --git a/src/components/SideBar/index.js b/src/components/SideBar/index.js index 94c99565..c9f66310 100644 --- a/src/components/SideBar/index.js +++ b/src/components/SideBar/index.js @@ -23,19 +23,27 @@ class SideBar extends PureComponent<{}> { {'Menu'}
- {'Dashboard'} + {'Dashboard'} {'Send'} {'Receive'} - {'Settings'} + {'Settings'}
{'Accounts'}
- {'Brian Account'} - {'Virginie Account'} - {'Ledger Account'} - {'Nicolas Account'} + + {'Brian Account'} + + + {'Virginie Account'} + + + {'Ledger Account'} + + + {'Nicolas Account'} +
diff --git a/src/components/Wrapper.js b/src/components/Wrapper.js index 902fc036..2d108c6d 100644 --- a/src/components/Wrapper.js +++ b/src/components/Wrapper.js @@ -6,7 +6,10 @@ import { translate } from 'react-i18next' import Box from 'components/base/Box' -import Home from 'components/Home' +import DashboardPage from 'components/DashboardPage' +import SettingsPage from 'components/SettingsPage' +import AccountPage from 'components/AccountPage' + import SideBar from 'components/SideBar' import TopBar from 'components/TopBar' @@ -15,7 +18,9 @@ const Wrapper = () => ( - + + + ) diff --git a/webpack.renderer.js b/webpack.renderer.js index 7343ff5a..cc8bb0dc 100644 --- a/webpack.renderer.js +++ b/webpack.renderer.js @@ -9,4 +9,7 @@ module.exports = { __PROD__, }), ], + devServer: { + historyApiFallback: true, + }, }