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-03-14 23:22:24 +01:00
parent 42efc20748
commit 81b635a872
18 changed files with 97 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
import React from 'react';
import { render } from 'react-dom';
import { browserHistory } from 'react-router';
import { routeActions } from 'react-router-redux';
import { syncHistoryWithStore, replace } from 'react-router-redux';
import configureStore from './store';
import createRoutes from './routes';
import Socket from './util/Socket';
@ -28,7 +28,7 @@ if (env.servers) {
data: env.servers
});
} else {
store.dispatch(routeActions.replace('/connect'));
store.dispatch(replace('/connect'));
}
if (env.channels) {
@ -48,8 +48,9 @@ if (env.users) {
handleSocket(socket, store);
const routes = createRoutes();
const history = syncHistoryWithStore(browserHistory, store);
render(
<Root store={store} routes={routes} history={browserHistory} />,
<Root store={store} routes={routes} history={history} />,
document.getElementById('root')
);