Merge pull request #840 from sidoh/web2

Revamped web UI!
sidoh · Nov 10, 2024 · bef50f8 · bef50f8
2 parents 6403ee2 + 4a117a7
commit bef50f8
Show file tree

Hide file tree

Showing 113 changed files with 18,319 additions and 200 deletions.
diff --git a/.build_web.py b/.build_web.py
@@ -17,16 +17,15 @@ def is_tool(name):
 
 def build_web():
     if is_tool("npm"):
-        os.chdir("web")
+        os.chdir("web2")
         print("Attempting to build webpage...")
         try:
             if platform.system() == "Windows":
-                print(check_output(["npm.cmd", "install", "--only=dev"]))
-                print(check_output(["node_modules\\.bin\\gulp.cmd"]))
+                print(check_output(["npm.cmd", "install"]))
+                print(check_output(["npm.cmd", "run", "build"]))
             else:
                 print(check_output(["npm", "install"]))
-                print(check_output(["node_modules/.bin/gulp"]))
-            copyfile("build/index.html.gz.h", "../dist/index.html.gz.h")
+                print(check_output(["npm", "run", "build"]))
         except OSError as e:
             print("Encountered error OSError building webpage:", e)
             if e.filename:

diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,9 @@
 /web/package-lock.json
 /dist/*.bin
 /dist/docs
+/web2/node_modules
+/web2/dist/build
+/web2/dist/compiled
 .vscode/
 .vscode/.browse.c_cpp.db*
 .vscode/c_cpp_properties.json

diff --git a/README.md b/README.md
diff --git a/dist/bundle.css b/dist/bundle.css
diff --git a/dist/bundle.css.gz.h b/dist/bundle.css.gz.h
diff --git a/dist/bundle.js b/dist/bundle.js
diff --git a/dist/bundle.js.gz.h b/dist/bundle.js.gz.h
diff --git a/dist/index.html.gz.h b/dist/index.html.gz.h