diff --git a/redux/toolkit_persist/src/store/index.js b/redux/toolkit_persist/src/store/index.js deleted file mode 100644 index 1bc89ddbf..000000000 --- a/redux/toolkit_persist/src/store/index.js +++ /dev/null @@ -1,12 +0,0 @@ -import { configureStore } from '@reduxjs/toolkit' -import todosReducer from './modules/todosReducer' -import visibilityFilterReducer from './modules/visibilityFilterReducer' - -const store = configureStore({ - reducer: { - todos: todosReducer, - filter: visibilityFilterReducer - } -}) - -export default store \ No newline at end of file diff --git a/redux/redux-reactRedux-toolkit-pure/.gitignore b/redux/toolkit_persist1/.gitignore similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/.gitignore rename to redux/toolkit_persist1/.gitignore diff --git a/redux/redux-reactRedux-toolkit-pure/README.md b/redux/toolkit_persist1/README.md similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/README.md rename to redux/toolkit_persist1/README.md diff --git a/redux/toolkit_persist/config/env.js b/redux/toolkit_persist1/config/env.js similarity index 100% rename from redux/toolkit_persist/config/env.js rename to redux/toolkit_persist1/config/env.js diff --git a/redux/toolkit_persist/config/getHttpsConfig.js b/redux/toolkit_persist1/config/getHttpsConfig.js similarity index 100% rename from redux/toolkit_persist/config/getHttpsConfig.js rename to redux/toolkit_persist1/config/getHttpsConfig.js diff --git a/redux/toolkit_persist/config/jest/babelTransform.js b/redux/toolkit_persist1/config/jest/babelTransform.js similarity index 100% rename from redux/toolkit_persist/config/jest/babelTransform.js rename to redux/toolkit_persist1/config/jest/babelTransform.js diff --git a/redux/toolkit_persist/config/jest/cssTransform.js b/redux/toolkit_persist1/config/jest/cssTransform.js similarity index 100% rename from redux/toolkit_persist/config/jest/cssTransform.js rename to redux/toolkit_persist1/config/jest/cssTransform.js diff --git a/redux/toolkit_persist/config/jest/fileTransform.js b/redux/toolkit_persist1/config/jest/fileTransform.js similarity index 100% rename from redux/toolkit_persist/config/jest/fileTransform.js rename to redux/toolkit_persist1/config/jest/fileTransform.js diff --git a/redux/toolkit_persist/config/modules.js b/redux/toolkit_persist1/config/modules.js similarity index 100% rename from redux/toolkit_persist/config/modules.js rename to redux/toolkit_persist1/config/modules.js diff --git a/redux/toolkit_persist/config/paths.js b/redux/toolkit_persist1/config/paths.js similarity index 100% rename from redux/toolkit_persist/config/paths.js rename to redux/toolkit_persist1/config/paths.js diff --git a/redux/toolkit_persist/config/webpack.config.js b/redux/toolkit_persist1/config/webpack.config.js similarity index 100% rename from redux/toolkit_persist/config/webpack.config.js rename to redux/toolkit_persist1/config/webpack.config.js diff --git a/redux/toolkit_persist/config/webpack/persistentCache/createEnvironmentHash.js b/redux/toolkit_persist1/config/webpack/persistentCache/createEnvironmentHash.js similarity index 100% rename from redux/toolkit_persist/config/webpack/persistentCache/createEnvironmentHash.js rename to redux/toolkit_persist1/config/webpack/persistentCache/createEnvironmentHash.js diff --git a/redux/toolkit_persist/config/webpackDevServer.config.js b/redux/toolkit_persist1/config/webpackDevServer.config.js similarity index 100% rename from redux/toolkit_persist/config/webpackDevServer.config.js rename to redux/toolkit_persist1/config/webpackDevServer.config.js diff --git a/redux/toolkit_persist/package-lock.json b/redux/toolkit_persist1/package-lock.json similarity index 100% rename from redux/toolkit_persist/package-lock.json rename to redux/toolkit_persist1/package-lock.json diff --git a/redux/toolkit_persist/package.json b/redux/toolkit_persist1/package.json similarity index 100% rename from redux/toolkit_persist/package.json rename to redux/toolkit_persist1/package.json diff --git a/redux/redux-reactRedux-toolkit-pure/public/favicon.ico b/redux/toolkit_persist1/public/favicon.ico similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/public/favicon.ico rename to redux/toolkit_persist1/public/favicon.ico diff --git a/redux/toolkit_persist/public/index.html b/redux/toolkit_persist1/public/index.html similarity index 100% rename from redux/toolkit_persist/public/index.html rename to redux/toolkit_persist1/public/index.html diff --git a/redux/redux-reactRedux-toolkit-pure/public/logo192.png b/redux/toolkit_persist1/public/logo192.png similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/public/logo192.png rename to redux/toolkit_persist1/public/logo192.png diff --git a/redux/redux-reactRedux-toolkit-pure/public/logo512.png b/redux/toolkit_persist1/public/logo512.png similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/public/logo512.png rename to redux/toolkit_persist1/public/logo512.png diff --git a/redux/redux-reactRedux-toolkit-pure/public/manifest.json b/redux/toolkit_persist1/public/manifest.json similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/public/manifest.json rename to redux/toolkit_persist1/public/manifest.json diff --git a/redux/redux-reactRedux-toolkit-pure/public/robots.txt b/redux/toolkit_persist1/public/robots.txt similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/public/robots.txt rename to redux/toolkit_persist1/public/robots.txt diff --git a/redux/toolkit_persist/scripts/build.js b/redux/toolkit_persist1/scripts/build.js similarity index 100% rename from redux/toolkit_persist/scripts/build.js rename to redux/toolkit_persist1/scripts/build.js diff --git a/redux/toolkit_persist/scripts/start.js b/redux/toolkit_persist1/scripts/start.js similarity index 100% rename from redux/toolkit_persist/scripts/start.js rename to redux/toolkit_persist1/scripts/start.js diff --git a/redux/toolkit_persist/scripts/test.js b/redux/toolkit_persist1/scripts/test.js similarity index 100% rename from redux/toolkit_persist/scripts/test.js rename to redux/toolkit_persist1/scripts/test.js diff --git a/redux/toolkit_persist/src/App.css b/redux/toolkit_persist1/src/App.css similarity index 100% rename from redux/toolkit_persist/src/App.css rename to redux/toolkit_persist1/src/App.css diff --git a/redux/toolkit_persist/src/App.js b/redux/toolkit_persist1/src/App.js similarity index 100% rename from redux/toolkit_persist/src/App.js rename to redux/toolkit_persist1/src/App.js diff --git a/redux/redux-reactRedux-toolkit-pure/src/App.test.js b/redux/toolkit_persist1/src/App.test.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/App.test.js rename to redux/toolkit_persist1/src/App.test.js diff --git a/redux/toolkit_persist/src/components/page1.jsx b/redux/toolkit_persist1/src/components/page1.jsx similarity index 91% rename from redux/toolkit_persist/src/components/page1.jsx rename to redux/toolkit_persist1/src/components/page1.jsx index dbb82bd18..ff2e6ef3b 100644 --- a/redux/toolkit_persist/src/components/page1.jsx +++ b/redux/toolkit_persist1/src/components/page1.jsx @@ -4,7 +4,7 @@ function Hehe(){ const test1=()=>{ dispatch(addTodo('love')) } - const {todos}=useSelector(state=>state.todos) + const {todos}=useSelector(state=>state.todosReducer) const dispatch=useDispatch() return (
diff --git a/redux/toolkit_persist/src/components/page2.jsx b/redux/toolkit_persist1/src/components/page2.jsx similarity index 89% rename from redux/toolkit_persist/src/components/page2.jsx rename to redux/toolkit_persist1/src/components/page2.jsx index dc08ba5c1..b4c61c455 100644 --- a/redux/toolkit_persist/src/components/page2.jsx +++ b/redux/toolkit_persist1/src/components/page2.jsx @@ -4,7 +4,7 @@ function Hehe(){ const test1=()=>{ dispatch(setFilter('love')) } - const {filter}=useSelector(state=>state.filter) + const {filter}=useSelector(state=>state.visibilityFilterReducer) const dispatch=useDispatch() return (
diff --git a/redux/redux-reactRedux-toolkit-pure/src/index.css b/redux/toolkit_persist1/src/index.css similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/index.css rename to redux/toolkit_persist1/src/index.css diff --git a/redux/toolkit_persist/src/index.js b/redux/toolkit_persist1/src/index.js similarity index 77% rename from redux/toolkit_persist/src/index.js rename to redux/toolkit_persist1/src/index.js index 3d84527dd..24117f5f0 100644 --- a/redux/toolkit_persist/src/index.js +++ b/redux/toolkit_persist1/src/index.js @@ -3,13 +3,15 @@ import ReactDOM from 'react-dom/client'; import './index.css'; import App from './App'; import { Provider } from 'react-redux'; -import store from './store/index' +import {store,persistor} from './store/index' +import {PersistGate} from 'redux-persist/integration/react' import reportWebVitals from './reportWebVitals'; const root = ReactDOM.createRoot(document.getElementById('root')); root.render( + diff --git a/redux/redux-reactRedux-toolkit-pure/src/logo.svg b/redux/toolkit_persist1/src/logo.svg similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/logo.svg rename to redux/toolkit_persist1/src/logo.svg diff --git a/redux/redux-reactRedux-toolkit-pure/src/reportWebVitals.js b/redux/toolkit_persist1/src/reportWebVitals.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/reportWebVitals.js rename to redux/toolkit_persist1/src/reportWebVitals.js diff --git a/redux/redux-reactRedux-toolkit-pure/src/setupTests.js b/redux/toolkit_persist1/src/setupTests.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/setupTests.js rename to redux/toolkit_persist1/src/setupTests.js diff --git a/redux/toolkit_persist1/src/store/index.js b/redux/toolkit_persist1/src/store/index.js new file mode 100644 index 000000000..67a8cc32a --- /dev/null +++ b/redux/toolkit_persist1/src/store/index.js @@ -0,0 +1,26 @@ + +import todosReducer from './modules/todosReducer' +import visibilityFilterReducer from './modules/visibilityFilterReducer' +import { combineReducers,configureStore} from '@reduxjs/toolkit' +import {persistReducer,persistStore} from 'redux-persist' +import storage from 'redux-persist/lib/storage'; + +const rootReducer = combineReducers({ + todosReducer,visibilityFilterReducer +}) +const persistConfig = { + key:'root', + storage +} +const persistedReducer=persistReducer(persistConfig,rootReducer) +const store = configureStore({ + reducer: persistedReducer, + middleware: (getDefaultMiddleware) => getDefaultMiddleware({ + serializableCheck: false, + }) +}); +const persistor = persistStore(store); +export { + store, + persistor +} \ No newline at end of file diff --git a/redux/toolkit_persist/src/store/modules/todosReducer.js b/redux/toolkit_persist1/src/store/modules/todosReducer.js similarity index 97% rename from redux/toolkit_persist/src/store/modules/todosReducer.js rename to redux/toolkit_persist1/src/store/modules/todosReducer.js index 5ad39ad1a..7388e188a 100644 --- a/redux/toolkit_persist/src/store/modules/todosReducer.js +++ b/redux/toolkit_persist1/src/store/modules/todosReducer.js @@ -2,7 +2,7 @@ import { createSlice } from "@reduxjs/toolkit" let nextTodoId = 0 const todosReducer = createSlice({ - name: 'todo', + name: 'hehe', // εˆε§‹ηŠΆζ€ initialState: { todos:[{ diff --git a/redux/toolkit_persist/src/store/modules/visibilityFilterReducer.js b/redux/toolkit_persist1/src/store/modules/visibilityFilterReducer.js similarity index 100% rename from redux/toolkit_persist/src/store/modules/visibilityFilterReducer.js rename to redux/toolkit_persist1/src/store/modules/visibilityFilterReducer.js diff --git a/redux/toolkit_persist/.gitignore b/redux/toolkit_persist2/.gitignore similarity index 100% rename from redux/toolkit_persist/.gitignore rename to redux/toolkit_persist2/.gitignore diff --git a/redux/toolkit_persist/README.md b/redux/toolkit_persist2/README.md similarity index 100% rename from redux/toolkit_persist/README.md rename to redux/toolkit_persist2/README.md diff --git a/redux/redux-reactRedux-toolkit-pure/package-lock.json b/redux/toolkit_persist2/package-lock.json similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/package-lock.json rename to redux/toolkit_persist2/package-lock.json diff --git a/redux/redux-reactRedux-toolkit-pure/package.json b/redux/toolkit_persist2/package.json similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/package.json rename to redux/toolkit_persist2/package.json diff --git a/redux/toolkit_persist/public/favicon.ico b/redux/toolkit_persist2/public/favicon.ico similarity index 100% rename from redux/toolkit_persist/public/favicon.ico rename to redux/toolkit_persist2/public/favicon.ico diff --git a/redux/redux-reactRedux-toolkit-pure/public/index.html b/redux/toolkit_persist2/public/index.html similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/public/index.html rename to redux/toolkit_persist2/public/index.html diff --git a/redux/toolkit_persist/public/logo192.png b/redux/toolkit_persist2/public/logo192.png similarity index 100% rename from redux/toolkit_persist/public/logo192.png rename to redux/toolkit_persist2/public/logo192.png diff --git a/redux/toolkit_persist/public/logo512.png b/redux/toolkit_persist2/public/logo512.png similarity index 100% rename from redux/toolkit_persist/public/logo512.png rename to redux/toolkit_persist2/public/logo512.png diff --git a/redux/toolkit_persist/public/manifest.json b/redux/toolkit_persist2/public/manifest.json similarity index 100% rename from redux/toolkit_persist/public/manifest.json rename to redux/toolkit_persist2/public/manifest.json diff --git a/redux/toolkit_persist/public/robots.txt b/redux/toolkit_persist2/public/robots.txt similarity index 100% rename from redux/toolkit_persist/public/robots.txt rename to redux/toolkit_persist2/public/robots.txt diff --git a/redux/redux-reactRedux-toolkit-pure/src/App.css b/redux/toolkit_persist2/src/App.css similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/App.css rename to redux/toolkit_persist2/src/App.css diff --git a/redux/redux-reactRedux-toolkit-pure/src/App.js b/redux/toolkit_persist2/src/App.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/App.js rename to redux/toolkit_persist2/src/App.js diff --git a/redux/toolkit_persist/src/App.test.js b/redux/toolkit_persist2/src/App.test.js similarity index 100% rename from redux/toolkit_persist/src/App.test.js rename to redux/toolkit_persist2/src/App.test.js diff --git a/redux/toolkit_persist/src/index.css b/redux/toolkit_persist2/src/index.css similarity index 100% rename from redux/toolkit_persist/src/index.css rename to redux/toolkit_persist2/src/index.css diff --git a/redux/redux-reactRedux-toolkit-pure/src/index.js b/redux/toolkit_persist2/src/index.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/index.js rename to redux/toolkit_persist2/src/index.js diff --git a/redux/toolkit_persist/src/logo.svg b/redux/toolkit_persist2/src/logo.svg similarity index 100% rename from redux/toolkit_persist/src/logo.svg rename to redux/toolkit_persist2/src/logo.svg diff --git a/redux/toolkit_persist/src/reportWebVitals.js b/redux/toolkit_persist2/src/reportWebVitals.js similarity index 100% rename from redux/toolkit_persist/src/reportWebVitals.js rename to redux/toolkit_persist2/src/reportWebVitals.js diff --git a/redux/toolkit_persist/src/setupTests.js b/redux/toolkit_persist2/src/setupTests.js similarity index 100% rename from redux/toolkit_persist/src/setupTests.js rename to redux/toolkit_persist2/src/setupTests.js diff --git a/redux/redux-reactRedux-toolkit-pure/src/store/dist/index.dev.js b/redux/toolkit_persist2/src/store/dist/index.dev.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/store/dist/index.dev.js rename to redux/toolkit_persist2/src/store/dist/index.dev.js diff --git a/redux/redux-reactRedux-toolkit-pure/src/store/index.js b/redux/toolkit_persist2/src/store/index.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/store/index.js rename to redux/toolkit_persist2/src/store/index.js diff --git a/redux/redux-reactRedux-toolkit-pure/src/store/modules/dist/users.dev.js b/redux/toolkit_persist2/src/store/modules/dist/users.dev.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/store/modules/dist/users.dev.js rename to redux/toolkit_persist2/src/store/modules/dist/users.dev.js diff --git a/redux/redux-reactRedux-toolkit-pure/src/store/modules/users.js b/redux/toolkit_persist2/src/store/modules/users.js similarity index 100% rename from redux/redux-reactRedux-toolkit-pure/src/store/modules/users.js rename to redux/toolkit_persist2/src/store/modules/users.js