From 2dd5a76a6b6ba61afbbc4dd86c84564b5823e80c Mon Sep 17 00:00:00 2001 From: VnPower Date: Sat, 26 Aug 2023 18:54:51 +0700 Subject: [PATCH] Feature: Last/Next month for ranking calendar #20 --- template/pages/ranking_log.jet.html | 6 ++++++ views/pages.go | 9 ++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/template/pages/ranking_log.jet.html b/template/pages/ranking_log.jet.html index eb36d09..c6703de 100644 --- a/template/pages/ranking_log.jet.html +++ b/template/pages/ranking_log.jet.html @@ -11,6 +11,7 @@ Daily (R-18) Weekly (R-18) +
Sun
@@ -25,4 +26,9 @@ {{ raw: Render }}
+ diff --git a/views/pages.go b/views/pages.go index aa081cd..1cfb660 100644 --- a/views/pages.go +++ b/views/pages.go @@ -2,6 +2,7 @@ package views import ( "errors" + "fmt" "math" "net/http" "pixivfe/configs" @@ -245,6 +246,7 @@ func ranking_log_page(c *fiber.Ctx) error { var month int var monthLit string + // If the user supplied a date if len(date) == 6 { var err error year, err = strconv.Atoi(date[:4]) @@ -264,12 +266,17 @@ func ranking_log_page(c *fiber.Ctx) error { realDate := time.Date(year, time.Month(month), 1, 0, 0, 0, 0, time.UTC) monthLit = realDate.Month().String() + monthBefore := realDate.AddDate(0, -1, 0) + monthAfter := realDate.AddDate(0, 1, 0) + monthBeforeLink := fmt.Sprintf("%d%02d", monthBefore.Year(), monthBefore.Month()) + monthAfterLink := fmt.Sprintf("%d%02d", monthAfter.Year(), monthAfter.Month()) + render, err := PC.GetRankingLog(mode, year, month, *image_proxy) if err != nil { return err } - return c.Render("pages/ranking_log", fiber.Map{"Title": "Ranking calendar", "Render": render, "Month": monthLit, "Year": year}) + return c.Render("pages/ranking_log", fiber.Map{"Title": "Ranking calendar", "Render": render, "Mode": mode, "Month": monthLit, "Year": year, "MonthBefore": monthBeforeLink, "MonthAfter": monthAfterLink}) } func following_works_page(c *fiber.Ctx) error {