Skip to content

Commit

Permalink
#24 store refactoring and storeFactory test util
Browse files Browse the repository at this point in the history
  • Loading branch information
paleika committed Jan 12, 2021
1 parent f1c105d commit a725423
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
9 changes: 8 additions & 1 deletion src/reducers/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import updateMoneyTable from './money-reducer'
import updateEquipmentTable from './equipment-reducer'
import { reducer as formReducer } from 'redux-form'
import { combineReducers } from 'redux'

const dataReducer = (state, action) => {
return {
Expand All @@ -8,4 +10,9 @@ const dataReducer = (state, action) => {
}
}

export default dataReducer
const rootReducer = {
main: dataReducer,
form: formReducer
}

export default combineReducers(rootReducer)
13 changes: 3 additions & 10 deletions src/store.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { createStore, combineReducers } from 'redux'
import dataReducer from './reducers'
import { reducer as formReducer } from 'redux-form'
import { createStore } from 'redux'
import rootReducer from './reducers'

const STATE_VERSION = 3

Expand Down Expand Up @@ -74,19 +73,13 @@ function migrateStateData(loadedState) {
return loadedState.stateData
}

const rootReducer = {
main: dataReducer,
form: formReducer
}
const reducer = combineReducers(rootReducer)

const persistedState = loadFromLocalStorage()

// @ts-ignore
const middlewares = window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__()

const store = createStore(
reducer,
rootReducer,
persistedState,
middlewares
)
Expand Down
6 changes: 6 additions & 0 deletions src/utils/test-utils.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { createStore } from 'redux'
import rootReducer from '../reducers'

export const storeFactory = (initialState = {}) => {
return createStore(rootReducer, initialState)
}

0 comments on commit a725423

Please sign in to comment.