updated templater

internal/server/api/templates/router.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"path"
 	"path/filepath"
 	"strconv"
@@ -85,9 +84,12 @@ func SetupRoutes(
 // func (s *Server) serveTemplates(r *http.Request) (response.Response, error) {
 func (s *webpageRouter) serveTemplates(c *gin.Context) (response.Response, error) {
 	r := c.Request
-	name, args := s.getTemplateNameAndArgs(r, s.contentDir+"/templates/component_bodies")
+	name, args := s.getTemplateNameAndArgs(r, s.contentDir+"/templates/components")
+	fmt.Println("name:", name)
+	fmt.Println("args:", args)
 
-	b, err := s.templater.ExecuteComponentBody(name, args...)
+	// TODO: update
+	b, err := s.templater.ExecuteComponent(name, args...)
 	if err == nil {
 		return response.HTML(b), nil
 	}
@@ -96,7 +98,9 @@ func (s *webpageRouter) serveTemplates(c *gin.Context) (response.Response, error
 		return s.handleTemplateError(err, args...)
 	}
 
-	name, args = s.getTemplateNameAndArgs(r, s.contentDir+"/templates/page_bodies")
+	name, args = s.getTemplateNameAndArgs(r, s.contentDir+"/templates/pages")
+	fmt.Println("name (page):", name)
+	fmt.Println("args (page):", args)
 
 	if b, err = s.templater.ExecutePage(name, args...); err == nil {
 		return response.HTML(b), nil
@@ -219,10 +223,15 @@ func (s *webpageRouter) handleTemplateError(err error, templateArgs ...any) (res
 }
 
 func isFileNotFoundError(err error) bool {
-	var pe *os.PathError
-	isPathErr := errors.As(err, &pe)
+	/*
+		var pe *os.PathError
+		isPathErr := errors.As(err, &pe)
 
-	return isPathErr && pe.Err != nil && pe.Err.Error() == "no such file or directory"
+		return isPathErr && pe.Err != nil && pe.Err.Error() == "no such file or directory"
+	*/
+
+	var te *templater.ErrNotTemplateFileFound
+	return errors.As(err, &te)
 }
 
 func getHTTPStatusCode(err error) int {

internal/server/server.go

@@ -73,9 +73,9 @@ func Router(
 		logger.WithGroup("templates"),
 		r.Group("/ui"),
 		contentDir,
-		templater.NewTemplater(
-			contentDir+"/templates",
-			func() template.FuncMap {
+		// TODO: move this constructor call up to main.go
+		new(templater.Templater).With(templater.Config{
+			Funcs: func(name string, props map[string]any) template.FuncMap {
 				return template.FuncMap{
 					// params
 					"addPathParam": func(k string, v any, args map[string]any) (map[string]any, error) {
@@ -121,7 +121,7 @@ func Router(
 					},
 				}
 			},
-		),
+		}),
 		rawEvents,
 		accts,
 		etsy,