From 9af56daa340defe565b2884f7433f890a45bb652 Mon Sep 17 00:00:00 2001
From: Evan Jarrett <evan@evanjarrett.com>
Date: Wed, 29 Oct 2025 17:25:39 -0500
Subject: [PATCH] make navbar a component

---
 pkg/appview/config.go                         |  1 +
 .../templates/components/nav-brand.html       |  5 ++
 .../templates/components/nav-search.html      |  7 +++
 .../components/nav-theme-toggle.html          |  3 ++
 .../templates/components/nav-user.html        | 27 ++++++++++
 pkg/appview/templates/components/nav.html     | 49 +++++--------------
 pkg/appview/templates/pages/login.html        |  6 +--
 pkg/auth/oauth/client.go                      | 11 -----
 8 files changed, 57 insertions(+), 52 deletions(-)
 create mode 100644 pkg/appview/templates/components/nav-brand.html
 create mode 100644 pkg/appview/templates/components/nav-search.html
 create mode 100644 pkg/appview/templates/components/nav-theme-toggle.html
 create mode 100644 pkg/appview/templates/components/nav-user.html

diff --git a/pkg/appview/config.go b/pkg/appview/config.go
index e474033..ce5f992 100644
--- a/pkg/appview/config.go
+++ b/pkg/appview/config.go
@@ -251,6 +251,7 @@ func autoDetectBaseURL(httpAddr string) string {
 	// Auto-detect from HTTP addr
 	if httpAddr[0] == ':' {
 		// Just a port, assume localhost
+		// Use "127.0.0.1" per RFC 8252 (OAuth servers reject "localhost")
 		return fmt.Sprintf("http://127.0.0.1%s", httpAddr)
 	}
 
diff --git a/pkg/appview/templates/components/nav-brand.html b/pkg/appview/templates/components/nav-brand.html
new file mode 100644
index 0000000..c337202
--- /dev/null
+++ b/pkg/appview/templates/components/nav-brand.html
@@ -0,0 +1,5 @@
+{{ define "nav-brand" }}
+<div class="nav-brand">
+    <a href="/"><span class="at-protocol">at://</span>Container Registry</a>
+</div>
+{{ end }}
diff --git a/pkg/appview/templates/components/nav-search.html b/pkg/appview/templates/components/nav-search.html
new file mode 100644
index 0000000..61f1d07
--- /dev/null
+++ b/pkg/appview/templates/components/nav-search.html
@@ -0,0 +1,7 @@
+{{ define "nav-search" }}
+<div class="nav-search">
+    <form action="/search" method="get">
+        <input type="text" name="q" placeholder="Search images..." value="{{ .Query }}" />
+    </form>
+</div>
+{{ end }}
diff --git a/pkg/appview/templates/components/nav-theme-toggle.html b/pkg/appview/templates/components/nav-theme-toggle.html
new file mode 100644
index 0000000..64d47d6
--- /dev/null
+++ b/pkg/appview/templates/components/nav-theme-toggle.html
@@ -0,0 +1,3 @@
+{{ define "nav-theme-toggle" }}
+<button id="theme-toggle" onclick="toggleTheme()" class="btn-link theme-toggle-btn" aria-label="Toggle theme"></button>
+{{ end }}
diff --git a/pkg/appview/templates/components/nav-user.html b/pkg/appview/templates/components/nav-user.html
new file mode 100644
index 0000000..fda7423
--- /dev/null
+++ b/pkg/appview/templates/components/nav-user.html
@@ -0,0 +1,27 @@
+{{ define "nav-user" }}
+{{ if .User }}
+    <div class="user-dropdown">
+        <button class="user-menu-btn" id="user-menu-btn" aria-expanded="false" aria-haspopup="true">
+            {{ if .User.Avatar }}
+                <img src="{{ .User.Avatar }}" alt="{{ .User.Handle }}" class="user-avatar">
+            {{ else }}
+                <div class="user-avatar-placeholder">{{ firstChar .User.Handle }}</div>
+            {{ end }}
+            <span class="user-handle">@{{ .User.Handle }}</span>
+            <svg class="dropdown-arrow" width="12" height="12" viewBox="0 0 12 12" fill="currentColor">
+                <path d="M6 9L1 4h10z"/>
+            </svg>
+        </button>
+        <div class="dropdown-menu" id="user-dropdown-menu" hidden>
+            <a href="/u/{{ .User.Handle }}" class="dropdown-item">Your Repositories</a>
+            <a href="/settings" class="dropdown-item">Settings</a>
+            <hr class="dropdown-divider">
+            <form action="/auth/logout" method="POST">
+                <button type="submit" class="dropdown-item logout-btn">Logout</button>
+            </form>
+        </div>
+    </div>
+{{ else }}
+    <a href="/auth/oauth/login?return_to=/" class="btn-primary">Login</a>
+{{ end }}
+{{ end }}
diff --git a/pkg/appview/templates/components/nav.html b/pkg/appview/templates/components/nav.html
index 52992d6..3bce09f 100644
--- a/pkg/appview/templates/components/nav.html
+++ b/pkg/appview/templates/components/nav.html
@@ -1,42 +1,19 @@
 {{ define "nav" }}
 <nav class="navbar">
-    <div class="nav-brand">
-        <a href="/"><span class="at-protocol">at://</span>Container Registry</a>
-    </div>
-
-    <div class="nav-search">
-        <form action="/search" method="get">
-            <input type="text" name="q" placeholder="Search images..." value="{{ .Query }}" />
-        </form>
-    </div>
-
+    {{ template "nav-brand" }}
+    {{ template "nav-search" . }}
     <div class="nav-links">
-        <button id="theme-toggle" onclick="toggleTheme()" class="btn-link theme-toggle-btn" aria-label="Toggle theme"></button>
-        {{ if .User }}
-            <div class="user-dropdown">
-                <button class="user-menu-btn" id="user-menu-btn" aria-expanded="false" aria-haspopup="true">
-                    {{ if .User.Avatar }}
-                        <img src="{{ .User.Avatar }}" alt="{{ .User.Handle }}" class="user-avatar">
-                    {{ else }}
-                        <div class="user-avatar-placeholder">{{ firstChar .User.Handle }}</div>
-                    {{ end }}
-                    <span class="user-handle">@{{ .User.Handle }}</span>
-                    <svg class="dropdown-arrow" width="12" height="12" viewBox="0 0 12 12" fill="currentColor">
-                        <path d="M6 9L1 4h10z"/>
-                    </svg>
-                </button>
-                <div class="dropdown-menu" id="user-dropdown-menu" hidden>
-                    <a href="/u/{{ .User.Handle }}" class="dropdown-item">Your Repositories</a>
-                    <a href="/settings" class="dropdown-item">Settings</a>
-                    <hr class="dropdown-divider">
-                    <form action="/auth/logout" method="POST">
-                        <button type="submit" class="dropdown-item logout-btn">Logout</button>
-                    </form>
-                </div>
-            </div>
-        {{ else }}
-            <a href="/auth/oauth/login?return_to=/" class="btn-primary">Login</a>
-        {{ end }}
+        {{ template "nav-theme-toggle" }}
+        {{ template "nav-user" . }}
+    </div>
+</nav>
+{{ end }}
+
+{{ define "nav-simple" }}
+<nav class="navbar">
+    {{ template "nav-brand" }}
+    <div class="nav-links">
+        {{ template "nav-theme-toggle" }}
     </div>
 </nav>
 {{ end }}
diff --git a/pkg/appview/templates/pages/login.html b/pkg/appview/templates/pages/login.html
index d23db52..aad8380 100644
--- a/pkg/appview/templates/pages/login.html
+++ b/pkg/appview/templates/pages/login.html
@@ -6,11 +6,7 @@
     {{ template "head" . }}
 </head>
 <body>
-    <nav class="navbar">
-        <div class="nav-brand">
-            <a href="/">ATCR</a>
-        </div>
-    </nav>
+    {{ template "nav-simple" . }}
 
     <main class="container">
         <div class="login-page">
diff --git a/pkg/auth/oauth/client.go b/pkg/auth/oauth/client.go
index b0f4dea..6ec48da 100644
--- a/pkg/auth/oauth/client.go
+++ b/pkg/auth/oauth/client.go
@@ -62,17 +62,6 @@ func NewAppWithScopes(baseURL string, store oauth.ClientAuthStore, scopes []stri
 	} else {
 		config = oauth.NewLocalhostConfig(redirectURI, scopes)
 
-		// Append client_name to localhost client ID query string
-		if clientName != "" {
-			u, err := url.Parse(config.ClientID)
-			if err == nil {
-				q := u.Query()
-				q.Set("client_name", clientName)
-				u.RawQuery = q.Encode()
-				config.ClientID = u.String()
-			}
-		}
-
 		slog.Info("Using public OAuth client (localhost development)")
 	}