Skip to content

Commit 0fa524f

Browse files
feat: worse error handling
1 parent 979c82a commit 0fa524f

File tree

4 files changed

+9
-22
lines changed

4 files changed

+9
-22
lines changed

web/controllers/controllers.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,5 +116,5 @@ func Trim(c *fiber.Ctx, cc *core.Context) error {
116116
}
117117

118118
func SomethingWentWrong(c *fiber.Ctx) error {
119-
return c.Render("something-went-wrong", nil)
119+
return c.Render("something-went-wrong", fiber.Map{"Error": ""})
120120
}

web/helpers/http.go

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
package helpers
22

33
import (
4-
"database/sql"
5-
"net/http"
6-
74
"github.com/gofiber/fiber/v2"
85
)
96

10-
// TODO: handle responses for HTMX requests
11-
func Error(c *fiber.Ctx, err error, code ...int) error {
12-
if len(code) == 1 {
13-
return c.Status(code[0]).Render("500", fiber.Map{"Error": err})
14-
}
15-
16-
if err == sql.ErrNoRows {
17-
return NotFound(c)
7+
func Error(c *fiber.Ctx, err error, codes ...int) error {
8+
if IsHTMXRequest(c) {
9+
c.Set("HX-Redirect", "/something-went-wrong")
1810
}
1911

20-
return c.Status(http.StatusInternalServerError).Render("500", fiber.Map{"Error": err})
12+
return c.Render("something-went-wrong", fiber.Map{"Error": err})
2113
}
2214

2315
func NotFound(c *fiber.Ctx) error {

web/views/500.html

-8
This file was deleted.

web/views/something-went-wrong.html

+4-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
<main class="container">
44
<section>
5-
Something went wrong.
5+
<div>Something went wrong.</div>
6+
{{with .Error}}
7+
<p>{{.}}</p>
8+
{{end}}
69
</section>
710
</main>
811

0 commit comments

Comments
 (0)