From 0bc508d46358f96666c93daec33e4562a7fb50cf Mon Sep 17 00:00:00 2001 From: pluja Date: Tue, 27 Feb 2024 22:03:49 +0100 Subject: [PATCH] fix no announcement breaking, also add warning announcements --- src/database/pocketbase.go | 4 +++ src/frontend/templates/index.html | 43 ++++++++++++++++++------------- src/server/web_handlers.go | 4 ++- 3 files changed, 32 insertions(+), 19 deletions(-) diff --git a/src/database/pocketbase.go b/src/database/pocketbase.go index c360d1e..46d374a 100644 --- a/src/database/pocketbase.go +++ b/src/database/pocketbase.go @@ -185,5 +185,9 @@ func (p *PbClient) GetAnnouncement() *Announcement { return nil } + if len(response.Items) < 1 { + return nil + } + return &response.Items[0] } diff --git a/src/frontend/templates/index.html b/src/frontend/templates/index.html index 7b2089f..4582d54 100644 --- a/src/frontend/templates/index.html +++ b/src/frontend/templates/index.html @@ -1,22 +1,29 @@ -
- - - - - - - +{{if .Announcement}} +
+ + {{if .Announcement.Warning}} + + + + + {{else}} + + + + + + + {{end}} - {{if .Announcement}} -
- {{.Announcement.Title}} - {{.Announcement.Body}} -
- {{end}} - -
+
+ {{.Announcement.Title}} + {{.Announcement.Body}} +
+ +
+{{end}}
diff --git a/src/server/web_handlers.go b/src/server/web_handlers.go index 0027c6d..867159b 100644 --- a/src/server/web_handlers.go +++ b/src/server/web_handlers.go @@ -70,6 +70,8 @@ func (s *Server) handleIndex(c iris.Context) { return } + announcement := database.Pb.GetAnnouncement() + c.ViewLayout("main") data := iris.Map{ "Title": "Home", @@ -82,7 +84,7 @@ func (s *Server) handleIndex(c iris.Context) { "Cash": cash, "Fiat": fiat, }, - "Announcement": *database.Pb.GetAnnouncement(), + "Announcement": announcement, "Current": "index", "Services": services, "RandomPitch": nokycPf[rand.Intn(len(nokycPf))],