moved shit around, started working on more features

.air.toml

@@ -0,0 +1,46 @@
+root = "."
+testdata_dir = "testdata"
+tmp_dir = "tmp"
+
+[build]
+  args_bin = []
+  bin = "./www"
+  cmd = "make webserver"
+  delay = 1000
+  exclude_dir = ["hugo", "tmp", "vendor"]
+  exclude_file = []
+  exclude_regex = ["_test.go", ".*_templ.go"]
+  exclude_unchanged = false
+  follow_symlink = false
+  full_bin = "PORT=8080 HOST=127.0.0.1 DEBUG=true ./www"
+  include_dir = []
+  include_ext = ["go", "tpl", "tmpl", "html", "templ", "toml"]
+  include_file = []
+  kill_delay = "0s"
+  log = "build-errors.log"
+  poll = false
+  poll_interval = 0
+  post_cmd = []
+  pre_cmd = []
+  rerun = false
+  rerun_delay = 500
+  send_interrupt = false
+  stop_on_error = false
+
+[color]
+  app = ""
+  build = "yellow"
+  main = "magenta"
+  runner = "green"
+  watcher = "cyan"
+
+[log]
+  main_only = false
+  time = false
+
+[misc]
+  clean_on_exit = false
+
+[screen]
+  clear_on_rebuild = false
+  keep_scroll = true

.gitignore

@@ -2,3 +2,5 @@
 public/
 resources/
 app
+www
+

Makefile

@@ -4,13 +4,14 @@ CTNAME:=git.jmbit.de/jmb/www-jmbit-de
 all: hugo webserver
 
 dev:
-	hugo server -D
+	cd hugo && hugo server -D
 
 hugo:
-	hugo
+	cd hugo && hugo
 
 webserver:
-	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o app .
+	templ generate .
+	CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o www .
 
 container:
 	podman build -t $(CTNAME):latest -t $(CTNAME):$(HEAD) .	
@@ -19,5 +20,7 @@ run:
 	podman run --rm -p8080:80 $(CTNAME)
 
 clean:
-	rm -rf public 
+	rm -rf hugo/public
+	rm -f www
 
+.PHONY: all dev hugo webserver container run clean

go.mod

@@ -1,3 +1,5 @@
 module git.jmbit.de/jmb/www-jmbit-de
 
 go 1.21.5
+
+require github.com/a-h/templ v0.2.793 // indirect

go.sum

@@ -0,0 +1,2 @@
+github.com/a-h/templ v0.2.793 h1:Io+/ocnfGWYO4VHdR0zBbf39PQlnzVCVVD+wEEs6/qY=
+github.com/a-h/templ v0.2.793/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w=

hugo/hugo.go

@@ -0,0 +1,8 @@
+package hugo
+
+import (
+	"embed"
+)
+
+//go:embed public/*
+var PublicFS embed.FS