From 1ba9c871848fbf02872158134ad9a61d6c42796d Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Fri, 29 Mar 2024 14:48:55 +0300 Subject: [PATCH 1/2] Treat today differently in previous day view --- routes.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/routes.go b/routes.go index 49def25..922ff09 100644 --- a/routes.go +++ b/routes.go @@ -89,6 +89,9 @@ func GetDays(w http.ResponseWriter, r *http.Request) { if err == nil { dayString = t.Format("02 Jan 2006") } + if v == time.Now().Format(time.DateOnly) { + dayString = "Today" + } daysFormatted = append(daysFormatted, ListEntry{Name: dayString, Link: v}) } @@ -116,6 +119,10 @@ func GetDay(w http.ResponseWriter, r *http.Request) { HandleWrite(w.Write([]byte("day not specified"))) return } + if dayString == time.Now().Format(time.DateOnly) { // today can still be edited + http.Redirect(w, r, "/", 302) + return + } day, err := ReadFile("day/" + dayString) if err != nil { slog.Error("error reading day's file", "error", err, "day", dayString) From a66e26477c2d52332099c0ecba26ea31520aeeaf Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Fri, 29 Mar 2024 14:58:24 +0300 Subject: [PATCH 2/2] Clean up HTML&CSS --- pages/base.html | 8 ++------ pages/day.html | 2 +- pages/days.html | 2 +- pages/index.html | 2 +- public/main.css | 3 +-- 5 files changed, 6 insertions(+), 11 deletions(-) diff --git a/pages/base.html b/pages/base.html index 7c697c2..741ef17 100644 --- a/pages/base.html +++ b/pages/base.html @@ -1,11 +1,10 @@ {{define "header"}}

🌺 Hibiscus.txt

-

Today is a place

+

Today is a place

{{end}} - {{define "base"}} @@ -23,10 +22,7 @@ {{template "main" .}} {{template "footer" .}} - + {{end}} diff --git a/pages/day.html b/pages/day.html index 3e87b95..2d8ea54 100644 --- a/pages/day.html +++ b/pages/day.html @@ -1,4 +1,4 @@ {{define "main"}} -

| Go back

+

| Go back

{{end}} \ No newline at end of file diff --git a/pages/days.html b/pages/days.html index 4376661..c21b116 100644 --- a/pages/days.html +++ b/pages/days.html @@ -1,6 +1,6 @@ {{define "main"}}

{{.Title}}

-