Simplify state and reducers

1 files changed, 15 insertions, 5 deletions

diff --git a/frontend/src/reducers.js b/frontend/src/reducers.js
index 5e066d28..612bd0c5 100644
--- a/frontend/src/reducers.js
+++ b/frontend/src/reducers.js
@@ -1,15 +1,25 @@
 // @flow
 import { routerReducer } from 'react-router-redux';
-import { combineReducers } from 'redux-immutable';
+import { combineReducers } from 'redux';
+import type { ApiPlayer } from './api/model';
+import type { CurrentGameState } from './redux/currentGame';
 import { createCurrentGameReducer } from './redux/currentGame';
-import { gamesReducer } from './redux/games';
-import { playersReducer } from './redux/players';
+import type { GamesState } from './redux/games';
+import { createGamesReducer } from './redux/games';
+import { currentUserReducer } from './redux/user';
+
+export type GlobalState = {
+  currentGame: CurrentGameState;
+  currentUser: ApiPlayer;
+  games: GamesState;
+  routing: any;
+}
 
 export function createReducer() {
   return combineReducers({
     currentGame: createCurrentGameReducer(),
-    games: gamesReducer,
-    players: playersReducer,
+    currentUser: currentUserReducer,
+    games: createGamesReducer(),
     routing: routerReducer,
   });
 }