diff --git a/internal/server/handle_public.go b/internal/server/handle_public.go index 74e797d..047ad36 100644 --- a/internal/server/handle_public.go +++ b/internal/server/handle_public.go @@ -1,62 +1,49 @@ package server -import ( - "fmt" - "net/http" - "time" +//func handleHomePage() echo.HandlerFunc { +// return func(ctx echo.Context) error { +// return renderTempl(ctx, http.StatusOK, view.Index()) +// } +//} - "github.com/labstack/echo/v4" - - "github.com/rjNemo/rentease/internal/booking" - "github.com/rjNemo/rentease/internal/view" - "github.com/rjNemo/rentease/internal/view/component" - myTime "github.com/rjNemo/rentease/pkg/time" -) - -func handleHomePage() echo.HandlerFunc { - return func(ctx echo.Context) error { - return renderTempl(ctx, http.StatusOK, view.Index()) - } -} - -func handleRequestBooking(bs *booking.Service) echo.HandlerFunc { - return func(c echo.Context) error { - itemStr := c.FormValue("item") - fromStr := c.FormValue("from") - toStr := c.FormValue("to") - name := c.FormValue("item") - phoneNumber := c.FormValue("phone") - email := c.FormValue("email") - - from, fErr := myTime.ParseFromForm(fromStr) - to, tErr := myTime.ParseFromForm(toStr) - if fErr != nil || tErr != nil { - return fmt.Errorf("error parsing booking request time: %q %q", fErr, tErr) - } - - errs := make([]string, 0) - if to.Sub(from) < time.Duration(0) { - errs = append(errs, "invalid_time_range") - } - - if phoneNumber == "" && email == "" { - errs = append(errs, "missing_communication_method") - } - - if len(errs) > 0 { - return renderTempl(c, http.StatusOK, component.RequestBookingForm(&component.RequestBookingViewModel{ - Item: itemStr, - From: fromStr, - To: toStr, - Name: name, - PhoneNumber: phoneNumber, - Email: email, - Errors: errs, - })) - } - - bs.CreateRequest(from, to, name, phoneNumber, email, itemStr, 1) - - return renderTempl(c, http.StatusSeeOther, view.Success()) - } -} +//func handleRequestBooking(bs *booking.Service) echo.HandlerFunc { +// return func(c echo.Context) error { +// itemStr := c.FormValue("item") +// fromStr := c.FormValue("from") +// toStr := c.FormValue("to") +// name := c.FormValue("item") +// phoneNumber := c.FormValue("phone") +// email := c.FormValue("email") +// +// from, fErr := myTime.ParseFromForm(fromStr) +// to, tErr := myTime.ParseFromForm(toStr) +// if fErr != nil || tErr != nil { +// return fmt.Errorf("error parsing booking request time: %q %q", fErr, tErr) +// } +// +// errs := make([]string, 0) +// if to.Sub(from) < time.Duration(0) { +// errs = append(errs, "invalid_time_range") +// } +// +// if phoneNumber == "" && email == "" { +// errs = append(errs, "missing_communication_method") +// } +// +// if len(errs) > 0 { +// return renderTempl(c, http.StatusOK, component.RequestBookingForm(&component.RequestBookingViewModel{ +// Item: itemStr, +// From: fromStr, +// To: toStr, +// Name: name, +// PhoneNumber: phoneNumber, +// Email: email, +// Errors: errs, +// })) +// } +// +// bs.CreateRequest(from, to, name, phoneNumber, email, itemStr, 1) +// +// return renderTempl(c, http.StatusSeeOther, view.Success()) +// } +//} diff --git a/internal/server/server.go b/internal/server/server.go index e5912ed..37df58e 100644 --- a/internal/server/server.go +++ b/internal/server/server.go @@ -114,7 +114,7 @@ func New(bs *booking.Service, as *auth.Service, ps *pdf.PdfService, hc *config.H return s, nil } -func (s Server) Start() { +func (s Server) Start(c context.Context) { go func() { if err := s.Router.Start(s.addr); err != nil && !errors.Is(err, http.ErrServerClosed) { s.Router.Logger.Fatalf("shutting down the server: %s", err) @@ -124,7 +124,7 @@ func (s Server) Start() { quit := make(chan os.Signal, 1) signal.Notify(quit, os.Interrupt) <-quit - ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + ctx, cancel := context.WithTimeout(c, 10*time.Second) defer cancel() if err := s.Router.Shutdown(ctx); err != nil { s.Router.Logger.Fatal(err) diff --git a/internal/view/booking_by_id_templ.go b/internal/view/booking_by_id_templ.go index c17ec7c..e027d1f 100644 --- a/internal/view/booking_by_id_templ.go +++ b/internal/view/booking_by_id_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.663 +// templ: version: v0.2.707 package view //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -67,7 +67,7 @@ func BookingById(booking *BookingViewModel) templ.Component { templ_7745c5c3_Buffer = templ.GetBuffer() defer templ.ReleaseBuffer(templ_7745c5c3_Buffer) } - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -80,7 +80,7 @@ func BookingById(booking *BookingViewModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 2) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -93,7 +93,7 @@ func BookingById(booking *BookingViewModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 3) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Create PDF ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } if booking.Canceled { - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 5) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Canceled") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } else { - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 6) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("Cancel") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 8) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Line Items

") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -319,7 +319,7 @@ func BookingById(booking *BookingViewModel) templ.Component { return templ_7745c5c3_Err } } - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 24) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
ItemQuantityPrice (€)Payment MethodPayment StatusSub-total (€)
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } @@ -332,7 +332,7 @@ func BookingById(booking *BookingViewModel) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 25) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
Add line
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/internal/view/booking_form_templ.go b/internal/view/booking_form_templ.go index 535cb52..8f155b3 100644 --- a/internal/view/booking_form_templ.go +++ b/internal/view/booking_form_templ.go @@ -1,6 +1,6 @@ // Code generated by templ - DO NOT EDIT. -// templ: version: v0.2.663 +// templ: version: v0.2.707 package view //lint:file-ignore SA4006 This context is only used if a nested component is present. @@ -23,7 +23,7 @@ func BookingForm(booking BookingViewModel) templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - templ_7745c5c3_Err = templ.WriteWatchModeString(templ_7745c5c3_Buffer, 1) + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } diff --git a/main.go b/main.go index 640c40b..3f21675 100644 --- a/main.go +++ b/main.go @@ -26,7 +26,7 @@ var static embed.FS func main() { ctx := context.Background() - godotenv.Load() + _ = godotenv.Load() if err := run(ctx, os.Getenv); err != nil { fmt.Fprintf(os.Stderr, "%s\n", err) @@ -97,6 +97,6 @@ func run(c context.Context, getEnv func(string) string) error { return fmt.Errorf("error starting server %s", err) } - srv.Start() + srv.Start(ctx) return nil }