fix #98

templates/middleware.go

@@ -14,14 +14,17 @@ import (
 
 type themeKey struct{}
 
+const ThemeCookieName = "theme"
+const ThemeAdminCookieName = "admin-theme"
+
 func ThemeCtx(storage radio.StorageService) func(http.Handler) http.Handler {
 	return func(next http.Handler) http.Handler {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			theme := DEFAULT_DIR
-			cookieName := theme
+			cookieName := ThemeCookieName
 			if strings.HasPrefix(r.URL.Path, "/admin") {
 				theme = DEFAULT_ADMIN_DIR
-				cookieName = "admin-theme"
+				cookieName = ThemeAdminCookieName
 			}
 
 			if cookie, err := r.Cookie(cookieName); err == nil {

website/admin/router.go

@@ -65,7 +65,10 @@ func Route(ctx context.Context, s State) func(chi.Router) {
 		r = r.With(
 			s.Authentication.LoginMiddleware,
 		)
-		r.Handle("/set-theme", templates.SetThemeHandler("admin-theme", s.Templates.ResolveThemeName))
+		r.Handle("/set-theme", templates.SetThemeHandler(
+			templates.ThemeAdminCookieName,
+			s.Templates.ResolveThemeName,
+		))
 		r.HandleFunc("/", s.GetHome)
 		r.Get("/profile", s.GetProfile)
 		r.Post("/profile", s.PostProfile)

website/main.go

@@ -118,7 +118,7 @@ func Execute(ctx context.Context, cfg config.Config) error {
 	r.Handle("/assets/*", http.StripPrefix("/assets/",
 		AssetsHandler(cfg.Conf().AssetsPath, siteTemplates)),
 	)
-	r.Handle("/set-theme", templates.SetThemeHandler("theme", siteTemplates.ResolveThemeName))
+	r.Handle("/set-theme", templates.SetThemeHandler(templates.ThemeCookieName, siteTemplates.ResolveThemeName))
 
 	// version 0 of the api (the legacy PHP version)
 	// it's mostly self-contained to the /api/* route, except for /request that