From 629b0189b7bf20c748a1d37f8803ad0e3ffb8a49 Mon Sep 17 00:00:00 2001 From: Alexander Kavon Date: Tue, 28 Nov 2023 05:24:30 -0500 Subject: working container compose w/database, no more auth package, message template partial, working html template writing, auth routes in user/routes.go --- src/server/ui.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/server/ui.go') diff --git a/src/server/ui.go b/src/server/ui.go index ce0ef01..a765d97 100644 --- a/src/server/ui.go +++ b/src/server/ui.go @@ -20,14 +20,15 @@ func NewUi(config *conf.Conf) Ui { func (ui *Ui) CompilePages(uipath string) { ui.pages = map[string]*template.Template{} - baseTmpl, err := template.ParseFiles(filepath.Join(uipath, "templates/base.tmpl.html")) + baseTmpl, err := template.ParseGlob(filepath.Join(uipath, "templates/*.tmpl.html")) if err != nil { log.Fatal(err) } - pagesDir := filepath.Join(uipath, "pages") - tmplGlob := "**/*.tmpl.html" + ui.pages["core/messages"] = baseTmpl - fileglob, err := filepath.Glob(filepath.Join(pagesDir, tmplGlob)) + pagesDir := filepath.Join(uipath, "pages") + tmplGlob := filepath.Join(pagesDir, "**/*.tmpl.html") + fileglob, err := filepath.Glob(tmplGlob) if err != nil { log.Fatal(err) } @@ -47,8 +48,13 @@ func (ui *Ui) CompilePages(uipath string) { } func (ui *Ui) Render(w http.ResponseWriter, pageName string, data interface{}) { + templateName := "base" + if pageName == "core/messages" { + templateName = "messages" + } p := ui.pages[pageName] - err := p.ExecuteTemplate(w, "base", data) + + err := p.ExecuteTemplate(w, templateName, data) if err != nil { log.Fatal(err) } -- cgit v1.2.3