fixup! templates: render static pages using templ

Signed-off-by: Sumner Evans <me@sumnerevans.com>
ColoradoSchoolOfMines · May 26, 2024 · 3b9d034 · 3b9d034
1 parent 3f6db8c
commit 3b9d034
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/internal/application.go b/internal/application.go
@@ -142,13 +142,14 @@ func (a *Application) Start() {
 		"GET /archive/":  {"Archive", partials.PageNameArchive, templates.Archive(archiveInfo)},
 	}
 	for path, pageInfo := range staticPages {
-		router.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
-			ctx := r.Context()
-			if len(pageInfo.pageName) > 0 {
-				ctx = context.WithValue(ctx, contextkeys.ContextKeyPageName, pageInfo.pageName)
-			}
-			templates.Base(pageInfo.title, pageInfo.content).Render(ctx, w)
-		})
+		if len(pageInfo.pageName) == 0 {
+			router.Handle(path, templ.Handler(templates.Base(pageInfo.title, pageInfo.content)))
+		} else {
+			router.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
+				ctx := context.WithValue(r.Context(), contextkeys.ContextKeyPageName, pageInfo.pageName)
+				templates.Base(pageInfo.title, pageInfo.content).Render(ctx, w)
+			})
+		}
 	}
 
 	// Redirect pages