From 516d68b8a65552a6c067663a5c8b19858423f9d5 Mon Sep 17 00:00:00 2001 From: VnPower Date: Sat, 24 Jun 2023 19:59:18 +0700 Subject: [PATCH] Feature: error page --- main.go | 20 +++++ template/error.html | 6 -- template/error.jet.html | 4 + template/rank.jet.html | 166 +++++++++++++--------------------------- views/pages.go | 1 - 5 files changed, 78 insertions(+), 119 deletions(-) delete mode 100644 template/error.html create mode 100644 template/error.jet.html diff --git a/main.go b/main.go index 76f8a03..7492ea0 100644 --- a/main.go +++ b/main.go @@ -35,6 +35,26 @@ func setup_router() *fiber.App { EnableTrustedProxyCheck: true, TrustedProxies: []string{"0.0.0.0/0"}, ProxyHeader: fiber.HeaderXForwardedFor, + ErrorHandler: func(c *fiber.Ctx, err error) error { + // Status code defaults to 500 + code := fiber.StatusInternalServerError + + // // Retrieve the custom status code if it's a *fiber.Error + // var e *fiber.Error + // if errors.As(err, &e) { + // code = e.Code + // } + + // Send custom error page + err = c.Status(code).Render("error", fiber.Map{"Title": code, "Error": err}) + if err != nil { + // In case the SendFile fails + return c.Status(fiber.StatusInternalServerError).SendString("Internal Server Error") + } + + // Return from handler + return nil + }, }) server.Use(logger.New()) diff --git a/template/error.html b/template/error.html deleted file mode 100644 index f951c4b..0000000 --- a/template/error.html +++ /dev/null @@ -1,6 +0,0 @@ -{{ template "header.html" .Title }} -
-

Error: {{ .Title }}

- {{ .Error }} -
-{{ template "footer.html" }} diff --git a/template/error.jet.html b/template/error.jet.html new file mode 100644 index 0000000..086fe37 --- /dev/null +++ b/template/error.jet.html @@ -0,0 +1,4 @@ +
+

Error: {{ Title }}

+ {{ Error }} +
diff --git a/template/rank.jet.html b/template/rank.jet.html index a29f78b..5a24ac0 100644 --- a/template/rank.jet.html +++ b/template/rank.jet.html @@ -1,121 +1,63 @@
-

{{ Title }}

+

{{ Title }}

-
- Content - Overall - Illustrations - Mangas -
-
+
+ Content + Overall + Illustrations + Mangas +
+
-
- Modes - Daily - Weekly - Monthly - Rookie - - Daily (R-18) - Weekly (R-18) -
-
+
+ Modes + Daily + Weekly + Monthly + Rookie + + Daily (R-18) + Weekly (R-18) +
+
- {{ range Items }} -
-
{{ .Rank }}
- {{ if toInt(.Pages) > 1 }} -
⧉ {{ .Pages }}
- {{ end }} - - {{ .Title }} - + {{ range Items }} +
+
{{ .Rank }}
+ {{ if toInt(.Pages) > 1 }} +
⧉ {{ .Pages }}
+ {{ end }} + + {{ .Title }} + - -

{{ .Title }}

- - {{ .ArtistName }} - {{ .ArtistName }} -
- {{ end }} - - {{ end }} - {{ Page }} + + {{ Page }} + + {{ if Page == 10 }} + Next + Last + {{ else }} + Next + Last + {{ end }} +
diff --git a/views/pages.go b/views/pages.go index 4fcdbae..319be18 100644 --- a/views/pages.go +++ b/views/pages.go @@ -122,7 +122,6 @@ func ranking_page(c *fiber.Ctx) error { if image_proxy == nil { image_proxy = &configs.ProxyServer } - mode := c.Query("mode", "daily") content := c.Query("content", "all")