From 9f4af72c8581630a19240bc552fd7761150280a9 Mon Sep 17 00:00:00 2001 From: Ruidy Date: Sat, 10 Feb 2024 15:21:33 +0100 Subject: [PATCH] boost --- internal/server/routes.go | 34 ++++++++++++++++++++++++++++++++++ internal/server/server.go | 26 -------------------------- internal/views/base.templ | 2 +- internal/views/base_templ.go | 2 +- 4 files changed, 36 insertions(+), 28 deletions(-) create mode 100644 internal/server/routes.go diff --git a/internal/server/routes.go b/internal/server/routes.go new file mode 100644 index 0000000..b6c6c54 --- /dev/null +++ b/internal/server/routes.go @@ -0,0 +1,34 @@ +package server + +import ( + "fmt" + "os" + "strings" + + "github.com/labstack/echo/v4/middleware" + + "github.com/rjNemo/rentease/constants" +) + +func (s Server) MountHandlers() { + // config + s.Router.HideBanner = true + s.Router.Debug = strings.ToLower(os.Getenv("DEBUG")) == "true" + s.Router.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{ + Format: "${time_rfc3339} [${method}: ${status}] ${uri}; ip=${remote_ip}; ${latency_human}; ${user_agent}\n", + })) + s.Router.HTTPErrorHandler = s.customHTTPErrorHandler + // middlewares + s.Router.Use(middleware.Recover()) + s.Router.Use(middleware.Secure()) + // static assets + s.Router.Static("/static", "assets") + // landing page + s.Router.GET("/", s.handleHomePage()) + s.Router.GET(constants.RouteBooking, s.handleListBookingPage()) + s.Router.GET(constants.RouteNewBooking, s.handleNewBookingPage()) + s.Router.POST(constants.RouteNewBooking, s.handleCreateBooking()) + s.Router.GET(fmt.Sprintf("%s/:id", constants.RouteBooking), s.handleBookingPage()) + s.Router.POST(fmt.Sprintf("%s/:id/items", constants.RouteBooking), s.handleCreateItem()) + s.Router.GET("/pdf", s.handleCreateInvoicePdf()) +} diff --git a/internal/server/server.go b/internal/server/server.go index 3b8b0fc..a8ea880 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -7,15 +7,12 @@ import ( "net/http" "os" "os/signal" - "strings" "time" "github.com/a-h/templ" "github.com/labstack/echo/v4" - "github.com/labstack/echo/v4/middleware" "gorm.io/gorm" - "github.com/rjNemo/rentease/constants" "github.com/rjNemo/rentease/internal/domains/booking" ) @@ -35,29 +32,6 @@ func New(db *gorm.DB) *Server { } } -func (s Server) MountHandlers() { - // config - s.Router.HideBanner = true - s.Router.Debug = strings.ToLower(os.Getenv("DEBUG")) == "true" - s.Router.Use(middleware.LoggerWithConfig(middleware.LoggerConfig{ - Format: "${time_rfc3339} [${method}: ${status}] ${uri}; ip=${remote_ip}; ${latency_human}; ${user_agent}\n", - })) - s.Router.HTTPErrorHandler = s.customHTTPErrorHandler - // middlewares - s.Router.Use(middleware.Recover()) - s.Router.Use(middleware.Secure()) - // static assets - s.Router.Static("/static", "assets") - // landing page - s.Router.GET("/", s.handleHomePage()) - s.Router.GET(constants.RouteBooking, s.handleListBookingPage()) - s.Router.GET(constants.RouteNewBooking, s.handleNewBookingPage()) - s.Router.POST(constants.RouteNewBooking, s.handleCreateBooking()) - s.Router.GET(fmt.Sprintf("%s/:id", constants.RouteBooking), s.handleBookingPage()) - s.Router.POST(fmt.Sprintf("%s/:id/items", constants.RouteBooking), s.handleCreateItem()) - s.Router.GET("/pdf", s.handleCreateInvoicePdf()) -} - func (s Server) Start() { go func() { if err := s.Router.Start(s.addr); err != nil && !errors.Is(err, http.ErrServerClosed) { diff --git a/internal/views/base.templ b/internal/views/base.templ index f100b55..7661537 100644 --- a/internal/views/base.templ +++ b/internal/views/base.templ @@ -13,7 +13,7 @@ templ BaseLayout() { - +