move to templ

server/server.go

@@ -2,27 +2,19 @@ package server
 
 import (
 	"embed"
-	"html/template"
 	"net/http"
 
 	"git.bronku.xyz/bronku/cake-order-tracker/store"
 )
 
 type Server struct {
-	tmpl   map[string]*template.Template
 	s      *store.Store
 	routes map[string]route
 	http.Handler
 }
 
 type route struct {
-	function      fetcher
-	template      string
-	templateEntry string
-}
-
-func (h *Server) Close() {
-	h.Close()
+	function fetcher
 }
 
 //go:embed static/*
@@ -32,7 +24,7 @@ func (h *Server) loadHandler() {
 	mux := http.NewServeMux()
 
 	for i, e := range h.routes {
-		mux.HandleFunc(i, h.render(e.function, e.template, e.templateEntry))
+		mux.HandleFunc(i, h.render(e.function))
 	}
 
 	mux.HandleFunc("GET /", h.redirect("/orders", http.StatusSeeOther))
@@ -47,16 +39,15 @@ func New(store *store.Store) *Server {
 	var server Server
 
 	server.routes = map[string]route{
-		"GET /order/":         {server.order, "order", "layout"},
-		"GET /orders":         {server.orders, "orders", "layout"},
-		"GET /orders/search/": {server.ordersSearch, "orders", "orders-table"},
-		"GET /cake/":          {server.cake, "cake", "layout"},
-		"GET /cakes":          {server.cakes, "cakes", "layout"},
-		"POST /order/":        {server.postOrder, "confirmation", "layout"},
-		"POST /cake/":         {server.postCake, "confirmation", "layout"},
+		"GET /order/":         {server.order},
+		"GET /orders":         {server.orders},
+		"GET /orders/search/": {server.ordersSearch},
+		"GET /cake/":          {server.cake},
+		"GET /cakes":          {server.cakes},
+		"POST /order/":        {server.postOrder},
+		"POST /cake/":         {server.postCake},
 	}
 
-	server.loadTemplates()
 	server.s = store
 	server.loadHandler()