max/gonotes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add templ package to handle rendering of templates

Browse source
This commit is contained in:
Maximilian Friedersdorff 2025-01-28 21:27:18 +00:00
parent e6b5ea3921
commit e7e420cd47
6 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
internal/notes/views/views.go
View file

@ -1,7 +1,6 @@
package views
import (
"html/template"
"log"
"net/http"
"os"
@ -11,6 +10,7 @@ import (
urls "gitea.gwairfelin.com/max/gispatcho"
"gitea.gwairfelin.com/max/gonotes/internal/conf"
"gitea.gwairfelin.com/max/gonotes/internal/notes"
"gitea.gwairfelin.com/max/gonotes/internal/templ"
)
var myurls urls.URLs
@ -39,7 +39,7 @@ func view(w http.ResponseWriter, r *http.Request) {
context := map[string]any{"note": note, "urlEdit": urlEdit}
note.Render()
err = renderTemplate(w, "view.html", context)
err = templ.RenderTemplate(w, "view.tmpl.html", context)
if err != nil {
log.Print(err.Error())
http.Error(w, "Couldn't load template", http.StatusInternalServerError)
@ -56,7 +56,7 @@ func edit(w http.ResponseWriter, r *http.Request) {
urlSave := myurls.Reverse("save", urls.Repl{"note": title})
context := map[string]any{"note": note, "urlSave": urlSave}
err = renderTemplate(w, "edit.html", context)
err = templ.RenderTemplate(w, "edit.tmpl.html", context)
if err != nil {
log.Print(err.Error())
http.Error(w, "Couldn't load template", http.StatusInternalServerError)
@ -89,20 +89,10 @@ func list(w http.ResponseWriter, r *http.Request) {
}
}
err = renderTemplate(w, "list.tmpl.html", map[string]any{"titles": titles})
err = templ.RenderTemplate(w, "list.tmpl.html", map[string]any{"titles": titles})
if err != nil {
log.Print(err.Error())
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
return
}
}
func renderTemplate(w http.ResponseWriter, tmpl string, context any) error {
files := []string{
filepath.Join(conf.Conf.TemplatesDir, "base.tmpl.html"),
filepath.Join(conf.Conf.TemplatesDir, tmpl),
}
t, err := template.ParseFiles(files...)
t.ExecuteTemplate(w, "base", context)
return err
}