working container compose w/database, no more auth package, message template partial, working html template writing, auth routes in user/routes.go

1 files changed, 11 insertions, 5 deletions

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)
 	}