refactor handlers

- repeat less
- lay framework for adding more pages
This commit is contained in:
Lilian Jónsdóttir 2024-01-22 21:55:03 -08:00
parent 4f97975986
commit e17e186c1d
2 changed files with 33 additions and 10 deletions

View file

@ -2,6 +2,7 @@ package handlers
import ( import (
"net/http" "net/http"
"time"
"git.burning.moe/celediel/burning.moe/internal/config" "git.burning.moe/celediel/burning.moe/internal/config"
"git.burning.moe/celediel/burning.moe/internal/models" "git.burning.moe/celediel/burning.moe/internal/models"
@ -21,18 +22,12 @@ var Handlers = []Handler{
// /about // /about
{ {
Handles: "/about", Handles: "/about",
Handler: func(w http.ResponseWriter, r *http.Request) { Handler: makeBasicHandler("about"),
app.Logger.Info("Got request for about page.")
render.RenderTemplate(w, "about.page", &models.TemplateData{})
},
}, },
// / comes last // / comes last
{ {
Handles: "/", Handles: "/",
Handler: func(w http.ResponseWriter, r *http.Request) { Handler: makeBasicHandler("home"),
app.Logger.Info("Got request for homepage.")
render.RenderTemplate(w, "home.page", &models.TemplateData{})
},
}, },
} }
@ -40,3 +35,32 @@ var Handlers = []Handler{
func Initialise(a *config.AppConfig) { func Initialise(a *config.AppConfig) {
app = a app = a
} }
// makeBasicTemplateData creates a blank TemplateData containing only the
// time the related template was generated
func makeBasicTemplateData(name string) models.TemplateData {
var strMap map[string]string
if _, ok := app.TemplateCache.Cache[name]; ok {
strMap = map[string]string{
"GeneratedAt": app.TemplateCache.Cache[name].GeneratedAt.Format(time.UnixDate),
}
} else {
strMap = make(map[string]string)
}
templateData := models.TemplateData{
StringMap: strMap,
}
return templateData
}
// makeBasicHandler creates a basic handler that builds from a .page.tmpl
// file, and sends only the time the template was generated as TemplateData
func makeBasicHandler(name string) func(w http.ResponseWriter, r *http.Request) {
return func(w http.ResponseWriter, r *http.Request) {
app.Logger.Infof("Got request for %s page", name)
pageName := name + ".page.tmpl"
templateData := makeBasicTemplateData(pageName)
render.RenderTemplate(w, pageName, &templateData)
}
}

View file

@ -79,8 +79,7 @@ func GenerateNewTemplateCache() (models.TemplateCache, error) {
} }
// RenderTemplate renders requested template (t), pulling from cache. // RenderTemplate renders requested template (t), pulling from cache.
func RenderTemplate(w http.ResponseWriter, t string, data *models.TemplateData) { func RenderTemplate(w http.ResponseWriter, filename string, data *models.TemplateData) {
filename := t + ".tmpl"
var cache models.TemplateCache var cache models.TemplateCache
if app.UseCache { if app.UseCache {
cache = app.TemplateCache cache = app.TemplateCache