Skip to content

Updated react and router #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moshie wants to merge 1 commit into from
Closed

Updated react and router #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions client.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ var React = require('react');
var Redux = require('redux');
var Provider = require('react-redux').Provider;
var BrowserRouter = require('react-router-dom').BrowserRouter;
var App = require('./views/app.jsx');

function reducer(state) { return state; }

var store = Redux.createStore(reducer, window.PROPS);
var store = Redux.createStore((state) => state, window.PROPS);

ReactDOM.render(
<Provider store={store}>
<BrowserRouter>
{require('./views/app.jsx')}
<App />
</BrowserRouter>
</Provider>, document
);
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"babel-preset-react": "6.5.0",
"babel-register": "6.9.0",
"express": "4.13.4",
"react": "15.0.2",
"react-dom": "15.0.2",
"react": "^15.6.1",
"react-dom": "^15.6.1",
"react-redux": "4.4.6",
"react-router": "4.0.0",
"react-router-dom": "4.0.0",
"react-router": "^4.1.2",
"react-router-dom": "^4.1.2",
"redux": "3.6.0",
"webpack": "1.13.1"
},
Expand Down
3 changes: 2 additions & 1 deletion routes/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ var ReactDOMServer = require('react-dom/server');
var StaticRouter = require('react-router').StaticRouter;
var Redux = require('redux');
var Provider = require('react-redux').Provider;
var App = require('../views/app.jsx')

function reducer(state) { return state; }

Expand All @@ -15,7 +16,7 @@ router.get('*', function(request, response) {
var html = ReactDOMServer.renderToString(
<Provider store={store}>
<StaticRouter location={request.url} context={context}>
{require('../views/app.jsx')}
<App />
</StaticRouter>
</Provider>
);
Expand Down
13 changes: 7 additions & 6 deletions views/app.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
var React = require('react');
var ReactRouter = require('react-router-dom');
var Route = ReactRouter.Route;
var { Route, Switch } = require('react-router-dom');
var Layout = require('./Layout.jsx');

module.exports = (
module.exports = () => (
<Layout>
<Route exact path='/' component={require('./Index.jsx')} />
<Route path='/about' component={require('./About.jsx')} />
<Route component={require('./NotFound.jsx')} />
<Switch>
<Route exact path='/' component={require('./Index.jsx')} />
<Route path='/about' component={require('./About.jsx')} />
<Route component={require('./NotFound.jsx')} />
</Switch>
</Layout>
);
Loading