Merge branch 'master' of github.com:adamhrv/megapixels_dev

1 files changed, 12 insertions, 16 deletions

diff --git a/client/store.js b/client/store.js
index 043af351..3c7acefb 100644
--- a/client/store.js
+++ b/client/store.js
@@ -1,30 +1,27 @@
 import { applyMiddleware, compose, combineReducers, createStore } from 'redux'
-import { connectRouter, routerMiddleware } from 'connected-react-router'
-import { createBrowserHistory } from 'history'
 import thunk from 'redux-thunk'
-import { login } from './util'
 
-import metadataReducer from './metadata/metadata.reducer'
-import searchReducer from './search/search.reducer'
-import reviewReducer from './review/review.reducer'
+// import metadataReducer from './metadata/metadata.reducer'
+// import searchReducer from './search/search.reducer'
+// import reviewReducer from './review/review.reducer'
 
 const rootReducer = combineReducers({
-  auth: (state = login()) => state,
-  metadata: metadataReducer,
-  search: searchReducer,
-  review: reviewReducer,
+  auth: (state = {}) => state,
+  // auth: (state = login()) => state,
+  // metadata: metadataReducer,
+  // search: searchReducer,
+  // review: reviewReducer,
 })
 
-function configureStore(initialState = {}, history) {
+function configureStore(initialState = {}) {
   const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose
 
   const store = createStore(
-    connectRouter(history)(rootReducer), // new root reducer with router state
+    rootReducer,
     initialState,
     composeEnhancers(
       applyMiddleware(
         thunk,
-        routerMiddleware(history)
       ),
     ),
   )
@@ -32,7 +29,6 @@ function configureStore(initialState = {}, history) {
   return store
 }
 
-const history = createBrowserHistory()
-const store = configureStore({}, history)
+const store = configureStore({})
 
-export { store, history }
+export { store }