|
|
@ -6,24 +6,20 @@ import { |
|
|
} from "@reduxjs/toolkit"; |
|
|
} from "@reduxjs/toolkit"; |
|
|
|
|
|
|
|
|
import counterReducer from "features/counter/counterSlice"; |
|
|
import counterReducer from "features/counter/counterSlice"; |
|
|
// TODO: Rework these to use a slice, otherwise redux complains about
|
|
|
|
|
|
// non-serializable Immutable.js types.
|
|
|
|
|
|
//
|
|
|
|
|
|
// import users from "../reducers/users";
|
|
|
|
|
|
//
|
|
|
|
|
|
import { loginSocketMessageMiddleware } from "modules/login/message"; |
|
|
import { loginSocketMessageMiddleware } from "modules/login/message"; |
|
|
import loginReducer from "modules/login/slice"; |
|
|
import loginReducer from "modules/login/slice"; |
|
|
import { roomSocketMessageMiddleware } from "modules/room/message"; |
|
|
import { roomSocketMessageMiddleware } from "modules/room/message"; |
|
|
import roomReducer from "modules/room/slice"; |
|
|
import roomReducer from "modules/room/slice"; |
|
|
import makeSocketMiddleware from "modules/socket/middleware"; |
|
|
import makeSocketMiddleware from "modules/socket/middleware"; |
|
|
import socketReducer from "modules/socket/slice"; |
|
|
import socketReducer from "modules/socket/slice"; |
|
|
|
|
|
import userReducer from "modules/user/slice"; |
|
|
|
|
|
|
|
|
const rootReducer = combineReducers({ |
|
|
const rootReducer = combineReducers({ |
|
|
counter: counterReducer, |
|
|
counter: counterReducer, |
|
|
login: loginReducer, |
|
|
login: loginReducer, |
|
|
rooms: roomReducer, |
|
|
rooms: roomReducer, |
|
|
socket: socketReducer, |
|
|
socket: socketReducer, |
|
|
//users,
|
|
|
|
|
|
|
|
|
users: userReducer, |
|
|
}); |
|
|
}); |
|
|
|
|
|
|
|
|
// Define this before defining `store`, to break a circular type reference:
|
|
|
// Define this before defining `store`, to break a circular type reference:
|
|
|
|