From 248af78f77a005a62604dedf849981e14e89bd9c Mon Sep 17 00:00:00 2001
From: Andrea Bondavalli <andrea.bondavalli74@gmail.com>
Date: Sat, 29 May 2021 11:49:23 +0200
Subject: [PATCH] Patches to use webui/dist folder instead of webui/build
 folder

---
 .github/workflows/release.yml | 2 +-
 cleanup.sh                    | 1 +
 daemon/config.hpp             | 2 +-
 daemon/daemon.conf            | 2 +-
 test/daemon.conf              | 2 +-
 webui/.gitignore              | 4 +++-
 6 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index c2a68a5..95a9c91 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Bundle webui release
         run: |
           cd webui/
-          tar -czvf ../webui.tar.gz build/
+          tar -czvf ../webui.tar.gz dist/
 
       - name: Release
         uses: softprops/action-gh-release@v1
diff --git a/cleanup.sh b/cleanup.sh
index eb7bad9..5d274ad 100755
--- a/cleanup.sh
+++ b/cleanup.sh
@@ -21,6 +21,7 @@ rm -f daemon/tests/daemon-test
 
 rm -f demo/sink-test.wav
 
+rm -rf webui/dist
 rm -rf webui/build
 rm -rf webui/node_modules
 rm -f webui/*.log
diff --git a/daemon/config.hpp b/daemon/config.hpp
index b5e1fde..7b74d0c 100644
--- a/daemon/config.hpp
+++ b/daemon/config.hpp
@@ -114,7 +114,7 @@ class Config {
   /* from json */
   uint16_t http_port_{8080};
   uint16_t rtsp_port_{8854};
-  std::string http_base_dir_{"../webui/build"};
+  std::string http_base_dir_{"../webui/dist"};
   int log_severity_{2};
   uint32_t playout_delay_{0};
   uint32_t tic_frame_size_at_1fs_{48};
diff --git a/daemon/daemon.conf b/daemon/daemon.conf
index b37ed4f..95f3343 100644
--- a/daemon/daemon.conf
+++ b/daemon/daemon.conf
@@ -1,7 +1,7 @@
 {
   "http_port": 8080,
   "rtsp_port": 8854,
-  "http_base_dir": "../webui/build",
+  "http_base_dir": "../webui/dist",
   "log_severity": 2,
   "playout_delay": 0,
   "tic_frame_size_at_1fs": 64,
diff --git a/test/daemon.conf b/test/daemon.conf
index 4e349be..0a118dc 100644
--- a/test/daemon.conf
+++ b/test/daemon.conf
@@ -1,7 +1,7 @@
 {
   "http_port": 8080,
   "rtsp_port": 8854,
-  "http_base_dir": "./webui/build",
+  "http_base_dir": "./webui/dist",
   "log_severity": 3,
   "playout_delay": 0,
   "tic_frame_size_at_1fs": 64,
diff --git a/webui/.gitignore b/webui/.gitignore
index 2d5c500..5fb4b6f 100644
--- a/webui/.gitignore
+++ b/webui/.gitignore
@@ -8,8 +8,10 @@
 
 # production
 /build
+/dist
 
 # misc
+webui.tar.gz
 .DS_Store
 .env
 npm-debug.log*
@@ -21,4 +23,4 @@ node_modules
 .DS_Store
 dist
 dist-ssr
-*.local
\ No newline at end of file
+*.local