From 19adbf48642085f39b9562ea6ad1e248a546373c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 20 Sep 2018 02:19:48 +0200 Subject: browser is browsing --- app/client/store.js | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'app/client/store.js') diff --git a/app/client/store.js b/app/client/store.js index 654b22d..d6c632c 100644 --- a/app/client/store.js +++ b/app/client/store.js @@ -7,24 +7,26 @@ import { routerReducer } from 'react-router-redux' // import navReducer from './nav.reducer' import authReducer from './auth/auth.reducer' -import systemReducer from './system/system.reducer' -import dashboardReducer from './dashboard/dashboard.reducer' import liveReducer from './live/live.reducer' -import uploadReducer from './dataset/upload.reducer' import queueReducer from './queue/queue.reducer' +import systemReducer from './system/system.reducer' +import uploadReducer from './dataset/upload.reducer' +import browserReducer from './browser/browser.reducer' +import dashboardReducer from './dashboard/dashboard.reducer' import audioPlayerReducer from './common/audioPlayer/audioPlayer.reducer' import { moduleReducer } from './modules/module.reducer' const appReducer = combineReducers({ + router: routerReducer, auth: authReducer, - system: systemReducer, - dashboard: dashboardReducer, live: liveReducer, - upload: uploadReducer, queue: queueReducer, - router: routerReducer, - module: moduleReducer, + system: systemReducer, + upload: uploadReducer, + browser: browserReducer, + dashboard: dashboardReducer, audioPlayer: audioPlayerReducer, + module: moduleReducer, }) export const history = createHistory() -- cgit v1.2.3-70-g09d2