pkg/contacts.go

@@ -24,7 +24,7 @@ func IndexContacts(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
 	page := &ContactsIndexPage{
 		Contacts: mustGetContactEntries(r.Context(), conn, company),
 	}
-	mustRenderMainTemplate(w, r, "contacts/index.gohtml", page)
+	mustRenderAppTemplate(w, r, "contacts/index.gohtml", page)
 }
 
 func GetContactForm(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
@@ -42,26 +42,15 @@ func GetContactForm(w http.ResponseWriter, r *http.Request, params httprouter.Pa
 		return
 	}
 	w.WriteHeader(http.StatusOK)
-	mustRenderEditContactForm(w, r, slug, form)
+	mustRenderEditContactForm(w, r, form)
 }
 
 func mustRenderNewContactForm(w http.ResponseWriter, r *http.Request, form *contactForm) {
 	mustRenderModalTemplate(w, r, "contacts/new.gohtml", form)
 }
 
-type editContactPage struct {
+func mustRenderEditContactForm(w http.ResponseWriter, r *http.Request, form *contactForm) {
-	Slug        string
+	mustRenderAppTemplate(w, r, "contacts/edit.gohtml", form)
-	ContactName string
-	Form        *contactForm
-}
-
-func mustRenderEditContactForm(w http.ResponseWriter, r *http.Request, slug string, form *contactForm) {
-	page := &editContactPage{
-		Slug:        slug,
-		ContactName: form.BusinessName.Val,
-		Form:        form,
-	}
-	mustRenderModalTemplate(w, r, "contacts/edit.gohtml", page)
 }
 
 func HandleAddContact(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
@@ -107,20 +96,14 @@ func HandleUpdateContact(w http.ResponseWriter, r *http.Request, params httprout
 		return
 	}
 	if !form.Validate(r.Context(), conn) {
-		mustRenderEditContactForm(w, r, params[0].Value, form)
+		mustRenderEditContactForm(w, r, form)
 		return
 	}
 	slug := conn.MustGetText(r.Context(), "", "update contact set business_name = $1, vatin = ($11 || $2)::vatin, trade_name = $3, phone = parse_packed_phone_number($4, $11), email = $5, web = $6, address = $7, city = $8, province = $9, postal_code = $10, country_code = $11 where slug = $12 returning slug", form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country, params[0].Value)
 	if slug == "" {
 		http.NotFound(w, r)
 	}
-	if IsHTMxRequest(r) {
-		w.Header().Set("HX-Trigger", "closeModal")
-		w.Header().Set("HX-Refresh", "true")
-		w.WriteHeader(http.StatusNoContent)
-	} else {
 	http.Redirect(w, r, companyURI(mustGetCompany(r), "/contacts/"+slug), http.StatusSeeOther)
-	}
 }
 
 func mustGetContactEntries(ctx context.Context, conn *Conn, company *Company) []*ContactEntry {

pkg/invoices.go

@@ -46,7 +46,7 @@ func IndexInvoices(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
 		Invoices:        mustCollectInvoiceEntries(r.Context(), conn, mustGetCompany(r), locale, tag),
 		InvoiceStatuses: mustCollectInvoiceStatuses(r.Context(), conn, locale),
 	}
-	mustRenderMainTemplate(w, r, "invoices/index.gohtml", page)
+	mustRenderAppTemplate(w, r, "invoices/index.gohtml", page)
 }
 
 func mustCollectInvoiceEntries(ctx context.Context, conn *Conn, company *Company, locale *Locale, tag string) []*InvoiceEntry {

pkg/products.go

@@ -26,7 +26,7 @@ func IndexProducts(w http.ResponseWriter, r *http.Request, _ httprouter.Params)
 	page := &productsIndexPage{
 		Products: mustGetProductEntries(r.Context(), conn, company),
 	}
-	mustRenderMainTemplate(w, r, "products/index.gohtml", page)
+	mustRenderAppTemplate(w, r, "products/index.gohtml", page)
 }
 
 func GetProductForm(w http.ResponseWriter, r *http.Request, params httprouter.Params) {

pkg/router.go

@@ -32,7 +32,7 @@ func NewRouter(db *Db) http.Handler {
 	companyRouter.GET("/invoices/:slug/edit", ServeEditInvoice)
 	companyRouter.POST("/invoices/:slug/edit", HandleEditInvoiceAction)
 	companyRouter.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-		mustRenderMainTemplate(w, r, "dashboard.gohtml", nil)
+		mustRenderAppTemplate(w, r, "dashboard.gohtml", nil)
 	})
 
 	router := httprouter.New()

pkg/template.go

@@ -100,19 +100,11 @@ func mustRenderAppTemplate(w io.Writer, r *http.Request, filename string, data i
 }
 
 func mustRenderModalTemplate(w io.Writer, r *http.Request, filename string, data interface{}) {
+	layout := "app.gohtml"
 	if IsHTMxRequest(r) {
-		mustRenderTemplate(w, r, "modal.gohtml", filename, data)
+		layout = "modal.gohtml"
-	} else {
-		mustRenderAppTemplate(w, r, filename, data)
-	}
-}
-
-func mustRenderMainTemplate(w io.Writer, r *http.Request, filename string, data interface{}) {
-	if IsHTMxRequest(r) {
-		mustRenderTemplate(w, r, "main.gohtml", filename, data)
-	} else {
-		mustRenderAppTemplate(w, r, filename, data)
 	}
+	mustRenderTemplate(w, r, layout, filename, data)
 }
 
 func mustRenderWebTemplate(w io.Writer, r *http.Request, filename string, data interface{}) {

web/template/app.gohtml

@@ -40,7 +40,7 @@
 				</ul>
 			</details>
 		</header>
-		<nav aria-label="{{( pgettext "Main" "title" )}}" data-hx-target="main" data-hx-boost="true">
+		<nav aria-label="{{( pgettext "Main" "title" )}}">
 			<ul>
 				<li><a href="{{ companyURI "/" }}">{{( pgettext "Dashboard" "nav" )}}</a></li>
 				<li><a href="{{ companyURI "/invoices" }}">{{( pgettext "Invoices" "nav" )}}</a></li>

web/template/contacts/edit.gohtml

@@ -1,28 +1,26 @@
 {{ define "title" -}}
-    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.editContactPage*/ -}}
+    {{printf (pgettext "Edit Contact “%s”" "title") .BusinessName.Val }}
-    {{printf (pgettext "Edit Contact “%s”" "title") .ContactName }}
 {{- end }}
 
 {{ define "breadcrumbs" -}}
-    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.editContactPage*/ -}}
+    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.contactForm*/ -}}
     <nav>
         <p>
             <a href="{{ companyURI "/" }}">{{( pgettext "Home" "title" )}}</a> /
             <a href="{{ companyURI "/contacts"}}">{{( pgettext "Contacts" "title" )}}</a> /
-            <a>{{ .ContactName }}</a>
+            <a>{{ .BusinessName.Val }}</a>
         </p>
     </nav>
 {{- end }}
 
 {{ define "content" }}
-    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.editContactPage*/ -}}
+    {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.contactForm*/ -}}
-    <section class="dialog-content" id="edit-contact-dialog-content" data-hx-target="this">
+    <section class="dialog-content">
-        <h2>{{printf (pgettext "Edit Contact “%s”" "title") .ContactName }}</h2>
+        <h2>{{printf (pgettext "Edit Contact “%s”" "title") .BusinessName.Val }}</h2>
-        <form method="POST" action="{{ companyURI "/contacts/" }}{{ .Slug }}" data-hx-boost="true" data-hx-select="#edit-contact-dialog-content">
+        <form method="POST">
             {{ csrfToken }}
             {{ putMethod }}
 
-            {{ with .Form }}
             {{ template "input-field" .BusinessName }}
             {{ template "input-field" .VATIN }}
             {{ template "input-field" .TradeName }}
@@ -34,7 +32,6 @@
             {{ template "input-field" .Province }}
             {{ template "input-field" .PostalCode }}
             {{ template "select-field" .Country | addSelectAttr `class="width-fixed"` }}
-            {{ end }}
 
             <fieldset>
                 <button class="primary" type="submit">{{( pgettext "Update contact" "action" )}}</button>

web/template/contacts/index.gohtml

@@ -28,12 +28,12 @@
             <th>{{( pgettext "Phone" "title" )}}</th>
         </tr>
         </thead>
-        <tbody data-hx-push-url="false" data-hx-swap="beforeend">
+        <tbody>
         {{ with .Contacts }}
             {{- range $contact := . }}
                 <tr>
                     <td></td>
-                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}" data-hx-boost="true">{{ .Name }}</a></td>
+                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}">{{ .Name }}</a></td>
                     <td><a href="mailto:{{ .Email }}">{{ .Email }}</a></td>
                     <td><a href="tel:{{ .Phone }}">{{ .Phone }}</a></td>
                 </tr>

web/template/main.gohtml

@@ -1,2 +0,0 @@
-{{- template "breadcrumbs" . }}
-{{- template "content" . }}