From 7b934295c6d69bee5e6effe6fea3d0b2b7a3d39c Mon Sep 17 00:00:00 2001 From: Haelnorr Date: Sat, 7 Mar 2026 11:53:49 +1100 Subject: [PATCH 1/8] removed theme switcher, always uses dark theme --- internal/embedfs/web/css/output.css | 11 --------- internal/view/baseview/footer.templ | 38 +---------------------------- internal/view/baseview/layout.templ | 7 +----- 3 files changed, 2 insertions(+), 54 deletions(-) diff --git a/internal/embedfs/web/css/output.css b/internal/embedfs/web/css/output.css index b9f0c88..555f0fd 100644 --- a/internal/embedfs/web/css/output.css +++ b/internal/embedfs/web/css/output.css @@ -341,9 +341,6 @@ .mt-1 { margin-top: calc(var(--spacing) * 1); } - .mt-1\.5 { - margin-top: calc(var(--spacing) * 1.5); - } .mt-2 { margin-top: calc(var(--spacing) * 2); } @@ -570,9 +567,6 @@ .w-80 { width: calc(var(--spacing) * 80); } - .w-fit { - width: fit-content; - } .w-full { width: 100%; } @@ -2322,11 +2316,6 @@ display: flex; } } - .lg\:inline { - @media (width >= 64rem) { - display: inline; - } - } .lg\:grid-cols-2 { @media (width >= 64rem) { grid-template-columns: repeat(2, minmax(0, 1fr)); diff --git a/internal/view/baseview/footer.templ b/internal/view/baseview/footer.templ index 29b2503..3347c50 100644 --- a/internal/view/baseview/footer.templ +++ b/internal/view/baseview/footer.templ @@ -15,7 +15,7 @@ func getFooterItems() []FooterItem { // Returns the template fragment for the Footer templ Footer() { @@ -91,38 +90,3 @@ templ footerCopyright() {

} - -templ themeSelector() { -
-
- - - -
-
-} diff --git a/internal/view/baseview/layout.templ b/internal/view/baseview/layout.templ index 4e36144..96a0c3c 100644 --- a/internal/view/baseview/layout.templ +++ b/internal/view/baseview/layout.templ @@ -11,13 +11,8 @@ templ Layout(title string) { - { title } @@ -34,7 +29,7 @@ templ Layout(title string) { } From 8b414ff7f071ea88c18390ee217e565b175685c6 Mon Sep 17 00:00:00 2001 From: Haelnorr Date: Sat, 7 Mar 2026 12:22:11 +1100 Subject: [PATCH 2/8] changed registration to have blank username on first load --- internal/handlers/register.go | 5 ++-- internal/view/authview/register_form.templ | 33 +++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/internal/handlers/register.go b/internal/handlers/register.go index 61bbb24..99ba067 100644 --- a/internal/handlers/register.go +++ b/internal/handlers/register.go @@ -54,14 +54,14 @@ func Register( store.ClearRedirectTrack(r, "/register") if r.Method == "GET" { - renderSafely(authview.RegisterPage(details.DiscordUser.Username), s, r, w) + renderSafely(authview.RegisterPage(""), s, r, w) return } username := r.FormValue("username") unique := false var user *db.User audit := db.NewAudit(r.RemoteAddr, r.UserAgent(), user) - if ok := conn.WithNotifyTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) { + if ok := conn.WithWriteTx(s, w, r, func(ctx context.Context, tx bun.Tx) (bool, error) { unique, err = db.IsUnique(ctx, tx, (*db.User)(nil), "username", username) if err != nil { return false, errors.Wrap(err, "db.IsUsernameUnique") @@ -79,6 +79,7 @@ func Register( } return true, nil }); !ok { + throw.InternalServiceError(s, w, r, "Registration failed", err) return } if !unique { diff --git a/internal/view/authview/register_form.templ b/internal/view/authview/register_form.templ index b8aa722..1816ce0 100644 --- a/internal/view/authview/register_form.templ +++ b/internal/view/authview/register_form.templ @@ -24,19 +24,19 @@ templ RegisterFormForm(username string) { this.isChecking = false; this.isUnique = false; }, - enableSubmit() { - this.canSubmit = true; - }, + enableSubmit() { + this.canSubmit = true; + }, handleSubmit() { this.isSubmitting = true; - this.buttontext = 'Loading...'; + this.buttontext = "Loading..."; // Set timeout for 10 seconds this.submitTimeout = setTimeout(() => { this.isSubmitting = false; - this.buttontext = 'Register'; - this.errorMessage = 'Request timed out. Please try again.'; + this.buttontext = "Register"; + this.errorMessage = "Request timed out. Please try again."; }, 10000); - } + }, }; } @@ -49,7 +49,7 @@ templ RegisterFormForm(username string) { type="text" id="username" name="username" - x-bind:class="{ + x-bind:class="{ 'py-3 px-4 block w-full rounded-lg text-sm bg-base disabled:opacity-50 disabled:pointer-events-none border-2 outline-none': true, 'border-overlay0 focus:border-blue': !isUnique && !errorMessage, 'border-green focus:border-green': isUnique && !isChecking && !errorMessage, @@ -60,19 +60,18 @@ templ RegisterFormForm(username string) { value={ username } @input="resetErr(); isEmpty = $el.value.trim() === ''; if(isEmpty) { errorMessage='Username is required'; isUnique=false; }" hx-post="/htmx/isusernameunique" - hx-trigger="load delay:100ms, input changed delay:500ms" + hx-trigger="input changed delay:500ms" hx-swap="none" @htmx:before-request="if($el.value.trim() === '') { isEmpty=true; return; } isEmpty=false; isChecking=true; isUnique=false; errorMessage=''" @htmx:after-request="isChecking=false; if($event.detail.successful) { isUnique=true; canSubmit=true; } else if($event.detail.xhr.status === 409) { errorMessage='Username is already taken'; isUnique=false; canSubmit=false; }" /> - -

+

} diff --git a/internal/view/baseview/layout.templ b/internal/view/baseview/layout.templ index 96a0c3c..531c87d 100644 --- a/internal/view/baseview/layout.templ +++ b/internal/view/baseview/layout.templ @@ -29,7 +29,7 @@ templ Layout(title string) { } @@ -38,16 +38,20 @@ templ Layout(title string) { @popup.ConfirmModal()
@Navbar() if previewRole != nil { @previewModeBanner(previewRole) } -
- { children... } +
+
+
+ { children... } +
+ @Footer() +
- @Footer()
From 1194d46613bd2199d260e22a2c69df88a980282f Mon Sep 17 00:00:00 2001 From: Haelnorr Date: Sat, 7 Mar 2026 13:06:58 +1100 Subject: [PATCH 6/8] navbar tweaks --- internal/view/baseview/navbar.templ | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/view/baseview/navbar.templ b/internal/view/baseview/navbar.templ index 1ac4c42..90977d7 100644 --- a/internal/view/baseview/navbar.templ +++ b/internal/view/baseview/navbar.templ @@ -240,6 +240,7 @@ templ mobileNav(navItems []NavItem, user *db.User) {
From 04389970aca84cc38c431cd5444ba83ef3ba3968 Mon Sep 17 00:00:00 2001 From: Haelnorr Date: Sat, 7 Mar 2026 13:13:09 +1100 Subject: [PATCH 7/8] stats page layout tweaks --- internal/embedfs/web/css/output.css | 8 +++++ .../seasonsview/season_league_stats.templ | 36 +++++++++++-------- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/internal/embedfs/web/css/output.css b/internal/embedfs/web/css/output.css index 8ef9548..b0677f9 100644 --- a/internal/embedfs/web/css/output.css +++ b/internal/embedfs/web/css/output.css @@ -720,6 +720,9 @@ .items-start { align-items: flex-start; } + .items-stretch { + align-items: stretch; + } .justify-between { justify-content: space-between; } @@ -2316,6 +2319,11 @@ display: flex; } } + .lg\:w-auto { + @media (width >= 64rem) { + width: auto; + } + } .lg\:grid-cols-2 { @media (width >= 64rem) { grid-template-columns: repeat(2, minmax(0, 1fr)); diff --git a/internal/view/seasonsview/season_league_stats.templ b/internal/view/seasonsview/season_league_stats.templ index 16fad83..74c6ace 100644 --- a/internal/view/seasonsview/season_league_stats.templ +++ b/internal/view/seasonsview/season_league_stats.templ @@ -37,16 +37,16 @@ templ SeasonLeagueStats( if len(topGoals) > 0 || len(topAssists) > 0 || len(topSaves) > 0 {

Trophy Leaders

- -
- -
- @topGoalScorersTable(season, league, topGoals) - @topAssistersTable(season, league, topAssists) -
- - @topSaversTable(season, league, topSaves) + +
+ +
+ @topGoalScorersTable(season, league, topGoals) + @topAssistersTable(season, league, topAssists)
+ + @topSaversTable(season, league, topSaves) +
} @@ -61,7 +61,7 @@ templ SeasonLeagueStats( } templ topGoalScorersTable(season *db.Season, league *db.League, goals []*db.LeagueTopGoalScorer) { -
+

Top Goal Scorers @@ -79,7 +79,8 @@ templ topGoalScorersTable(season *db.Season, league *db.League, goals []*db.Leag

No goal data available yet.

} else { - +
+
@@ -109,12 +110,13 @@ templ topGoalScorersTable(season *db.Season, league *db.League, goals []*db.Leag }
#
+
}
} templ topAssistersTable(season *db.Season, league *db.League, assists []*db.LeagueTopAssister) { -
+

Top Assisters @@ -132,7 +134,8 @@ templ topAssistersTable(season *db.Season, league *db.League, assists []*db.Leag

No assist data available yet.

} else { - +
+
@@ -162,12 +165,13 @@ templ topAssistersTable(season *db.Season, league *db.League, assists []*db.Leag }
#
+
}
} templ topSaversTable(season *db.Season, league *db.League, saves []*db.LeagueTopSaver) { -
+

Top Saves @@ -185,7 +189,8 @@ templ topSaversTable(season *db.Season, league *db.League, saves []*db.LeagueTop

No save data available yet.

} else { - +
+
@@ -215,6 +220,7 @@ templ topSaversTable(season *db.Season, league *db.League, saves []*db.LeagueTop }
#
+
}
} From 78db8d03243d237a7bb40b4e016457305d11fd16 Mon Sep 17 00:00:00 2001 From: Haelnorr Date: Sat, 7 Mar 2026 13:24:36 +1100 Subject: [PATCH 8/8] added staging banner --- internal/config/flags.go | 3 +++ internal/contexts/devmode.go | 1 + internal/embedfs/web/css/output.css | 5 ----- internal/server/middleware.go | 22 +++++++++++++--------- internal/view/baseview/layout.templ | 9 +++++++++ 5 files changed, 26 insertions(+), 14 deletions(-) diff --git a/internal/config/flags.go b/internal/config/flags.go index b131a67..986b795 100644 --- a/internal/config/flags.go +++ b/internal/config/flags.go @@ -14,6 +14,7 @@ type Flags struct { GenEnv string EnvFile string DevMode bool + Staging bool // Database reset (destructive) ResetDB bool @@ -36,6 +37,7 @@ func SetupFlags() (*Flags, error) { genEnv := flag.String("genenv", "", "Generate a .env file with all environment variables (specify filename)") envfile := flag.String("envfile", ".env", "Specify a .env file to use for the configuration") devMode := flag.Bool("dev", false, "Run the server in dev mode") + staging := flag.Bool("staging", false, "Show a staging banner") // Database reset (destructive) resetDB := flag.Bool("reset-db", false, "⚠️ DESTRUCTIVE: Drop and recreate all tables (dev only)") @@ -92,6 +94,7 @@ func SetupFlags() (*Flags, error) { GenEnv: *genEnv, EnvFile: *envfile, DevMode: *devMode, + Staging: *staging, ResetDB: *resetDB, MigrateUp: *migrateUp, MigrateRollback: *migrateRollback, diff --git a/internal/contexts/devmode.go b/internal/contexts/devmode.go index ea1c20e..21827ac 100644 --- a/internal/contexts/devmode.go +++ b/internal/contexts/devmode.go @@ -13,4 +13,5 @@ func DevMode(ctx context.Context) DevInfo { type DevInfo struct { WebsocketBase string HTMXLog bool + StagingBanner bool } diff --git a/internal/embedfs/web/css/output.css b/internal/embedfs/web/css/output.css index b0677f9..59614a2 100644 --- a/internal/embedfs/web/css/output.css +++ b/internal/embedfs/web/css/output.css @@ -2344,11 +2344,6 @@ align-items: flex-end; } } - .lg\:items-start { - @media (width >= 64rem) { - align-items: flex-start; - } - } .lg\:justify-between { @media (width >= 64rem) { justify-content: space-between; diff --git a/internal/server/middleware.go b/internal/server/middleware.go index 21f3f28..c75abcc 100644 --- a/internal/server/middleware.go +++ b/internal/server/middleware.go @@ -44,17 +44,21 @@ func addMiddleware( func devMode(cfg *config.Config) hws.Middleware { return func(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - if cfg.Flags.DevMode { - devInfo := contexts.DevInfo{ - WebsocketBase: "ws://" + cfg.HWS.Host + ":" + strconv.FormatUint(cfg.HWS.Port, 10), - HTMXLog: true, - } - ctx := context.WithValue(r.Context(), contexts.DevModeKey, devInfo) - req := r.WithContext(ctx) - next.ServeHTTP(w, req) + if !cfg.Flags.DevMode && !cfg.Flags.Staging { + next.ServeHTTP(w, r) return } - next.ServeHTTP(w, r) + devInfo := contexts.DevInfo{} + if cfg.Flags.DevMode { + devInfo.WebsocketBase = "ws://" + cfg.HWS.Host + ":" + strconv.FormatUint(cfg.HWS.Port, 10) + devInfo.HTMXLog = true + } + if cfg.Flags.Staging { + devInfo.StagingBanner = true + } + ctx := context.WithValue(r.Context(), contexts.DevModeKey, devInfo) + req := r.WithContext(ctx) + next.ServeHTTP(w, req) }, ) } diff --git a/internal/view/baseview/layout.templ b/internal/view/baseview/layout.templ index 531c87d..c118543 100644 --- a/internal/view/baseview/layout.templ +++ b/internal/view/baseview/layout.templ @@ -40,6 +40,9 @@ templ Layout(title string) { id="main-content" class="flex flex-col h-screen" > + if devInfo.StagingBanner { + @stagingBanner() + } @Navbar() if previewRole != nil { @previewModeBanner(previewRole) @@ -57,6 +60,12 @@ templ Layout(title string) { } +templ stagingBanner() { +
+ Staging Environment - For Testing Only +
+} + // Preview mode banner (private helper) templ previewModeBanner(previewRole *db.Role) {