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

Compare commits

base: tandem:18b38f593cde8f8021ada7a3edac0e5d99c5c6a8
Branches Tags
tandem:master
tandem:v1.1
tandem:v1
tandem:v0
..
compare: tandem:7e377f550c705b379978251d9497049f84015196
Branches Tags
tandem:master
tandem:v1.1
tandem:v1
tandem:v0

No commits in common. "18b38f593cde8f8021ada7a3edac0e5d99c5c6a8" and "7e377f550c705b379978251d9497049f84015196" have entirely different histories.
18b38f593c ... 7e377f550c

8 changed files with 83 additions and 96 deletions
Show Stats Expand all files Collapse all files

3
cmd/numerus/main.go
View File

@ -2,7 +2,6 @@ package main
import ( import (
"context" "context"
"errors"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -30,7 +29,7 @@ func main() {
go func() { go func() {
log.Printf("INFO - listening on %s\n", srv.Addr) log.Printf("INFO - listening on %s\n", srv.Addr)
if err := srv.ListenAndServe(); !errors.Is(err, http.ErrServerClosed) { if err := srv.ListenAndServe(); err != http.ErrServerClosed {
log.Fatalf("http server: %v", err) log.Fatalf("http server: %v", err)
} }
}() }()

1
debian/rules vendored
View File

@ -4,7 +4,6 @@
dh $@ --builddirectory=_build --buildsystem=golang --with=golang dh $@ --builddirectory=_build --buildsystem=golang --with=golang
execute_before_dh_auto_build: execute_before_dh_auto_build:
printf 'package pkg; const Version = "%s"' "$(DEB_UPSTREAM_VERSION)" > pkg/build.go
make make
execute_after_dh_auto_test: execute_after_dh_auto_test:

3
pkg/build.go
View File

@ -1,3 +0,0 @@
package pkg
const Version = "1.1~git"

3
pkg/template.go
View File

@ -96,9 +96,6 @@ func mustRenderTemplate(wr io.Writer, r *http.Request, layout string, filename s
"slugify": func(s string) string { "slugify": func(s string) string {
return slugify(s) return slugify(s)
}, },
"numerusVersion": func() string {
return Version
},
}) })
if _, err := t.ParseFiles(templateFile(filename), templateFile(layout), templateFile("form.gohtml")); err != nil { if _, err := t.ParseFiles(templateFile(filename), templateFile(layout), templateFile("form.gohtml")); err != nil {
panic(err) panic(err)

80
po/ca.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: numerus\n" "Project-Id-Version: numerus\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2024-01-19 19:57+0100\n" "POT-Creation-Date: 2023-11-06 13:50+0100\n"
"PO-Revision-Date: 2023-01-18 17:08+0100\n" "PO-Revision-Date: 2023-01-18 17:08+0100\n"
"Last-Translator: jordi fita mas <jordi@tandem.blog>\n" "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
"Language-Team: Catalan <ca@dodds.net>\n" "Language-Team: Catalan <ca@dodds.net>\n"
@ -288,6 +288,26 @@ msgctxt "title"
msgid "Edit Invoice “%s”" msgid "Edit Invoice “%s”"
msgstr "Edició de la factura «%s»" msgstr "Edició de la factura «%s»"
#: web/template/home.gohtml:9
msgid "If you want to sign in, just head to %sthe login page%s and enter your credentials in the form."
msgstr "Si vols accedir al teu usuari només has d'anar a %sla pàgina d’entrada%s i apuntar les teves credencials al seu lloc."
#: web/template/home.gohtml:12
msgid "manager"
msgstr "gestor"
#: web/template/home.gohtml:16
msgid "Tool to simplify management for small business and freelancers"
msgstr "Eina per simplificar la gestió d’autònoms i petites empreses."
#: web/template/home.gohtml:19
msgid "Reduce management time, take control of your balance."
msgstr "Redueix el temps de gestió, tingues controlats els teus números."
#: web/template/home.gohtml:20
msgid "application"
msgstr "aplicació"
#: web/template/form.gohtml:36 #: web/template/form.gohtml:36
msgctxt "input" msgctxt "input"
msgid "(Max. %s)" msgid "(Max. %s)"
@ -314,27 +334,32 @@ msgctxt "title"
msgid "Dashboard" msgid "Dashboard"
msgstr "Tauler" msgstr "Tauler"
#: web/template/dashboard.gohtml:31 #: web/template/dashboard.gohtml:29
msgctxt "term"
msgid "Sales"
msgstr "Vendes"
#: web/template/dashboard.gohtml:33
msgctxt "term" msgctxt "term"
msgid "Income" msgid "Income"
msgstr "Ingressos" msgstr "Ingressos"
#: web/template/dashboard.gohtml:35 #: web/template/dashboard.gohtml:37
msgctxt "term" msgctxt "term"
msgid "Expenses" msgid "Expenses"
msgstr "Despeses" msgstr "Despeses"
#: web/template/dashboard.gohtml:39 #: web/template/dashboard.gohtml:41
msgctxt "term" msgctxt "term"
msgid "VAT" msgid "VAT"
msgstr "IVA" msgstr "IVA"
#: web/template/dashboard.gohtml:43 #: web/template/dashboard.gohtml:45
msgctxt "term" msgctxt "term"
msgid "IRPF" msgid "IRPF"
msgstr "IRPF" msgstr "IRPF"
#: web/template/dashboard.gohtml:47 #: web/template/dashboard.gohtml:49
msgctxt "term" msgctxt "term"
msgid "Net Income" msgid "Net Income"
msgstr "Ingressos nets" msgstr "Ingressos nets"
@ -414,60 +439,56 @@ msgctxt "title"
msgid "Edit Quotation “%s”" msgid "Edit Quotation “%s”"
msgstr "Edició del pressupost «%s»" msgstr "Edició del pressupost «%s»"
#: web/template/app.gohtml:24 #: web/template/app.gohtml:23
msgctxt "menu" msgctxt "menu"
msgid "Account" msgid "Account"
msgstr "Compte" msgstr "Compte"
#: web/template/app.gohtml:30 #: web/template/app.gohtml:29
msgctxt "menu" msgctxt "menu"
msgid "Tax Details" msgid "Tax Details"
msgstr "Configuració fiscal" msgstr "Configuració fiscal"
#: web/template/app.gohtml:36 #: web/template/app.gohtml:35
msgctxt "menu" msgctxt "menu"
msgid "Switch Company" msgid "Switch Company"
msgstr "Canvi d’empresa" msgstr "Canvi d’empresa"
#: web/template/app.gohtml:44 #: web/template/app.gohtml:43
msgctxt "action" msgctxt "action"
msgid "Logout" msgid "Logout"
msgstr "Surt" msgstr "Surt"
#: web/template/app.gohtml:53 #: web/template/app.gohtml:52
msgctxt "nav" msgctxt "nav"
msgid "Dashboard" msgid "Dashboard"
msgstr "Tauler" msgstr "Tauler"
#: web/template/app.gohtml:54 #: web/template/app.gohtml:53
msgctxt "nav" msgctxt "nav"
msgid "Quotations" msgid "Quotations"
msgstr "Pressuposts" msgstr "Pressuposts"
#: web/template/app.gohtml:55 #: web/template/app.gohtml:54
msgctxt "nav" msgctxt "nav"
msgid "Invoices" msgid "Invoices"
msgstr "Factures" msgstr "Factures"
#: web/template/app.gohtml:56 #: web/template/app.gohtml:55
msgctxt "nav" msgctxt "nav"
msgid "Expenses" msgid "Expenses"
msgstr "Despeses" msgstr "Despeses"
#: web/template/app.gohtml:57 #: web/template/app.gohtml:56
msgctxt "nav" msgctxt "nav"
msgid "Products" msgid "Products"
msgstr "Productes" msgstr "Productes"
#: web/template/app.gohtml:58 #: web/template/app.gohtml:57
msgctxt "nav" msgctxt "nav"
msgid "Contacts" msgid "Contacts"
msgstr "Contactes" msgstr "Contactes"
#: web/template/app.gohtml:66
msgid "<a href=\"https://numerus.cat/\">Numerus</a> Version: %s"
msgstr "<a href=\"https://numerus.cat/\">Numerus</a> versió: %s"
#: web/template/contacts/new.gohtml:2 web/template/contacts/new.gohtml:11 #: web/template/contacts/new.gohtml:2 web/template/contacts/new.gohtml:11
#: web/template/contacts/new.gohtml:19 #: web/template/contacts/new.gohtml:19
msgctxt "title" msgctxt "title"
@ -1353,25 +1374,6 @@ msgctxt "input"
msgid "Holded Excel file" msgid "Holded Excel file"
msgstr "Fitxer Excel del Holded" msgstr "Fitxer Excel del Holded"
#~ msgid "If you want to sign in, just head to %sthe login page%s and enter your credentials in the form."
#~ msgstr "Si vols accedir al teu usuari només has d'anar a %sla pàgina d’entrada%s i apuntar les teves credencials al seu lloc."
#~ msgid "manager"
#~ msgstr "gestor"
#~ msgid "Tool to simplify management for small business and freelancers"
#~ msgstr "Eina per simplificar la gestió d’autònoms i petites empreses."
#~ msgid "Reduce management time, take control of your balance."
#~ msgstr "Redueix el temps de gestió, tingues controlats els teus números."
#~ msgid "application"
#~ msgstr "aplicació"
#~ msgctxt "term"
#~ msgid "Sales"
#~ msgstr "Vendes"
#~ msgctxt "title" #~ msgctxt "title"
#~ msgid "Switch Company" #~ msgid "Switch Company"
#~ msgstr "Canvi d’empresa" #~ msgstr "Canvi d’empresa"

80
po/es.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: numerus\n" "Project-Id-Version: numerus\n"
"Report-Msgid-Bugs-To: jordi@tandem.blog\n" "Report-Msgid-Bugs-To: jordi@tandem.blog\n"
"POT-Creation-Date: 2024-01-19 19:57+0100\n" "POT-Creation-Date: 2023-11-06 13:50+0100\n"
"PO-Revision-Date: 2023-01-18 17:45+0100\n" "PO-Revision-Date: 2023-01-18 17:45+0100\n"
"Last-Translator: jordi fita mas <jordi@tandem.blog>\n" "Last-Translator: jordi fita mas <jordi@tandem.blog>\n"
"Language-Team: Spanish <es@tp.org.es>\n" "Language-Team: Spanish <es@tp.org.es>\n"
@ -288,6 +288,26 @@ msgctxt "title"
msgid "Edit Invoice “%s”" msgid "Edit Invoice “%s”"
msgstr "Edición de la factura «%s»" msgstr "Edición de la factura «%s»"
#: web/template/home.gohtml:9
msgid "If you want to sign in, just head to %sthe login page%s and enter your credentials in the form."
msgstr "Si quieres acceder a tu usuario solo tienes que ir a %sla página de entrada% y anotar tus credenciales a su sitio."
#: web/template/home.gohtml:12
msgid "manager"
msgstr "gestor"
#: web/template/home.gohtml:16
msgid "Tool to simplify management for small business and freelancers"
msgstr "Herramienta para simplificar la gestión de autónomos y pequeñas empresas."
#: web/template/home.gohtml:19
msgid "Reduce management time, take control of your balance."
msgstr "Reduce el tiempo de gestión, ten controlados tus números."
#: web/template/home.gohtml:20
msgid "application"
msgstr "aplicación"
#: web/template/form.gohtml:36 #: web/template/form.gohtml:36
msgctxt "input" msgctxt "input"
msgid "(Max. %s)" msgid "(Max. %s)"
@ -314,27 +334,32 @@ msgctxt "title"
msgid "Dashboard" msgid "Dashboard"
msgstr "Panel" msgstr "Panel"
#: web/template/dashboard.gohtml:31 #: web/template/dashboard.gohtml:29
msgctxt "term"
msgid "Sales"
msgstr "Ventas"
#: web/template/dashboard.gohtml:33
msgctxt "term" msgctxt "term"
msgid "Income" msgid "Income"
msgstr "Ingresos" msgstr "Ingresos"
#: web/template/dashboard.gohtml:35 #: web/template/dashboard.gohtml:37
msgctxt "term" msgctxt "term"
msgid "Expenses" msgid "Expenses"
msgstr "Gastos" msgstr "Gastos"
#: web/template/dashboard.gohtml:39 #: web/template/dashboard.gohtml:41
msgctxt "term" msgctxt "term"
msgid "VAT" msgid "VAT"
msgstr "IVA" msgstr "IVA"
#: web/template/dashboard.gohtml:43 #: web/template/dashboard.gohtml:45
msgctxt "term" msgctxt "term"
msgid "IRPF" msgid "IRPF"
msgstr "IRPF" msgstr "IRPF"
#: web/template/dashboard.gohtml:47 #: web/template/dashboard.gohtml:49
msgctxt "term" msgctxt "term"
msgid "Net Income" msgid "Net Income"
msgstr "Ingresos netos" msgstr "Ingresos netos"
@ -414,60 +439,56 @@ msgctxt "title"
msgid "Edit Quotation “%s”" msgid "Edit Quotation “%s”"
msgstr "Edición del presupuesto «%s»" msgstr "Edición del presupuesto «%s»"
#: web/template/app.gohtml:24 #: web/template/app.gohtml:23
msgctxt "menu" msgctxt "menu"
msgid "Account" msgid "Account"
msgstr "Cuenta" msgstr "Cuenta"
#: web/template/app.gohtml:30 #: web/template/app.gohtml:29
msgctxt "menu" msgctxt "menu"
msgid "Tax Details" msgid "Tax Details"
msgstr "Configuración fiscal" msgstr "Configuración fiscal"
#: web/template/app.gohtml:36 #: web/template/app.gohtml:35
msgctxt "menu" msgctxt "menu"
msgid "Switch Company" msgid "Switch Company"
msgstr "Cambio de empresa" msgstr "Cambio de empresa"
#: web/template/app.gohtml:44 #: web/template/app.gohtml:43
msgctxt "action" msgctxt "action"
msgid "Logout" msgid "Logout"
msgstr "Salir" msgstr "Salir"
#: web/template/app.gohtml:53 #: web/template/app.gohtml:52
msgctxt "nav" msgctxt "nav"
msgid "Dashboard" msgid "Dashboard"
msgstr "Panel" msgstr "Panel"
#: web/template/app.gohtml:54 #: web/template/app.gohtml:53
msgctxt "nav" msgctxt "nav"
msgid "Quotations" msgid "Quotations"
msgstr "Presupuestos" msgstr "Presupuestos"
#: web/template/app.gohtml:55 #: web/template/app.gohtml:54
msgctxt "nav" msgctxt "nav"
msgid "Invoices" msgid "Invoices"
msgstr "Facturas" msgstr "Facturas"
#: web/template/app.gohtml:56 #: web/template/app.gohtml:55
msgctxt "nav" msgctxt "nav"
msgid "Expenses" msgid "Expenses"
msgstr "Gastos" msgstr "Gastos"
#: web/template/app.gohtml:57 #: web/template/app.gohtml:56
msgctxt "nav" msgctxt "nav"
msgid "Products" msgid "Products"
msgstr "Productos" msgstr "Productos"
#: web/template/app.gohtml:58 #: web/template/app.gohtml:57
msgctxt "nav" msgctxt "nav"
msgid "Contacts" msgid "Contacts"
msgstr "Contactos" msgstr "Contactos"
#: web/template/app.gohtml:66
msgid "<a href=\"https://numerus.cat/\">Numerus</a> Version: %s"
msgstr "<a href=\"https://numerus.cat/\">Numerus</a> versión: %s"
#: web/template/contacts/new.gohtml:2 web/template/contacts/new.gohtml:11 #: web/template/contacts/new.gohtml:2 web/template/contacts/new.gohtml:11
#: web/template/contacts/new.gohtml:19 #: web/template/contacts/new.gohtml:19
msgctxt "title" msgctxt "title"
@ -1353,25 +1374,6 @@ msgctxt "input"
msgid "Holded Excel file" msgid "Holded Excel file"
msgstr "Archivo Excel de Holded" msgstr "Archivo Excel de Holded"
#~ msgid "If you want to sign in, just head to %sthe login page%s and enter your credentials in the form."
#~ msgstr "Si quieres acceder a tu usuario solo tienes que ir a %sla página de entrada% y anotar tus credenciales a su sitio."
#~ msgid "manager"
#~ msgstr "gestor"
#~ msgid "Tool to simplify management for small business and freelancers"
#~ msgstr "Herramienta para simplificar la gestión de autónomos y pequeñas empresas."
#~ msgid "Reduce management time, take control of your balance."
#~ msgstr "Reduce el tiempo de gestión, ten controlados tus números."
#~ msgid "application"
#~ msgstr "aplicación"
#~ msgctxt "term"
#~ msgid "Sales"
#~ msgstr "Ventas"
#~ msgctxt "title" #~ msgctxt "title"
#~ msgid "Switch Company" #~ msgid "Switch Company"
#~ msgstr "Cambio de empresa" #~ msgstr "Cambio de empresa"

6
web/static/numerus.css
View File

@ -314,12 +314,6 @@ main {
padding: 2rem 3rem; padding: 2rem 3rem;
} }
body > footer {
border-top: 1px solid var(--numerus--color--light-gray);
font-size: 75%;
padding: .25em 3rem;
}
.input { .input {
margin-top: 2rem; margin-top: 2rem;
flex: 1; flex: 1;

3
web/template/app.gohtml
View File

@ -62,9 +62,6 @@
{{- template "breadcrumbs" . }} {{- template "breadcrumbs" . }}
{{- template "content" . }} {{- template "content" . }}
</main> </main>
<footer>
<p>{{printf ( gettext "<a href=\"https://numerus.cat/\">Numerus</a> Version: %s") numerusVersion | unsafe}}</p>
</footer>
</body> </body>
<div x-data="snackbar"> <div x-data="snackbar">
<div x-show="show" <div x-show="show"