From ecae24e73e73037930c2a589b7eba976704acdb7 Mon Sep 17 00:00:00 2001 From: Haelnorr Date: Sat, 7 Mar 2026 12:22:11 +1100 Subject: [PATCH] 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; }" /> - -

+