tandem
/
numerus
2
0
Fork 0
Code Issues 39 Pull Requests Packages Projects 1 Releases 1 Wiki Activity

Create constants for the HTMX request and response headers used 

It works better with an IDE, and less chance of mistyping something
without notice.
This commit is contained in:
jordi fita mas 2023-04-06 12:07:20 +02:00
parent 233e7723c3
commit 2df6947577
6 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/company.go
View File

@ -184,7 +184,7 @@ func HandleCompanyTaxDetailsForm(w http.ResponseWriter, r *http.Request, _ httpr
company := mustGetCompany(r) company := mustGetCompany(r)
conn.MustExec(r.Context(), "update company 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, currency_code = $12, invoice_number_format = $13, legal_disclaimer = $14 where company_id = $15", form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country, form.Currency, form.InvoiceNumberFormat, form.LegalDisclaimer, company.Id) conn.MustExec(r.Context(), "update company 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, currency_code = $12, invoice_number_format = $13, legal_disclaimer = $14 where company_id = $15", form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country, form.Currency, form.InvoiceNumberFormat, form.LegalDisclaimer, company.Id)
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, companyURI(company, "/tax-details"), http.StatusSeeOther) http.Redirect(w, r, companyURI(company, "/tax-details"), http.StatusSeeOther)

8
pkg/contacts.go
View File

@ -88,8 +88,8 @@ func HandleAddContact(w http.ResponseWriter, r *http.Request, _ httprouter.Param
company := mustGetCompany(r) company := mustGetCompany(r)
conn.MustExec(r.Context(), "select add_contact($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)", company.Id, form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country, form.Tags) conn.MustExec(r.Context(), "select add_contact($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13)", company.Id, form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country, form.Tags)
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
w.Header().Set("HX-Refresh", "true") w.Header().Set(HxRefresh, "true")
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, companyURI(company, "/contacts"), http.StatusSeeOther) http.Redirect(w, r, companyURI(company, "/contacts"), http.StatusSeeOther)
@ -117,8 +117,8 @@ func HandleUpdateContact(w http.ResponseWriter, r *http.Request, params httprout
http.NotFound(w, r) http.NotFound(w, r)
} }
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
w.Header().Set("HX-Refresh", "true") w.Header().Set(HxRefresh, "true")
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, companyURI(mustGetCompany(r), "/contacts/"+slug), http.StatusSeeOther) http.Redirect(w, r, companyURI(mustGetCompany(r), "/contacts/"+slug), http.StatusSeeOther)

9
pkg/htmx.go
View File

@ -5,13 +5,20 @@ import (
"net/http" "net/http"
) )
const (
HxLocation = "HX-Location"
HxRefresh = "HX-Refresh"
HxRequest = "HX-Request"
HxTrigger = "HX-Trigger"
)
type HTMxLocation struct { type HTMxLocation struct {
Path string `json:"path"` Path string `json:"path"`
Target string `json:"target"` Target string `json:"target"`
} }
func IsHTMxRequest(r *http.Request) bool { func IsHTMxRequest(r *http.Request) bool {
return r.Header.Get("HX-Request") == "true" return r.Header.Get(HxRequest) == "true"
} }
func MustMarshalHTMxLocation(location *HTMxLocation) string { func MustMarshalHTMxLocation(location *HTMxLocation) string {

10
pkg/invoices.go
View File

@ -459,7 +459,7 @@ func HandleAddInvoice(w http.ResponseWriter, r *http.Request, _ httprouter.Param
slug := conn.MustGetText(r.Context(), "", "select add_invoice($1, $2, $3, $4, $5, $6, $7)", company.Id, form.Date, form.Customer, form.Notes, form.PaymentMethod, form.Tags, NewInvoiceProductArray(form.Products)) slug := conn.MustGetText(r.Context(), "", "select add_invoice($1, $2, $3, $4, $5, $6, $7)", company.Id, form.Date, form.Customer, form.Notes, form.PaymentMethod, form.Tags, NewInvoiceProductArray(form.Products))
viewUrl := companyURI(company, "/invoices/"+slug) viewUrl := companyURI(company, "/invoices/"+slug)
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
location := &HTMxLocation{ location := &HTMxLocation{
Target: "main", Target: "main",
} }
@ -468,7 +468,7 @@ func HandleAddInvoice(w http.ResponseWriter, r *http.Request, _ httprouter.Param
} else { } else {
location.Path = companyURI(company, "/invoices") location.Path = companyURI(company, "/invoices")
} }
w.Header().Set("HX-Location", MustMarshalHTMxLocation(location)) w.Header().Set(HxLocation, MustMarshalHTMxLocation(location))
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, viewUrl, http.StatusSeeOther) http.Redirect(w, r, viewUrl, http.StatusSeeOther)
@ -849,7 +849,7 @@ func HandleUpdateInvoice(w http.ResponseWriter, r *http.Request, params httprout
} }
indexUrl := companyURI(mustGetCompany(r), "/invoices") indexUrl := companyURI(mustGetCompany(r), "/invoices")
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Location", MustMarshalHTMxLocation(&HTMxLocation{ w.Header().Set(HxLocation, MustMarshalHTMxLocation(&HTMxLocation{
Path: indexUrl, Path: indexUrl,
Target: "main", Target: "main",
})) }))
@ -871,7 +871,7 @@ func HandleUpdateInvoice(w http.ResponseWriter, r *http.Request, params httprout
} }
viewUrl := companyURI(company, "/invoices/"+slug) viewUrl := companyURI(company, "/invoices/"+slug)
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
location := &HTMxLocation{ location := &HTMxLocation{
Target: "main", Target: "main",
} }
@ -880,7 +880,7 @@ func HandleUpdateInvoice(w http.ResponseWriter, r *http.Request, params httprout
} else { } else {
location.Path = companyURI(company, "/invoices") location.Path = companyURI(company, "/invoices")
} }
w.Header().Set("HX-Location", MustMarshalHTMxLocation(location)) w.Header().Set(HxLocation, MustMarshalHTMxLocation(location))
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, viewUrl, http.StatusSeeOther) http.Redirect(w, r, viewUrl, http.StatusSeeOther)

8
pkg/products.go
View File

@ -92,8 +92,8 @@ func HandleAddProduct(w http.ResponseWriter, r *http.Request, _ httprouter.Param
taxes := mustSliceAtoi(form.Tax.Selected) taxes := mustSliceAtoi(form.Tax.Selected)
conn.MustExec(r.Context(), "select add_product($1, $2, $3, $4, $5, $6)", company.Id, form.Name, form.Description, form.Price, taxes, form.Tags) conn.MustExec(r.Context(), "select add_product($1, $2, $3, $4, $5, $6)", company.Id, form.Name, form.Description, form.Price, taxes, form.Tags)
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
w.Header().Set("HX-Refresh", "true") w.Header().Set(HxRefresh, "true")
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, companyURI(company, "/products"), http.StatusSeeOther) http.Redirect(w, r, companyURI(company, "/products"), http.StatusSeeOther)
@ -144,8 +144,8 @@ func HandleUpdateProduct(w http.ResponseWriter, r *http.Request, params httprout
http.NotFound(w, r) http.NotFound(w, r)
} }
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
w.Header().Set("HX-Refresh", "true") w.Header().Set(HxRefresh, "true")
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
http.Redirect(w, r, companyURI(company, "/products/"+slug), http.StatusSeeOther) http.Redirect(w, r, companyURI(company, "/products/"+slug), http.StatusSeeOther)

2
pkg/profile.go
View File

@ -134,7 +134,7 @@ func HandleProfileForm(w http.ResponseWriter, r *http.Request, _ httprouter.Para
conn.MustExec(r.Context(), "select change_password($1)", form.Password) conn.MustExec(r.Context(), "select change_password($1)", form.Password)
} }
if IsHTMxRequest(r) { if IsHTMxRequest(r) {
w.Header().Set("HX-Trigger", "closeModal") w.Header().Set(HxTrigger, "closeModal")
w.WriteHeader(http.StatusNoContent) w.WriteHeader(http.StatusNoContent)
} else { } else {
company := mustGetCompany(r) company := mustGetCompany(r)