Fix: build

Signed-off-by: Thomas Klaehn <thomas.klaehn@perinet.io>

.gitignore

@@ -1,10 +1,8 @@
 /node_modules/
-/public/build/
+/build/
 
 .DS_Store
 
 __debug_bin
 
-bin/
-static/
 homeservice.tar.gz

Makefile

@@ -7,7 +7,7 @@ SYSTEM_DIR := /usr/lib/systemd/system
 WEB_DIR := /var/lib/$(PROJECT_NAME)
 
 CONFIG_FILE := config/config.json
-BIN_FILE := bin/$(PROJECT_NAME)
+BIN_FILE := build/bin/$(PROJECT_NAME)
 UNIT_FILE := $(PROJECT_NAME).service
 README_FILE := README.md
 

main.go

@@ -74,7 +74,7 @@ func main() {
 	logger.Println("starting")
 
 	var webui_path string
-	flag.StringVar(&webui_path, "d", "./static", "Specify path to serve the web ui. Default is ./static")
+	flag.StringVar(&webui_path, "d", "./build/webui", "Specify path to serve the web ui. Default is ./static")
 	flag.Parse()
 
 	// MQTT connection

webui/src/routes/+page.js

@@ -1 +1,2 @@
 export const prerender = true;
+export const trailingSlash = 'always';

webui/src/routes/+page.svelte

@@ -8,8 +8,8 @@
 </svelte:head>
 
 <section id='content_id' class='content'>
+	<h1>Home</h1>
 	<figure>
 		<img src={icon} alt="Home" width=150/>
 	</figure>
-	<h1>Home</h1>
 </section>

webui/src/routes/chicken/+page.js

@@ -1 +1,2 @@
 export const prerender = true;
+export const trailingSlash = 'always';

webui/src/routes/chicken/+page.svelte

@@ -113,10 +113,10 @@
 </svelte:head>
 
 <section id='content_id' class='content'>
+	<h1>Chicken</h1>
 	<figure>
 		<img src={icon} alt="Chicken" width=150/>
 	</figure>
-	<h1>Chicken</h1>
 	<hr>
 	<table>
 		<tr>

webui/src/routes/sauna/+page.js

@@ -1 +1,2 @@
 export const prerender = true;
+export const trailingSlash = 'always';

webui/src/routes/sauna/+page.svelte

@@ -34,9 +34,9 @@
 </svelte:head>
 
 <section id='content_id' class='content'>
-	<h1>{temperature_value} {temperature_unit}</h1>
+	<h1>Sauna</h1>
 	<figure>
 		<img src={icon} alt="Sauna" width=150/>
 	</figure>
-	<h1>Sauna</h1>
+	<h1>{temperature_value} {temperature_unit}</h1>
 </section>

webui/svelte.config.js

@@ -17,4 +17,3 @@ const config = {
 };
 
 export default config;
-export const trailingSlash = 'always';