e2m/dispatch
4
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update client dependencies

Browse source
This commit is contained in:
Ken-Håvard Lieng 2016-01-15 20:56:03 +01:00
parent 383ca39354
commit d023f63a7c
9 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

15
client/src/js/index.js
View file

@ -1,7 +1,6 @@
import React from 'react';
import { render } from 'react-dom';
import { syncReduxAndRouter } from 'redux-simple-router';
import createBrowserHistory from 'history/lib/createBrowserHistory';
import { browserHistory } from 'react-router';
import configureStore from './store';
import createRoutes from './routes';
import Socket from './util/Socket';
@ -9,14 +8,14 @@ import handleSocket from './socket';
import Root from './containers/Root';
const host = __DEV__ ? `${window.location.hostname}:1337` : window.location.host;
const socket = new Socket(host);
const store = configureStore(socket);
handleSocket(socket, store);
const history = createBrowserHistory();
syncReduxAndRouter(history, store);
const store = configureStore(socket, browserHistory);
handleSocket(socket, store);
const routes = createRoutes();
render(<Root store={store} routes={routes} history={history} />, document.getElementById('root'));
render(
<Root store={store} routes={routes} history={browserHistory} />,
document.getElementById('root')
);