Compare commits

...

2 commits

Author SHA1 Message Date
bbb48f49e2
fix: embed templates directly
All checks were successful
ci/woodpecker/tag/release Pipeline was successful
2025-04-21 15:10:08 +02:00
3426b668fe
ci: fix deprecated attribute in goreleaser 2025-04-21 15:09:54 +02:00
2 changed files with 30 additions and 9 deletions

View file

@ -47,7 +47,7 @@ archives:
{{- if eq .Arch "amd64" }}x86_64{{- else if eq .Arch "arm64" }}aarch64{{- else }}{{ .Arch }}{{ end }}_{{ .Version }}
format_overrides:
- goos: windows
format: zip
formats: ['zip']
dockers:
- image_templates:

View file

@ -1,9 +1,9 @@
package admin
import (
"embed"
"html/template"
"net/http"
"path/filepath"
"strconv"
"strings"
@ -14,12 +14,12 @@ import (
"github.com/gorilla/sessions"
)
//go:embed templates/*.html
var templateFS embed.FS
const (
// Session store key
sessionKey = "butterrobot-session"
// Template directory
templateDir = "./internal/admin/templates"
)
// FlashMessage represents a flash message
@ -63,9 +63,17 @@ func New(cfg *config.Config, database *db.Database) *Admin {
"contains": strings.Contains,
}
// Read base template from embedded filesystem
baseContent, err := templateFS.ReadFile("templates/_base.html")
if err != nil {
panic(err)
}
// Create a custom template with functions
baseTemplate := template.New("_base.html").Funcs(funcMap)
baseTemplate = template.Must(baseTemplate.ParseFiles(filepath.Join(templateDir, "_base.html")))
baseTemplate, err := template.New("_base.html").Funcs(funcMap).Parse(string(baseContent))
if err != nil {
panic(err)
}
// Parse and register all templates
templateFiles := []string{
@ -78,11 +86,24 @@ func New(cfg *config.Config, database *db.Database) *Admin {
}
for _, tf := range templateFiles {
// Create a clone of the base template
t, err := template.Must(baseTemplate.Clone()).ParseFiles(filepath.Join(templateDir, tf))
// Read template content from embedded filesystem
content, err := templateFS.ReadFile("templates/" + tf)
if err != nil {
panic(err)
}
// Create a clone of the base template
t, err := baseTemplate.Clone()
if err != nil {
panic(err)
}
// Parse the template content
t, err = t.Parse(string(content))
if err != nil {
panic(err)
}
templates[tf] = t
}