summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--frontend/src/index.js5
-rw-r--r--frontend/src/sagas.js2
-rw-r--r--frontend/src/sagas/gameBrowser.js2
-rw-r--r--frontend/src/sagas/home.js2
-rw-r--r--frontend/src/sagas/lobby.js2
-rw-r--r--frontend/src/scenes/SplashScreen/index.js3
-rw-r--r--frontend/src/scenes/index.js5
-rw-r--r--frontend/src/store.js4
8 files changed, 11 insertions, 14 deletions
diff --git a/frontend/src/index.js b/frontend/src/index.js
index f8841abc..1a7a0859 100644
--- a/frontend/src/index.js
+++ b/frontend/src/index.js
@@ -1,14 +1,13 @@
// @flow
+import '@blueprintjs/core/dist/blueprint.css';
import 'babel-polyfill';
import React from 'react';
import ReactDOM from 'react-dom';
import { Provider } from 'react-redux';
import { ConnectedRouter } from 'react-router-redux';
import './global-styles.css';
-import '@blueprintjs/core/dist/blueprint.css';
-
-import { configureStore } from './store';
import { Application } from './scenes';
+import { configureStore } from './store';
const initialState = {};
const { store, history } = configureStore(initialState);
diff --git a/frontend/src/sagas.js b/frontend/src/sagas.js
index 457dac04..40f8a587 100644
--- a/frontend/src/sagas.js
+++ b/frontend/src/sagas.js
@@ -3,8 +3,8 @@ import type { History } from 'react-router';
import { call, fork } from 'redux-saga/effects';
import { connectToGame, SevenWondersSession } from './api/sevenWondersApi';
import { errorHandlingSaga } from './sagas/errors';
-import { homeSaga } from './sagas/home';
import { gameBrowserSaga } from './sagas/gameBrowser';
+import { homeSaga } from './sagas/home';
import { lobbySaga } from './sagas/lobby';
export function* rootSaga(history: History): * {
diff --git a/frontend/src/sagas/gameBrowser.js b/frontend/src/sagas/gameBrowser.js
index f6aa77bd..95326a2b 100644
--- a/frontend/src/sagas/gameBrowser.js
+++ b/frontend/src/sagas/gameBrowser.js
@@ -2,7 +2,7 @@
import { normalize } from 'normalizr';
import { push } from 'react-router-redux';
import { eventChannel } from 'redux-saga';
-import { apply, call, put, take, all } from 'redux-saga/effects';
+import { all, apply, call, put, take } from 'redux-saga/effects';
import type { SevenWondersSession } from '../api/sevenWondersApi';
import { actions as gameActions, types } from '../redux/games';
import { actions as playerActions } from '../redux/players';
diff --git a/frontend/src/sagas/home.js b/frontend/src/sagas/home.js
index db273d28..c55986c3 100644
--- a/frontend/src/sagas/home.js
+++ b/frontend/src/sagas/home.js
@@ -1,7 +1,7 @@
// @flow
import { push } from 'react-router-redux';
import { eventChannel } from 'redux-saga';
-import { apply, call, put, take, all } from 'redux-saga/effects';
+import { all, apply, call, put, take } from 'redux-saga/effects';
import type { ApiPlayer } from '../api/model';
import type { SevenWondersSession } from '../api/sevenWondersApi';
diff --git a/frontend/src/sagas/lobby.js b/frontend/src/sagas/lobby.js
index 2deb5035..f884910d 100644
--- a/frontend/src/sagas/lobby.js
+++ b/frontend/src/sagas/lobby.js
@@ -3,7 +3,7 @@ import { normalize } from 'normalizr';
import { push } from 'react-router-redux';
import type { Channel } from 'redux-saga';
import { eventChannel } from 'redux-saga';
-import { apply, call, put, take, all } from 'redux-saga/effects';
+import { all, apply, call, put, take } from 'redux-saga/effects';
import { SevenWondersSession } from '../api/sevenWondersApi';
import { actions as gameActions, types } from '../redux/games';
import { actions as playerActions } from '../redux/players';
diff --git a/frontend/src/scenes/SplashScreen/index.js b/frontend/src/scenes/SplashScreen/index.js
index dca8bc49..022caf45 100644
--- a/frontend/src/scenes/SplashScreen/index.js
+++ b/frontend/src/scenes/SplashScreen/index.js
@@ -1,10 +1,9 @@
// @flow
+import { Button, Classes, InputGroup, Intent } from '@blueprintjs/core';
import React, { Component } from 'react';
import { connect } from 'react-redux';
import { Container } from 'rebass';
import { actions } from '../../redux/players';
-
-import { InputGroup, Button, Classes, Intent } from '@blueprintjs/core';
import { HomeLayout } from './components/HomeLayout';
class SplashScreenPresenter extends Component {
diff --git a/frontend/src/scenes/index.js b/frontend/src/scenes/index.js
index 0229e850..5d75f275 100644
--- a/frontend/src/scenes/index.js
+++ b/frontend/src/scenes/index.js
@@ -1,9 +1,8 @@
import React from 'react';
-import { Route, Redirect, Switch } from 'react-router-dom';
-
-import { SplashScreen } from './SplashScreen';
+import { Redirect, Route, Switch } from 'react-router-dom';
import { GameBrowser } from './GameBrowser';
import { Lobby } from './Lobby';
+import { SplashScreen } from './SplashScreen';
export const Application = () => (
<Switch>
diff --git a/frontend/src/store.js b/frontend/src/store.js
index 3170d194..9c0be13a 100644
--- a/frontend/src/store.js
+++ b/frontend/src/store.js
@@ -1,8 +1,8 @@
// @flow
-import { createStore, applyMiddleware, compose } from 'redux';
import createHistory from 'history/createBrowserHistory';
-import { routerMiddleware } from 'react-router-redux';
import { fromJS } from 'immutable';
+import { routerMiddleware } from 'react-router-redux';
+import { applyMiddleware, compose, createStore } from 'redux';
import createSagaMiddleware from 'redux-saga';
import { createReducer } from './reducers';
import { rootSaga } from './sagas';
bgstack15