refactor(web): logout button

Author: ItsNotGoodName

web/controllers/auth.go

@@ -21,9 +21,9 @@ func LoginPost(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	err := procs.AuthHTTPLogin(cc, username, password)
 	if err != nil {
 		if h.IsHTMXRequest(c) {
-			return h.Render(c, "login", loginData(err.Error()), "form")
+			return h.Render(c, "login", loginData(username, err.Error()), "form")
 		}
-		return h.Render(c, "login", loginData(err.Error()))
+		return h.Render(c, "login", loginData(username, err.Error()))
 	}
 
 	// Response
@@ -54,8 +54,9 @@ func Logout(c *fiber.Ctx, cc core.Context, store *session.Store) error {
 	return h.Redirect(c, "/login")
 }
 
-func loginData(flash string) fiber.Map {
+func loginData(username, flash string) fiber.Map {
 	return fiber.Map{
-		"Flash": flash,
+		"Username": username,
+		"Flash":    flash,
 	}
 }

web/views/envelopes-new.html

@@ -12,6 +12,7 @@ <h2>New Envelope</h2>
 
   <form method="post" enctype="multipart/form-data">
     <div class="grid">
+      {{csrf $}}
       <label for="from">
         From
         <input type="text" id="from" name="from" placeholder="From" />

web/views/login.html

@@ -12,7 +12,7 @@ <h2>Login</h2>
       {{csrf $}}
       <label for="username">
         Username
-        <input type="text" id="username" name="username" placeholder="Username" />
+        <input type="text" id="username" name="username" placeholder="Username" value="{{.Username}}" />
       </label>
 
       <label for="password">

web/views/partials/header.html

@@ -10,7 +10,7 @@
     </ul>
     <ul class=" block lg:hidden">
       <li class="p-0 flex flex-items-center h-full">
-        <details role="list" dir="rtl">
+        <details role="list" dir="rtl" open>
           <summary aria-haspopup="listbox" class="block pico-no-chevron">
             <div class=" i-ri-align-justify h-6 w-6" />
           </summary>
@@ -45,16 +45,11 @@
             </li>
             {{if not .Meta.Anonymous}}
             <li>
-              <form method="post" action="/logout" class="pico-form-reset">
-                {{csrf $}}
-                <button type="submit" class="pico-button-reset">
-                  <a href="#" class="contrast" hx-post="/logout">
-                    <div class="flex flex-items-center flex-row-reverse gap-2">
-                      <div class="i-ri-logout-box-r-fill"></div>Log out
-                    </div>
-                  </a>
-                </button>
-              </form>
+              <a href="#" class="contrast" hx-post="/logout">
+                <div class="flex flex-items-center flex-row-reverse gap-2">
+                  <div class="i-ri-logout-box-r-fill"></div>Log out
+                </div>
+              </a>
             </li>
             {{end}}
           </ul>
@@ -92,16 +87,11 @@
       </li>
       {{if not .Meta.Anonymous}}
       <li>
-        <form method="post" action="/logout" class="pico-form-reset">
-          {{csrf $}}
-          <button type="submit" class="pico-button-reset">
-            <a href="#" class="contrast" hx-post="/logout">
-              <div class="flex flex-items-center gap-2">
-                <div class="i-ri-logout-box-r-fill"></div>Log out
-              </div>
-            </a>
-          </button>
-        </form>
+        <a href="#" class="contrast" hx-post="/logout">
+          <div class="flex flex-items-center gap-2">
+            <div class="i-ri-logout-box-r-fill"></div>Log out
+          </div>
+        </a>
       </li>
       {{end}}
     </ul>