debian/control

@@ -8,7 +8,6 @@ Build-Depends:
   gettext,
   golang-any,
   golang-github-jackc-pgx-v4-dev,
-  golang-github-julienschmidt-httprouter-dev,
   golang-github-leonelquinteros-gotext-dev,
   golang-golang-x-text-dev,
   postgresql-all (>= 217~),

demo/demo.sql

@@ -20,13 +20,4 @@ values (1, 'Retenció 15 %', -0.15)
      , (1, 'IVA 21 %', 0.21)
 ;
 
-insert into contact (contact_id, company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, country_code) 
-values (1, 1, 'Melcior', 'IR1', 'Rei Blanc', parse_packed_phone_number('0732621', 'IR'), 'melcio@reismags.cat', '', 'C/ Principal, 1', 'Shiraz', 'Fars', '1', 'IR')
-     , (2, 1, 'Gaspar', 'IN2', 'Rei Ros', parse_packed_phone_number('111', 'IN'), 'gaspar@reismags.cat', '', 'C/ Principal, 2', 'Nova Delhi', 'Delhi', '2', 'IN')
-     , (3, 1, 'Baltasar', 'YE3', 'Rei Negre', parse_packed_phone_number('1-111-111', 'YE'), 'baltasar@reismags.cat', '', 'C/ Principal, 3', 'Sanaa', 'Sanaa', '3', 'YE')
-     , (4, 1, 'Caganera', 'ES41414141L', '', parse_packed_phone_number('222 222 222', 'ES'), 'caganera@pesebre.cat', '', 'C/ De l’Hort, 4', 'Olot', 'Girona', '17800', 'ES')
-     , (5, 1, 'Bou', 'ES41414142C', '', parse_packed_phone_number('333 333 333', 'ES'), 'bou@pesebre.cat', '', 'C/ De la Palla, 5', 'Sant Climent Sescebes', 'Girona', '17751', 'ES')
-     , (6, 1, 'Rabadà', 'ES41414143K', '', parse_packed_phone_number('444 444 444', 'ES'), 'rabada@pesebre.cat', '', 'C/ De les Ovelles, 6', 'Fornells de la Selva', 'Girona', '17458', 'ES')
-;
-
 commit;

go.mod

@@ -4,7 +4,6 @@ go 1.18
 
 require (
 	github.com/jackc/pgx/v4 v4.17.2
-	github.com/julienschmidt/httprouter v1.3.0
 	github.com/leonelquinteros/gotext v1.5.1
 	golang.org/x/text v0.3.8
 )

go.sum

@@ -62,8 +62,6 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f
 github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
 github.com/jackc/puddle v1.3.0 h1:eHK/5clGOatcjX3oWGBO/MpxpbHzSwud5EWTSCI+MX0=
 github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk=
-github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=

pkg/company.go

@@ -3,11 +3,11 @@ package pkg
 import (
 	"context"
 	"errors"
-	"github.com/julienschmidt/httprouter"
 	"html/template"
 	"net/http"
 	"net/url"
 	"strconv"
+	"strings"
 )
 
 const (
@@ -19,26 +19,44 @@ type Company struct {
 	Slug string
 }
 
-func CompanyHandler(next http.Handler) httprouter.Handle {
+func CompanyHandler(next http.Handler) http.Handler {
-	return func(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		company := &Company{
+		slug := r.URL.Path
-			Slug: params[0].Value,
+		if idx := strings.IndexByte(slug, '/'); idx >= 0 {
+			slug = slug[:idx]
 		}
+
 		conn := getConn(r)
-		err := conn.QueryRow(r.Context(), "select company_id from company where slug = $1", company.Slug).Scan(&company.Id)
+		company := &Company{
+			Slug: slug,
+		}
+		err := conn.QueryRow(r.Context(), "select company_id from company where slug = $1", slug).Scan(&company.Id)
 		if err != nil {
 			http.NotFound(w, r)
 			return
 		}
 		ctx := context.WithValue(r.Context(), ContextCompanyKey, company)
 		r = r.WithContext(ctx)
+
+		// Same as StripPrefix
+		p := strings.TrimPrefix(r.URL.Path, slug)
+		rp := strings.TrimPrefix(r.URL.RawPath, slug)
+		if len(p) < len(r.URL.Path) && (r.URL.RawPath == "" || len(rp) < len(r.URL.RawPath)) {
 			r2 := new(http.Request)
 			*r2 = *r
 			r2.URL = new(url.URL)
 			*r2.URL = *r.URL
-		r2.URL.Path = params[1].Value
+			if p == "" {
-		next.ServeHTTP(w, r2)
+				r2.URL.Path = "/"
+			} else {
+				r2.URL.Path = p
 			}
+			r2.URL.RawPath = rp
+			next.ServeHTTP(w, r2)
+		} else {
+			http.NotFound(w, r)
+		}
+	})
 }
 
 func getCompany(r *http.Request) *Company {
@@ -106,30 +124,21 @@ func (form *taxDetailsForm) mustFillFromDatabase(ctx context.Context, conn *Conn
 
 type TaxDetailsPage struct {
 	DetailsForm *taxDetailsForm
-	NewTaxForm  *taxForm
+	NewTaxForm  *newTaxForm
 	Taxes       []*Tax
 }
 
-func GetCompanyTaxDetailsForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+func CompanyTaxDetailsHandler() http.Handler {
-	mustRenderTaxDetailsForm(w, r, newTaxDetailsFormFromDatabase(r))
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-}
-
-func newTaxDetailsFormFromDatabase(r *http.Request) *taxDetailsForm {
 		locale := getLocale(r)
 		conn := getConn(r)
-	form := newTaxDetailsForm(r.Context(), conn, locale)
+		page := &TaxDetailsPage{
-
+			DetailsForm: newTaxDetailsForm(r.Context(), conn, locale),
+			NewTaxForm:  newNewTaxForm(locale),
+		}
 		company := mustGetCompany(r)
-	form.mustFillFromDatabase(r.Context(), conn, company)
+		if r.Method == "POST" {
-
+			if err := page.DetailsForm.Parse(r); err != nil {
-	return form
-}
-
-func HandleCompanyTaxDetailsForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	locale := getLocale(r)
-	conn := getConn(r)
-	form := newTaxDetailsForm(r.Context(), conn, locale)
-	if err := form.Parse(r); err != nil {
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
 			}
@@ -137,39 +146,19 @@ func HandleCompanyTaxDetailsForm(w http.ResponseWriter, r *http.Request, _ httpr
 				http.Error(w, err.Error(), http.StatusForbidden)
 				return
 			}
-	if ok := form.Validate(r.Context(), conn); !ok {
+			if ok := page.DetailsForm.Validate(r.Context(), conn); ok {
-		w.WriteHeader(http.StatusUnprocessableEntity)
+				form := page.DetailsForm
-		mustRenderTaxDetailsForm(w, r, form)
-		return
-	}
-	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 where company_id = $13", form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country, form.Currency, company.Id)
 				http.Redirect(w, r, "/company/"+company.Slug+"/tax-details", http.StatusSeeOther)
 				return
 			}
-
+			w.WriteHeader(http.StatusUnprocessableEntity)
-func mustRenderTaxDetailsForm(w http.ResponseWriter, r *http.Request, form *taxDetailsForm) {
+		} else {
-	locale := getLocale(r)
+			page.DetailsForm.mustFillFromDatabase(r.Context(), conn, company)
-	page := &TaxDetailsPage{
-		DetailsForm: form,
-		NewTaxForm:  newTaxForm(locale),
 		}
-	mustRenderTexDetailsPage(w, r, page)
-}
-
-func mustRenderTaxForm(w http.ResponseWriter, r *http.Request, form *taxForm) {
-	page := &TaxDetailsPage{
-		DetailsForm: newTaxDetailsFormFromDatabase(r),
-		NewTaxForm:  form,
-	}
-	mustRenderTexDetailsPage(w, r, page)
-}
-
-func mustRenderTexDetailsPage(w http.ResponseWriter, r *http.Request, page *TaxDetailsPage) {
-	conn := getConn(r)
-	company := mustGetCompany(r)
 		page.Taxes = mustGetTaxes(r.Context(), conn, company)
 		mustRenderAppTemplate(w, r, "tax-details.gohtml", page)
+	})
 }
 
 func mustGetCompany(r *http.Request) *Company {
@@ -203,14 +192,14 @@ func mustGetTaxes(ctx context.Context, conn *Conn, company *Company) []*Tax {
 	return taxes
 }
 
-type taxForm struct {
+type newTaxForm struct {
 	locale *Locale
 	Name   *InputField
 	Rate   *InputField
 }
 
-func newTaxForm(locale *Locale) *taxForm {
+func newNewTaxForm(locale *Locale) *newTaxForm {
-	return &taxForm{
+	return &newTaxForm{
 		locale: locale,
 		Name: &InputField{
 			Name:     "tax_name",
@@ -231,7 +220,7 @@ func newTaxForm(locale *Locale) *taxForm {
 	}
 }
 
-func (form *taxForm) Parse(r *http.Request) error {
+func (form *newTaxForm) Parse(r *http.Request) error {
 	if err := r.ParseForm(); err != nil {
 		return err
 	}
@@ -240,7 +229,7 @@ func (form *taxForm) Parse(r *http.Request) error {
 	return nil
 }
 
-func (form *taxForm) Validate() bool {
+func (form *newTaxForm) Validate() bool {
 	validator := newFormValidator()
 	validator.CheckRequiredInput(form.Name, gettext("Tax name can not be empty.", form.locale))
 	if validator.CheckRequiredInput(form.Rate, gettext("Tax rate can not be empty.", form.locale)) {
@@ -249,25 +238,24 @@ func (form *taxForm) Validate() bool {
 	return validator.AllOK()
 }
 
-func HandleDeleteCompanyTax(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
+func CompanyTaxHandler() http.Handler {
-	taxId, err := strconv.Atoi(params[0].Value)
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-	if err != nil {
+		param := r.URL.Path
-		http.NotFound(w, r)
+		if idx := strings.LastIndexByte(param, '/'); idx >= 0 {
-		return
+			param = param[idx+1:]
 		}
+		conn := getConn(r)
+		company := mustGetCompany(r)
+		if taxId, err := strconv.Atoi(param); err == nil {
 			if err := verifyCsrfTokenValid(r); err != nil {
 				http.Error(w, err.Error(), http.StatusForbidden)
 				return
 			}
-	conn := getConn(r)
-	company := mustGetCompany(r)
 			conn.MustExec(r.Context(), "delete from tax where tax_id = $1", taxId)
 			http.Redirect(w, r, "/company/"+company.Slug+"/tax-details", http.StatusSeeOther)
-}
+		} else {
-
-func HandleAddCompanyTax(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 			locale := getLocale(r)
-	form := newTaxForm(locale)
+			form := newNewTaxForm(locale)
 			if err := form.Parse(r); err != nil {
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
@@ -276,13 +264,18 @@ func HandleAddCompanyTax(w http.ResponseWriter, r *http.Request, _ httprouter.Pa
 				http.Error(w, err.Error(), http.StatusForbidden)
 				return
 			}
-	if !form.Validate() {
+			if form.Validate() {
-		w.WriteHeader(http.StatusUnprocessableEntity)
-		mustRenderTaxForm(w, r, form)
-		return
-	}
-	conn := getConn(r)
-	company := mustGetCompany(r)
 				conn.MustExec(r.Context(), "insert into tax (company_id, name, rate) values ($1, $2, $3 / 100::decimal)", company.Id, form.Name, form.Rate.Integer())
 				http.Redirect(w, r, "/company/"+company.Slug+"/tax-details", http.StatusSeeOther)
+			} else {
+				w.WriteHeader(http.StatusUnprocessableEntity)
+			}
+			page := &TaxDetailsPage{
+				DetailsForm: newTaxDetailsForm(r.Context(), conn, locale).mustFillFromDatabase(r.Context(), conn, company),
+				NewTaxForm:  form,
+				Taxes:       mustGetTaxes(r.Context(), conn, company),
+			}
+			mustRenderAppTemplate(w, r, "tax-details.gohtml", page)
+		}
+	})
 }

pkg/contacts.go

@@ -2,14 +2,11 @@ package pkg
 
 import (
 	"context"
-	"github.com/jackc/pgx/v4"
-	"github.com/julienschmidt/httprouter"
 	"html/template"
 	"net/http"
 )
 
 type ContactEntry struct {
-	Slug  string
 	Name  string
 	Email string
 	Phone string
@@ -19,93 +16,38 @@ type ContactsIndexPage struct {
 	Contacts []*ContactEntry
 }
 
-func IndexContacts(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+func ContactsHandler() http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		conn := getConn(r)
 		company := getCompany(r)
+		if r.Method == "POST" {
+			locale := getLocale(r)
+			form := newContactForm(r.Context(), conn, locale)
+			if err := form.Parse(r); err != nil {
+				http.Error(w, err.Error(), http.StatusBadRequest)
+				return
+			}
+			if err := verifyCsrfTokenValid(r); err != nil {
+				http.Error(w, err.Error(), http.StatusForbidden)
+				return
+			}
+			if form.Validate(r.Context(), conn) {
+				conn.MustExec(r.Context(), "insert into contact (company_id, business_name, vatin, trade_name, phone, email, web, address, province, city, postal_code, country_code) values ($1, $2, ($12 || $3)::vatin, $4, parse_packed_phone_number($5, $12), $6, $7, $8, $9, $10, $11, $12)", company.Id, form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country)
+				http.Redirect(w, r, "/company/"+company.Slug+"/contacts", http.StatusSeeOther)
+			} else {
+				mustRenderAppTemplate(w, r, "contacts-new.gohtml", form)
+			}
+		} else {
 			page := &ContactsIndexPage{
 				Contacts: mustGetContactEntries(r.Context(), conn, company),
 			}
 			mustRenderAppTemplate(w, r, "contacts-index.gohtml", page)
 		}
-
+	})
-func GetContactForm(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
-	locale := getLocale(r)
-	conn := getConn(r)
-	form := newContactForm(r.Context(), conn, locale)
-	slug := params[0].Value
-	if slug == "new" {
-		w.WriteHeader(http.StatusOK)
-		mustRenderNewContactForm(w, r, form)
-		return
-	}
-	err := conn.QueryRow(r.Context(), "select business_name, substr(vatin::text, 3), trade_name, phone, email, web, address, city, province, postal_code, country_code from contact where slug = $1", slug).Scan(form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country)
-	if err != nil {
-		if err == pgx.ErrNoRows {
-			http.NotFound(w, r)
-			return
-		} else {
-			panic(err)
-		}
-	}
-	w.WriteHeader(http.StatusOK)
-	mustRenderEditContactForm(w, r, form)
-}
-
-func mustRenderNewContactForm(w http.ResponseWriter, r *http.Request, form *contactForm) {
-	mustRenderAppTemplate(w, r, "contacts-new.gohtml", form)
-}
-
-func mustRenderEditContactForm(w http.ResponseWriter, r *http.Request, form *contactForm) {
-	mustRenderAppTemplate(w, r, "contacts-edit.gohtml", form)
-}
-
-func HandleAddContact(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	conn := getConn(r)
-	locale := getLocale(r)
-	form := newContactForm(r.Context(), conn, locale)
-	if err := form.Parse(r); err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	if err := verifyCsrfTokenValid(r); err != nil {
-		http.Error(w, err.Error(), http.StatusForbidden)
-		return
-	}
-	if !form.Validate(r.Context(), conn) {
-		mustRenderNewContactForm(w, r, form)
-		return
-	}
-	company := getCompany(r)
-	conn.MustExec(r.Context(), "insert into contact (company_id, business_name, vatin, trade_name, phone, email, web, address, city, province, postal_code, country_code) values ($1, $2, ($12 || $3)::vatin, $4, parse_packed_phone_number($5, $12), $6, $7, $8, $9, $10, $11, $12)", company.Id, form.BusinessName, form.VATIN, form.TradeName, form.Phone, form.Email, form.Web, form.Address, form.City, form.Province, form.PostalCode, form.Country)
-	http.Redirect(w, r, "/company/"+company.Slug+"/contacts", http.StatusSeeOther)
-}
-
-func HandleUpdateContact(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
-	conn := getConn(r)
-	locale := getLocale(r)
-	form := newContactForm(r.Context(), conn, locale)
-	if err := form.Parse(r); err != nil {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-		return
-	}
-	if err := verifyCsrfTokenValid(r); err != nil {
-		http.Error(w, err.Error(), http.StatusForbidden)
-		return
-	}
-	if !form.Validate(r.Context(), conn) {
-		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)
-	}
-	company := getCompany(r)
-	http.Redirect(w, r, "/company/"+company.Slug+"/contacts/"+slug, http.StatusSeeOther)
 }
 
 func mustGetContactEntries(ctx context.Context, conn *Conn, company *Company) []*ContactEntry {
-	rows, err := conn.Query(ctx, "select slug, business_name, email, phone from contact where company_id = $1 order by business_name", company.Id)
+	rows, err := conn.Query(ctx, "select business_name, email, phone from contact where company_id = $1 order by business_name", company.Id)
 	if err != nil {
 		panic(err)
 	}
@@ -114,7 +56,7 @@ func mustGetContactEntries(ctx context.Context, conn *Conn, company *Company) []
 	var entries []*ContactEntry
 	for rows.Next() {
 		entry := &ContactEntry{}
-		err = rows.Scan(&entry.Slug, &entry.Name, &entry.Email, &entry.Phone)
+		err = rows.Scan(&entry.Name, &entry.Email, &entry.Phone)
 		if err != nil {
 			panic(err)
 		}
@@ -275,3 +217,12 @@ func (form *contactForm) Validate(ctx context.Context, conn *Conn) bool {
 	validator.CheckValidSelectOption(form.Country, gettext("Selected country is not valid.", form.locale))
 	return validator.AllOK()
 }
+
+func NewContactHandler() http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		locale := getLocale(r)
+		conn := getConn(r)
+		form := newContactForm(r.Context(), conn, locale)
+		mustRenderAppTemplate(w, r, "contacts-new.gohtml", form)
+	})
+}

pkg/locale.go

@@ -22,7 +22,7 @@ func NewLocale(lang language.Tag) *Locale {
 	}
 }
 
-func LocaleSetter(db *Db, next http.Handler) http.Handler {
+func SetLocale(db *Db, next http.Handler) http.Handler {
 	availableLanguages := mustGetAvailableLanguages(db)
 	var matcher = language.NewMatcher(availableLanguages)
 

pkg/login.go

@@ -3,7 +3,6 @@ package pkg
 import (
 	"context"
 	"errors"
-	"github.com/julienschmidt/httprouter"
 	"html/template"
 	"net"
 	"net/http"
@@ -73,19 +72,8 @@ func (form *loginForm) Validate() bool {
 	return validator.AllOK()
 }
 
-func GetLoginForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+func LoginHandler() http.Handler {
-	user := getUser(r)
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-	if user.LoggedIn {
-		http.Redirect(w, r, "/", http.StatusSeeOther)
-		return
-	}
-	locale := getLocale(r)
-	form := newLoginForm(locale)
-	w.WriteHeader(http.StatusOK)
-	mustRenderLoginForm(w, r, form)
-}
-
-func HandleLoginForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		user := getUser(r)
 		if user.LoggedIn {
 			http.Redirect(w, r, "/", http.StatusSeeOther)
@@ -93,6 +81,7 @@ func HandleLoginForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params
 		}
 		locale := getLocale(r)
 		form := newLoginForm(locale)
+		if r.Method == "POST" {
 			if err := form.Parse(r); err != nil {
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
@@ -110,14 +99,13 @@ func HandleLoginForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params
 			} else {
 				w.WriteHeader(http.StatusUnprocessableEntity)
 			}
-	mustRenderLoginForm(w, r, form)
 		}
-
-func mustRenderLoginForm(w http.ResponseWriter, r *http.Request, form *loginForm) {
 		mustRenderWebTemplate(w, r, "login.gohtml", form)
+	})
 }
 
-func HandleLogout(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+func LogoutHandler() http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if err := verifyCsrfTokenValid(r); err != nil {
 			http.Error(w, err.Error(), http.StatusForbidden)
 			return
@@ -126,6 +114,7 @@ func HandleLogout(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		conn.MustExec(r.Context(), "select logout()")
 		http.SetCookie(w, createSessionCookie("", -24*time.Hour))
 		http.Redirect(w, r, "/login", http.StatusSeeOther)
+	})
 }
 
 func remoteAddr(r *http.Request) string {
@@ -159,7 +148,7 @@ type AppUser struct {
 	CsrfToken string
 }
 
-func LoginChecker(db *Db, next http.Handler) http.Handler {
+func CheckLogin(db *Db, next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		var ctx = r.Context()
 		if cookie, err := r.Cookie(sessionCookie); err == nil {
@@ -206,13 +195,13 @@ func getConn(r *http.Request) *Conn {
 	return r.Context().Value(ContextConnKey).(*Conn)
 }
 
-func Authenticated(next httprouter.Handle) httprouter.Handle {
+func Authenticated(next http.Handler) http.Handler {
-	return func(w http.ResponseWriter, r *http.Request, params httprouter.Params) {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		user := getUser(r)
 		if user.LoggedIn {
-			next(w, r, params)
+			next.ServeHTTP(w, r)
 		} else {
 			http.Redirect(w, r, "/login", http.StatusSeeOther)
 		}
-	}
+	})
 }

pkg/profile.go

@@ -2,7 +2,6 @@ package pkg
 
 import (
 	"context"
-	"github.com/julienschmidt/httprouter"
 	"html/template"
 	"net/http"
 )
@@ -94,23 +93,13 @@ func (form *profileForm) Validate() bool {
 	return validator.AllOK()
 }
 
-func GetProfileForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+func ProfileHandler() http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		user := getUser(r)
 		conn := getConn(r)
 		locale := getLocale(r)
 		form := newProfileForm(r.Context(), conn, locale)
-	form.Name.Val = conn.MustGetText(r.Context(), "", "select name from user_profile")
+		if r.Method == "POST" {
-	form.Email.Val = user.Email
-	form.Language.Selected = user.Language.String()
-
-	w.WriteHeader(http.StatusOK)
-	mustRenderProfileForm(w, r, form)
-}
-
-func HandleProfileForm(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
-	conn := getConn(r)
-	locale := getLocale(r)
-	form := newProfileForm(r.Context(), conn, locale)
 			if err := form.Parse(r); err != nil {
 				http.Error(w, err.Error(), http.StatusBadRequest)
 				return
@@ -119,11 +108,7 @@ func HandleProfileForm(w http.ResponseWriter, r *http.Request, _ httprouter.Para
 				http.Error(w, err.Error(), http.StatusForbidden)
 				return
 			}
-	if ok := form.Validate(); !ok {
+			if ok := form.Validate(); ok {
-		w.WriteHeader(http.StatusUnprocessableEntity)
-		mustRenderProfileForm(w, r, form)
-		return
-	}
 				//goland:noinspection SqlWithoutWhere
 				cookie := conn.MustGetText(r.Context(), "", "update user_profile set name = $1, email = $2, lang_tag = $3 returning build_cookie()", form.Name, form.Email, form.Language)
 				setSessionCookie(w, cookie)
@@ -132,8 +117,14 @@ func HandleProfileForm(w http.ResponseWriter, r *http.Request, _ httprouter.Para
 				}
 				company := getCompany(r)
 				http.Redirect(w, r, "/company/"+company.Slug+"/profile", http.StatusSeeOther)
+				return
+			}
+			w.WriteHeader(http.StatusUnprocessableEntity)
+		} else {
+			form.Name.Val = conn.MustGetText(r.Context(), "", "select name from user_profile")
+			form.Email.Val = user.Email
+			form.Language.Selected = user.Language.String()
 		}
-
-func mustRenderProfileForm(w http.ResponseWriter, r *http.Request, form *profileForm) {
 		mustRenderAppTemplate(w, r, "profile.gohtml", form)
+	})
 }

pkg/router.go

@@ -2,73 +2,43 @@ package pkg
 
 import (
 	"net/http"
-
-	"github.com/julienschmidt/httprouter"
 )
 
 func NewRouter(db *Db) http.Handler {
-	companyRouter := httprouter.New()
+	companyRouter := http.NewServeMux()
-	companyRouter.GET("/profile", GetProfileForm)
+	companyRouter.Handle("/tax-details", CompanyTaxDetailsHandler())
-	companyRouter.POST("/profile", HandleProfileForm)
+	companyRouter.Handle("/tax/", CompanyTaxHandler())
-	companyRouter.GET("/tax-details", GetCompanyTaxDetailsForm)
+	companyRouter.Handle("/tax", CompanyTaxHandler())
-	companyRouter.POST("/tax-details", HandleCompanyTaxDetailsForm)
+	companyRouter.Handle("/profile", ProfileHandler())
-	companyRouter.POST("/tax", HandleAddCompanyTax)
+	companyRouter.Handle("/contacts/new", NewContactHandler())
-	companyRouter.DELETE("/tax/:taxId", HandleDeleteCompanyTax)
+	companyRouter.Handle("/contacts", ContactsHandler())
-	companyRouter.GET("/contacts", IndexContacts)
+	companyRouter.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-	companyRouter.POST("/contacts", HandleAddContact)
-	companyRouter.GET("/contacts/:slug", GetContactForm)
-	companyRouter.PUT("/contacts/:slug", HandleUpdateContact)
-	companyRouter.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		mustRenderAppTemplate(w, r, "dashboard.gohtml", nil)
 	})
 
-	router := httprouter.New()
+	router := http.NewServeMux()
-	router.ServeFiles("/static/*filepath", http.Dir("web/static"))
+	router.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("web/static"))))
-	router.GET("/login", GetLoginForm)
+	router.Handle("/login", LoginHandler())
-	router.POST("/login", HandleLoginForm)
+	router.Handle("/logout", Authenticated(LogoutHandler()))
-	router.POST("/logout", Authenticated(HandleLogout))
+	router.Handle("/company/", Authenticated(http.StripPrefix("/company/", CompanyHandler(companyRouter))))
-
+	router.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-	companyHandler := Authenticated(CompanyHandler(companyRouter))
-	router.GET("/company/:slug/*rest", companyHandler)
-	router.POST("/company/:slug/*rest", companyHandler)
-	router.PUT("/company/:slug/*rest", companyHandler)
-	router.DELETE("/company/:slug/*rest", companyHandler)
-
-	router.GET("/", func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 		user := getUser(r)
 		if user.LoggedIn {
 			conn := getConn(r)
-			slug := conn.MustGetText(r.Context(), "", "select slug::text from company order by company_id limit 1")
+			var slug string
-			http.Redirect(w, r, "/company/"+slug+"/", http.StatusFound)
+			err := conn.QueryRow(r.Context(), "select slug::text from company order by company_id limit 1").Scan(&slug)
+			if err != nil {
+				panic(err)
+			}
+			http.Redirect(w, r, "/company/"+slug, http.StatusFound)
 		} else {
 			http.Redirect(w, r, "/login", http.StatusSeeOther)
 		}
 	})
-
 	var handler http.Handler = router
-	handler = MethodOverrider(handler)
+	handler = SetLocale(db, handler)
-	handler = LocaleSetter(db, handler)
+	handler = CheckLogin(db, handler)
-	handler = LoginChecker(db, handler)
 	handler = Recoverer(handler)
 	handler = Logger(handler)
 	return handler
 }
-
-func MethodOverrider(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == http.MethodPost {
-			if err := r.ParseForm(); err != nil {
-				http.Error(w, err.Error(), http.StatusBadRequest)
-				return
-			}
-			override := r.FormValue(overrideMethodName)
-			if override == http.MethodDelete || override == http.MethodPut {
-				r2 := new(http.Request)
-				*r2 = *r
-				r2.Method = override
-				r = r2
-			}
-		}
-		next.ServeHTTP(w, r)
-	})
-}

pkg/template.go

@@ -7,8 +7,6 @@ import (
 	"net/http"
 )
 
-const overrideMethodName = "_method"
-
 func templateFile(name string) string {
 	return "web/template/" + name
 }
@@ -41,12 +39,6 @@ func mustRenderTemplate(wr io.Writer, r *http.Request, layout string, filename s
 			field.Attributes = append(field.Attributes, template.HTMLAttr(attr))
 			return field
 		},
-		"deleteMethod": func() template.HTML {
-			return overrideMethodField(http.MethodDelete)
-		},
-		"putMethod": func() template.HTML {
-			return overrideMethodField(http.MethodPut)
-		},
 	})
 	if _, err := t.ParseFiles(templateFile(filename), templateFile(layout), templateFile("form.gohtml")); err != nil {
 		panic(err)
@@ -56,9 +48,6 @@ func mustRenderTemplate(wr io.Writer, r *http.Request, layout string, filename s
 	}
 }
 
-func overrideMethodField(method string) template.HTML {
-	return template.HTML(fmt.Sprintf(`<input type="hidden" name="%s" value="%s">`, overrideMethodName, method))
-}
 func mustRenderAppTemplate(w io.Writer, r *http.Request, filename string, data interface{}) {
 	mustRenderTemplate(w, r, "app.gohtml", filename, data)
 }

po/ca.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: numerus\n"
 "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
-"POT-Creation-Date: 2023-02-03 13:57+0100\n"
+"POT-Creation-Date: 2023-02-01 11:26+0100\n"
 "PO-Revision-Date: 2023-01-18 17:08+0100\n"
 "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -32,17 +32,17 @@ msgctxt "menu"
 msgid "Tax Details"
 msgstr "Configuració fiscal"
 
-#: web/template/app.gohtml:34
+#: web/template/app.gohtml:33
 msgctxt "action"
 msgid "Logout"
 msgstr "Surt"
 
-#: web/template/app.gohtml:43
+#: web/template/app.gohtml:42
 msgctxt "nav"
 msgid "Dashboard"
 msgstr "Tauler"
 
-#: web/template/app.gohtml:44
+#: web/template/app.gohtml:43
 msgctxt "nav"
 msgid "Contacts"
 msgstr "Contactes"
@@ -57,311 +57,222 @@ msgctxt "action"
 msgid "Login"
 msgstr "Entra"
 
-#: web/template/profile.gohtml:2 web/template/profile.gohtml:10
+#: web/template/profile.gohtml:2 web/template/profile.gohtml:7
-#: web/template/profile.gohtml:14
 msgctxt "title"
 msgid "User Settings"
 msgstr "Configuració usuari"
 
-#: web/template/profile.gohtml:9 web/template/contacts-edit.gohtml:9
+#: web/template/profile.gohtml:10
-#: web/template/contacts-index.gohtml:8 web/template/tax-details.gohtml:8
-#: web/template/contacts-new.gohtml:9
-msgctxt "title"
-msgid "Home"
-msgstr "Inici"
-
-#: web/template/profile.gohtml:18
 msgctxt "title"
 msgid "User Access Data"
 msgstr "Dades accés usuari"
 
-#: web/template/profile.gohtml:24
+#: web/template/profile.gohtml:16
 msgctxt "title"
 msgid "Password Change"
 msgstr "Canvi contrasenya"
 
-#: web/template/profile.gohtml:31
+#: web/template/profile.gohtml:23
 msgctxt "title"
 msgid "Language"
 msgstr "Idioma"
 
-#: web/template/profile.gohtml:35 web/template/tax-details.gohtml:96
+#: web/template/profile.gohtml:27 web/template/tax-details.gohtml:133
 msgctxt "action"
 msgid "Save changes"
 msgstr "Desa canvis"
 
-#: web/template/contacts-edit.gohtml:2 web/template/contacts-edit.gohtml:15
+#: web/template/contacts-index.gohtml:2
-msgctxt "title"
-msgid "Edit Contact “%s”"
-msgstr "Edició del contacte «%s»"
-
-#: web/template/contacts-edit.gohtml:10 web/template/contacts-index.gohtml:2
-#: web/template/contacts-index.gohtml:9 web/template/contacts-new.gohtml:10
 msgctxt "title"
 msgid "Contacts"
 msgstr "Contactes"
 
-#: web/template/contacts-edit.gohtml:33
+#: web/template/contacts-index.gohtml:6 web/template/contacts-new.gohtml:60
-msgctxt "action"
-msgid "Update contact"
-msgstr "Actualitza contacte"
-
-#: web/template/contacts-index.gohtml:13 web/template/contacts-new.gohtml:31
 msgctxt "action"
 msgid "New contact"
 msgstr "Nou contacte"
 
-#: web/template/contacts-index.gohtml:20
+#: web/template/contacts-index.gohtml:11
 msgctxt "contact"
 msgid "All"
 msgstr "Tots"
 
-#: web/template/contacts-index.gohtml:21
+#: web/template/contacts-index.gohtml:12
 msgctxt "title"
 msgid "Customer"
 msgstr "Client"
 
-#: web/template/contacts-index.gohtml:22
+#: web/template/contacts-index.gohtml:13
 msgctxt "title"
 msgid "Email"
 msgstr "Correu-e"
 
-#: web/template/contacts-index.gohtml:23
+#: web/template/contacts-index.gohtml:14
 msgctxt "title"
 msgid "Phone"
 msgstr "Telèfon"
 
-#: web/template/contacts-index.gohtml:38
+#: web/template/contacts-index.gohtml:29
 msgid "No contacts added yet."
 msgstr "No hi ha cap contacte."
 
-#: web/template/tax-details.gohtml:2 web/template/tax-details.gohtml:9
+#: web/template/tax-details.gohtml:2 web/template/tax-details.gohtml:7
-#: web/template/tax-details.gohtml:13
 msgctxt "title"
 msgid "Tax Details"
 msgstr "Configuració fiscal"
 
-#: web/template/tax-details.gohtml:31
+#: web/template/tax-details.gohtml:11 web/template/contacts-new.gohtml:11
-msgctxt "title"
-msgid "Currency"
-msgstr "Moneda"
-
-#: web/template/tax-details.gohtml:47
-msgctxt "title"
-msgid "Tax Name"
-msgstr "Nom import"
-
-#: web/template/tax-details.gohtml:48
-msgctxt "title"
-msgid "Rate (%)"
-msgstr "Percentatge"
-
-#: web/template/tax-details.gohtml:71
-msgid "No taxes added yet."
-msgstr "No hi ha cap impost."
-
-#: web/template/tax-details.gohtml:77
-msgctxt "title"
-msgid "New Line"
-msgstr "Nova línia"
-
-#: web/template/tax-details.gohtml:88
-msgctxt "action"
-msgid "Add new tax"
-msgstr "Afegeix nou impost"
-
-#: web/template/contacts-new.gohtml:2 web/template/contacts-new.gohtml:11
-#: web/template/contacts-new.gohtml:15
-msgctxt "title"
-msgid "New Contact"
-msgstr "Nou contacte"
-
-#: pkg/login.go:36 pkg/profile.go:40 pkg/contacts.go:179
-msgctxt "input"
-msgid "Email"
-msgstr "Correu-e"
-
-#: pkg/login.go:47 pkg/profile.go:49
-msgctxt "input"
-msgid "Password"
-msgstr "Contrasenya"
-
-#: pkg/login.go:69 pkg/profile.go:88 pkg/contacts.go:263
-msgid "Email can not be empty."
-msgstr "No podeu deixar el correu-e en blanc."
-
-#: pkg/login.go:70 pkg/profile.go:89 pkg/contacts.go:264
-msgid "This value is not a valid email. It should be like name@domain.com."
-msgstr "Aquest valor no és un correu-e vàlid. Hauria de ser similar a nom@domini.cat."
-
-#: pkg/login.go:72
-msgid "Password can not be empty."
-msgstr "No podeu deixar la contrasenya en blanc."
-
-#: pkg/login.go:108
-msgid "Invalid user or password."
-msgstr "Nom d’usuari o contrasenya incorrectes."
-
-#: pkg/company.go:78
-msgctxt "input"
-msgid "Currency"
-msgstr "Moneda"
-
-#: pkg/company.go:95
-msgid "Selected currency is not valid."
-msgstr "Heu seleccionat una moneda que no és vàlida."
-
-#: pkg/company.go:217
-msgctxt "input"
-msgid "Tax name"
-msgstr "Nom impost"
-
-#: pkg/company.go:223
-msgctxt "input"
-msgid "Rate (%)"
-msgstr "Percentatge"
-
-#: pkg/company.go:245
-msgid "Tax name can not be empty."
-msgstr "No podeu deixar el nom de l’impost en blanc."
-
-#: pkg/company.go:246
-msgid "Tax rate can not be empty."
-msgstr "No podeu deixar percentatge en blanc."
-
-#: pkg/company.go:247
-msgid "Tax rate must be an integer between -99 and 99."
-msgstr "El percentatge ha de ser entre -99 i 99."
-
-#: pkg/profile.go:25
-msgctxt "language option"
-msgid "Automatic"
-msgstr "Automàtic"
-
-#: pkg/profile.go:31
-msgctxt "input"
-msgid "User name"
-msgstr "Nom d’usuari"
-
-#: pkg/profile.go:57
-msgctxt "input"
-msgid "Password Confirmation"
-msgstr "Confirmació contrasenya"
-
-#: pkg/profile.go:65
-msgctxt "input"
-msgid "Language"
-msgstr "Idioma"
-
-#: pkg/profile.go:91
-msgid "Name can not be empty."
-msgstr "No podeu deixar el nom en blanc."
-
-#: pkg/profile.go:92
-msgid "Confirmation does not match password."
-msgstr "La confirmació no és igual a la contrasenya."
-
-#: pkg/profile.go:93
-msgid "Selected language is not valid."
-msgstr "Heu seleccionat un idioma que no és vàlid."
-
-#: pkg/contacts.go:150
 msgctxt "input"
 msgid "Business name"
-msgstr "Nom i cognoms"
+msgstr "Nom i cognom"
 
-#: pkg/contacts.go:159
+#: web/template/tax-details.gohtml:15 web/template/contacts-new.gohtml:15
 msgctxt "input"
 msgid "VAT number"
 msgstr "DNI / NIF"
 
-#: pkg/contacts.go:165
+#: web/template/tax-details.gohtml:19 web/template/contacts-new.gohtml:19
 msgctxt "input"
 msgid "Trade name"
 msgstr "Nom comercial"
 
-#: pkg/contacts.go:170
+#: web/template/tax-details.gohtml:23 web/template/contacts-new.gohtml:23
 msgctxt "input"
 msgid "Phone"
 msgstr "Telèfon"
 
-#: pkg/contacts.go:188
+#: web/template/tax-details.gohtml:27 web/template/contacts-new.gohtml:27
+#: pkg/login.go:33 pkg/profile.go:35
+msgctxt "input"
+msgid "Email"
+msgstr "Correu-e"
+
+#: web/template/tax-details.gohtml:31 web/template/contacts-new.gohtml:31
 msgctxt "input"
 msgid "Web"
 msgstr "Web"
 
-#: pkg/contacts.go:196
+#: web/template/tax-details.gohtml:35 web/template/contacts-new.gohtml:35
 msgctxt "input"
 msgid "Address"
 msgstr "Adreça"
 
-#: pkg/contacts.go:205
+#: web/template/tax-details.gohtml:39 web/template/contacts-new.gohtml:39
 msgctxt "input"
 msgid "City"
 msgstr "Població"
 
-#: pkg/contacts.go:211
+#: web/template/tax-details.gohtml:43 web/template/contacts-new.gohtml:43
 msgctxt "input"
 msgid "Province"
 msgstr "Província"
 
-#: pkg/contacts.go:217
+#: web/template/tax-details.gohtml:47 web/template/contacts-new.gohtml:47
 msgctxt "input"
 msgid "Postal code"
 msgstr "Codi postal"
 
-#: pkg/contacts.go:226
+#: web/template/tax-details.gohtml:56 web/template/contacts-new.gohtml:56
 msgctxt "input"
 msgid "Country"
 msgstr "País"
 
-#: pkg/contacts.go:256
+#: web/template/tax-details.gohtml:60
-msgid "Business name can not be empty."
+msgctxt "input"
-msgstr "No podeu deixar el nom i els cognoms en blanc."
+msgid "Currency"
+msgstr "Moneda"
 
-#: pkg/contacts.go:257
+#: web/template/tax-details.gohtml:78
-msgid "VAT number can not be empty."
+msgctxt "title"
-msgstr "No podeu deixar el DNI o NIF en blanc."
+msgid "Tax Name"
+msgstr "Nom import"
 
-#: pkg/contacts.go:258
+#: web/template/tax-details.gohtml:79
-msgid "This value is not a valid VAT number."
+msgctxt "title"
-msgstr "Aquest valor no és un DNI o NIF vàlid."
+msgid "Rate (%)"
+msgstr "Percentatge"
 
-#: pkg/contacts.go:260
+#: web/template/tax-details.gohtml:100
-msgid "Phone can not be empty."
+msgid "No taxes added yet."
-msgstr "No podeu deixar el telèfon en blanc."
+msgstr "No hi ha cap impost."
 
-#: pkg/contacts.go:261
+#: web/template/tax-details.gohtml:106
-msgid "This value is not a valid phone number."
+msgctxt "title"
-msgstr "Aquest valor no és un telèfon vàlid."
+msgid "New Line"
+msgstr "Nova línia"
 
-#: pkg/contacts.go:267
+#: web/template/tax-details.gohtml:111
-msgid "This value is not a valid web address. It should be like https://domain.com/."
+msgctxt "input"
-msgstr "Aquest valor no és una adreça web vàlida. Hauria de ser similar a https://domini.cat/."
+msgid "Tax name"
+msgstr "Nom impost"
 
-#: pkg/contacts.go:269
+#: web/template/tax-details.gohtml:118
-msgid "Address can not be empty."
+msgctxt "input"
-msgstr "No podeu deixar l’adreça en blanc."
+msgid "Rate (%)"
+msgstr "Percentatge"
 
-#: pkg/contacts.go:270
+#: web/template/tax-details.gohtml:125
-msgid "City can not be empty."
+msgctxt "action"
-msgstr "No podeu deixar la població en blanc."
+msgid "Add new tax"
+msgstr "Afegeix nou impost"
 
-#: pkg/contacts.go:271
+#: web/template/contacts-new.gohtml:2 web/template/contacts-new.gohtml:7
-msgid "Province can not be empty."
+msgctxt "title"
-msgstr "No podeu deixar la província en blanc."
+msgid "New Contact"
+msgstr "Nou contacte"
 
-#: pkg/contacts.go:272
+#: pkg/login.go:44 pkg/profile.go:41
-msgid "Postal code can not be empty."
+msgctxt "input"
-msgstr "No podeu deixar el codi postal en blanc."
+msgid "Password"
+msgstr "Contrasenya"
 
-#: pkg/contacts.go:273
+#: pkg/login.go:66 pkg/profile.go:71
-msgid "This value is not a valid postal code."
+msgid "Email can not be empty."
-msgstr "Aquest valor no és un codi postal vàlid."
+msgstr "No podeu deixar el correu-e en blanc."
 
-#: pkg/contacts.go:275
+#: pkg/login.go:67 pkg/profile.go:72
-msgid "Selected country is not valid."
+msgid "This value is not a valid email. It should be like name@domain.com."
-msgstr "Heu seleccionat un país que no és vàlid."
+msgstr "Aquest valor no és un correu-e vàlid. Hauria de ser similar a nom@domini.cat."
+
+#: pkg/login.go:69
+msgid "Password can not be empty."
+msgstr "No podeu deixar la contrasenya en blanc."
+
+#: pkg/login.go:95
+msgid "Invalid user or password."
+msgstr "Nom d’usuari o contrasenya incorrectes."
+
+#: pkg/profile.go:23
+msgctxt "language option"
+msgid "Automatic"
+msgstr "Automàtic"
+
+#: pkg/profile.go:29
+msgctxt "input"
+msgid "User name"
+msgstr "Nom d’usuari"
+
+#: pkg/profile.go:46
+msgctxt "input"
+msgid "Password Confirmation"
+msgstr "Confirmació contrasenya"
+
+#: pkg/profile.go:51
+msgctxt "input"
+msgid "Language"
+msgstr "Idioma"
+
+#: pkg/profile.go:74
+msgid "Name can not be empty."
+msgstr "No podeu deixar el nom en blanc."
+
+#: pkg/profile.go:75
+msgid "Confirmation does not match password."
+msgstr "La confirmació no és igual a la contrasenya."
+
+#: pkg/profile.go:76
+msgid "Selected language is not valid."
+msgstr "Heu seleccionat un idioma que no és vàlid."
 
 #~ msgctxt "nav"
 #~ msgid "Customers"

po/es.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: numerus\n"
 "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
-"POT-Creation-Date: 2023-02-03 13:57+0100\n"
+"POT-Creation-Date: 2023-02-01 11:26+0100\n"
 "PO-Revision-Date: 2023-01-18 17:45+0100\n"
 "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
 "Language-Team: Spanish <es@tp.org.es>\n"
@@ -32,17 +32,17 @@ msgctxt "menu"
 msgid "Tax Details"
 msgstr "Configuración fiscal"
 
-#: web/template/app.gohtml:34
+#: web/template/app.gohtml:33
 msgctxt "action"
 msgid "Logout"
 msgstr "Salir"
 
-#: web/template/app.gohtml:43
+#: web/template/app.gohtml:42
 msgctxt "nav"
 msgid "Dashboard"
 msgstr "Panel"
 
-#: web/template/app.gohtml:44
+#: web/template/app.gohtml:43
 msgctxt "nav"
 msgid "Contacts"
 msgstr "Contactos"
@@ -57,311 +57,222 @@ msgctxt "action"
 msgid "Login"
 msgstr "Entrar"
 
-#: web/template/profile.gohtml:2 web/template/profile.gohtml:10
+#: web/template/profile.gohtml:2 web/template/profile.gohtml:7
-#: web/template/profile.gohtml:14
 msgctxt "title"
 msgid "User Settings"
 msgstr "Configuración usuario"
 
-#: web/template/profile.gohtml:9 web/template/contacts-edit.gohtml:9
+#: web/template/profile.gohtml:10
-#: web/template/contacts-index.gohtml:8 web/template/tax-details.gohtml:8
-#: web/template/contacts-new.gohtml:9
-msgctxt "title"
-msgid "Home"
-msgstr "Inicio"
-
-#: web/template/profile.gohtml:18
 msgctxt "title"
 msgid "User Access Data"
 msgstr "Datos acceso usuario"
 
-#: web/template/profile.gohtml:24
+#: web/template/profile.gohtml:16
 msgctxt "title"
 msgid "Password Change"
 msgstr "Cambio de contraseña"
 
-#: web/template/profile.gohtml:31
+#: web/template/profile.gohtml:23
 msgctxt "title"
 msgid "Language"
 msgstr "Idioma"
 
-#: web/template/profile.gohtml:35 web/template/tax-details.gohtml:96
+#: web/template/profile.gohtml:27 web/template/tax-details.gohtml:133
 msgctxt "action"
 msgid "Save changes"
 msgstr "Guardar cambios"
 
-#: web/template/contacts-edit.gohtml:2 web/template/contacts-edit.gohtml:15
+#: web/template/contacts-index.gohtml:2
-msgctxt "title"
-msgid "Edit Contact “%s”"
-msgstr "Edición del contacto «%s»"
-
-#: web/template/contacts-edit.gohtml:10 web/template/contacts-index.gohtml:2
-#: web/template/contacts-index.gohtml:9 web/template/contacts-new.gohtml:10
 msgctxt "title"
 msgid "Contacts"
 msgstr "Contactos"
 
-#: web/template/contacts-edit.gohtml:33
+#: web/template/contacts-index.gohtml:6 web/template/contacts-new.gohtml:60
-msgctxt "action"
-msgid "Update contact"
-msgstr "Actualizar contacto"
-
-#: web/template/contacts-index.gohtml:13 web/template/contacts-new.gohtml:31
 msgctxt "action"
 msgid "New contact"
 msgstr "Nuevo contacto"
 
-#: web/template/contacts-index.gohtml:20
+#: web/template/contacts-index.gohtml:11
 msgctxt "contact"
 msgid "All"
 msgstr "Todos"
 
-#: web/template/contacts-index.gohtml:21
+#: web/template/contacts-index.gohtml:12
 msgctxt "title"
 msgid "Customer"
 msgstr "Cliente"
 
-#: web/template/contacts-index.gohtml:22
+#: web/template/contacts-index.gohtml:13
 msgctxt "title"
 msgid "Email"
 msgstr "Correo-e"
 
-#: web/template/contacts-index.gohtml:23
+#: web/template/contacts-index.gohtml:14
 msgctxt "title"
 msgid "Phone"
 msgstr "Teléfono"
 
-#: web/template/contacts-index.gohtml:38
+#: web/template/contacts-index.gohtml:29
 msgid "No contacts added yet."
 msgstr "No hay contactos."
 
-#: web/template/tax-details.gohtml:2 web/template/tax-details.gohtml:9
+#: web/template/tax-details.gohtml:2 web/template/tax-details.gohtml:7
-#: web/template/tax-details.gohtml:13
 msgctxt "title"
 msgid "Tax Details"
 msgstr "Configuración fiscal"
 
-#: web/template/tax-details.gohtml:31
+#: web/template/tax-details.gohtml:11 web/template/contacts-new.gohtml:11
-msgctxt "title"
-msgid "Currency"
-msgstr "Moneda"
-
-#: web/template/tax-details.gohtml:47
-msgctxt "title"
-msgid "Tax Name"
-msgstr "Nombre impuesto"
-
-#: web/template/tax-details.gohtml:48
-msgctxt "title"
-msgid "Rate (%)"
-msgstr "Porcentaje"
-
-#: web/template/tax-details.gohtml:71
-msgid "No taxes added yet."
-msgstr "No hay impuestos."
-
-#: web/template/tax-details.gohtml:77
-msgctxt "title"
-msgid "New Line"
-msgstr "Nueva línea"
-
-#: web/template/tax-details.gohtml:88
-msgctxt "action"
-msgid "Add new tax"
-msgstr "Añadir nuevo impuesto"
-
-#: web/template/contacts-new.gohtml:2 web/template/contacts-new.gohtml:11
-#: web/template/contacts-new.gohtml:15
-msgctxt "title"
-msgid "New Contact"
-msgstr "Nuevo contacto"
-
-#: pkg/login.go:36 pkg/profile.go:40 pkg/contacts.go:179
-msgctxt "input"
-msgid "Email"
-msgstr "Correo-e"
-
-#: pkg/login.go:47 pkg/profile.go:49
-msgctxt "input"
-msgid "Password"
-msgstr "Contraseña"
-
-#: pkg/login.go:69 pkg/profile.go:88 pkg/contacts.go:263
-msgid "Email can not be empty."
-msgstr "No podéis dejar el correo-e en blanco."
-
-#: pkg/login.go:70 pkg/profile.go:89 pkg/contacts.go:264
-msgid "This value is not a valid email. It should be like name@domain.com."
-msgstr "Este valor no es un correo-e válido. Tiene que ser parecido a nombre@dominio.es."
-
-#: pkg/login.go:72
-msgid "Password can not be empty."
-msgstr "No podéis dejar la contraseña en blanco."
-
-#: pkg/login.go:108
-msgid "Invalid user or password."
-msgstr "Nombre de usuario o contraseña inválido."
-
-#: pkg/company.go:78
-msgctxt "input"
-msgid "Currency"
-msgstr "Moneda"
-
-#: pkg/company.go:95
-msgid "Selected currency is not valid."
-msgstr "Habéis escogido una moneda que no es válida."
-
-#: pkg/company.go:217
-msgctxt "input"
-msgid "Tax name"
-msgstr "Nombre impuesto"
-
-#: pkg/company.go:223
-msgctxt "input"
-msgid "Rate (%)"
-msgstr "Porcentaje"
-
-#: pkg/company.go:245
-msgid "Tax name can not be empty."
-msgstr "No podéis dejar el nombre del impuesto en blanco."
-
-#: pkg/company.go:246
-msgid "Tax rate can not be empty."
-msgstr "No podéis dejar el porcentaje en blanco."
-
-#: pkg/company.go:247
-msgid "Tax rate must be an integer between -99 and 99."
-msgstr "El porcentaje tiene que estar entre -99 y 99."
-
-#: pkg/profile.go:25
-msgctxt "language option"
-msgid "Automatic"
-msgstr "Automático"
-
-#: pkg/profile.go:31
-msgctxt "input"
-msgid "User name"
-msgstr "Nombre de usuario"
-
-#: pkg/profile.go:57
-msgctxt "input"
-msgid "Password Confirmation"
-msgstr "Confirmación contraseña"
-
-#: pkg/profile.go:65
-msgctxt "input"
-msgid "Language"
-msgstr "Idioma"
-
-#: pkg/profile.go:91
-msgid "Name can not be empty."
-msgstr "No podéis dejar el nombre en blanco."
-
-#: pkg/profile.go:92
-msgid "Confirmation does not match password."
-msgstr "La confirmación no corresponde con la contraseña."
-
-#: pkg/profile.go:93
-msgid "Selected language is not valid."
-msgstr "Habéis escogido un idioma que no es válido."
-
-#: pkg/contacts.go:150
 msgctxt "input"
 msgid "Business name"
 msgstr "Nombre y apellidos"
 
-#: pkg/contacts.go:159
+#: web/template/tax-details.gohtml:15 web/template/contacts-new.gohtml:15
 msgctxt "input"
 msgid "VAT number"
 msgstr "DNI / NIF"
 
-#: pkg/contacts.go:165
+#: web/template/tax-details.gohtml:19 web/template/contacts-new.gohtml:19
 msgctxt "input"
 msgid "Trade name"
 msgstr "Nombre comercial"
 
-#: pkg/contacts.go:170
+#: web/template/tax-details.gohtml:23 web/template/contacts-new.gohtml:23
 msgctxt "input"
 msgid "Phone"
 msgstr "Teléfono"
 
-#: pkg/contacts.go:188
+#: web/template/tax-details.gohtml:27 web/template/contacts-new.gohtml:27
+#: pkg/login.go:33 pkg/profile.go:35
+msgctxt "input"
+msgid "Email"
+msgstr "Correo-e"
+
+#: web/template/tax-details.gohtml:31 web/template/contacts-new.gohtml:31
 msgctxt "input"
 msgid "Web"
 msgstr "Web"
 
-#: pkg/contacts.go:196
+#: web/template/tax-details.gohtml:35 web/template/contacts-new.gohtml:35
 msgctxt "input"
 msgid "Address"
 msgstr "Dirección"
 
-#: pkg/contacts.go:205
+#: web/template/tax-details.gohtml:39 web/template/contacts-new.gohtml:39
 msgctxt "input"
 msgid "City"
 msgstr "Población"
 
-#: pkg/contacts.go:211
+#: web/template/tax-details.gohtml:43 web/template/contacts-new.gohtml:43
 msgctxt "input"
 msgid "Province"
 msgstr "Provincia"
 
-#: pkg/contacts.go:217
+#: web/template/tax-details.gohtml:47 web/template/contacts-new.gohtml:47
 msgctxt "input"
 msgid "Postal code"
 msgstr "Código postal"
 
-#: pkg/contacts.go:226
+#: web/template/tax-details.gohtml:56 web/template/contacts-new.gohtml:56
 msgctxt "input"
 msgid "Country"
 msgstr "País"
 
-#: pkg/contacts.go:256
+#: web/template/tax-details.gohtml:60
-msgid "Business name can not be empty."
+msgctxt "input"
-msgstr "No podéis dejar el nombre y los apellidos en blanco."
+msgid "Currency"
+msgstr "Moneda"
 
-#: pkg/contacts.go:257
+#: web/template/tax-details.gohtml:78
-msgid "VAT number can not be empty."
+msgctxt "title"
-msgstr "No podéis dejar el DNI o NIF en blanco."
+msgid "Tax Name"
+msgstr "Nombre impuesto"
 
-#: pkg/contacts.go:258
+#: web/template/tax-details.gohtml:79
-msgid "This value is not a valid VAT number."
+msgctxt "title"
-msgstr "Este valor no es un DNI o NIF válido."
+msgid "Rate (%)"
+msgstr "Porcentage"
 
-#: pkg/contacts.go:260
+#: web/template/tax-details.gohtml:100
-msgid "Phone can not be empty."
+msgid "No taxes added yet."
-msgstr "No podéis dejar el teléfono en blanco."
+msgstr "No hay impuestos."
 
-#: pkg/contacts.go:261
+#: web/template/tax-details.gohtml:106
-msgid "This value is not a valid phone number."
+msgctxt "title"
-msgstr "Este valor no es un teléfono válido."
+msgid "New Line"
+msgstr "Nueva línea"
 
-#: pkg/contacts.go:267
+#: web/template/tax-details.gohtml:111
-msgid "This value is not a valid web address. It should be like https://domain.com/."
+msgctxt "input"
-msgstr "Este valor no es una dirección web válida. Tiene que ser parecida a https://dominio.es/."
+msgid "Tax name"
+msgstr "Nombre impuesto"
 
-#: pkg/contacts.go:269
+#: web/template/tax-details.gohtml:118
-msgid "Address can not be empty."
+msgctxt "input"
-msgstr "No podéis dejar la dirección en blanco."
+msgid "Rate (%)"
+msgstr "Porcentage"
 
-#: pkg/contacts.go:270
+#: web/template/tax-details.gohtml:125
-msgid "City can not be empty."
+msgctxt "action"
-msgstr "No podéis dejar la población en blanco."
+msgid "Add new tax"
+msgstr "Añadir nuevo impuesto"
 
-#: pkg/contacts.go:271
+#: web/template/contacts-new.gohtml:2 web/template/contacts-new.gohtml:7
-msgid "Province can not be empty."
+msgctxt "title"
-msgstr "No podéis dejar la provincia en blanco."
+msgid "New Contact"
+msgstr "Nuevo contacto"
 
-#: pkg/contacts.go:272
+#: pkg/login.go:44 pkg/profile.go:41
-msgid "Postal code can not be empty."
+msgctxt "input"
-msgstr "No podéis dejar el código postal en blanco."
+msgid "Password"
+msgstr "Contraseña"
 
-#: pkg/contacts.go:273
+#: pkg/login.go:66 pkg/profile.go:71
-msgid "This value is not a valid postal code."
+msgid "Email can not be empty."
-msgstr "Este valor no es un código postal válido válido."
+msgstr "No podéis dejar el correo-e en blanco."
 
-#: pkg/contacts.go:275
+#: pkg/login.go:67 pkg/profile.go:72
-msgid "Selected country is not valid."
+msgid "This value is not a valid email. It should be like name@domain.com."
-msgstr "Habéis escogido un país que no es válido."
+msgstr "Este valor no es un correo-e válido. Tiene que ser parecido a nombre@dominio.es."
+
+#: pkg/login.go:69
+msgid "Password can not be empty."
+msgstr "No podéis dejar la contaseña en blanco."
+
+#: pkg/login.go:95
+msgid "Invalid user or password."
+msgstr "Nombre de usuario o contraseña inválido."
+
+#: pkg/profile.go:23
+msgctxt "language option"
+msgid "Automatic"
+msgstr "Automático"
+
+#: pkg/profile.go:29
+msgctxt "input"
+msgid "User name"
+msgstr "Nombre de usuario"
+
+#: pkg/profile.go:46
+msgctxt "input"
+msgid "Password Confirmation"
+msgstr "Confirmación contrasenya"
+
+#: pkg/profile.go:51
+msgctxt "input"
+msgid "Language"
+msgstr "Idioma"
+
+#: pkg/profile.go:74
+msgid "Name can not be empty."
+msgstr "No podéis dejar el nombre en blanco."
+
+#: pkg/profile.go:75
+msgid "Confirmation does not match password."
+msgstr "La confirmación no corresponde con la contraseña."
+
+#: pkg/profile.go:76
+msgid "Selected language is not valid."
+msgstr "Habéis escogido un idioma que no es válido."
 
 #~ msgctxt "nav"
 #~ msgid "Customers"

web/template/contacts-edit.gohtml

@@ -1,37 +0,0 @@
-{{ define "title" -}}
-    {{printf (pgettext "Edit Contact “%s”" "title") .BusinessName.Val }}
-{{- end }}
-
-{{ define "content" }}
-    {{- /*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>{{ .BusinessName.Val }}</a>
-        </p>
-    </nav>
-    <section class="dialog-content">
-        <h2>{{printf (pgettext "Edit Contact “%s”" "title") .BusinessName.Val }}</h2>
-        <form method="POST">
-            {{ csrfToken }}
-            {{ putMethod }}
-
-            {{ template "input-field" .BusinessName | addInputAttr "autofocus" }}
-            {{ template "input-field" .VATIN }}
-            {{ template "input-field" .TradeName }}
-            {{ template "input-field" .Phone }}
-            {{ template "input-field" .Email }}
-            {{ template "input-field" .Web }}
-            {{ template "input-field" .Address | addInputAttr `class="width-2x"` }}
-            {{ template "input-field" .City }}
-            {{ template "input-field" .Province }}
-            {{ template "input-field" .PostalCode }}
-            {{ template "select-field" .Country | addSelectAttr `class="width-fixed"` }}
-
-            <fieldset>
-                <button class="primary" type="submit">{{( pgettext "Update contact" "action" )}}</button>
-            </fieldset>
-        </form>
-    </section>
-{{- end }}

web/template/contacts-index.gohtml

@@ -3,16 +3,7 @@
 {{- end }}
 
 {{ define "content" }}
-    <nav>
+<a class="primary button" href="{{ companyURI "/contacts/new" }}">{{( pgettext "New contact" "action" )}}</a>
-        <p>
-            <a href="{{ companyURI "/" }}">{{( pgettext "Home" "title" )}}</a> /
-            <a>{{( pgettext "Contacts" "title" )}}</a>
-        </p>
-        <p>
-            <a class="primary button"
-               href="{{ companyURI "/contacts/new" }}">{{( pgettext "New contact" "action" )}}</a>
-        </p>
-    </nav>
 
 <table>
 	<thead>
@@ -28,9 +19,9 @@
 		{{- range $tax := . }}
 		<tr>
 			<td></td>
-                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}">{{ .Name }}</a></td>
+			<td>{{ .Name }}</td>
-                    <td><a href="mailto:{{ .Email }}">{{ .Email }}</a></td>
+			<td>{{ .Email }}</td>
-                    <td><a href="tel:{{ .Phone }}">{{ .Phone }}</a></td>
+			<td>{{ .Phone }}</td>
 		</tr>
 		{{- end }}
 		{{ else }}

web/template/contacts-new.gohtml

@@ -4,13 +4,6 @@
 
 {{ define "content" }}
     {{- /*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>{{( pgettext "New Contact" "title" )}}</a>
-        </p>
-    </nav>
     <section class="dialog-content">
         <h2>{{(pgettext "New Contact" "title")}}</h2>
         <form method="POST" action="{{ companyURI "/contacts" }}">
@@ -28,7 +21,7 @@
             {{ template "select-field" .Country | addSelectAttr `class="width-fixed"` }}
 
             <fieldset>
-                <button class="primary" type="submit">{{( pgettext "New contact" "action" )}}</button>
+                <button type="submit">{{( pgettext "New contact" "action" )}}</button>
             </fieldset>
 
         </form>

web/template/profile.gohtml

@@ -4,12 +4,6 @@
 
 {{ define "content" }}
     {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.profileForm*/ -}}
-    <nav>
-        <p>
-            <a href="{{ companyURI "/" }}">{{( pgettext "Home" "title" )}}</a> /
-            <a>{{( pgettext "User Settings" "title" )}}</a>
-        </p>
-    </nav>
     <section class="dialog-content">
         <h2>{{(pgettext "User Settings" "title")}}</h2>
         <form method="POST">

web/template/tax-details.gohtml

@@ -3,12 +3,6 @@
 {{- end }}
 
 {{ define "content" }}
-    <nav>
-        <p>
-            <a href="{{ companyURI "/" }}">{{( pgettext "Home" "title" )}}</a> /
-            <a>{{( pgettext "Tax Details" "title" )}}</a>
-        </p>
-    </nav>
     <section class="dialog-content">
         <h2>{{(pgettext "Tax Details" "title")}}</h2>
         {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.TaxDetailsPage*/ -}}
@@ -59,7 +53,7 @@
                             <td>
                                 <form method="POST" action="{{ companyURI "/tax"}}/{{ .Id }}">
                                     {{ csrfToken }}
-                                    {{ deleteMethod }}
+                                    <input type="hidden" name="_method" value="DELETE"/>
                                     <button class="icon" aria-label="{{( gettext "Delete tax" )}}" type="submit"><i
                                                 class="ri-delete-back-2-line"></i></button>
                                 </form>