From a5fe3b2ea299b5299a46e425803545954d2d26b5 Mon Sep 17 00:00:00 2001
From: Anhgelus Morhtuuzh <anhgelus@anhgelus.world>
Date: Mon, 24 Feb 2025 13:53:20 +0100
Subject: [PATCH] build(golatt): upgrade to pre-0.4.0

---
 docker-compose.yml |  4 ++--
 go.mod             |  4 ++--
 go.sum             |  4 ++++
 main.go            | 17 +++++++++++++----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 6eaad0f..f8b0cf0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,7 @@ services:
       NOW_DOMAIN: "example.org"
       NOW_CONFIG: "config.json"
     volumes:
-      - ./data.json:/app/data.json:ro
-      - ./assets:/app/public:ro
+      - ./config.json:/app/config.json:ro
+      - ./public:/app/public:ro
     ports:
       - "8000:80"
diff --git a/go.mod b/go.mod
index 4e9d28f..a1b3d57 100644
--- a/go.mod
+++ b/go.mod
@@ -1,7 +1,7 @@
 module now
 
-go 1.23.2
+go 1.24
 
-require github.com/anhgelus/golatt v0.2.0
+require github.com/anhgelus/golatt v0.3.1-0.20250224013601-7215f78c2860
 
 require github.com/gorilla/mux v1.8.1 // indirect
diff --git a/go.sum b/go.sum
index 299575c..fb8229c 100644
--- a/go.sum
+++ b/go.sum
@@ -2,5 +2,9 @@ github.com/anhgelus/golatt v0.1.0 h1:Lb6wCtbOmIE/p/wlDeFzuFuR++twPx+fHMNVDGhqjXk
 github.com/anhgelus/golatt v0.1.0/go.mod h1:Lgyy/Tm9A3w1ft72mZOUxl/p+4G2/WB3qxoXTv7Y4y8=
 github.com/anhgelus/golatt v0.2.0 h1:tdgrx3K61mVYBMy9CNhTheSIV8lPWBl/JjeDIHmz9eg=
 github.com/anhgelus/golatt v0.2.0/go.mod h1:Lgyy/Tm9A3w1ft72mZOUxl/p+4G2/WB3qxoXTv7Y4y8=
+github.com/anhgelus/golatt v0.3.0 h1:HjolihJ+S9egfTXcbk3YBfxBKmEcEraUsqCsrPXzHOU=
+github.com/anhgelus/golatt v0.3.0/go.mod h1:Lgyy/Tm9A3w1ft72mZOUxl/p+4G2/WB3qxoXTv7Y4y8=
+github.com/anhgelus/golatt v0.3.1-0.20250224013601-7215f78c2860 h1:Xi1aqbDU1sr/8pJEun4sjOqz5PPQc7hVSR1kuCiRgTE=
+github.com/anhgelus/golatt v0.3.1-0.20250224013601-7215f78c2860/go.mod h1:Lgyy/Tm9A3w1ft72mZOUxl/p+4G2/WB3qxoXTv7Y4y8=
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
diff --git a/main.go b/main.go
index 34086cc..06cc35b 100644
--- a/main.go
+++ b/main.go
@@ -10,8 +10,12 @@ import (
 	"os"
 )
 
-//go:embed templates
-var templates embed.FS
+var (
+	//go:embed templates
+	templates embed.FS
+	//go:embed dist
+	assets embed.FS
+)
 
 var (
 	domain     string
@@ -37,7 +41,7 @@ func main() {
 	if configPath == "" {
 		configPath = os.Getenv("NOW_DATA")
 		if configPath == "" {
-			slog.Error("Config not set. Set it with --cfg relative path or with the env NOW_DATA")
+			slog.Error("Config not set. Set it with --config relative path or with the env NOW_DATA")
 			return
 		}
 	}
@@ -54,7 +58,12 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	g := golatt.New(templates)
+	var g *golatt.Golatt
+	if dev {
+		g = golatt.New(templates, os.DirFS("public"), os.DirFS("dist"))
+	} else {
+		g = golatt.New(templates, os.DirFS("public"), golatt.UsableEmbedFS("dist", assets))
+	}
 	g.DefaultSeoData = &golatt.SeoData{
 		Image:       cfg.Image,
 		Description: cfg.Description,