Transition to ts and redux toolkit

carkod · Sep 28, 2024 · 2d24df4 · 2d24df4
1 parent 4cea7f1
commit 2d24df4
Show file tree

Hide file tree

Showing 11 changed files with 540 additions and 532 deletions.
diff --git a/web/.eslintrc.js b/web/.eslintrc.js
@@ -0,0 +1,17 @@
+module.exports = {
+  parser: "@typescript-eslint/parser",
+  extends: [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:react/recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:import/typescript",
+  ],
+  plugins: ["@typescript-eslint", "react", "import"],
+  settings: {
+    react: {
+      version: "detect",
+    },
+  },
+};
diff --git a/web/package.json b/web/package.json
@@ -16,6 +16,7 @@
     "map-sass": "sass src/assets/scss/paper-dashboard.scss src/assets/css/paper-dashboard.css --source-map true"
   },
   "dependencies": {
+    "@reduxjs/toolkit": "^2.2.7",
     "binbot-charts": "^0.4.1",
     "bootstrap": "5.2.2",
     "history": "^5.0.0",
@@ -48,8 +49,8 @@
     "@types/react-dom": "^18.2.13",
     "@types/react-router-dom": "^5.3.3",
     "@types/redux": "^3.6.0",
-    "@typescript-eslint/eslint-plugin": "^6.7.5",
-    "@typescript-eslint/parser": "^6.7.5",
+    "@typescript-eslint/eslint-plugin": "^8.7.0",
+    "@typescript-eslint/parser": "^8.7.0",
     "prettier": "^2.4.3",
     "react-scripts": "^5.0.1",
     "sass": "^1.55.0",

diff --git a/web/src/index.js → web/src/index.tsx b/web/src/index.js → web/src/index.tsx
@@ -5,9 +5,8 @@ import { Provider } from "react-redux";
 import { BrowserRouter, Switch } from "react-router-dom";
 import App from "./App.jsx";
 import "./assets/scss/paper-dashboard.scss";
-import configureStore from "./store";
+import { store } from "./store.js";
 
-const store = configureStore({});
 
 ReactDOM.render(
   <Provider store={store}>