cleaned up the routing

admin/src/redux-router/configureStore.js

@@ -1,31 +1,20 @@
-// https://github.com/supasate/connected-react-router
-// configureStore.js
+import { configureStore } from '@reduxjs/toolkit'
+import { userReducer } from '../features/user/userSlice'
+import { apiSlice } from "../features/api/apiSlice"
 
-import { createBrowserHistory } from 'history'
-import { applyMiddleware, compose, createStore } from 'redux'
-import { createRouterMiddleware } from '@lagunovsky/redux-react-router'
-import createRootReducer from './reducers'
-import thunk from 'redux-thunk';
-import { apiSlice } from '../features/api/apiSlice'
-import { composeWithDevTools } from 'redux-devtools-extension'
-
-//const composedEnhancers = composeWithDevTools(...enhancers)
-export const history = createBrowserHistory()
-
-export default function configureStore(preloadedState) {
-  const store = createStore(
-    createRootReducer(history), // root reducer with router state
+const setupStore = (preloadedState) => {
+  const store = configureStore({
+    reducer: {
+      user: userReducer,
+      [apiSlice.reducerPath]: apiSlice.reducer,
+    },
+    middleware: (getDefaultMiddleware) =>
+      // adding the api middleware enables caching, invalidation, polling and other features of `rtk-query`
+      getDefaultMiddleware().concat(apiSlice.middleware),
     preloadedState,
-    composeWithDevTools(
-      applyMiddleware(
-        createRouterMiddleware(history), // for dispatching history actions
-        thunk,
-        apiSlice.middleware,
-        // ... other middlewares ...
-      ),
-    ),
-  )
+  })
 
   return store
 }
 
+export default setupStore;

admin/src/redux-router/reducers.js

@@ -1,16 +0,0 @@
-
-// from https://github.com/supasate/connected-react-router
-import { combineReducers } from 'redux'
-import { createRouterReducer } from '@lagunovsky/redux-react-router'
-import { userSlice, userReducer } from '../features/user/userSlice'
-import {apiSlice} from "../features/api/apiSlice"
-
-const createRootReducer = (history) => combineReducers({
-  router: createRouterReducer (history),
-  user: userReducer,
-  [apiSlice.reducerPath]: apiSlice.reducer,
-
-})
-export default createRootReducer
-
-