adjustments in render

render.go

@@ -34,22 +34,17 @@ func (a *App) JSON(w http.ResponseWriter, code int, v any) {
 	json.NewEncoder(w).Encode(v)
 }
 
-func (a *App) HTML(w http.ResponseWriter, code int, layout, page string, td *TemplateData) {
+func (a *App) HTML(w http.ResponseWriter, r *http.Request, code int, layout string, page string, td *TemplateData) {
 	w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	w.WriteHeader(code)
-	err := a.Templates.Template(w, layout, page, td)
+
+	err := a.Templates.Render(w, layout, page, td, r.Header.Get("HX-Request") != "true")
 	if err != nil {
-		slog.Error("error rendering template", "error", err)
+		slog.Error("error rendering", "layout", layout, "page", page, "error", err)
 		http.Error(w, err.Error(), http.StatusInternalServerError)
-		return
 	}
 }
 
 func (a *App) RenderComponent(name string, td *TemplateData) (string, error) {
-	result, err := a.Templates.RenderComponent(name, td)
-	if err != nil {
-		slog.Error("error rendering component", "component", name, "error", err)
-		return "", err
-	}
-	return result, nil
+	return a.Templates.RenderComponent(name, td)
 }