mirror of
https://github.com/mgerb/react-starter
synced 2026-01-11 17:42:48 +00:00
added wrapper and navbar
This commit is contained in:
32
app/app.js
32
app/app.js
@@ -2,39 +2,17 @@ import React from 'react';
|
||||
import ReactDOM from 'react-dom';
|
||||
import { Router, Route, IndexRoute, browserHistory } from 'react-router';
|
||||
|
||||
import Wrapper from './Wrapper';
|
||||
import NotFound from './pages/NotFound/NotFound';
|
||||
|
||||
//pages
|
||||
import Home from './pages/Home';
|
||||
import New from './pages/New';
|
||||
import Default from './pages/Default';
|
||||
|
||||
//components
|
||||
import Navbar from './components/Navbar';
|
||||
|
||||
//styling
|
||||
import './scss/index.scss';
|
||||
|
||||
class Wrapper extends React.Component {
|
||||
|
||||
render() {
|
||||
return (
|
||||
<div>
|
||||
<Navbar/>
|
||||
{this.props.children}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Wrapper.propTypes = {
|
||||
children: React.PropTypes.node,
|
||||
};
|
||||
import Home from './pages/Home/Home';
|
||||
|
||||
ReactDOM.render(
|
||||
<Router history={browserHistory}>
|
||||
<Route path="/" component={Wrapper}>
|
||||
<IndexRoute component={Home}/>
|
||||
<Route path="/new" component={New}/>
|
||||
<Route path="*" component={Default}/>
|
||||
<Route path="*" component={NotFound}/>
|
||||
</Route>
|
||||
</Router>
|
||||
, document.getElementById('app'));
|
||||
|
||||
Reference in New Issue
Block a user