From da24e3c258fa1111dbe7f2a2358de7a4cba31e07 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Wed, 27 Nov 2024 16:49:27 +0100 Subject: [PATCH 1/3] refactor: rebuild application with stl only --- controllers/add.go | 8 +++----- controllers/end.go | 5 +---- controllers/export.go | 6 ++---- controllers/parse.go | 21 ++++++++++----------- controllers/render.go | 7 +++---- controllers/toggle.go | 9 ++++----- go.mod | 4 +--- go.sum | 4 ---- main.go | 23 ++++++++++------------- utils/utils.go | 5 ++--- 10 files changed, 36 insertions(+), 56 deletions(-) diff --git a/controllers/add.go b/controllers/add.go index a3a5600..4ae54b5 100644 --- a/controllers/add.go +++ b/controllers/add.go @@ -2,14 +2,12 @@ package controllers import ( "net/http" - - "github.com/labstack/echo/v4" ) -func (c *Controller) AddBewertungRoute(ctx echo.Context) error { - new := c.ParseBewertungen(ctx) +func (c *Controller) AddBewertungRoute(w http.ResponseWriter, r *http.Request) { + new := c.ParseBewertungen(w, r) if new.Nachname != "" { *c.Bewertungen = append(*c.Bewertungen, new) } - return ctx.Redirect(http.StatusSeeOther, "/") + http.Redirect(w, r, "/", http.StatusSeeOther) } diff --git a/controllers/end.go b/controllers/end.go index 0263caa..dd98890 100644 --- a/controllers/end.go +++ b/controllers/end.go @@ -3,11 +3,8 @@ package controllers import ( "net/http" "os" - - "github.com/labstack/echo/v4" ) -func (c *Controller) EndRoute(ctx echo.Context) error { +func (c *Controller) EndRoute(w http.ResponseWriter, r *http.Request) { os.Exit(0) - return ctx.HTML(http.StatusOK, "Tschüss") } diff --git a/controllers/export.go b/controllers/export.go index 96a9c48..1e5847c 100644 --- a/controllers/export.go +++ b/controllers/export.go @@ -7,10 +7,9 @@ import ( "strconv" "github.com/jung-kurt/gofpdf" - "github.com/labstack/echo/v4" ) -func (c *Controller) ExportBewertungenRoute(ctx echo.Context) error { +func (c *Controller) ExportBewertungenRoute(w http.ResponseWriter, r *http.Request) { log.Println("Exporting") pdf := gofpdf.New("P", "mm", "A4", "") pdf.AddPage() @@ -37,7 +36,6 @@ func (c *Controller) ExportBewertungenRoute(ctx echo.Context) error { err := pdf.OutputFileAndClose("bewertungen.pdf") if err != nil { fmt.Println("Fehler beim Exportieren der Bewertungen:", err) - return err } - return ctx.HTML(http.StatusOK, "Export beendet") + fmt.Fprintln(w, "Export beendet") } diff --git a/controllers/parse.go b/controllers/parse.go index 4266c47..6d9a4b6 100644 --- a/controllers/parse.go +++ b/controllers/parse.go @@ -3,26 +3,25 @@ package controllers import ( "echoTest/models" "echoTest/utils" + "net/http" "strconv" - - "github.com/labstack/echo/v4" ) -func (c *Controller) ParseBewertungen(ctx echo.Context) models.Bewertung { - newName := utils.ValidateName(ctx, c.Bewertungen) - vorname := ctx.FormValue("vorname") +func (c *Controller) ParseBewertungen(w http.ResponseWriter, r *http.Request) models.Bewertung { + newName := utils.ValidateName(r, c.Bewertungen) + vorname := r.FormValue("vorname") if c.MaxPunkte.HvMax == 0.00 { - hvMax, _ := strconv.ParseFloat(ctx.FormValue("hv_max"), 64) - lvMax, _ := strconv.ParseFloat(ctx.FormValue("lv_max"), 64) - hvGewichtung, _ := strconv.ParseFloat(ctx.FormValue("hv_gewichtung"), 64) - lvGewichtung, _ := strconv.ParseFloat(ctx.FormValue("lv_gewichtung"), 64) + hvMax, _ := strconv.ParseFloat(r.FormValue("hv_max"), 64) + lvMax, _ := strconv.ParseFloat(r.FormValue("lv_max"), 64) + hvGewichtung, _ := strconv.ParseFloat(r.FormValue("hv_gewichtung"), 64) + lvGewichtung, _ := strconv.ParseFloat(r.FormValue("lv_gewichtung"), 64) c.MaxPunkte.HvMax = hvMax c.MaxPunkte.LvMax = lvMax c.MaxPunkte.LvGewichtung = lvGewichtung c.MaxPunkte.HvGewichtung = hvGewichtung } - hvPunkte, _ := strconv.ParseFloat(ctx.FormValue("hv_punkte"), 64) - lvPunkte, _ := strconv.ParseFloat(ctx.FormValue("lv_punkte"), 64) + hvPunkte, _ := strconv.ParseFloat(r.FormValue("hv_punkte"), 64) + lvPunkte, _ := strconv.ParseFloat(r.FormValue("lv_punkte"), 64) hvProzent := 100.00 / c.MaxPunkte.HvMax * hvPunkte lvProzent := 100.00 / c.MaxPunkte.LvMax * lvPunkte hvNote := utils.SetNote(hvProzent) diff --git a/controllers/render.go b/controllers/render.go index 311fbcf..08c81bf 100644 --- a/controllers/render.go +++ b/controllers/render.go @@ -2,10 +2,9 @@ package controllers import ( "echoTest/templates" - - "github.com/labstack/echo/v4" + "net/http" ) -func (c *Controller) RenderBewertungenRoute(ctx echo.Context) error { - return templates.BewertungenPage(*c.Bewertungen, *c.MaxPunkte).Render(ctx.Request().Context(), ctx.Response().Writer) +func (c *Controller) RenderBewertungenRoute(w http.ResponseWriter, r *http.Request) { + templates.BewertungenPage(*c.Bewertungen, *c.MaxPunkte).Render(r.Context(), w) } diff --git a/controllers/toggle.go b/controllers/toggle.go index 9baeb89..b064462 100644 --- a/controllers/toggle.go +++ b/controllers/toggle.go @@ -3,13 +3,12 @@ package controllers import ( "echoTest/models" "echoTest/templates" + "net/http" "strconv" - - "github.com/labstack/echo/v4" ) -func (c *Controller) ToggleWertungRoute(ctx echo.Context) error { - id, _ := strconv.Atoi(ctx.Param("id")) +func (c *Controller) ToggleWertungRoute(w http.ResponseWriter, r *http.Request) { + id, _ := strconv.Atoi(r.PathValue("id")) var updatedBewertung models.Bewertung for i, bewertung := range *c.Bewertungen { if bewertung.ID == id { @@ -19,5 +18,5 @@ func (c *Controller) ToggleWertungRoute(ctx echo.Context) error { } } // return c.CreateBewertungNode(updatedBewertung).Render(ctx.Request().Context(), ctx.Response().Writer) - return templates.BewertungRow(updatedBewertung).Render(ctx.Request().Context(), ctx.Response().Writer) + templates.BewertungRow(updatedBewertung).Render(r.Context(), w) } diff --git a/go.mod b/go.mod index 55da7e2..54dd4b9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module echoTest -go 1.21.5 +go 1.23.1 require ( github.com/a-h/templ v0.2.793 @@ -9,7 +9,6 @@ require ( ) require ( - github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/gommon v0.4.2 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect @@ -19,5 +18,4 @@ require ( golang.org/x/net v0.28.0 // indirect golang.org/x/sys v0.24.0 // indirect golang.org/x/text v0.17.0 // indirect - golang.org/x/time v0.6.0 // indirect ) diff --git a/go.sum b/go.sum index ab47e8c..9abf7c5 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,6 @@ github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= -github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= @@ -44,7 +42,5 @@ golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= -golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 5cef2ba..d7f10c5 100644 --- a/main.go +++ b/main.go @@ -4,9 +4,7 @@ import ( "echoTest/controllers" "echoTest/models" "echoTest/utils" - - "github.com/labstack/echo/v4" - "github.com/labstack/echo/v4/middleware" + "net/http" ) var ( @@ -20,20 +18,19 @@ var ( ) func main() { - e := echo.New() - e.Use(middleware.Logger()) - e.Use(middleware.Recover()) - + router := http.NewServeMux() controller := controllers.NewController(&bewertungen, &maxPunkte) - e.GET("/", controller.RenderBewertungenRoute) - e.POST("/toggle/:id", controller.ToggleWertungRoute) - e.POST("/add", controller.AddBewertungRoute) - e.GET("/export", controller.ExportBewertungenRoute) - e.GET("/end", controller.EndRoute) + router.HandleFunc("GET /", controller.RenderBewertungenRoute) + router.HandleFunc("POST /toggle/{id}", controller.ToggleWertungRoute) + router.HandleFunc("POST /add", controller.AddBewertungRoute) + router.HandleFunc("GET /export", controller.ExportBewertungenRoute) + router.HandleFunc("GET /end", controller.EndRoute) go func() { - e.Logger.Fatal(e.Start(":3000")) + if err := http.ListenAndServe(":3000", router); err != nil { + panic(err) + } }() utils.OpenInBrowser("http://localhost:3000") diff --git a/utils/utils.go b/utils/utils.go index 31a90a7..f159d64 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -3,10 +3,9 @@ package utils import ( "echoTest/models" "fmt" + "net/http" "os/exec" "runtime" - - "github.com/labstack/echo/v4" ) func SetNote(prozent float64) float64 { @@ -51,7 +50,7 @@ func OpenInBrowser(url string) { } } -func ValidateName(c echo.Context, bewertungen *[]models.Bewertung) string { +func ValidateName(c *http.Request, bewertungen *[]models.Bewertung) string { newNachname := c.FormValue("nachname") newVorname := c.FormValue("vorname") for _, bewertung := range *bewertungen { From 59c8599d34b91dc044b6f4f05175b697d2073cb7 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Thu, 2 Jan 2025 07:54:31 +0100 Subject: [PATCH 2/3] refactor: update dependencies --- go.mod | 13 ------------- go.sum | 30 ------------------------------ 2 files changed, 43 deletions(-) diff --git a/go.mod b/go.mod index 54dd4b9..c939b4d 100644 --- a/go.mod +++ b/go.mod @@ -5,17 +5,4 @@ go 1.23.1 require ( github.com/a-h/templ v0.2.793 github.com/jung-kurt/gofpdf v1.16.2 - github.com/labstack/echo/v4 v4.12.0 -) - -require ( - github.com/labstack/gommon v0.4.2 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.20 // indirect - github.com/valyala/bytebufferpool v1.0.0 // indirect - github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.26.0 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/text v0.17.0 // indirect ) diff --git a/go.sum b/go.sum index 9abf7c5..48e7795 100644 --- a/go.sum +++ b/go.sum @@ -2,45 +2,15 @@ github.com/a-h/templ v0.2.793 h1:Io+/ocnfGWYO4VHdR0zBbf39PQlnzVCVVD+wEEs6/qY= github.com/a-h/templ v0.2.793/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5PtRc= github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= -github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= -github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= -github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= -github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= -github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/phpdave11/gofpdi v1.0.7/go.mod h1:vBmVV0Do6hSBHC8uKUQ71JGW+ZGQq74llk/7bXwjDoI= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= -github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= -github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= -github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= -github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= -github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= -golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= -golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= -golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= -golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= -golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= -golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= From 7f7cafdd9348f9e20aedb5cc03e9961662785a50 Mon Sep 17 00:00:00 2001 From: Patryk Hegenberg Date: Thu, 2 Jan 2025 07:56:04 +0100 Subject: [PATCH 3/3] build: update dependencies --- go.mod | 12 ++++++------ go.sum | 13 +++++++++++++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 55da7e2..c03f767 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.21.5 require ( github.com/a-h/templ v0.2.793 github.com/jung-kurt/gofpdf v1.16.2 - github.com/labstack/echo/v4 v4.12.0 + github.com/labstack/echo/v4 v4.13.3 ) require ( @@ -15,9 +15,9 @@ require ( github.com/mattn/go-isatty v0.0.20 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.2 // indirect - golang.org/x/crypto v0.26.0 // indirect - golang.org/x/net v0.28.0 // indirect - golang.org/x/sys v0.24.0 // indirect - golang.org/x/text v0.17.0 // indirect - golang.org/x/time v0.6.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + golang.org/x/time v0.8.0 // indirect ) diff --git a/go.sum b/go.sum index ab47e8c..663a046 100644 --- a/go.sum +++ b/go.sum @@ -13,6 +13,8 @@ github.com/jung-kurt/gofpdf v1.16.2 h1:jgbatWHfRlPYiK85qgevsZTHviWXKwB1TTiKdz5Pt github.com/jung-kurt/gofpdf v1.16.2/go.mod h1:1hl7y57EsiPAkLbOwzpzqgx1A30nQCk/YmFV8S2vmK0= github.com/labstack/echo/v4 v4.12.0 h1:IKpw49IMryVB2p1a4dzwlhP1O2Tf2E0Ir/450lH+kI0= github.com/labstack/echo/v4 v4.12.0/go.mod h1:UP9Cr2DJXbOK3Kr9ONYzNowSh7HP0aG0ShAyycHSJvM= +github.com/labstack/echo/v4 v4.13.3 h1:pwhpCPrTl5qry5HRdM5FwdXnhXSLSY+WE+YQSeCaafY= +github.com/labstack/echo/v4 v4.13.3/go.mod h1:o90YNEeQWjDozo584l7AwhJMHN0bOC4tAfg+Xox9q5g= github.com/labstack/gommon v0.4.2 h1:F8qTUNXgG1+6WQmqoUWnz8WiEU60mXVVw0P4ht1WRA0= github.com/labstack/gommon v0.4.2/go.mod h1:QlUFxVM+SNXhDL/Z7YhocGIBYOiwB0mXm1+1bAPHPyU= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= @@ -28,23 +30,34 @@ github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfF github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQD0Loo= github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= golang.org/x/crypto v0.26.0 h1:RrRspgV4mU+YwB4FYnuBoKsUapNIL5cohGAmSH3azsw= golang.org/x/crypto v0.26.0/go.mod h1:GY7jblb9wI+FOo5y8/S2oY4zWP07AkOJ4+jxCqdqn54= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/image v0.0.0-20190910094157-69e4b8554b2a/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE= golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg= golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc= golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/time v0.6.0 h1:eTDhh4ZXt5Qf0augr54TN6suAUudPcawVZeIAPU7D4U= golang.org/x/time v0.6.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= +golang.org/x/time v0.8.0 h1:9i3RxcPv3PZnitoVGMPDKZSq1xW1gK1Xy3ArNOGZfEg= +golang.org/x/time v0.8.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=