From 13fff8a88c5fdd050d36ce5df1c5ee395c7121ba Mon Sep 17 00:00:00 2001
From: Maxim Devaev <mdevaev@gmail.com>
Date: Sat, 1 Feb 2025 08:29:36 +0200
Subject: [PATCH] web: preparing to relative paths

---
 web/base.pug               | 29 +++++++++++++++++------------
 web/index.pug              |  2 +-
 web/kvm/index.pug          |  8 ++++++--
 web/login/index.pug        |  2 +-
 web/share/site.webmanifest |  2 +-
 5 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/web/base.pug b/web/base.pug
index 004c849f..5d7de14f 100644
--- a/web/base.pug
+++ b/web/base.pug
@@ -23,36 +23,41 @@ doctype html
 	==============================================================================
 
 -
-	var css_dir = "/share/css"
-	var js_dir = "/share/js"
-	var svg_dir = "/share/svg"
-	var png_dir = "/share/png"
+	var prefix = "/"
 
 	title = ""
 	main_js = ""
 	body_class = ""
-	css_list = ["vars", "main"]
+	css_list = []
 
 
 block vars
 
 
+block _vars_dynamic
+	-
+		share_dir = `${prefix}share`
+		css_dir = `${share_dir}/css`
+		js_dir = `${share_dir}/js`
+		svg_dir = `${share_dir}/svg`
+		png_dir = `${share_dir}/png`
+
+
 html(lang="en")
 	head
 		meta(charset="utf-8")
 		title #{title}
 
-		link(rel="apple-touch-icon" sizes="180x180" href="/share/apple-touch-icon.png")
-		link(rel="icon" type="image/png" sizes="32x32" href="/share/favicon-32x32.png")
-		link(rel="icon" type="image/png" sizes="16x16" href="/share/favicon-16x16.png")
-		link(rel="manifest" href="/share/site.webmanifest")
-		link(rel="mask-icon" href="/share/safari-pinned-tab.svg" color="#5bbad5")
+		link(rel="apple-touch-icon" sizes="180x180" href=`${share_dir}/apple-touch-icon.png`)
+		link(rel="icon" type="image/png" sizes="32x32" href=`${share_dir}/favicon-32x32.png`)
+		link(rel="icon" type="image/png" sizes="16x16" href=`${share_dir}/favicon-16x16.png`)
+		link(rel="manifest" href=`${share_dir}/site.webmanifest`)
+		link(rel="mask-icon" href=`${share_dir}/safari-pinned-tab.svg` color="#5bbad5")
 		meta(name="msapplication-TileColor" content="#2b5797")
 		meta(name="theme-color" content="#ffffff")
 
-		each name in css_list
+		each name in ["vars", "main"].concat(css_list).concat(["user"])
 			link(rel="stylesheet" href=`${css_dir}/${name}.css`)
-		link(rel="stylesheet" href=`${css_dir}/user.css`)
 
 		if main_js
 			script(type="module")
diff --git a/web/index.pug b/web/index.pug
index 29de6da7..4543cf6c 100644
--- a/web/index.pug
+++ b/web/index.pug
@@ -5,7 +5,7 @@ append vars
 	-
 		title = "PiKVM Index"
 		main_js = "index/main"
-		css_list = css_list.concat(["window", "modal", "index/index"])
+		css_list.push("window", "modal", "index/index")
 
 
 block start
diff --git a/web/kvm/index.pug b/web/kvm/index.pug
index 6bf69430..fe04e570 100644
--- a/web/kvm/index.pug
+++ b/web/kvm/index.pug
@@ -6,8 +6,12 @@ append vars
 		title = "PiKVM Session"
 		main_js = "kvm/main"
 		body_class = "body-no-select"
-		css_list = css_list.concat(["navbar", "window", "modal", "led", "slider", "switch", "radio", "progress", "keypad", "tabs"])
-		css_list = css_list.concat(["kvm/stream", "kvm/hid", "kvm/msd", "kvm/system", "kvm/keyboard", "kvm/about"])
+		css_list.push(
+			"navbar", "window", "modal", "led", "slider",
+			"switch", "radio", "progress", "keypad", "tabs",
+			"kvm/stream", "kvm/hid", "kvm/msd",
+			"kvm/system", "kvm/keyboard", "kvm/about"
+		)
 
 
 block body
diff --git a/web/login/index.pug b/web/login/index.pug
index 99097a27..69681255 100644
--- a/web/login/index.pug
+++ b/web/login/index.pug
@@ -5,7 +5,7 @@ append vars
 	-
 		title = "PiKVM Login"
 		main_js = "login/main"
-		css_list = css_list.concat(["window", "modal", "login/login"])
+		css_list.push("window", "modal", "login/login")
 
 
 block body
diff --git a/web/share/site.webmanifest b/web/share/site.webmanifest
index a1f95a9a..d939d130 100644
--- a/web/share/site.webmanifest
+++ b/web/share/site.webmanifest
@@ -4,7 +4,7 @@
 	"start_url": "/",
 	"icons": [
 		{
-			"src": "/share/android-chrome-192x192.png",
+			"src": "android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image/png"
 		}