h/oslstats
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed registration to have blank username on first load

Browse Source
This commit is contained in:
Haelnorr
2026-03-07 12:22:11 +11:00
parent 7b934295c6
commit 8b414ff7f0
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/handlers/register.go
View File

@@ -54,14 +54,14 @@ func Register(
store.ClearRedirectTrack(r, "/register") store.ClearRedirectTrack(r, "/register")
if r.Method == "GET" { if r.Method == "GET" {
renderSafely(authview.RegisterPage(details.DiscordUser.Username), s, r, w) renderSafely(authview.RegisterPage(""), s, r, w)
return return
} }
username := r.FormValue("username") username := r.FormValue("username")
unique := false unique := false
var user *db.User var user *db.User
audit := db.NewAudit(r.RemoteAddr, r.UserAgent(), 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) unique, err = db.IsUnique(ctx, tx, (*db.User)(nil), "username", username)
if err != nil { if err != nil {
return false, errors.Wrap(err, "db.IsUsernameUnique") return false, errors.Wrap(err, "db.IsUsernameUnique")
@@ -79,6 +79,7 @@ func Register(
} }
return true, nil return true, nil
}); !ok { }); !ok {
throw.InternalServiceError(s, w, r, "Registration failed", err)
return return
} }
if !unique { if !unique {

33
internal/view/authview/register_form.templ
View File

@@ -24,19 +24,19 @@ templ RegisterFormForm(username string) {
this.isChecking = false; this.isChecking = false;
this.isUnique = false; this.isUnique = false;
}, },
enableSubmit() { enableSubmit() {
this.canSubmit = true; this.canSubmit = true;
}, },
handleSubmit() { handleSubmit() {
this.isSubmitting = true; this.isSubmitting = true;
this.buttontext = 'Loading...'; this.buttontext = "Loading...";
// Set timeout for 10 seconds // Set timeout for 10 seconds
this.submitTimeout = setTimeout(() => { this.submitTimeout = setTimeout(() => {
this.isSubmitting = false; this.isSubmitting = false;
this.buttontext = 'Register'; this.buttontext = "Register";
this.errorMessage = 'Request timed out. Please try again.'; this.errorMessage = "Request timed out. Please try again.";
}, 10000); }, 10000);
} },
}; };
} }
</script> </script>
@@ -49,7 +49,7 @@ templ RegisterFormForm(username string) {
type="text" type="text"
id="username" id="username"
name="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, '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-overlay0 focus:border-blue': !isUnique && !errorMessage,
'border-green focus:border-green': isUnique && !isChecking && !errorMessage, 'border-green focus:border-green': isUnique && !isChecking && !errorMessage,
@@ -60,19 +60,18 @@ templ RegisterFormForm(username string) {
value={ username } value={ username }
@input="resetErr(); isEmpty = $el.value.trim() === ''; if(isEmpty) { errorMessage='Username is required'; isUnique=false; }" @input="resetErr(); isEmpty = $el.value.trim() === ''; if(isEmpty) { errorMessage='Username is required'; isUnique=false; }"
hx-post="/htmx/isusernameunique" hx-post="/htmx/isusernameunique"
hx-trigger="load delay:100ms, input changed delay:500ms" hx-trigger="input changed delay:500ms"
hx-swap="none" hx-swap="none"
@htmx:before-request="if($el.value.trim() === '') { isEmpty=true; return; } isEmpty=false; isChecking=true; isUnique=false; errorMessage=''" @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; }" @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; }"
/> />
<p
<p class="text-center text-xs text-red mt-2"
class="text-center text-xs text-red mt-2" id="username-error"
id="username-error" x-show="errorMessage && !isSubmitting"
x-show="errorMessage && !isSubmitting" x-cloak
x-cloak x-text="errorMessage"
x-text="errorMessage" ></p>
></p>
</div> </div>
</div> </div>
<button <button