From c66be7775f9effd859267fe01241e3eeb024dac5 Mon Sep 17 00:00:00 2001 From: Erik Brakkee Date: Sat, 17 Aug 2024 10:22:03 +0200 Subject: [PATCH] renamed templates package to ui --- cmd/converge/pagehandler.go | 2 +- cmd/converge/usage.go | 6 +++--- cmd/templaterender/render.go | 2 +- pkg/server/matchmaker/websessions.go | 4 ++-- pkg/server/{templates => ui}/about.templ | 2 +- pkg/server/{templates => ui}/basepage.templ | 2 +- pkg/server/{templates => ui}/constants.go | 2 +- pkg/server/{templates => ui}/downloads.templ | 2 +- pkg/server/{templates => ui}/index.templ | 2 +- pkg/server/{templates => ui}/sessions.templ | 2 +- pkg/server/{templates => ui}/usage.templ | 2 +- pkg/server/{templates => ui}/usageinputs.go | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) rename pkg/server/{templates => ui}/about.templ (99%) rename pkg/server/{templates => ui}/basepage.templ (99%) rename pkg/server/{templates => ui}/constants.go (94%) rename pkg/server/{templates => ui}/downloads.templ (99%) rename pkg/server/{templates => ui}/index.templ (92%) rename pkg/server/{templates => ui}/sessions.templ (99%) rename pkg/server/{templates => ui}/usage.templ (99%) rename pkg/server/{templates => ui}/usageinputs.go (98%) diff --git a/cmd/converge/pagehandler.go b/cmd/converge/pagehandler.go index f7cb909..48e836e 100644 --- a/cmd/converge/pagehandler.go +++ b/cmd/converge/pagehandler.go @@ -1,7 +1,7 @@ package main import ( - templates2 "git.wamblee.org/converge/pkg/server/templates" + templates2 "git.wamblee.org/converge/pkg/server/ui" "net/http" ) diff --git a/cmd/converge/usage.go b/cmd/converge/usage.go index af30185..9e383fa 100644 --- a/cmd/converge/usage.go +++ b/cmd/converge/usage.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "git.wamblee.org/converge/pkg/server/templates" + "git.wamblee.org/converge/pkg/server/ui" "github.com/gliderlabs/ssh" "math/rand" "net/http" @@ -32,7 +32,7 @@ func generateCLIExammple(w http.ResponseWriter, r *http.Request) { downloadCommand := r.FormValue("download-command") certificateValidation := r.FormValue("certificate-validation") != "" sshPublicKeys := strings.Split(keysString, "\n") - usageInputs := templates.NewUsageInputs(id, sshPublicKeys, remoteShells, localShells, downloadCommand, + usageInputs := ui.NewUsageInputs(id, sshPublicKeys, remoteShells, localShells, downloadCommand, certificateValidation) if generatedId { usageInputs.ErrorMessages = append(usageInputs.ErrorMessages, "rendez-vous id is randomly generated, changes on every page refresh") @@ -64,7 +64,7 @@ func generateCLIExammple(w http.ResponseWriter, r *http.Request) { "No valid public keys configured. Without these the agent will not work.") } - err = templates.ShellUsage(access, usageInputs).Render(r.Context(), w) + err = ui.ShellUsage(access, usageInputs).Render(r.Context(), w) if err != nil { http.Error(w, err.Error(), 500) } diff --git a/cmd/templaterender/render.go b/cmd/templaterender/render.go index a3e3a95..2bd5013 100644 --- a/cmd/templaterender/render.go +++ b/cmd/templaterender/render.go @@ -4,7 +4,7 @@ import ( "context" "git.wamblee.org/converge/pkg/comms" "git.wamblee.org/converge/pkg/models" - templates2 "git.wamblee.org/converge/pkg/server/templates" + templates2 "git.wamblee.org/converge/pkg/server/ui" "github.com/a-h/templ" "log" "math/rand" diff --git a/pkg/server/matchmaker/websessions.go b/pkg/server/matchmaker/websessions.go index 64708dd..1acb34c 100644 --- a/pkg/server/matchmaker/websessions.go +++ b/pkg/server/matchmaker/websessions.go @@ -3,7 +3,7 @@ package matchmaker import ( "context" "git.wamblee.org/converge/pkg/models" - "git.wamblee.org/converge/pkg/server/templates" + "git.wamblee.org/converge/pkg/server/ui" "log" "net" "net/http" @@ -138,7 +138,7 @@ func (session *WebSession) WriteNotifications(location *time.Location, ctx conte func (session *WebSession) writeNotificationToClient(location *time.Location, notification *models.State) bool { agents, clients := notification.Slices() - err := templates.State(agents, clients, location).Render(context.Background(), session.conn) + err := ui.State(agents, clients, location).Render(context.Background(), session.conn) if err != nil { log.Printf("WS connection closed: %v", err) return false diff --git a/pkg/server/templates/about.templ b/pkg/server/ui/about.templ similarity index 99% rename from pkg/server/templates/about.templ rename to pkg/server/ui/about.templ index 4105bb1..b754b8e 100644 --- a/pkg/server/templates/about.templ +++ b/pkg/server/ui/about.templ @@ -1,4 +1,4 @@ -package templates +package ui templ About() {
diff --git a/pkg/server/templates/basepage.templ b/pkg/server/ui/basepage.templ similarity index 99% rename from pkg/server/templates/basepage.templ rename to pkg/server/ui/basepage.templ index fce8514..f150486 100644 --- a/pkg/server/templates/basepage.templ +++ b/pkg/server/ui/basepage.templ @@ -1,4 +1,4 @@ -package templates +package ui func active(actual int, active int) string { diff --git a/pkg/server/templates/constants.go b/pkg/server/ui/constants.go similarity index 94% rename from pkg/server/templates/constants.go rename to pkg/server/ui/constants.go index f5f63a7..fb6fa14 100644 --- a/pkg/server/templates/constants.go +++ b/pkg/server/ui/constants.go @@ -1,4 +1,4 @@ -package templates +package ui type Shell string diff --git a/pkg/server/templates/downloads.templ b/pkg/server/ui/downloads.templ similarity index 99% rename from pkg/server/templates/downloads.templ rename to pkg/server/ui/downloads.templ index de45ec5..9f95c0d 100644 --- a/pkg/server/templates/downloads.templ +++ b/pkg/server/ui/downloads.templ @@ -1,4 +1,4 @@ -package templates +package ui templ Downloads() { diff --git a/pkg/server/templates/index.templ b/pkg/server/ui/index.templ similarity index 92% rename from pkg/server/templates/index.templ rename to pkg/server/ui/index.templ index e0f0df9..3958946 100644 --- a/pkg/server/templates/index.templ +++ b/pkg/server/ui/index.templ @@ -1,4 +1,4 @@ -package templates +package ui import "git.wamblee.org/converge/pkg/models" diff --git a/pkg/server/templates/sessions.templ b/pkg/server/ui/sessions.templ similarity index 99% rename from pkg/server/templates/sessions.templ rename to pkg/server/ui/sessions.templ index 9385c48..9ea21a5 100644 --- a/pkg/server/templates/sessions.templ +++ b/pkg/server/ui/sessions.templ @@ -1,4 +1,4 @@ -package templates +package ui import ( "git.wamblee.org/converge/pkg/models" diff --git a/pkg/server/templates/usage.templ b/pkg/server/ui/usage.templ similarity index 99% rename from pkg/server/templates/usage.templ rename to pkg/server/ui/usage.templ index 8c87de9..2fe9fde 100644 --- a/pkg/server/templates/usage.templ +++ b/pkg/server/ui/usage.templ @@ -1,4 +1,4 @@ -package templates +package ui import "git.wamblee.org/converge/pkg/models" diff --git a/pkg/server/templates/usageinputs.go b/pkg/server/ui/usageinputs.go similarity index 98% rename from pkg/server/templates/usageinputs.go rename to pkg/server/ui/usageinputs.go index b6983da..1508d07 100644 --- a/pkg/server/templates/usageinputs.go +++ b/pkg/server/ui/usageinputs.go @@ -1,4 +1,4 @@ -package templates +package ui import ( "fmt"