From 444a110d59a683e98e8bef4c2ec9d3d2669e3ab5 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Sat, 3 Jan 2026 12:57:29 -0700
Subject: [PATCH 1/6] installer migration fix

---
 internal/models/install.go | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/internal/models/install.go b/internal/models/install.go
index 872d75d..180bf12 100644
--- a/internal/models/install.go
+++ b/internal/models/install.go
@@ -3,6 +3,8 @@ package models
 import (
 	"database/sql"
 	"errors"
+	"fmt"
+	"os"
 	"time"
 
 	"github.com/golang-migrate/migrate/v4"
@@ -26,6 +28,12 @@ func (m *InstallModel) SetupDatabase() error {
 	if err != nil {
 		return err
 	}
+	wd, err := os.Getwd()
+	if err != nil {
+		return err
+	}
+	mFolder := fmt.Sprintf("file://%s/migrations", wd)
+	fmt.Printf("migrations %s\n", mFolder)
 	mi, err := migrate.NewWithDatabaseInstance("file://migrations", "sqlite", driver)
 	if err != nil {
 		return err
-- 
2.30.2


From ebabd6c14df92b89c371d24571ef720ab0d39cf1 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Sat, 3 Jan 2026 13:05:40 -0700
Subject: [PATCH 2/6] installer fix

---
 internal/models/install.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/internal/models/install.go b/internal/models/install.go
index 180bf12..23a8ddd 100644
--- a/internal/models/install.go
+++ b/internal/models/install.go
@@ -14,7 +14,8 @@ import (
 )
 
 type InstallModel struct {
-	DB *sql.DB
+	DB     *sql.DB
+	DBPath string
 }
 
 type InstallModelInterface interface {
@@ -34,7 +35,7 @@ func (m *InstallModel) SetupDatabase() error {
 	}
 	mFolder := fmt.Sprintf("file://%s/migrations", wd)
 	fmt.Printf("migrations %s\n", mFolder)
-	mi, err := migrate.NewWithDatabaseInstance("file://migrations", "sqlite", driver)
+	mi, err := migrate.NewWithDatabaseInstance(mFolder, "sqlite", driver)
 	if err != nil {
 		return err
 	}
-- 
2.30.2


From efeda7662dafbf01e8f3277189b7a57e8b25fb95 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Sat, 3 Jan 2026 13:14:24 -0700
Subject: [PATCH 3/6] migrations cmd parameter

---
 cmd/web/main.go            | 16 ++++++++++------
 internal/models/install.go | 15 +++++----------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/cmd/web/main.go b/cmd/web/main.go
index b9dba2f..5f77602 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -11,6 +11,7 @@ import (
 	"net/http"
 	"net/url"
 	"os"
+	"path/filepath"
 	"strconv"
 	"strings"
 	"time"
@@ -57,14 +58,16 @@ type application struct {
 }
 
 type appInstaller struct {
-	app          *application
-	srv          *http.Server
-	installModel models.InstallModelInterface
+	app            *application
+	srv            *http.Server
+	installModel   models.InstallModelInterface
+	migrationsPath string
 }
 
 func main() {
 	addr := flag.String("addr", ":3000", "HTTP network address")
 	dsn := flag.String("dsn", "guestbook.db", "data source name")
+	migrations := flag.String("migrations", "migrations", "folder containing sql migrations")
 	debug := flag.Bool("debug", false, "enable debug mode")
 	env := flag.String("env", ".env", ".env file path")
 	flag.Parse()
@@ -113,8 +116,9 @@ func main() {
 	}
 
 	installer := &appInstaller{
-		app:          app,
-		installModel: &models.InstallModel{DB: db},
+		app:            app,
+		installModel:   &models.InstallModel{DB: db},
+		migrationsPath: filepath.Clean(*migrations),
 	}
 	installer.srv = &http.Server{
 		Addr:         *addr,
@@ -301,7 +305,7 @@ func walkTzDir(path string, zones []string) []string {
 
 func runInstaller(i *appInstaller) error {
 	i.app.logger.Info("Performing migrations")
-	err := i.installModel.SetupDatabase()
+	err := i.installModel.SetupDatabase(i.migrationsPath)
 	if err != nil {
 		return err
 	}
diff --git a/internal/models/install.go b/internal/models/install.go
index 23a8ddd..61595b0 100644
--- a/internal/models/install.go
+++ b/internal/models/install.go
@@ -4,7 +4,7 @@ import (
 	"database/sql"
 	"errors"
 	"fmt"
-	"os"
+	"path/filepath"
 	"time"
 
 	"github.com/golang-migrate/migrate/v4"
@@ -14,26 +14,21 @@ import (
 )
 
 type InstallModel struct {
-	DB     *sql.DB
-	DBPath string
+	DB *sql.DB
 }
 
 type InstallModelInterface interface {
-	SetupDatabase() error
+	SetupDatabase(migrations string) error
 	SetInstalledFlag() error
 	GetInstalledFlag() (bool, error)
 }
 
-func (m *InstallModel) SetupDatabase() error {
+func (m *InstallModel) SetupDatabase(migrations string) error {
 	driver, err := sqlite3.WithInstance(m.DB, &sqlite3.Config{})
 	if err != nil {
 		return err
 	}
-	wd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	mFolder := fmt.Sprintf("file://%s/migrations", wd)
+	mFolder := fmt.Sprintf("file://%s", filepath.Clean(migrations))
 	fmt.Printf("migrations %s\n", mFolder)
 	mi, err := migrate.NewWithDatabaseInstance(mFolder, "sqlite", driver)
 	if err != nil {
-- 
2.30.2


From 4bd5248cdd7c63ba49dd169ac8acc560e5b6ed02 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Sat, 3 Jan 2026 13:19:35 -0700
Subject: [PATCH 4/6] remove all guestbooks view

---
 cmd/web/routes.go        |  2 +-
 ui/views/common.templ    |  1 -
 ui/views/common_templ.go | 14 +++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/cmd/web/routes.go b/cmd/web/routes.go
index 932e778..31b8d0f 100644
--- a/cmd/web/routes.go
+++ b/cmd/web/routes.go
@@ -43,7 +43,6 @@ func (app *application) routes() http.Handler {
 	mux.Handle("POST /users/logout", protected.ThenFunc(app.postUserLogout))
 	mux.Handle("GET /users/settings", protected.ThenFunc(app.getUserSettings))
 	mux.Handle("PUT /users/settings", protected.ThenFunc(app.putUserSettings))
-	mux.Handle("GET /guestbooks", protected.ThenFunc(app.getAllGuestbooks))
 	mux.Handle("GET /websites", protected.ThenFunc(app.getWebsiteList))
 	mux.Handle("GET /websites/create", protected.ThenFunc(app.getWebsiteCreate))
 	mux.Handle("POST /websites/create", protected.ThenFunc(app.postWebsiteCreate))
@@ -59,6 +58,7 @@ func (app *application) routes() http.Handler {
 	mux.Handle("GET /websites/{id}/dashboard/guestbook/customize", protected.ThenFunc(app.getComingSoon))
 
 	adminOnly := protected.Append(app.requireAdmin)
+	mux.Handle("GET /guestbooks", adminOnly.ThenFunc(app.getAllGuestbooks))
 	mux.Handle("GET /admin", adminOnly.ThenFunc(app.getAdminPanelLanding))
 	mux.Handle("GET /admin/users", adminOnly.ThenFunc(app.getAdminPanelAllUsers))
 	mux.Handle("GET /admin/users/{id}", adminOnly.ThenFunc(app.getAdminPanelUser))
diff --git a/ui/views/common.templ b/ui/views/common.templ
index c0463fb..5eccfac 100644
--- a/ui/views/common.templ
+++ b/ui/views/common.templ
@@ -65,7 +65,6 @@ templ topNav(data CommonData) {
 		</div>
 		<ul class="nav-links">
 			if data.IsAuthenticated {
-				<li><a href="/guestbooks">All Guestbooks</a></li>
 				<li><a href="/websites">My Websites</a></li>
 				<li><a href="/users/settings">Settings</a></li>
 				if slices.Contains(data.CurrentUser.Groups, models.AdminGroup) {
diff --git a/ui/views/common_templ.go b/ui/views/common_templ.go
index 82a92c6..d0f5949 100644
--- a/ui/views/common_templ.go
+++ b/ui/views/common_templ.go
@@ -130,7 +130,7 @@ func topNav(data CommonData) templ.Component {
 			return templ_7745c5c3_Err
 		}
 		if data.IsAuthenticated {
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<li><a href=\"/guestbooks\">All Guestbooks</a></li><li><a href=\"/websites\">My Websites</a></li><li><a href=\"/users/settings\">Settings</a></li>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 5, "<li><a href=\"/websites\">My Websites</a></li><li><a href=\"/users/settings\">Settings</a></li>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
@@ -147,7 +147,7 @@ func topNav(data CommonData) templ.Component {
 			var templ_7745c5c3_Var4 string
 			templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(hxHeaders)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 74, Col: 66}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 73, Col: 66}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4))
 			if templ_7745c5c3_Err != nil {
@@ -234,7 +234,7 @@ func base(title string, data CommonData) templ.Component {
 		var templ_7745c5c3_Var7 string
 		templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(title)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 99, Col: 17}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 98, Col: 17}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7))
 		if templ_7745c5c3_Err != nil {
@@ -247,7 +247,7 @@ func base(title string, data CommonData) templ.Component {
 		var templ_7745c5c3_Var8 string
 		templ_7745c5c3_Var8, templ_7745c5c3_Err = templ.JoinStringErrs(`{"includeIndicatorStyles":false}`)
 		if templ_7745c5c3_Err != nil {
-			return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 102, Col: 72}
+			return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 101, Col: 72}
 		}
 		_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var8))
 		if templ_7745c5c3_Err != nil {
@@ -277,7 +277,7 @@ func base(title string, data CommonData) templ.Component {
 			var templ_7745c5c3_Var9 string
 			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Flash)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 113, Col: 43}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 112, Col: 43}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 			if templ_7745c5c3_Err != nil {
@@ -369,7 +369,7 @@ func pagination(baseUrl string, currentPage int64, recordsAmount int64, recordsP
 				var templ_7745c5c3_Var12 string
 				templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d", i+1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 137, Col: 28}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 136, Col: 28}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 				if templ_7745c5c3_Err != nil {
@@ -392,7 +392,7 @@ func pagination(baseUrl string, currentPage int64, recordsAmount int64, recordsP
 				var templ_7745c5c3_Var14 string
 				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d", i+1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 139, Col: 55}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 138, Col: 55}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 				if templ_7745c5c3_Err != nil {
-- 
2.30.2


From 20a14aa0c00a5d487d8ba5814ca6657c3222d727 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Sat, 3 Jan 2026 13:42:41 -0700
Subject: [PATCH 5/6] fix initial user setting initialization

---
 cmd/web/handlers_user.go | 1 +
 cmd/web/main.go          | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/cmd/web/handlers_user.go b/cmd/web/handlers_user.go
index 391eb13..a530641 100644
--- a/cmd/web/handlers_user.go
+++ b/cmd/web/handlers_user.go
@@ -251,6 +251,7 @@ func (app *application) putUserSettings(w http.ResponseWriter, r *http.Request)
 	if !form.Valid() {
 		// TODO: rerender template with errors
 		app.clientError(w, http.StatusUnprocessableEntity)
+		return
 	}
 	user.Settings.LocalTimezone, err = time.LoadLocation(form.LocalTimezone)
 	if err != nil {
diff --git a/cmd/web/main.go b/cmd/web/main.go
index 5f77602..8faa38d 100644
--- a/cmd/web/main.go
+++ b/cmd/web/main.go
@@ -313,6 +313,10 @@ func runInstaller(i *appInstaller) error {
 	if installed {
 		return nil
 	}
+	err = i.app.users.InitializeSettingsMap()
+	if err != nil {
+		return err
+	}
 	i.app.logger.Info("App not installed, running installer...")
 	i.app.logger.Info("Starting installation server", slog.Any("addr", i.srv.Addr))
 	if i.app.debug {
-- 
2.30.2


From 80fa317cb1acf5d39d261b871d092b3d823a2581 Mon Sep 17 00:00:00 2001
From: yequari <yequari@32bit.cafe>
Date: Sat, 3 Jan 2026 13:47:28 -0700
Subject: [PATCH 6/6] update service status message

---
 ui/views/common.templ    | 4 ++++
 ui/views/common_templ.go | 8 ++++----
 ui/views/home.templ      | 4 ----
 ui/views/home_templ.go   | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ui/views/common.templ b/ui/views/common.templ
index 5eccfac..7482489 100644
--- a/ui/views/common.templ
+++ b/ui/views/common.templ
@@ -108,6 +108,10 @@ templ base(title string, data CommonData) {
 			@commonHeader()
 			@topNav(data)
 			<main role="main">
+				<aside class="notice" role="alert" aria-labelledby="service-status">
+					<h3 id="service-status" class="sr-only">Service Status Notice</h3>
+					<p><strong>Important:</strong> This service is in a beta state. Please report any bugs or issues to the <a href="https://git.32bit.cafe/32bitcafe/webweav.ing/issues/">git repository</a>.</p>
+				</aside>
 				if data.Flash != "" {
 					<div class="notice flash">{ data.Flash }</div>
 				}
diff --git a/ui/views/common_templ.go b/ui/views/common_templ.go
index d0f5949..495f90f 100644
--- a/ui/views/common_templ.go
+++ b/ui/views/common_templ.go
@@ -265,7 +265,7 @@ func base(title string, data CommonData) templ.Component {
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
-		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<main role=\"main\">")
+		templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 16, "<main role=\"main\"><aside class=\"notice\" role=\"alert\" aria-labelledby=\"service-status\"><h3 id=\"service-status\" class=\"sr-only\">Service Status Notice</h3><p><strong>Important:</strong> This service is in a beta state. Please report any bugs or issues to the <a href=\"https://git.32bit.cafe/32bitcafe/webweav.ing/issues/\">git repository</a>.</p></aside>")
 		if templ_7745c5c3_Err != nil {
 			return templ_7745c5c3_Err
 		}
@@ -277,7 +277,7 @@ func base(title string, data CommonData) templ.Component {
 			var templ_7745c5c3_Var9 string
 			templ_7745c5c3_Var9, templ_7745c5c3_Err = templ.JoinStringErrs(data.Flash)
 			if templ_7745c5c3_Err != nil {
-				return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 112, Col: 43}
+				return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 116, Col: 43}
 			}
 			_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var9))
 			if templ_7745c5c3_Err != nil {
@@ -369,7 +369,7 @@ func pagination(baseUrl string, currentPage int64, recordsAmount int64, recordsP
 				var templ_7745c5c3_Var12 string
 				templ_7745c5c3_Var12, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d", i+1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 136, Col: 28}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 140, Col: 28}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var12))
 				if templ_7745c5c3_Err != nil {
@@ -392,7 +392,7 @@ func pagination(baseUrl string, currentPage int64, recordsAmount int64, recordsP
 				var templ_7745c5c3_Var14 string
 				templ_7745c5c3_Var14, templ_7745c5c3_Err = templ.JoinStringErrs(fmt.Sprintf("%d", i+1))
 				if templ_7745c5c3_Err != nil {
-					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 138, Col: 55}
+					return templ.Error{Err: templ_7745c5c3_Err, FileName: `ui/views/common.templ`, Line: 142, Col: 55}
 				}
 				_, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var14))
 				if templ_7745c5c3_Err != nil {
diff --git a/ui/views/home.templ b/ui/views/home.templ
index b3693e0..9b62159 100644
--- a/ui/views/home.templ
+++ b/ui/views/home.templ
@@ -5,10 +5,6 @@ templ Home(title string, data CommonData) {
 		<section aria-labelledby="welcome-heading">
 			<h2 id="welcome-heading">Welcome</h2>
 			<p>Welcome to webweav.ing, a collection of webmastery tools created by the <a href="https://32bit.cafe" rel="noopener">32-Bit Cafe</a>.</p>
-			<aside class="notice" role="alert" aria-labelledby="service-status">
-				<h3 id="service-status" class="sr-only">Service Status Notice</h3>
-				<p><strong>Important:</strong> This service is in a pre-alpha state. Your account and data can disappear at any time.</p>
-			</aside>
 		</section>
 	}
 }
diff --git a/ui/views/home_templ.go b/ui/views/home_templ.go
index 03173a0..d70dd67 100644
--- a/ui/views/home_templ.go
+++ b/ui/views/home_templ.go
@@ -41,7 +41,7 @@ func Home(title string, data CommonData) templ.Component {
 				}()
 			}
 			ctx = templ.InitializeContext(ctx)
-			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<section aria-labelledby=\"welcome-heading\"><h2 id=\"welcome-heading\">Welcome</h2><p>Welcome to webweav.ing, a collection of webmastery tools created by the <a href=\"https://32bit.cafe\" rel=\"noopener\">32-Bit Cafe</a>.</p><aside class=\"notice\" role=\"alert\" aria-labelledby=\"service-status\"><h3 id=\"service-status\" class=\"sr-only\">Service Status Notice</h3><p><strong>Important:</strong> This service is in a pre-alpha state. Your account and data can disappear at any time.</p></aside></section>")
+			templ_7745c5c3_Err = templruntime.WriteString(templ_7745c5c3_Buffer, 1, "<section aria-labelledby=\"welcome-heading\"><h2 id=\"welcome-heading\">Welcome</h2><p>Welcome to webweav.ing, a collection of webmastery tools created by the <a href=\"https://32bit.cafe\" rel=\"noopener\">32-Bit Cafe</a>.</p></section>")
 			if templ_7745c5c3_Err != nil {
 				return templ_7745c5c3_Err
 			}
-- 
2.30.2