Merge remote-tracking branch 'origin/v3.4' into dev

interface/package.json

@@ -1,41 +1,41 @@
 {
-  "name": "emsesp-react",
-  "version": "0.1.0",
+  "name": "EMS-ESP",
+  "version": "3.4.0",
   "private": true,
+  "proxy": "http://localhost:3080",
   "dependencies": {
-    "@material-ui/core": "^4.12.3",
-    "@material-ui/icons": "^4.11.2",
-    "@msgpack/msgpack": "^2.7.0",
-    "@types/lodash": "^4.14.172",
-    "@types/node": "^12.20.20",
-    "@types/react": "^17.0.19",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-material-ui-form-validator": "^2.1.0",
-    "@types/react-router": "^5.1.13",
-    "@types/react-router-dom": "^5.1.7",
-    "compression-webpack-plugin": "^5.0.2",
-    "env-cmd": "^10.1.0",
-    "express": "^4.17.1",
+    "@emotion/react": "^11.7.1",
+    "@emotion/styled": "^11.6.0",
+    "@msgpack/msgpack": "^2.7.1",
+    "@mui/icons-material": "^5.3.0",
+    "@mui/material": "^5.3.0",
+    "@types/lodash": "^4.14.178",
+    "@types/node": "^17.0.10",
+    "@types/react": "^17.0.38",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-router-dom": "^5.3.3",
+    "async-validator": "^4.0.7",
+    "axios": "^0.25.0",
+    "http-proxy-middleware": "^2.0.1",
     "jwt-decode": "^3.1.2",
     "lodash": "^4.17.21",
-    "mime-types": "^2.1.30",
-    "notistack": "^1.0.6",
+    "notistack": "^2.0.3",
     "parse-ms": "^3.0.0",
     "react": "^17.0.2",
+    "react-app-rewired": "^2.1.11",
     "react-dom": "^17.0.2",
-    "react-dropzone": "^11.3.2",
-    "react-form-validator-core": "^1.1.1",
-    "react-material-ui-form-validator": "^2.1.4",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "react-scripts": "4.0.3",
+    "react-dropzone": "^11.5.1",
+    "react-icons": "^4.3.1",
+    "react-router-dom": "^6.2.1",
+    "react-scripts": "5.0.0",
     "sockette": "^2.0.6",
-    "typescript": "4.3.5",
-    "zlib": "^1.0.5"
+    "typescript": "^4.5.5"
   },
   "scripts": {
     "start": "react-app-rewired start",
     "build": "react-app-rewired build",
+    "test": "react-app-rewired test",
+    "eject": "react-scripts eject",
     "format": "prettier --write '**/*.{ts,tsx,js,css,json,md}'",
     "build-hosted": "env-cmd -f .env.hosted npm run build",
     "build-localhost": "PUBLIC_URL=/ react-app-rewired build",
@@ -44,7 +44,44 @@
     "lint": "eslint . --ext .ts,.tsx"
   },
   "eslintConfig": {
-    "extends": "react-app"
+    "extends": [
+      "react-app",
+      "react-app/jest"
+    ],
+    "rules": {
+      "eol-last": 1,
+      "react/jsx-closing-bracket-location": 1,
+      "react/jsx-closing-tag-location": 1,
+      "react/jsx-wrap-multilines": 1,
+      "react/jsx-curly-newline": 1,
+      "no-multiple-empty-lines": [
+        1,
+        {
+          "max": 1
+        }
+      ],
+      "no-trailing-spaces": 1,
+      "semi": 1,
+      "no-extra-semi": 1,
+      "react/jsx-max-props-per-line": [
+        1,
+        {
+          "when": "multiline"
+        }
+      ],
+      "react/jsx-first-prop-new-line": [
+        1,
+        "multiline"
+      ],
+      "@typescript-eslint/no-shadow": 1,
+      "max-len": [
+        1,
+        {
+          "code": 150
+        }
+      ],
+      "arrow-parens": 1
+    }
   },
   "browserslist": {
     "production": [
@@ -59,13 +96,7 @@
     ]
   },
   "devDependencies": {
-    "concurrently": "^6.0.1",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-prettier": "^3.4.0",
-    "http-proxy-middleware": "^1.1.1",
-    "nodemon": "^2.0.7",
-    "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.5",
-    "react-app-rewired": "^2.1.8"
+    "nodemon": "^2.0.15",
+    "npm-run-all": "^4.1.5"
   }
 }