bronku/cake-order-tracker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement shared template layout system

Browse source
This commit is contained in:
bronku 2025-03-29 07:33:23 +01:00
parent 3be7fb76e7
commit 08b669fd8f
9 changed files with 69 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

14
internal/server/server.go
View file

@ -8,7 +8,7 @@ import (
) )
type Server struct { type Server struct {
tmpl *template.Template tmpl map[string]*template.Template
s *store.Store s *store.Store
http.Handler http.Handler
} }
@ -19,13 +19,13 @@ func (h *Server) Close() {
func (h *Server) loadHandler() { func (h *Server) loadHandler() {
mux := http.NewServeMux() mux := http.NewServeMux()
mux.HandleFunc("GET /order/", h.render(h.order, "order.html")) mux.HandleFunc("GET /order/", h.render(h.order, "order"))
mux.HandleFunc("GET /", h.redirect("/orders", http.StatusSeeOther)) mux.HandleFunc("GET /", h.redirect("/orders", http.StatusSeeOther))
mux.HandleFunc("GET /orders", h.render(h.orders, "orders.html")) mux.HandleFunc("GET /orders", h.render(h.orders, "orders"))
mux.HandleFunc("POST /order/", h.render(h.postOrder, "confirmation.html")) mux.HandleFunc("POST /order/", h.render(h.postOrder, "confirmation"))
mux.HandleFunc("GET /cakes", h.render(h.cakes, "cakes.html")) mux.HandleFunc("GET /cakes", h.render(h.cakes, "cakes"))
mux.HandleFunc("GET /cake/", h.render(h.cake, "cake.html")) mux.HandleFunc("GET /cake/", h.render(h.cake, "cake"))
mux.HandleFunc("POST /cake/", h.render(h.postCake, "confirmation.html")) mux.HandleFunc("POST /cake/", h.render(h.postCake, "confirmation"))
h.Handler = mux h.Handler = mux
} }

18
internal/server/template.go
View file

@ -13,24 +13,32 @@ import (
var templates embed.FS var templates embed.FS
func (h *Server) loadTemplates() { func (h *Server) loadTemplates() {
var err error h.tmpl = make(map[string]*template.Template)
h.tmpl, err = template.ParseFS(templates, "templates/*") pages := []string{"orders", "order", "cake", "cakes", "confirmation"}
for _, page := range pages {
tmpl, err := template.ParseFS(templates,
"templates/layout/*.html",
"templates/"+page+".html",
)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
h.tmpl[page] = tmpl
}
} }
func (s *Server) render(fetch fetcher, templateName string) http.HandlerFunc { func (s *Server) render(fetch fetcher, templateName string) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("content-type", "text/html")
data, code, err := fetch(r) data, code, err := fetch(r)
if err != nil { if err != nil {
logging.ErrorPage(err, code).ServeHTTP(w, r) logging.ErrorPage(err, code).ServeHTTP(w, r)
return return
} }
err = s.tmpl.ExecuteTemplate(w, templateName, data) err = s.tmpl[templateName].ExecuteTemplate(w, "layout", data)
if err != nil { if err != nil {
logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r) logging.ErrorPage(err, http.StatusInternalServerError).ServeHTTP(w, r)
} return
}
w.Header().Set("content-type", "text/html")
} }
} }

11
internal/server/templates/cake.html
View file

@ -1,9 +1,7 @@
<header> {{define "title"}}
<h1>New Cake</h1> Cake
</header> {{end}}
<nav> {{define "main"}}
<a href="/cakes">back</a>
</nav>
<main> <main>
<form method="post"> <form method="post">
<div> <div>
@ -29,3 +27,4 @@
<button type="submit">submit</button> <button type="submit">submit</button>
</form> </form>
</main> </main>
{{end}}

12
internal/server/templates/cakes.html
View file

@ -1,10 +1,7 @@
<header> {{define "title"}}
<h1>Kill me please</h1> Cakes
</header> {{end}}
<nav> {{define "main"}}
<a href="/">orders</a>
<a href="cake">new</a>
</nav>
<main> <main>
<table> <table>
<tr> <tr>
@ -25,3 +22,4 @@
{{end}} {{end}}
</table> </table>
</main> </main>
{{end}}

11
internal/server/templates/confirmation.html
View file

@ -1,9 +1,8 @@
<header> {{define "title"}}
<h1>Confirmation</h1> Confirmed
</header> {{end}}
<nav> {{define "main"}}
<a href="/">index</a>
</nav>
<main> <main>
<h2>{{.ID}} confirmed</h2> <h2>{{.ID}} confirmed</h2>
</main> </main>
{{end}}

16
internal/server/templates/layout/layout.html Normal file
View file

@ -0,0 +1,16 @@
{{define "layout"}}
<!doctype html>
<html>
<head>
<meta charset="UTF-8" />
<title>{{template "title" .}}</title>
</head>
<body>
<header>
<h1>{{template "title" .}}</h1>
</header>
<nav>{{template "nav" .}}</nav>
{{template "main" .}}
</body>
</html>
{{end}}

6
internal/server/templates/layout/nav.html Normal file
View file

@ -0,0 +1,6 @@
{{define "nav"}}
<a href="/orders">All orders</a>
<a href="/order">New order</a>
<a href="/cakes">All Cakes</a>
<a href="/cake">New Cake</a>
{{end}}

11
internal/server/templates/order.html
View file

@ -1,9 +1,7 @@
<header> {{define "title"}}
<h1>New Order</h1> Order
</header> {{end}}
<nav> {{define "main"}}
<a href="/">back</a>
</nav>
<main> <main>
<form method="post"> <form method="post">
{{with .Order}} {{with .Order}}
@ -89,3 +87,4 @@
addCake({{.ID}}, '{{.Name}} {{.Price}}', {{.Amount}}) addCake({{.ID}}, '{{.Name}} {{.Price}}', {{.Amount}})
{{end}} {{end}}
</script> </script>
{{end}}

13
internal/server/templates/orders.html
View file

@ -1,10 +1,8 @@
<header>
<h1>Kill me please</h1> {{define "title"}}
</header> Orders
<nav> {{end}}
<a href="order">New</a> {{define "main"}}
<a href="cakes">Manage Cakes</a>
</nav>
<main> <main>
<table> <table>
<tr> <tr>
@ -33,3 +31,4 @@
{{end}} {{end}}
</table> </table>
</main> </main>
{{end}}