chore: fix dockerfile more

This commit is contained in:
Katie Thornhill 2019-11-20 01:03:16 -05:00
parent f6b54eb196
commit dc390937b8
No known key found for this signature in database
GPG key ID: F76EDC6541A99644
13 changed files with 216 additions and 162 deletions

1
UI/.prettierignore Normal file
View file

@ -0,0 +1 @@
build

View file

@ -1,2 +0,0 @@
const { override, addDecoratorsLegacy } = require("customize-cra");
module.exports = override(addDecoratorsLegacy());

View file

@ -11,7 +11,7 @@ import AppRouter from './router'
import { userInit } from './actions'
import { history } from './router/history'
const store = configureStore(undefined, history)
const store = configureStore(undefined)
window.__APP_STORE__ = store

View file

@ -3,7 +3,6 @@ import { DropTarget } from 'react-dnd'
import Role from '../role/draggable'
import CategoryEditor from './CategoryEditor'
class Category extends Component {
render() {
const {

View file

@ -21,4 +21,4 @@ class DraggableRole extends Component {
}
}
export default dragSource(DraggableRole)
export default dragSource(DraggableRole)

View file

@ -1,3 +1,3 @@
import createHistory from 'history/createBrowserHistory'
export const history = createHistory()
export const history = createHistory()

View file

@ -50,4 +50,6 @@ class _AppRouter extends Component {
}
}
export default withRouter(connect(({ appState, user }) => ({ ready: appState.ready, user }))(_AppRouter))
export default withRouter(
connect(({ appState, user }) => ({ ready: appState.ready, user }))(_AppRouter)
)

View file

@ -1,16 +1,13 @@
import { routerMiddleware } from 'react-router-redux'
import { applyMiddleware, compose, createStore } from 'redux'
import { createLogger } from 'redux-logger'
import thunk from 'redux-thunk'
import rootReducer from '../reducers'
const configureStore = (preloadedState, history) => {
const configureStore = preloadedState => {
const store = createStore(
rootReducer,
preloadedState,
compose(
applyMiddleware(thunk, routerMiddleware(history), createLogger())
)
compose(applyMiddleware(thunk, createLogger()))
)
if (module.hot) {

View file

@ -1,15 +1,10 @@
import { createStore, applyMiddleware } from 'redux'
import { routerMiddleware } from 'react-router-redux'
import thunk from 'redux-thunk'
// import api from '../middleware/api'
import rootReducer from '../reducers'
const configureStore = (preloadedState, history) =>
createStore(
rootReducer,
preloadedState,
applyMiddleware(thunk, routerMiddleware(history))
)
const configureStore = preloadedState =>
createStore(rootReducer, preloadedState, applyMiddleware(thunk))
export default configureStore