Merge branch '14-cleanup' into dev

cmd/web/main.go

@@ -78,7 +78,11 @@ func main() {
 
 	logger.Info("Starting server", slog.Any("addr", *addr))
 
-	err = srv.ListenAndServeTLS("./tls/cert.pem", "./tls/key.pem")
+	if app.debug {
+		err = srv.ListenAndServeTLS("./tls/cert.pem", "./tls/key.pem")
+	} else {
+		err = srv.ListenAndServe()
+	}
 	logger.Error(err.Error())
 	os.Exit(1)
 }

cmd/web/routes.go

@@ -3,13 +3,13 @@ package main
 import (
 	"net/http"
 
+	"git.32bit.cafe/32bitcafe/guestbook/ui"
 	"github.com/justinas/alice"
 )
 
 func (app *application) routes() http.Handler {
 	mux := http.NewServeMux()
-	fileServer := http.FileServer(http.Dir("./ui/static"))
+	mux.Handle("GET /static/", http.FileServerFS(ui.Files))
-	mux.Handle("GET /static/", http.StripPrefix("/static", fileServer))
 
 	dynamic := alice.New(app.sessionManager.LoadAndSave, noSurf, app.authenticate)
 	standard := alice.New(app.recoverPanic, app.logRequest, commonHeaders)

ui/efs.go

@@ -0,0 +1,6 @@
+package ui
+
+import "embed"
+
+//go:embed "static"
+var Files embed.FS