diff --git a/.air/appview.toml b/.air/appview.toml index 194bd8d2..01efc93c 100644 --- a/.air/appview.toml +++ b/.air/appview.toml @@ -1,8 +1,8 @@ [build] -cmd = "go build -o .bin/app ./cmd/appview/main.go" +cmd = "tailwindcss -i input.css -o ./appview/pages/static/tw.css && go build -o .bin/app ./cmd/appview/main.go" bin = ".bin/app" root = "." exclude_regex = [".*_templ.go"] -include_ext = ["go", "templ", "html"] +include_ext = ["go", "templ", "html", "css"] exclude_dir = ["target", "atrium"] diff --git a/appview/pages/htmx.go b/appview/pages/htmx.go new file mode 100644 index 00000000..29aeaca1 --- /dev/null +++ b/appview/pages/htmx.go @@ -0,0 +1,28 @@ +package pages + +import ( + "fmt" + "net/http" +) + +// Notice performs a hx-oob-swap to replace the content of an element with a message. +// Pass the id of the element and the message to display. +func (s *Pages) Notice(w http.ResponseWriter, id, msg string) { + html := fmt.Sprintf(`%s`, id, msg) + + w.Header().Set("Content-Type", "text/html") + w.WriteHeader(http.StatusOK) + w.Write([]byte(html)) +} + +// HxRedirect is a full page reload with a new location. +func (s *Pages) HxRedirect(w http.ResponseWriter, location string) { + w.Header().Set("HX-Redirect", location) + w.WriteHeader(http.StatusOK) +} + +// HxLocation is an SPA-style navigation to a new location. +func (s *Pages) HxLocation(w http.ResponseWriter, location string) { + w.Header().Set("HX-Location", location) + w.WriteHeader(http.StatusOK) +} diff --git a/appview/pages/templates/layouts/base.html b/appview/pages/templates/layouts/base.html index b2a4aee0..62d4e824 100644 --- a/appview/pages/templates/layouts/base.html +++ b/appview/pages/templates/layouts/base.html @@ -7,9 +7,11 @@ name="viewport" content="width=device-width, initial-scale=1.0" /> + + {{ block "title" . }}tangled{{ end }} - +
{{ block "topbar" . }} {{ template "layouts/topbar" . }} diff --git a/appview/pages/templates/repo/new.html b/appview/pages/templates/repo/new.html index ab2c417a..f70f389b 100644 --- a/appview/pages/templates/repo/new.html +++ b/appview/pages/templates/repo/new.html @@ -1,24 +1,45 @@ -{{define "title"}}new repo{{end}} +{{ define "title" }}new repo{{ end }} -{{define "content"}} -

new repo

-
- - +{{ define "content" }} +
+

new repo

+ + + -
+
+ select a knot: + {{ range .Knots }} +
+ {{ else }} +

no knots available

+ {{ end }} +
-
- select a knot: - {{ range .Knots }} -
- - {{ else }} -

no knots available

- {{ end }} -
+ + +
- -{{end}} +
+{{ end }} diff --git a/appview/state/state.go b/appview/state/state.go index 6d2d122b..9030fa62 100644 --- a/appview/state/state.go +++ b/appview/state/state.go @@ -431,7 +431,7 @@ func (s *State) AddRepo(w http.ResponseWriter, r *http.Request) { knots, err := s.enforcer.GetDomainsForUser(user.Did) if err != nil { - log.Println("invalid user?", err) + s.pages.Notice(w, "repo", "Invalid user account.") return } @@ -444,40 +444,41 @@ func (s *State) AddRepo(w http.ResponseWriter, r *http.Request) { domain := r.FormValue("domain") if domain == "" { - log.Println("invalid form") + s.pages.Notice(w, "repo", "Invalid form submission—missing knot domain.") return } repoName := r.FormValue("name") if repoName == "" { - log.Println("invalid form") + s.pages.Notice(w, "repo", "Invalid repo name.") return } ok, err := s.enforcer.E.Enforce(user.Did, domain, domain, "repo:create") if err != nil || !ok { - w.Write([]byte("domain inaccessible to you")) + s.pages.Notice(w, "repo", "You do not have permission to create a repo in this knot.") return } secret, err := s.db.GetRegistrationKey(domain) if err != nil { - log.Printf("no key found for domain %s: %s\n", domain, err) + s.pages.Notice(w, "repo", fmt.Sprintf("No registration key found for knot %s.", domain)) return } client, err := NewSignedClient(domain, secret) if err != nil { - log.Println("failed to create client to ", domain) + s.pages.Notice(w, "repo", "Failed to connect to knot server.") + return } resp, err := client.NewRepo(user.Did, repoName) if err != nil { - log.Println("failed to send create repo request", err) + s.pages.Notice(w, "repo", "Failed to create repository on knot server.") return } if resp.StatusCode != http.StatusNoContent { - log.Println("server returned ", resp.StatusCode) + s.pages.Notice(w, "repo", fmt.Sprintf("Server returned unexpected status: %d", resp.StatusCode)) return } @@ -489,18 +490,19 @@ func (s *State) AddRepo(w http.ResponseWriter, r *http.Request) { } err = s.db.AddRepo(repo) if err != nil { - log.Println("failed to add repo to db", err) + s.pages.Notice(w, "repo", "Failed to save repository information.") return } // acls err = s.enforcer.AddRepo(user.Did, domain, filepath.Join(user.Did, repoName)) if err != nil { - log.Println("failed to set up acls", err) + s.pages.Notice(w, "repo", "Failed to set up repository permissions.") return } - w.Write([]byte("created!")) + s.pages.HxLocation(w, fmt.Sprintf("/@%s/%s", user.Handle, repoName)) + return } } diff --git a/input.css b/input.css index d9b746c2..e9d7da8a 100644 --- a/input.css +++ b/input.css @@ -12,10 +12,38 @@ @apply text-2xl; @apply font-sans; @apply text-gray-900; + @apply py-4; } + ::selection { @apply bg-green-400; @apply text-gray-900; @apply bg-opacity-30; } + a { + @apply underline text-blue-600 hover:text-blue-800 visited:text-purple-600; + } + + @layer components { + .btn { + @apply relative z-10 inline-flex min-h-[36px] cursor-pointer items-center + justify-center border-0 bg-transparent px-3 pb-[0.3rem] text-base + text-gray-800 before:absolute before:inset-0 before:-z-10 + before:block before:rounded before:border before:border-cyan-200 + before:bg-white before:shadow-[0_4px_3px_0_rgba(20,20,96,0.1),inset_0_-5px_0_0_#ebebf6] + before:content-[''] hover:before:border-cyan-600 + hover:before:bg-cyan-600 + hover:before:shadow-[0_4px_3px_0_rgba(20,20,96,0.1),inset_0_-5px_0_0_#c2b3ff] + focus:outline-none focus-visible:before:outline + focus-visible:before:outline-4 focus-visible:before:outline-[#fc440f] + active:border-t-4 active:border-transparent active:py-1 + active:before:shadow-none; + } + } + + @layer utilities { + .error { + @apply py-1 border-red-400 text-red-600; + } + } }