From e918ba6850dbddb69a69d524fcacafc0985c19a2 Mon Sep 17 00:00:00 2001
From: joerdav <joe.davidson.21111@gmail.com>
Date: Tue, 4 Jul 2023 09:49:44 +0100
Subject: [PATCH 1/3] feat: templ templates

---
 content/posts/goodbye-world.md |   2 +-
 go.mod                         |   2 +
 go.sum                         |   2 +
 partials/goodbyeworld.html     |   1 -
 partials/helloworld.html       |  10 --
 partials/templates.templ       |  18 +++
 partials/templates_templ.go    | 213 +++++++++++++++++++++++++++++++++
 server.go                      |  73 ++++-------
 8 files changed, 261 insertions(+), 60 deletions(-)
 create mode 100644 go.sum
 delete mode 100644 partials/goodbyeworld.html
 delete mode 100644 partials/helloworld.html
 create mode 100644 partials/templates.templ
 create mode 100644 partials/templates_templ.go

diff --git a/content/posts/goodbye-world.md b/content/posts/goodbye-world.md
index 8308ce9..020e3f6 100644
--- a/content/posts/goodbye-world.md
+++ b/content/posts/goodbye-world.md
@@ -10,7 +10,7 @@ Every time `Click Me!` is clicked, a request is sent to fetch static template `/
 
 {{< html.inline >}}
 <button
-  hx-get="/goodbyeworld.html"
+  hx-get="{{ .Site.Params.apiBaseUrl }}/goodbyeworld.html"
   hx-trigger="click"
   hx-target="#goodbye"
   hx-swap="beforeend">
diff --git a/go.mod b/go.mod
index e6bd594..9f837e3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,3 +1,5 @@
 module github.com/acaloiaro/hugo-htmx-go-template
 
 go 1.20
+
+require github.com/a-h/templ v0.2.304
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..5599da4
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,2 @@
+github.com/a-h/templ v0.2.304 h1:vIgCNazkW6NiYifFIGYNRfBkoBzOMZMO1NibIayzihE=
+github.com/a-h/templ v0.2.304/go.mod h1:3oc37WS5rpDvFGi6yeknvTKt50xCu67ywQsM43Wr4PU=
diff --git a/partials/goodbyeworld.html b/partials/goodbyeworld.html
deleted file mode 100644
index a9422b5..0000000
--- a/partials/goodbyeworld.html
+++ /dev/null
@@ -1 +0,0 @@
-<p>Goodbye, World!</p>
diff --git a/partials/helloworld.html b/partials/helloworld.html
deleted file mode 100644
index 37f5f69..0000000
--- a/partials/helloworld.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div>
-  <p>This content is coming from our API server. It's a standard <strong>text/html</strong> template:
-  <strong>partials/helloworld.html</strong>. The template has a single variable named
-  <strong>Name</strong>, which it greets below.</p>
-</div>
-
-<p>If you set the <strong>name</strong> URL param, it greets you by name, e.g.
-<a href="/posts/hello-world/?name=foobar">/posts/hello-world/?name=foobar</a></p>
-
-<h3>Greeting: Hello, {{ .Name }}!</h3>
diff --git a/partials/templates.templ b/partials/templates.templ
new file mode 100644
index 0000000..d929cbe
--- /dev/null
+++ b/partials/templates.templ
@@ -0,0 +1,18 @@
+package partials
+
+templ HelloWorld(name string) {
+	<div>
+		<p>This content is coming from our API server. It's a standard <strong>text/html</strong>template: <strong>partials/helloworld.html</strong>. The template has a single variable named <strong>Name</strong>, which it greets below.</p>
+	</div>
+	<p>If you set the <strong>name</strong>URL param, it greets you by name, e.g. <a href="/posts/hello-world/?name=foobar">/posts/hello-world/?name=foobar</a></p>
+	@HelloWorldGreeting(name)
+}
+
+templ HelloWorldGreeting(name string) {
+	<h3>Greeting: Hello, { name }!</h3>
+}
+
+templ GoodbyeWorld() {
+	<p>Goodbye, World!</p>
+}
+
diff --git a/partials/templates_templ.go b/partials/templates_templ.go
new file mode 100644
index 0000000..28c257e
--- /dev/null
+++ b/partials/templates_templ.go
@@ -0,0 +1,213 @@
+// Code generated by templ@(devel) DO NOT EDIT.
+
+package partials
+
+//lint:file-ignore SA4006 This context is only used if a nested component is present.
+
+import "github.com/a-h/templ"
+import "context"
+import "io"
+import "bytes"
+
+func HelloWorld(name string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
+		templBuffer, templIsBuffer := w.(*bytes.Buffer)
+		if !templIsBuffer {
+			templBuffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templBuffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		var_1 := templ.GetChildren(ctx)
+		if var_1 == nil {
+			var_1 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, err = templBuffer.WriteString("<div><p>")
+		if err != nil {
+			return err
+		}
+		var_2 := `This content is coming from our API server. It's a standard `
+		_, err = templBuffer.WriteString(var_2)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("<strong>")
+		if err != nil {
+			return err
+		}
+		var_3 := `text/html`
+		_, err = templBuffer.WriteString(var_3)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</strong>")
+		if err != nil {
+			return err
+		}
+		var_4 := `template: `
+		_, err = templBuffer.WriteString(var_4)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("<strong>")
+		if err != nil {
+			return err
+		}
+		var_5 := `partials/helloworld.html`
+		_, err = templBuffer.WriteString(var_5)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</strong>")
+		if err != nil {
+			return err
+		}
+		var_6 := `. The template has a single variable named `
+		_, err = templBuffer.WriteString(var_6)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("<strong>")
+		if err != nil {
+			return err
+		}
+		var_7 := `Name`
+		_, err = templBuffer.WriteString(var_7)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</strong>")
+		if err != nil {
+			return err
+		}
+		var_8 := `, which it greets below.`
+		_, err = templBuffer.WriteString(var_8)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</p></div><p>")
+		if err != nil {
+			return err
+		}
+		var_9 := `If you set the `
+		_, err = templBuffer.WriteString(var_9)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("<strong>")
+		if err != nil {
+			return err
+		}
+		var_10 := `name`
+		_, err = templBuffer.WriteString(var_10)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</strong>")
+		if err != nil {
+			return err
+		}
+		var_11 := `URL param, it greets you by name, e.g. `
+		_, err = templBuffer.WriteString(var_11)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("<a href=\"/posts/hello-world/?name=foobar\">")
+		if err != nil {
+			return err
+		}
+		var_12 := `/posts/hello-world/?name=foobar`
+		_, err = templBuffer.WriteString(var_12)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</a></p>")
+		if err != nil {
+			return err
+		}
+		err = HelloWorldGreeting(name).Render(ctx, templBuffer)
+		if err != nil {
+			return err
+		}
+		if !templIsBuffer {
+			_, err = io.Copy(w, templBuffer)
+		}
+		return err
+	})
+}
+
+func HelloWorldGreeting(name string) templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
+		templBuffer, templIsBuffer := w.(*bytes.Buffer)
+		if !templIsBuffer {
+			templBuffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templBuffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		var_13 := templ.GetChildren(ctx)
+		if var_13 == nil {
+			var_13 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, err = templBuffer.WriteString("<h3>")
+		if err != nil {
+			return err
+		}
+		var_14 := `Greeting: Hello, `
+		_, err = templBuffer.WriteString(var_14)
+		if err != nil {
+			return err
+		}
+		var var_15 string = name
+		_, err = templBuffer.WriteString(templ.EscapeString(var_15))
+		if err != nil {
+			return err
+		}
+		var_16 := `!`
+		_, err = templBuffer.WriteString(var_16)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</h3>")
+		if err != nil {
+			return err
+		}
+		if !templIsBuffer {
+			_, err = io.Copy(w, templBuffer)
+		}
+		return err
+	})
+}
+
+func GoodbyeWorld() templ.Component {
+	return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
+		templBuffer, templIsBuffer := w.(*bytes.Buffer)
+		if !templIsBuffer {
+			templBuffer = templ.GetBuffer()
+			defer templ.ReleaseBuffer(templBuffer)
+		}
+		ctx = templ.InitializeContext(ctx)
+		var_17 := templ.GetChildren(ctx)
+		if var_17 == nil {
+			var_17 = templ.NopComponent
+		}
+		ctx = templ.ClearChildren(ctx)
+		_, err = templBuffer.WriteString("<p>")
+		if err != nil {
+			return err
+		}
+		var_18 := `Goodbye, World!`
+		_, err = templBuffer.WriteString(var_18)
+		if err != nil {
+			return err
+		}
+		_, err = templBuffer.WriteString("</p>")
+		if err != nil {
+			return err
+		}
+		if !templIsBuffer {
+			_, err = io.Copy(w, templBuffer)
+		}
+		return err
+	})
+}
diff --git a/server.go b/server.go
index 8c2324d..fbe5daa 100644
--- a/server.go
+++ b/server.go
@@ -1,13 +1,14 @@
 package main
 
 import (
-	"bytes"
 	"embed"
 	"fmt"
-	"html/template"
 	"io/fs"
 	"log"
 	"net/http"
+
+	"github.com/a-h/templ"
+	"github.com/acaloiaro/hugo-htmx-go-template/partials"
 )
 
 //go:embed all:public
@@ -20,9 +21,25 @@ func main() {
 	// Serve all hugo content (the 'public' directory) at the root url
 	mux.Handle("/", http.FileServer(http.FS(serverRoot)))
 
+	cors := func(h http.Handler) http.HandlerFunc {
+		return func(w http.ResponseWriter, r *http.Request) {
+			// in development, the Origin is the the Hugo server, i.e. http://localhost:1313
+			// but in production, it is the domain name where one's site is deployed
+			w.Header().Set("Access-Control-Allow-Origin", "*")
+			w.Header().Set("Access-Control-Allow-Methods", "GET, POST")
+			w.Header().Set("Access-Control-Allow-Headers", "Content-Type, hx-target, hx-current-url, hx-request")
+			if r.Method == "OPTIONS" {
+				w.WriteHeader(http.StatusNoContent)
+				return
+			}
+			h.ServeHTTP(w, r)
+		}
+	}
+
 	// Add any number of handlers for custom endpoints here
-	mux.HandleFunc("/hello_world", helloWorld)
-	mux.HandleFunc("/hello_world_form", helloWorldForm)
+	mux.HandleFunc("/goodbyeworld.html", cors(templ.Handler(partials.GoodbyeWorld())))
+	mux.HandleFunc("/hello_world", cors(http.HandlerFunc(helloWorld)))
+	mux.HandleFunc("/hello_world_form", cors(http.HandlerFunc(helloWorldForm)))
 
 	fmt.Printf("Starting API server on port 1314\n")
 	if err := http.ListenAndServe("0.0.0.0:1314", mux); err != nil {
@@ -36,30 +53,15 @@ func main() {
 //
 // It responds with the the HTML partial `partials/helloworld.html`
 func helloWorld(w http.ResponseWriter, r *http.Request) {
-	// in development, the Origin is the the Hugo server, i.e. http://localhost:1313
-	// but in production, it is the domain name where one's site is deployed
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-
-	if r.Method == "OPTIONS" {
-		w.WriteHeader(http.StatusNoContent)
-		return
-	}
-
 	name := r.URL.Query().Get("name")
 	if name == "null" || name == "" {
 		name = "World"
 	}
 
-	tmpl := template.Must(template.ParseFiles("partials/helloworld.html"))
-	var buff = bytes.NewBufferString("")
-	err := tmpl.Execute(buff, map[string]string{"Name": name})
-	if err != nil {
-		ise(err, w)
+	if err := partials.HelloWorld(name).Render(r.Context(), w); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-
-	w.WriteHeader(http.StatusOK)
-	w.Write(buff.Bytes())
 }
 
 // this handler accepts POST requests to /hello_world_form
@@ -68,18 +70,6 @@ func helloWorld(w http.ResponseWriter, r *http.Request) {
 //
 // It responds with a simple greeting HTML partial
 func helloWorldForm(w http.ResponseWriter, r *http.Request) {
-	// in development, the Origin is the the Hugo server, i.e. http://localhost:1313
-	// but in production, it is the domain name where one's site is deployed
-	// for this demo, we're using `*` to keep things simple
-	w.Header().Set("Access-Control-Allow-Origin", "*")
-
-	if r.Method == "OPTIONS" {
-		w.Header().Set("Access-Control-Allow-Methods", "POST")
-		w.Header().Set("Access-Control-Allow-Headers", "Content-Type, hx-current-url, hx-request")
-		w.WriteHeader(http.StatusNoContent)
-		return
-	}
-
 	name := "World"
 	// The name is not in the query param, let's see if it was submitted as a form
 	if err := r.ParseForm(); err != nil {
@@ -88,23 +78,10 @@ func helloWorldForm(w http.ResponseWriter, r *http.Request) {
 	}
 
 	name = r.FormValue("name")
-	// we're dealing with a really simple template; let's use an inline string instead of a whole separate file for this
-	// one
-	tmpl, err := template.New("form_response").Parse("<h3>Greeting: Hello, {{ .Name }}!</h3>")
-	if err != nil {
-		ise(err, w)
+	if err := partials.HelloWorldGreeting(name).Render(r.Context(), w); err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
-
-	var buff = bytes.NewBufferString("")
-	err = tmpl.Execute(buff, map[string]string{"Name": name})
-	if err != nil {
-		ise(err, w)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-	w.Write(buff.Bytes())
 }
 
 func ise(err error, w http.ResponseWriter) {

From 5288d6102397cd7f9c6706d5fa2c3e822bca3cc7 Mon Sep 17 00:00:00 2001
From: Adriano Caloiaro <me@adriano.fyi>
Date: Tue, 4 Jul 2023 11:29:25 -0600
Subject: [PATCH 2/3] Retain 'html/template' examples and update README

---
 .air.toml                      |   6 +-
 README.md                      |  41 ++++++---
 content/posts/goodbye-world.md |   4 +-
 partials/helloworld.html       |  10 +++
 partials/templates.templ       |   8 --
 partials/templates_templ.go    | 159 ++++-----------------------------
 server.go                      |  15 +++-
 7 files changed, 77 insertions(+), 166 deletions(-)
 create mode 100644 partials/helloworld.html

diff --git a/.air.toml b/.air.toml
index 12877e3..521bb5e 100644
--- a/.air.toml
+++ b/.air.toml
@@ -5,16 +5,16 @@ tmp_dir = "tmp"
 [build]
   args_bin = []
   bin = "./tmp/hugo-htmx-go-template"
-  cmd = "go build -o ./tmp/hugo-htmx-go-template server.go"
+  cmd = "templ generate 2> /dev/null && go build -o ./tmp/hugo-htmx-go-template server.go"
   delay = 1000
   exclude_dir = ["assets", "tmp", "vendor", "testdata"]
   exclude_file = []
-  exclude_regex = ["_test.go"]
+  exclude_regex = ["_test.go", "_templ.go"]
   exclude_unchanged = false
   follow_symlink = false
   full_bin = ""
   include_dir = []
-  include_ext = ["go", "tpl", "tmpl", "html"]
+  include_ext = ["go", "tpl", "tmpl", "html", "templ"]
   include_file = []
 # 50ms in nanoseconds
   kill_delay = 500000000
diff --git a/README.md b/README.md
index c171c67..5f2051e 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,25 @@
 # hugo-htmx-go-template
 
-This is a project template combining [Hugo](https://gohugo.io), [htmx](https://htmx.org), and an optional API server written in Go, using `html/template` for HTML rendering.
+This is a project template combining [Hugo](https://gohugo.io), [htmx](https://htmx.org), and an optional API server written in Go, using `html/template` or [templ](https://github.com/a-h/templ/) for HTML rendering.
 
 ## Why?
 
-Hugo is a fantastic static site build tool, and there are few things about Hugo that can or should be improved.
+Hugo is a fantastic static site building tool, and there are few things about Hugo that can or should be improved.
 
-The existence of this project template should in no way suggest that static sites should be dynamic. If your site _can_ be static, it _should_ be static.
+The existence of this project template does not suggest that all static sites should be dynamic. If your site _can_ be static, it _should_ be static.
 
-Yet there are instances in which one might need to add dynamic functionality to static Hugo sites. That is the purpose of this project template. Not to make all static sites dynamic, but to provide a simple solution to add islands of dynamic behavior to static sites.
+Yet there are instances in which one might want to add dynamic functionality to static Hugo sites. That is the purpose of this project template. Not to make all static sites dynamic, but to provide a simple solution to add islands of dynamic behavior to static sites.
 
-This allows us to build fast, easily deployable HTML content, but with the added ability of meeting a new class dynamic behavior needs.
+This allows us to build fast, easily deployable HTML content, with the added ability of meeting a new class dynamic behavior needs.
+
+Example use cases include
+
+- Contact forms
+- Comment systems
+- Up/Down vote systems
+- You know ... website stuff
+
+You shouldn't have to reach for a SaaS product to offer dynamic content on your static sites.
 
 ## About
 
@@ -24,8 +33,8 @@ This template provides example code and simple developer tooling for running Hug
 
 **What developer tooling is provided?**
 
-1. `bin/develop`: This utility both starts the hugo server (`hugo server`) and the API server (`go run server.go`) for development. If the user has `air` installed (https://github.com/cosmtrek/air), it will hot reload the API server code when changes to server.go are made.
-2. `bin/build`: This utility builds a binary with your entire Hugo site embedded within. Note: this is only to be used to deploy Hugo sites as a self-contained binary.
+1. `bin/develop`: This utility both starts the hugo server (`hugo server`) and the API server (`go run server.go`) for development. If the user has `air` installed (https://github.com/cosmtrek/air), API server code will hot-reload when changes to server.go are made.
+2. `bin/build`: This utility builds a binary with your entire Hugo site embedded within. This allows Hugo sites to be deployed as a self-contained binary.
 
 ## Getting Started
 
@@ -44,27 +53,37 @@ go build -o bin/build internal/cmd/build/main.go
 mkdir public && touch public/.empty
 ```
 
-If you'll be using the API server, it's useful to install `air` if you want auto-rebuild functionality when running `bin/develop`:
+If you'll be using the API server, it's useful to install `air` to hot redeploy Go code changes when running `bin/develop`:
 
 ```bash
 go install github.com/cosmtrek/air@latest
 ```
 
+To make changes to `templ` templates (.templ files), you will need to install `templ`. Using `templ` is optional. The [goodbye world](https://github.com/acaloiaro/hugo-htmx-go-template/blob/main/server.go#L83) example shows `templ` in action.
+
+```bash
+go install github.com/a-h/templ/cmd/templ@latest
+```
+
 ## Run
 
 To start the development server(s), run `bin/develop`
 
 Hugo will run on its develop port at [http://localhost:1313](http://localhost:1313) and the API server runs on [http://localhost:1314](http://localhost:1314).
 
-Example content using Hugo/htmx/go api is available at: [http://localhost:1313/posts/hello-world/](http://localhost:1313/posts/hello-world/)
+Example content is available at: [http://localhost:1313/posts/hello-world/](http://localhost:1313/posts/hello-world/)
 
-You can also use `bin/build` to build a fat binary of your Hugo site, which will be available at  [http://localhost:1314](http://localhost:1314) after running `build/server`.
+`bin/build` can be used to build fat binaries of your Hugo site, which will be available at  [http://localhost:1314](http://localhost:1314) after running `build/server`.
 
 ![screenshot](https://user-images.githubusercontent.com/3331648/248586236-1ad03704-4f13-418c-aa9a-3122742c6b8c.png)
 
+## Changing `templ` templates
+
+To use `templ` templates, you will need to `templ` installed. The `air` configuration watches for changes to `templ` files and automatically builds them.
+
 ## Deploy
 
-Hugo sites made from this template can be deployed in two ways.
+Hugo sites made from this template project can be deployed in two ways.
 
 ### Traditional deployment
 
diff --git a/content/posts/goodbye-world.md b/content/posts/goodbye-world.md
index 020e3f6..836c786 100644
--- a/content/posts/goodbye-world.md
+++ b/content/posts/goodbye-world.md
@@ -4,9 +4,9 @@ date: 2023-06-23T15:58:00-06:00
 draft: false
 ---
 
-## Goodbye world is a static template example
+## Goodbye world is a `templ` template example
 
-Every time `Click Me!` is clicked, a request is sent to fetch static template `/goodbyeworld.html`.
+Every time `Click Me!` is clicked, a request is sent to the API server, which renders `templ GoodbyeWorld()` from `partial/templates.templ`.
 
 {{< html.inline >}}
 <button
diff --git a/partials/helloworld.html b/partials/helloworld.html
new file mode 100644
index 0000000..37f5f69
--- /dev/null
+++ b/partials/helloworld.html
@@ -0,0 +1,10 @@
+<div>
+  <p>This content is coming from our API server. It's a standard <strong>text/html</strong> template:
+  <strong>partials/helloworld.html</strong>. The template has a single variable named
+  <strong>Name</strong>, which it greets below.</p>
+</div>
+
+<p>If you set the <strong>name</strong> URL param, it greets you by name, e.g.
+<a href="/posts/hello-world/?name=foobar">/posts/hello-world/?name=foobar</a></p>
+
+<h3>Greeting: Hello, {{ .Name }}!</h3>
diff --git a/partials/templates.templ b/partials/templates.templ
index d929cbe..5648e9a 100644
--- a/partials/templates.templ
+++ b/partials/templates.templ
@@ -1,13 +1,5 @@
 package partials
 
-templ HelloWorld(name string) {
-	<div>
-		<p>This content is coming from our API server. It's a standard <strong>text/html</strong>template: <strong>partials/helloworld.html</strong>. The template has a single variable named <strong>Name</strong>, which it greets below.</p>
-	</div>
-	<p>If you set the <strong>name</strong>URL param, it greets you by name, e.g. <a href="/posts/hello-world/?name=foobar">/posts/hello-world/?name=foobar</a></p>
-	@HelloWorldGreeting(name)
-}
-
 templ HelloWorldGreeting(name string) {
 	<h3>Greeting: Hello, { name }!</h3>
 }
diff --git a/partials/templates_templ.go b/partials/templates_templ.go
index 28c257e..a080f10 100644
--- a/partials/templates_templ.go
+++ b/partials/templates_templ.go
@@ -1,4 +1,4 @@
-// Code generated by templ@(devel) DO NOT EDIT.
+// Code generated by templ@v0.2.304 DO NOT EDIT.
 
 package partials
 
@@ -9,7 +9,7 @@ import "context"
 import "io"
 import "bytes"
 
-func HelloWorld(name string) templ.Component {
+func HelloWorldGreeting(name string) templ.Component {
 	return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
 		templBuffer, templIsBuffer := w.(*bytes.Buffer)
 		if !templIsBuffer {
@@ -22,149 +22,26 @@ func HelloWorld(name string) templ.Component {
 			var_1 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
-		_, err = templBuffer.WriteString("<div><p>")
-		if err != nil {
-			return err
-		}
-		var_2 := `This content is coming from our API server. It's a standard `
-		_, err = templBuffer.WriteString(var_2)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("<strong>")
-		if err != nil {
-			return err
-		}
-		var_3 := `text/html`
-		_, err = templBuffer.WriteString(var_3)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</strong>")
-		if err != nil {
-			return err
-		}
-		var_4 := `template: `
-		_, err = templBuffer.WriteString(var_4)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("<strong>")
-		if err != nil {
-			return err
-		}
-		var_5 := `partials/helloworld.html`
-		_, err = templBuffer.WriteString(var_5)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</strong>")
-		if err != nil {
-			return err
-		}
-		var_6 := `. The template has a single variable named `
-		_, err = templBuffer.WriteString(var_6)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("<strong>")
-		if err != nil {
-			return err
-		}
-		var_7 := `Name`
-		_, err = templBuffer.WriteString(var_7)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</strong>")
-		if err != nil {
-			return err
-		}
-		var_8 := `, which it greets below.`
-		_, err = templBuffer.WriteString(var_8)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</p></div><p>")
-		if err != nil {
-			return err
-		}
-		var_9 := `If you set the `
-		_, err = templBuffer.WriteString(var_9)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("<strong>")
-		if err != nil {
-			return err
-		}
-		var_10 := `name`
-		_, err = templBuffer.WriteString(var_10)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</strong>")
-		if err != nil {
-			return err
-		}
-		var_11 := `URL param, it greets you by name, e.g. `
-		_, err = templBuffer.WriteString(var_11)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("<a href=\"/posts/hello-world/?name=foobar\">")
-		if err != nil {
-			return err
-		}
-		var_12 := `/posts/hello-world/?name=foobar`
-		_, err = templBuffer.WriteString(var_12)
-		if err != nil {
-			return err
-		}
-		_, err = templBuffer.WriteString("</a></p>")
-		if err != nil {
-			return err
-		}
-		err = HelloWorldGreeting(name).Render(ctx, templBuffer)
-		if err != nil {
-			return err
-		}
-		if !templIsBuffer {
-			_, err = io.Copy(w, templBuffer)
-		}
-		return err
-	})
-}
-
-func HelloWorldGreeting(name string) templ.Component {
-	return templ.ComponentFunc(func(ctx context.Context, w io.Writer) (err error) {
-		templBuffer, templIsBuffer := w.(*bytes.Buffer)
-		if !templIsBuffer {
-			templBuffer = templ.GetBuffer()
-			defer templ.ReleaseBuffer(templBuffer)
-		}
-		ctx = templ.InitializeContext(ctx)
-		var_13 := templ.GetChildren(ctx)
-		if var_13 == nil {
-			var_13 = templ.NopComponent
-		}
-		ctx = templ.ClearChildren(ctx)
+		// Element (standard)
 		_, err = templBuffer.WriteString("<h3>")
 		if err != nil {
 			return err
 		}
-		var_14 := `Greeting: Hello, `
-		_, err = templBuffer.WriteString(var_14)
+		// Text
+		var_2 := `Greeting: Hello, `
+		_, err = templBuffer.WriteString(var_2)
 		if err != nil {
 			return err
 		}
-		var var_15 string = name
-		_, err = templBuffer.WriteString(templ.EscapeString(var_15))
+		// StringExpression
+		var var_3 string = name
+		_, err = templBuffer.WriteString(templ.EscapeString(var_3))
 		if err != nil {
 			return err
 		}
-		var_16 := `!`
-		_, err = templBuffer.WriteString(var_16)
+		// Text
+		var_4 := `!`
+		_, err = templBuffer.WriteString(var_4)
 		if err != nil {
 			return err
 		}
@@ -187,17 +64,19 @@ func GoodbyeWorld() templ.Component {
 			defer templ.ReleaseBuffer(templBuffer)
 		}
 		ctx = templ.InitializeContext(ctx)
-		var_17 := templ.GetChildren(ctx)
-		if var_17 == nil {
-			var_17 = templ.NopComponent
+		var_5 := templ.GetChildren(ctx)
+		if var_5 == nil {
+			var_5 = templ.NopComponent
 		}
 		ctx = templ.ClearChildren(ctx)
+		// Element (standard)
 		_, err = templBuffer.WriteString("<p>")
 		if err != nil {
 			return err
 		}
-		var_18 := `Goodbye, World!`
-		_, err = templBuffer.WriteString(var_18)
+		// Text
+		var_6 := `Goodbye, World!`
+		_, err = templBuffer.WriteString(var_6)
 		if err != nil {
 			return err
 		}
diff --git a/server.go b/server.go
index fbe5daa..9571118 100644
--- a/server.go
+++ b/server.go
@@ -1,11 +1,13 @@
 package main
 
 import (
+	"bytes"
 	"embed"
 	"fmt"
 	"io/fs"
 	"log"
 	"net/http"
+	"text/template"
 
 	"github.com/a-h/templ"
 	"github.com/acaloiaro/hugo-htmx-go-template/partials"
@@ -25,6 +27,9 @@ func main() {
 		return func(w http.ResponseWriter, r *http.Request) {
 			// in development, the Origin is the the Hugo server, i.e. http://localhost:1313
 			// but in production, it is the domain name where one's site is deployed
+			//
+			// CHANGE THIS: You likely do not want to allow any origin (*) in production. The value should be the base URL of
+			// where your static content is served
 			w.Header().Set("Access-Control-Allow-Origin", "*")
 			w.Header().Set("Access-Control-Allow-Methods", "GET, POST")
 			w.Header().Set("Access-Control-Allow-Headers", "Content-Type, hx-target, hx-current-url, hx-request")
@@ -58,10 +63,16 @@ func helloWorld(w http.ResponseWriter, r *http.Request) {
 		name = "World"
 	}
 
-	if err := partials.HelloWorld(name).Render(r.Context(), w); err != nil {
-		w.WriteHeader(http.StatusInternalServerError)
+	tmpl := template.Must(template.ParseFiles("partials/helloworld.html"))
+	var buff = bytes.NewBufferString("")
+	err := tmpl.Execute(buff, map[string]string{"Name": name})
+	if err != nil {
+		ise(err, w)
 		return
 	}
+
+	w.WriteHeader(http.StatusOK)
+	w.Write(buff.Bytes())
 }
 
 // this handler accepts POST requests to /hello_world_form

From 048d50dea9d59520f52158625b1be877b6f6dc91 Mon Sep 17 00:00:00 2001
From: Adriano Caloiaro <me@adriano.fyi>
Date: Tue, 4 Jul 2023 11:46:39 -0600
Subject: [PATCH 3/3] Copy edits

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5f2051e..71fa2f5 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ If you'll be using the API server, it's useful to install `air` to hot redeploy
 go install github.com/cosmtrek/air@latest
 ```
 
-To make changes to `templ` templates (.templ files), you will need to install `templ`. Using `templ` is optional. The [goodbye world](https://github.com/acaloiaro/hugo-htmx-go-template/blob/main/server.go#L83) example shows `templ` in action.
+To make changes to `templ` templates (.templ files), first install `templ`. Using `templ` is optional. The [goodbye world](https://github.com/acaloiaro/hugo-htmx-go-template/blob/main/server.go#L83) example shows `templ` in action.
 
 ```bash
 go install github.com/a-h/templ/cmd/templ@latest