From 09885ef1e4b7610d05377596f02d08c5079c0434 Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Wed, 22 Jan 2025 00:46:49 +0100 Subject: feat(webui): implement states list --- pkg/webui/html/base.html | 12 ++++++++++-- pkg/webui/html/index.html | 3 --- pkg/webui/html/states.html | 23 +++++++++++++++++++++++ pkg/webui/index.go | 12 ++++++------ pkg/webui/login.go | 2 +- pkg/webui/routes.go | 1 + pkg/webui/states.go | 29 +++++++++++++++++++++++++++++ 7 files changed, 70 insertions(+), 12 deletions(-) delete mode 100644 pkg/webui/html/index.html create mode 100644 pkg/webui/html/states.html create mode 100644 pkg/webui/states.go (limited to 'pkg/webui') diff --git a/pkg/webui/html/base.html b/pkg/webui/html/base.html index 1c15cc5..7821d28 100644 --- a/pkg/webui/html/base.html +++ b/pkg/webui/html/base.html @@ -9,12 +9,20 @@ tfstated -

+ diff --git a/pkg/webui/html/index.html b/pkg/webui/html/index.html deleted file mode 100644 index 5c50159..0000000 --- a/pkg/webui/html/index.html +++ /dev/null @@ -1,3 +0,0 @@ -{{ define "main" }} -

TODO

-{{ end }} diff --git a/pkg/webui/html/states.html b/pkg/webui/html/states.html new file mode 100644 index 0000000..8d3d803 --- /dev/null +++ b/pkg/webui/html/states.html @@ -0,0 +1,23 @@ +{{ define "main" }} +

States

+ + + + + + + + + + + {{ range .States }} + + + + + + + {{ end }} + +

Path	Created	Updated	Locked
{{ .Path }}	{{ .Created }}	{{ .Updated }}	{{ .Lock }}

+{{ end }} diff --git a/pkg/webui/index.go b/pkg/webui/index.go index 9c81729..3a52fc1 100644 --- a/pkg/webui/index.go +++ b/pkg/webui/index.go @@ -1,16 +1,16 @@ package webui import ( - "html/template" + "fmt" "net/http" ) -var indexTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/index.html")) - func handleIndexGET() http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Header().Set("Cache-Control", "no-store, no-cache") - - render(w, indexTemplates, http.StatusOK, nil) + if r.URL.Path == "/" { + http.Redirect(w, r, "/states", http.StatusFound) + } else { + errorResponse(w, http.StatusNotFound, fmt.Errorf("Page not found")) + } }) } diff --git a/pkg/webui/login.go b/pkg/webui/login.go index fda227a..8444e2c 100644 --- a/pkg/webui/login.go +++ b/pkg/webui/login.go @@ -24,7 +24,7 @@ func handleLoginGET() http.Handler { session := r.Context().Value(model.SessionContextKey{}) if session != nil { - http.Redirect(w, r, "/", http.StatusFound) + http.Redirect(w, r, "/states", http.StatusFound) return } diff --git a/pkg/webui/routes.go b/pkg/webui/routes.go index e9a0346..9bf04ec 100644 --- a/pkg/webui/routes.go +++ b/pkg/webui/routes.go @@ -16,6 +16,7 @@ func addRoutes( mux.Handle("GET /login", requireSession(handleLoginGET())) mux.Handle("POST /login", requireSession(handleLoginPOST(db))) mux.Handle("GET /logout", requireLogin(handleLogoutGET(db))) + mux.Handle("GET /states", requireLogin(handleStatesGET(db))) mux.Handle("GET /static/", cache(http.FileServer(http.FS(staticFS)))) mux.Handle("GET /", requireLogin(handleIndexGET())) } diff --git a/pkg/webui/states.go b/pkg/webui/states.go new file mode 100644 index 0000000..3633cb8 --- /dev/null +++ b/pkg/webui/states.go @@ -0,0 +1,29 @@ +package webui + +import ( + "html/template" + "net/http" + + "git.adyxax.org/adyxax/tfstated/pkg/database" + "git.adyxax.org/adyxax/tfstated/pkg/model" +) + +var statesTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/states.html")) + +func handleStatesGET(db *database.DB) http.Handler { + type StatesData struct { + States []model.State + } + return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { + w.Header().Set("Cache-Control", "no-store, no-cache") + + states, err := db.LoadStatesByPath() + if err != nil { + errorResponse(w, http.StatusInternalServerError, err) + return + } + render(w, statesTemplates, http.StatusOK, StatesData{ + States: states, + }) + }) +} -- cgit v1.2.3