diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2017-06-22 00:37:03 +0200 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2017-06-22 00:37:03 +0200 |
| commit | 2fb44e9ef9feef5179487d56a8a97699fa4b739e (patch) | |
| tree | f2f8e2d1bd2c9ccf6bc83229cdf55b3d26701774 /client/components/App.jsx | |
| parent | c46bc4988b477c20797408fcbd9269198de0d2c3 (diff) | |
mobile css and slight refactor
Diffstat (limited to 'client/components/App.jsx')
| -rw-r--r-- | client/components/App.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/client/components/App.jsx b/client/components/App.jsx index 5ab98cb..fbe4d79 100644 --- a/client/components/App.jsx +++ b/client/components/App.jsx @@ -3,7 +3,8 @@ import { isMobile } from '../util' import db from '../db' import { Link, withRouter } from 'react-router-dom' -import Scroller from './Scroller.jsx' +import Header from './Header.jsx' +import Paintings from './Paintings.jsx' import Details from './Details.jsx' import Modal from './Modal.jsx' @@ -42,8 +43,8 @@ class App extends Component { }) return ( <div> - <div class='header'>Procedural Paintings by Pepper</div> - <Scroller data={this.state.data} /> + <Header location={this.props.location} /> + <Paintings data={this.state.data} /> <Modal visible={this.props.location.pathname !== '/'}> <Details painting={painting} /> </Modal> @@ -52,5 +53,4 @@ class App extends Component { } } - export default withRouter(App)
\ No newline at end of file |
