From 8f24de645e431d6bf01502466e823d0101b75163 Mon Sep 17 00:00:00 2001 From: Amolith Date: Tue, 12 Mar 2024 11:47:01 -0400 Subject: [PATCH] Begin work on status messages --- ws/static/home.html | 9 +++++---- ws/ws.go | 13 ++++++++++++- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/ws/static/home.html b/ws/static/home.html index 13baf9991c2017226121dda36e5b87855c4af3e8..5453d239065c4dcec01d0ba52e93f796eab80801 100644 --- a/ws/static/home.html +++ b/ws/static/home.html @@ -21,11 +21,12 @@

Willow    Log out

Track a new project

+

{{ .Message }}

- {{- range . -}} + {{- range .Projects -}} {{- if ne .Running (index .Releases 0).Tag -}}

Outdated projects

{{- break -}} @@ -43,13 +44,13 @@ {{- end -}} - {{- range . -}} + {{- range .Projects -}} {{- if eq .Running (index .Releases 0).Tag -}}

Up-to-date projects

{{- break -}} {{- end -}} {{- end -}} - {{- range . -}} + {{- range .Projects -}} {{- if eq .Running (index .Releases 0).Tag -}}

{{ .Name }}   Delete?

@@ -60,7 +61,7 @@

Release notes

- {{- range . -}} + {{- range .Projects -}}

{{ .Name }}: release notes for {{ (index .Releases 0).Tag }}

{{- if eq .Forge "github" "gitea" "forgejo" -}} diff --git a/ws/ws.go b/ws/ws.go index 7eccc4f4563f9c46715b0e926849380dcb30fb58..95bfcb2201c8bfdf1f5f8efeec28102fadfb8f0f 100644 --- a/ws/ws.go +++ b/ws/ws.go @@ -29,6 +29,12 @@ type Handler struct { Mu *sync.Mutex } +type page struct { + Projects []project.Project + Message string + MessageType string +} + //go:embed static var fs embed.FS @@ -51,7 +57,12 @@ func (h Handler) RootHandler(w http.ResponseWriter, r *http.Request) { return } tmpl := template.Must(template.ParseFS(fs, "static/home.html")) - if err := tmpl.Execute(w, data); err != nil { + p := page{ + Projects: data, + Message: "Hello world", + MessageType: "info", + } + if err := tmpl.Execute(w, p); err != nil { fmt.Println(err) } }