group CSS reading with Files FS
2 files changed, 14 insertions(+), 14 deletions(-)
M templates/files.go → templates/files.go
@@ -1,10 +1,14 @@ package templates import ( + "io/fs" "os" ) -var Files = os.DirFS(getEnvFallback("KO_DATA_PATH", "kodata")) +var ( + CSS string + Files fs.FS +) func getEnvFallback(key, fallback string) string { if value, found := os.LookupEnv(key); found {@@ -13,3 +17,12 @@ } return fallback } + +func Init() { + Files = os.DirFS(getEnvFallback("KO_DATA_PATH", "kodata")) + bytes, err := fs.ReadFile(Files, "style.css") + if err != nil { + panic(err) + } + CSS = string(bytes) +}
M templates/layout.templ → templates/layout.templ
@@ -4,21 +4,8 @@ import ( "context" "go.alanpearce.eu/website/internal/config" "io" - "io/fs" "net/url" ) - -var ( - CSS string -) - -func init() { - bytes, err := fs.ReadFile(Files, "style.css") - if err != nil { - panic(err) - } - CSS = string(bytes) -} type PageSettings struct { Title string