From 9d93b55d605c22070f76df96a30817bb5c493166 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mose=20M=C3=BCller?= <mosemueller@gmail.com>
Date: Wed, 2 Aug 2023 12:06:20 +0200
Subject: [PATCH] frontend: updating build command, location of static files

---
 frontend/package.json                                         | 2 +-
 {frontend/build => src/frontend}/asset-manifest.json          | 0
 {frontend/build => src/frontend}/index.html                   | 0
 {frontend/build => src/frontend}/manifest.json                | 0
 {frontend/build => src/frontend}/robots.txt                   | 0
 {frontend/build => src/frontend}/static/css/main.4da62354.css | 0
 .../build => src/frontend}/static/css/main.4da62354.css.map   | 0
 {frontend/build => src/frontend}/static/js/main.d69e51b9.js   | 0
 .../frontend}/static/js/main.d69e51b9.js.LICENSE.txt          | 0
 .../build => src/frontend}/static/js/main.d69e51b9.js.map     | 0
 src/pyDataInterface/server/web_server.py                      | 4 +---
 11 files changed, 2 insertions(+), 4 deletions(-)
 rename {frontend/build => src/frontend}/asset-manifest.json (100%)
 rename {frontend/build => src/frontend}/index.html (100%)
 rename {frontend/build => src/frontend}/manifest.json (100%)
 rename {frontend/build => src/frontend}/robots.txt (100%)
 rename {frontend/build => src/frontend}/static/css/main.4da62354.css (100%)
 rename {frontend/build => src/frontend}/static/css/main.4da62354.css.map (100%)
 rename {frontend/build => src/frontend}/static/js/main.d69e51b9.js (100%)
 rename {frontend/build => src/frontend}/static/js/main.d69e51b9.js.LICENSE.txt (100%)
 rename {frontend/build => src/frontend}/static/js/main.d69e51b9.js.map (100%)

diff --git a/frontend/package.json b/frontend/package.json
index 3875806..7ce5dfe 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -20,7 +20,7 @@
   },
   "scripts": {
     "start": "NODE_ENV=development react-scripts start",
-    "build": "react-scripts build",
+    "build": "BUILD_PATH='../src/frontend' react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"
   },
diff --git a/frontend/build/asset-manifest.json b/src/frontend/asset-manifest.json
similarity index 100%
rename from frontend/build/asset-manifest.json
rename to src/frontend/asset-manifest.json
diff --git a/frontend/build/index.html b/src/frontend/index.html
similarity index 100%
rename from frontend/build/index.html
rename to src/frontend/index.html
diff --git a/frontend/build/manifest.json b/src/frontend/manifest.json
similarity index 100%
rename from frontend/build/manifest.json
rename to src/frontend/manifest.json
diff --git a/frontend/build/robots.txt b/src/frontend/robots.txt
similarity index 100%
rename from frontend/build/robots.txt
rename to src/frontend/robots.txt
diff --git a/frontend/build/static/css/main.4da62354.css b/src/frontend/static/css/main.4da62354.css
similarity index 100%
rename from frontend/build/static/css/main.4da62354.css
rename to src/frontend/static/css/main.4da62354.css
diff --git a/frontend/build/static/css/main.4da62354.css.map b/src/frontend/static/css/main.4da62354.css.map
similarity index 100%
rename from frontend/build/static/css/main.4da62354.css.map
rename to src/frontend/static/css/main.4da62354.css.map
diff --git a/frontend/build/static/js/main.d69e51b9.js b/src/frontend/static/js/main.d69e51b9.js
similarity index 100%
rename from frontend/build/static/js/main.d69e51b9.js
rename to src/frontend/static/js/main.d69e51b9.js
diff --git a/frontend/build/static/js/main.d69e51b9.js.LICENSE.txt b/src/frontend/static/js/main.d69e51b9.js.LICENSE.txt
similarity index 100%
rename from frontend/build/static/js/main.d69e51b9.js.LICENSE.txt
rename to src/frontend/static/js/main.d69e51b9.js.LICENSE.txt
diff --git a/frontend/build/static/js/main.d69e51b9.js.map b/src/frontend/static/js/main.d69e51b9.js.map
similarity index 100%
rename from frontend/build/static/js/main.d69e51b9.js.map
rename to src/frontend/static/js/main.d69e51b9.js.map
diff --git a/src/pyDataInterface/server/web_server.py b/src/pyDataInterface/server/web_server.py
index 6be4e67..4cdd0c5 100644
--- a/src/pyDataInterface/server/web_server.py
+++ b/src/pyDataInterface/server/web_server.py
@@ -142,9 +142,7 @@ class WebAPI:
             app.mount(
                 "/",
                 StaticFiles(
-                    directory=Path(__file__).parent.parent.parent.parent
-                    / "frontend"
-                    / "build",
+                    directory=Path(__file__).parent.parent.parent / "frontend",
                     html=True,
                 ),
             )