From 4e029fb83a1e70495330eaac94981a97de24682e Mon Sep 17 00:00:00 2001 From: Julien Dessaux Date: Sun, 26 Jan 2025 00:04:38 +0100 Subject: feat(webui): bootstrap a proper UI --- pkg/webui/error.go | 2 ++ pkg/webui/html/base.html | 54 ++++++++++++++++++++++++++++++++-------------- pkg/webui/html/error.html | 8 +++---- pkg/webui/html/login.html | 51 +++++++++++++++++++++---------------------- pkg/webui/html/logout.html | 6 +++--- pkg/webui/html/states.html | 51 +++++++++++++++++++++++++------------------ pkg/webui/index.go | 5 +++++ pkg/webui/login.go | 6 +++++- pkg/webui/logout.go | 7 +++++- pkg/webui/states.go | 2 ++ pkg/webui/static/main.css | 10 +++++++-- 11 files changed, 127 insertions(+), 75 deletions(-) diff --git a/pkg/webui/error.go b/pkg/webui/error.go index 05d8e9e..afce9a6 100644 --- a/pkg/webui/error.go +++ b/pkg/webui/error.go @@ -9,11 +9,13 @@ var errorTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", "h func errorResponse(w http.ResponseWriter, status int, err error) { type ErrorData struct { + Page Err error Status int StatusText string } render(w, errorTemplates, status, &ErrorData{ + Page: Page{Title: "Error", Section: "error"}, Err: err, Status: status, StatusText: http.StatusText(status), diff --git a/pkg/webui/html/base.html b/pkg/webui/html/base.html index 7821d28..06328e4 100644 --- a/pkg/webui/html/base.html +++ b/pkg/webui/html/base.html @@ -1,28 +1,50 @@ +{{ define "nav" }} +

+ +

+{{ if eq .Page.Section "login" }} + + login + Login + +{{ else }} + + home_storage + States + +

+ + logout + Logout + +{{ end }} +{{ end }} - + - - - tfstated + + + TFSTATED - {{ .Page.Title }} - -

+ + + + +

- {{ template "main" . }} -

+ {{ template "main" . }} + + diff --git a/pkg/webui/html/error.html b/pkg/webui/html/error.html index d2ea7e1..cda21f6 100644 --- a/pkg/webui/html/error.html +++ b/pkg/webui/html/error.html @@ -1,6 +1,6 @@ {{ define "main" }} -

{{ .Status }} - {{ .StatusText }}

{{ end }} diff --git a/pkg/webui/html/login.html b/pkg/webui/html/login.html index 0c2a167..4ff0265 100644 --- a/pkg/webui/html/login.html +++ b/pkg/webui/html/login.html @@ -1,29 +1,26 @@ {{ define "main" }} -{{ if .Forbidden }} -

Invalid username or password

-{{ end }} - +

+ +

{{ end }} diff --git a/pkg/webui/html/logout.html b/pkg/webui/html/logout.html index 58191c0..e9203d4 100644 --- a/pkg/webui/html/logout.html +++ b/pkg/webui/html/logout.html @@ -1,5 +1,5 @@ {{ define "main" }} -

Logout successful

{{ end }} diff --git a/pkg/webui/html/states.html b/pkg/webui/html/states.html index 8d3d803..f61b87c 100644 --- a/pkg/webui/html/states.html +++ b/pkg/webui/html/states.html @@ -1,23 +1,32 @@ {{ define "main" }} -

States

- - - - - - - - - - - {{ range .States }} - - - - - - - {{ end }} - -

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

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

Path	Updated	Locked
{{ .Path }}	{{ .Updated }}	+ + {{ if eq .Lock nil }}no{{ else }} + yes + + Lock + {{ .Lock }} + + {{ end }} + +

{{ end }} diff --git a/pkg/webui/index.go b/pkg/webui/index.go index 3a52fc1..deea5d1 100644 --- a/pkg/webui/index.go +++ b/pkg/webui/index.go @@ -5,6 +5,11 @@ import ( "net/http" ) +type Page struct { + Section string + Title string +} + func handleIndexGET() http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { if r.URL.Path == "/" { diff --git a/pkg/webui/login.go b/pkg/webui/login.go index 8444e2c..6f688c1 100644 --- a/pkg/webui/login.go +++ b/pkg/webui/login.go @@ -14,6 +14,7 @@ import ( var loginTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/login.html")) type loginPage struct { + Page Forbidden bool Username string } @@ -28,7 +29,9 @@ func handleLoginGET() http.Handler { return } - render(w, loginTemplate, http.StatusOK, loginPage{}) + render(w, loginTemplate, http.StatusOK, loginPage{ + Page: Page{Title: "Login", Section: "login"}, + }) }) } @@ -36,6 +39,7 @@ func handleLoginPOST(db *database.DB) http.Handler { var validUsername = regexp.MustCompile(`^[a-zA-Z]\w*$`) renderForbidden := func(w http.ResponseWriter, username string) { render(w, loginTemplate, http.StatusForbidden, loginPage{ + Page: Page{Title: "Login", Section: "login"}, Forbidden: true, Username: username, }) diff --git a/pkg/webui/logout.go b/pkg/webui/logout.go index 6a281bb..58e445d 100644 --- a/pkg/webui/logout.go +++ b/pkg/webui/logout.go @@ -11,6 +11,9 @@ import ( var logoutTemplate = template.Must(template.ParseFS(htmlFS, "html/base.html", "html/logout.html")) func handleLogoutGET(db *database.DB) http.Handler { + type logoutPage struct { + Page + } return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { session := r.Context().Value(model.SessionContextKey{}) err := db.DeleteSession(session.(*model.Session)) @@ -19,6 +22,8 @@ func handleLogoutGET(db *database.DB) http.Handler { return } unsetSesssionCookie(w) - render(w, logoutTemplate, http.StatusOK, nil) + render(w, logoutTemplate, http.StatusOK, logoutPage{ + Page: Page{Title: "Logout", Section: "login"}, + }) }) } diff --git a/pkg/webui/states.go b/pkg/webui/states.go index 3633cb8..9e3ce27 100644 --- a/pkg/webui/states.go +++ b/pkg/webui/states.go @@ -12,6 +12,7 @@ var statesTemplates = template.Must(template.ParseFS(htmlFS, "html/base.html", " func handleStatesGET(db *database.DB) http.Handler { type StatesData struct { + Page States []model.State } return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { @@ -23,6 +24,7 @@ func handleStatesGET(db *database.DB) http.Handler { return } render(w, statesTemplates, http.StatusOK, StatesData{ + Page: Page{Title: "States", Section: "states"}, States: states, }) }) diff --git a/pkg/webui/static/main.css b/pkg/webui/static/main.css index a2472b7..f0fe350 100644 --- a/pkg/webui/static/main.css +++ b/pkg/webui/static/main.css @@ -1,3 +1,9 @@ -.error-message { - color:red; +.clickable-rows tbody a { + display: block; + padding: 0 1em 0; + text-decoration: none; + transition: all 0.25s ease-out; +} +.clickable-rows tbody tr:hover a { + background-color: var(--secondary-container); } -- cgit v1.2.3