fixup! templates: render static pages using templ

Signed-off-by: Sumner Evans <me@sumnerevans.com>
ColoradoSchoolOfMines · May 25, 2024 · ce0374a · ce0374a
1 parent 7ef603e
commit ce0374a
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/internal/application.go b/internal/application.go
@@ -97,6 +97,19 @@ type renderInfo struct {
 	RedirectIfLoggedIn bool
 }
 
+func (a *Application) SettingsContextMiddleware(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+		user, err := a.GetLoggedInTeacher(r)
+		if err == nil {
+			ctx = context.WithValue(ctx, contextkeys.ContextKeyLoggedInTeacher, user)
+		}
+		ctx = context.WithValue(ctx, contextkeys.ContextKeyRegistrationEnabled, a.Config.RegistrationEnabled)
+		ctx = context.WithValue(ctx, contextkeys.ContextKeyHostedByHTML, a.Config.HostedByHTML)
+		next.ServeHTTP(w, r.WithContext(ctx))
+	})
+}
+
 func (a *Application) Start() {
 	a.Log.Info().Msg("connecting to sendgrid")
 	a.SendGridClient = sendgrid.NewSendClient(a.Config.SendgridAPIKey)
@@ -125,14 +138,9 @@ func (a *Application) Start() {
 	for path, pageInfo := range staticPages {
 		router.HandleFunc(path, func(w http.ResponseWriter, r *http.Request) {
 			ctx := r.Context()
-			user, err := a.GetLoggedInTeacher(r)
-			if err == nil {
-				ctx = context.WithValue(ctx, contextkeys.ContextKeyLoggedInTeacher, user)
-			}
 			if len(pageInfo.pageName) > 0 {
 				ctx = context.WithValue(ctx, contextkeys.ContextKeyPageName, pageInfo.pageName)
 			}
-			ctx = context.WithValue(ctx, contextkeys.ContextKeyRegistrationEnabled, a.Config.RegistrationEnabled)
 			templates.Base(pageInfo.title, pageInfo.content).Render(ctx, w)
 		})
 	}
@@ -261,6 +269,7 @@ func (a *Application) Start() {
 
 	// Middleware goes from bottom up because it's doing function composition.
 	var handler http.Handler = router
+	handler = a.SettingsContextMiddleware(handler)
 	handler = requestlog.AccessLogger(false)(handler)
 	handler = hlog.RequestIDHandler("request_id", "RequestID")(handler)
 	handler = hlog.NewHandler(*a.Log)(handler)

diff --git a/internal/templates/partials/footer.templ b/internal/templates/partials/footer.templ
@@ -2,11 +2,12 @@ package partials
 
 import (
 	"html/template"
+
 	"github.com/ColoradoSchoolOfMines/mineshspc.com/internal/contextkeys"
 )
 
 func GetHostedByHTML(ctx context.Context) template.HTML {
-	hostedByHTML, _ := ctx.Value(contextkeys.ContextKeyLoggedInTeacher).(template.HTML)
+	hostedByHTML, _ := ctx.Value(contextkeys.ContextKeyHostedByHTML).(template.HTML)
 	return hostedByHTML
 }
 
@@ -32,8 +33,7 @@ templ Footer() {
 					&copy; 2023 Mines ACM.
 					View the
 					<a href="https://github.com/ColoradoSchoolOfMines/mineshspc.com" target="_blank">
-						source
-						code
+						source code
 					</a>.
 					@templ.Raw(GetHostedByHTML(ctx))
 				</p>