From 8205bec34d5ba208f3aae19672908745419339b0 Mon Sep 17 00:00:00 2001 From: jordi fita mas Date: Mon, 15 Jan 2024 22:47:16 +0100 Subject: [PATCH] Remove now-unused locales field from admin handlers --- pkg/app/admin.go | 11 +++++------ pkg/app/app.go | 2 +- pkg/campsite/admin.go | 4 ++-- pkg/campsite/types/admin.go | 5 ++--- pkg/carousel/admin.go | 4 +--- pkg/home/admin.go | 7 ++----- pkg/season/admin.go | 7 ++----- pkg/services/admin.go | 6 ++---- 8 files changed, 17 insertions(+), 29 deletions(-) diff --git a/pkg/app/admin.go b/pkg/app/admin.go index e055478..7ddf4f6 100644 --- a/pkg/app/admin.go +++ b/pkg/app/admin.go @@ -16,7 +16,6 @@ import ( "dev.tandem.ws/tandem/camper/pkg/home" httplib "dev.tandem.ws/tandem/camper/pkg/http" "dev.tandem.ws/tandem/camper/pkg/legal" - "dev.tandem.ws/tandem/camper/pkg/locale" "dev.tandem.ws/tandem/camper/pkg/location" "dev.tandem.ws/tandem/camper/pkg/media" "dev.tandem.ws/tandem/camper/pkg/season" @@ -36,17 +35,17 @@ type adminHandler struct { services *services.AdminHandler } -func newAdminHandler(locales locale.Locales, mediaDir string) *adminHandler { +func newAdminHandler(mediaDir string) *adminHandler { return &adminHandler{ - campsite: campsite.NewAdminHandler(locales), + campsite: campsite.NewAdminHandler(), company: company.NewAdminHandler(), - home: home.NewAdminHandler(locales), + home: home.NewAdminHandler(), legal: legal.NewAdminHandler(), location: location.NewAdminHandler(), media: media.NewAdminHandler(mediaDir), payment: booking.NewAdminHandler(), - season: season.NewAdminHandler(locales), - services: services.NewAdminHandler(locales), + season: season.NewAdminHandler(), + services: services.NewAdminHandler(), } } diff --git a/pkg/app/app.go b/pkg/app/app.go index b1961c4..093a87a 100644 --- a/pkg/app/app.go +++ b/pkg/app/app.go @@ -48,7 +48,7 @@ func New(db *database.DB, avatarsDir string, mediaDir string) (http.Handler, err db: db, fileHandler: static, profile: profile, - admin: newAdminHandler(locales, mediaDir), + admin: newAdminHandler(mediaDir), public: newPublicHandler(), media: mediaHandler, locales: locales, diff --git a/pkg/campsite/admin.go b/pkg/campsite/admin.go index 2b2db9b..6b95e81 100644 --- a/pkg/campsite/admin.go +++ b/pkg/campsite/admin.go @@ -22,9 +22,9 @@ type AdminHandler struct { types *types.AdminHandler } -func NewAdminHandler(locales locale.Locales) *AdminHandler { +func NewAdminHandler() *AdminHandler { return &AdminHandler{ - types: types.NewAdminHandler(locales), + types: types.NewAdminHandler(), } } diff --git a/pkg/campsite/types/admin.go b/pkg/campsite/types/admin.go index 75c8c08..b8e6da4 100644 --- a/pkg/campsite/types/admin.go +++ b/pkg/campsite/types/admin.go @@ -22,11 +22,10 @@ import ( ) type AdminHandler struct { - locales locale.Locales } -func NewAdminHandler(locales locale.Locales) *AdminHandler { - return &AdminHandler{locales} +func NewAdminHandler() *AdminHandler { + return &AdminHandler{} } func (h *AdminHandler) Handler(user *auth.User, company *auth.Company, conn *database.Conn) http.Handler { diff --git a/pkg/carousel/admin.go b/pkg/carousel/admin.go index 8425908..b1817e3 100644 --- a/pkg/carousel/admin.go +++ b/pkg/carousel/admin.go @@ -24,16 +24,14 @@ import ( type AdminHandler struct { name string indexHandler IndexHandler - locales locale.Locales } type IndexHandler func(w http.ResponseWriter, r *http.Request, user *auth.User, company *auth.Company, conn *database.Conn) -func NewAdminHandler(name string, indexHandler IndexHandler, locales locale.Locales) *AdminHandler { +func NewAdminHandler(name string, indexHandler IndexHandler) *AdminHandler { return &AdminHandler{ name: name, indexHandler: indexHandler, - locales: locales, } } diff --git a/pkg/home/admin.go b/pkg/home/admin.go index ffd5c80..297e4db 100644 --- a/pkg/home/admin.go +++ b/pkg/home/admin.go @@ -12,21 +12,18 @@ import ( "dev.tandem.ws/tandem/camper/pkg/carousel" "dev.tandem.ws/tandem/camper/pkg/database" httplib "dev.tandem.ws/tandem/camper/pkg/http" - "dev.tandem.ws/tandem/camper/pkg/locale" "dev.tandem.ws/tandem/camper/pkg/template" ) const carouselName = "home" type AdminHandler struct { - locales locale.Locales carousel *carousel.AdminHandler } -func NewAdminHandler(locales locale.Locales) *AdminHandler { +func NewAdminHandler() *AdminHandler { return &AdminHandler{ - locales: locales, - carousel: carousel.NewAdminHandler(carouselName, serveHomeIndex, locales), + carousel: carousel.NewAdminHandler(carouselName, serveHomeIndex), } } diff --git a/pkg/season/admin.go b/pkg/season/admin.go index 09b9eb5..b448203 100644 --- a/pkg/season/admin.go +++ b/pkg/season/admin.go @@ -29,13 +29,10 @@ import ( const UnsetColor = 0xd1d0df type AdminHandler struct { - locales locale.Locales } -func NewAdminHandler(locales locale.Locales) *AdminHandler { - return &AdminHandler{ - locales: locales, - } +func NewAdminHandler() *AdminHandler { + return &AdminHandler{} } func (h *AdminHandler) Handler(user *auth.User, company *auth.Company, conn *database.Conn) http.HandlerFunc { diff --git a/pkg/services/admin.go b/pkg/services/admin.go index 4bd2f05..3738d19 100644 --- a/pkg/services/admin.go +++ b/pkg/services/admin.go @@ -24,14 +24,12 @@ import ( const carouselName = "services" type AdminHandler struct { - locales locale.Locales carousel *carousel.AdminHandler } -func NewAdminHandler(locales locale.Locales) *AdminHandler { +func NewAdminHandler() *AdminHandler { return &AdminHandler{ - locales: locales, - carousel: carousel.NewAdminHandler(carouselName, serveServicesIndex, locales), + carousel: carousel.NewAdminHandler(carouselName, serveServicesIndex), } }