From aaf10ece073ec61463b52c8f2dfcc8dadaa2ca36 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 19 Feb 2024 10:50:49 +0100
Subject: [PATCH] Show logged in username

---
 template/index.html |  4 +++-
 user.go             | 10 ++++++++--

diff --git a/template/index.html b/template/index.html
index 3f643efde220126418718c02005b34727c2118d1..2322b4a2783dcd210b0de8c75b09b02640a642ff 100644
--- a/template/index.html
+++ b/template/index.html
@@ -4,9 +4,11 @@ <main>
 
 <h1>sinwon</h1>
 
+<p>Welcome, {{ .Me.Username }}!</p>
+
 <form method="post">
 	<a href="/user/new"><button type="button">Create user</button></a>
-	<a href="/user/{{ .Me }}"><button type="button">Edit user</button></a>
+	<a href="/user/{{ .Me.ID }}"><button type="button">Edit user</button></a>
 	<button type="submit" formaction="/client/new">Register new client</button>
 	<button type="submit" formaction="/logout">Logout</button>
 </form>
diff --git a/user.go b/user.go
index 7ee8bc93dbed941e4cc64c79c1f40c324ff70fd5..4365ca5499e266f7290a8131bcbd992b0f2adc1e 100644
--- a/user.go
+++ b/user.go
@@ -20,6 +20,12 @@ 		http.Redirect(w, req, "/login", http.StatusFound)
 		return
 	}
 
+	me, err := db.FetchUser(ctx, loginToken.User)
+	if err != nil {
+		httpError(w, err)
+		return
+	}
+
 	clients, err := db.ListClients(ctx, loginToken.User)
 	if err != nil {
 		httpError(w, err)
@@ -28,10 +34,10 @@ 	}
 
 	data := struct {
 		Clients []Client
-		Me      ID[*User]
+		Me      *User
 	}{
 		Clients: clients,
-		Me:      loginToken.User,
+		Me:      me,
 	}
 	if err := tpl.ExecuteTemplate(w, "index.html", &data); err != nil {
 		panic(err)

-- 
2.48.1