update web app and auto build

App/.gitignore

@@ -10,3 +10,4 @@ ormconfig.test.json
 .cache
 .directory
 .history
+prodbuild/

App/package.json

@@ -2,47 +2,43 @@
   "name": "eggbotapp",
   "scripts": {
     "start": "parcel src/index.html",
-    "build": "parcel build src/index.html",
+    "prebuild": "rimraf prodbuild",
+    "build": "parcel build src/index.html -d prodbuild",
     "test": "jest"
   },
   "devDependencies": {
-    "@types/autoprefixer": "^9.7.1",
-    "@types/bootstrap": "^4.3.1",
-    "@types/enzyme": "^3.10.5",
+    "@types/autoprefixer": "^9.7.2",
+    "@types/bootstrap": "^5.0.1",
+    "@types/enzyme": "^3.10.8",
     "@types/enzyme-adapter-react-16": "^1.0.6",
-    "@types/jest": "^25.1.4",
-    "@types/node-sass": "^4.11.0",
+    "@types/jest": "^26.0.16",
     "@types/parcel-bundler": "^1.12.1",
-    "@types/prettier": "^1.19.0",
-    "@types/react": "^16.9.23",
-    "@types/react-bootstrap": "^0.32.20",
-    "@types/react-dom": "^16.9.5",
-    "@types/sass": "^1.16.0",
-    "autoprefixer": "^9.7.4",
-    "enzyme": "^3.11.0",
-    "enzyme-adapter-react-16": "^1.15.2",
-    "jest": "^25.1.0",
-    "parcel-bundler": "^1.12.4",
-    "postcss-modules": "^1.5.0",
-    "prettier": "^1.19.1",
-    "redux-devtools-extension": "^2.13.8",
-    "sass": "^1.26.3",
-    "ts-jest": "^25.2.1",
-    "tsconfig-paths": "^3.9.0",
-    "tslint": "^6.1.0",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-no-unused-expression-chai": "^0.1.4",
-    "tslint-plugin-prettier": "^2.2.0",
-    "typescript": "^3.8.3"
+    "@types/prettier": "^2.1.5",
+    "@types/react": "^17.0.0",
+    "@types/react-bootstrap": "^0.32.25",
+    "@types/react-dom": "^17.0.0",
+    "@types/sass": "^1.16.0"
   },
   "dependencies": {
-    "bootstrap": "^4.4.1",
-    "konva": "^4.2.0",
+    "autoprefixer": "^10.0.4",
+    "bootstrap": "^4.5.3",
+    "enzyme": "^3.11.0",
+    "enzyme-adapter-react-16": "^1.15.5",
+    "jest": "^26.6.3",
+    "konva": "^7.2.0",
     "normalize.css": "^8.0.1",
-    "react": "^16.13.0",
-    "react-bootstrap": "^1.0.0-beta.17",
-    "react-dom": "^16.13.0",
-    "react-konva": "^16.12.0-0"
+    "parcel-bundler": "^1.12.4",
+    "postcss": "^8.1.14",
+    "postcss-modules": "^4.0.0",
+    "react": "^17.0.1",
+    "react-bootstrap": "^1.4.0",
+    "react-dom": "^17.0.1",
+    "react-konva": "^17.0.0-0",
+    "rimraf": "^3.0.2",
+    "sass": "^1.30.0",
+    "ts-jest": "^26.4.4",
+    "tsconfig-paths": "^3.9.0",
+    "typescript": "^4.1.2"
   },
   "postcss": {
     "plugins": {

App/tslint.json

@@ -1,16 +0,0 @@
-{
-    "extends": [
-        "tslint-plugin-prettier"
-    ],
-    "rules": {
-        "prettier": true,
-        "no-console": false,
-        "object-literal-sort-keys": false,
-        "no-implicit-dependencies": false,
-        "no-submodule-imports": false,
-        "no-this-assignment": false,
-        "max-classes-per-file": false,
-        "jsx-no-lambda": false,
-        "linebreak-style": false
-    }
-}

Firmware/EggbotWireless/buildweb.py

@@ -0,0 +1,25 @@
+import shutil
+import os
+import gzip
+
+os.chdir("../../App")
+os.system("npm run build")
+os.chdir("../Firmware/EggbotWireless")
+
+try:
+    shutil.rmtree("./data/")
+except FileNotFoundError:
+    pass
+
+shutil.copytree("../../App/prodbuild", "data")
+
+for file in os.listdir("./data/"):
+    file = "./data/" + file
+    inf = open(file, "rb")
+    infs = inf.read()
+    inf.close()
+    os.remove(file)
+
+    out = gzip.GzipFile(file + ".gz", "wb")
+    out.write(infs)
+    out.close()

Firmware/EggbotWireless/platformio.ini

@@ -17,6 +17,8 @@ board_build.f_cpu = 160000000L
 upload_resetmethod = nodemcu
 board_build.filesystem = littlefs
 
+build_flags = !python buildweb.py
+
 upload_port=COM5
 
 lib_deps = ArduinoJson@6.11