diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 25b5c355..77d74a46 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -367,22 +367,6 @@ func (p *Pages) KnotListing(w io.Writer, params KnotListingParams) error { return p.executePlain("knots/fragments/knotListing", w, params) } -type KnotListingFullParams struct { - Registrations []db.Registration -} - -func (p *Pages) KnotListingFull(w io.Writer, params KnotListingFullParams) error { - return p.executePlain("knots/fragments/knotListingFull", w, params) -} - -type KnotSecretParams struct { - Secret string -} - -func (p *Pages) KnotSecret(w io.Writer, params KnotSecretParams) error { - return p.executePlain("knots/fragments/secret", w, params) -} - type SpindlesParams struct { LoggedInUser *oauth.User Spindles []db.Spindle diff --git a/appview/pages/templates/knots/dashboard.html b/appview/pages/templates/knots/dashboard.html index 29595c2d..c6394719 100644 --- a/appview/pages/templates/knots/dashboard.html +++ b/appview/pages/templates/knots/dashboard.html @@ -1,39 +1,50 @@ -{{ define "title" }}{{ .Registration.Domain }}{{ end }} +{{ define "title" }}{{ .Registration.Domain }} · knots{{ end }} {{ define "content" }} -
-
-
-

- {{ .Registration.Domain }} -

- - {{ template "repo/fragments/shortTimeAgo" .Registration.Created }} - -
-
- {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} - {{ if .Registration.Registered }} - {{ i "shield-check" "w-4 h-4" }} verified +
+
+

{{ .Registration.Domain }}

+
+ {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} + {{ $isOwner := and .LoggedInUser (eq .LoggedInUser.Did .Registration.ByDid) }} + {{ if .Registration.IsRegistered }} + {{ i "shield-check" "w-4 h-4" }} verified + {{ if $isOwner }} {{ template "knots/fragments/addMemberModal" .Registration }} - {{ else }} - {{ i "shield-off" "w-4 h-4" }} pending {{ end }} -
+ {{ else if .Registration.IsReadOnly }} + + {{ i "shield-alert" "w-4 h-4" }} read-only + + {{ if $isOwner }} + {{ block "retryButton" .Registration }} {{ end }} + {{ end }} + {{ else }} + {{ i "shield-off" "w-4 h-4" }} unverified + {{ if $isOwner }} + {{ block "retryButton" .Registration }} {{ end }} + {{ end }} + {{ end }} + + {{ if $isOwner }} + {{ block "deleteButton" .Registration }} {{ end }} + {{ end }}
-
+
+
- {{ if .Members }} -
-
- {{ block "knotMember" . }} {{ end }} -
-
- {{ end }} +{{ if .Members }} +
+
+ {{ block "member" . }} {{ end }} +
+
+{{ end }} {{ end }} -{{ define "knotMember" }} + +{{ define "member" }} {{ range .Members }}
@@ -41,6 +52,9 @@ {{ template "user/fragments/picHandleLink" . }} {{.}}
+ {{ if ne $.LoggedInUser.Did . }} + {{ block "removeMemberButton" (list $ . ) }} {{ end }} + {{ end }}
{{ $repos := index $.Repos . }} @@ -53,10 +67,61 @@
{{ else }}
- No repositories created yet. + No repositories configured yet.
{{ end }}
{{ end }} {{ end }} + +{{ define "deleteButton" }} + +{{ end }} + + +{{ define "retryButton" }} + +{{ end }} + + +{{ define "removeMemberButton" }} + {{ $root := index . 0 }} + {{ $member := index . 1 }} + {{ $memberHandle := resolve $member }} + +{{ end }} + + diff --git a/appview/pages/templates/knots/fragments/addMemberModal.html b/appview/pages/templates/knots/fragments/addMemberModal.html index 5d4aa9e3..be619a0f 100644 --- a/appview/pages/templates/knots/fragments/addMemberModal.html +++ b/appview/pages/templates/knots/fragments/addMemberModal.html @@ -1,7 +1,7 @@ {{ define "knots/fragments/addMemberModal" }} {{ end }} + +{{ define "knotRetryButton" }} + +{{ end }} diff --git a/appview/pages/templates/knots/fragments/knotListingFull.html b/appview/pages/templates/knots/fragments/knotListingFull.html deleted file mode 100644 index 748402e0..00000000 --- a/appview/pages/templates/knots/fragments/knotListingFull.html +++ /dev/null @@ -1,18 +0,0 @@ -{{ define "knots/fragments/knotListingFull" }} -
-

your knots

-
- {{ range $knot := .Registrations }} - {{ template "knots/fragments/knotListing" . }} - {{ else }} -
- no knots registered yet -
- {{ end }} -
-
-
-{{ end }} diff --git a/appview/pages/templates/knots/fragments/secret.html b/appview/pages/templates/knots/fragments/secret.html deleted file mode 100644 index 385847c5..00000000 --- a/appview/pages/templates/knots/fragments/secret.html +++ /dev/null @@ -1,10 +0,0 @@ -{{ define "knots/fragments/secret" }} -
-

generated secret

-

Configure your knot to use this secret, and then hit initialize.

- {{ .Secret }} -
-{{ end }} diff --git a/appview/pages/templates/knots/index.html b/appview/pages/templates/knots/index.html index 8d9019ae..c9485a7c 100644 --- a/appview/pages/templates/knots/index.html +++ b/appview/pages/templates/knots/index.html @@ -8,7 +8,7 @@
{{ block "about" . }} {{ end }} - {{ template "knots/fragments/knotListingFull" . }} + {{ block "list" . }} {{ end }} {{ block "register" . }} {{ end }}
@@ -27,13 +27,29 @@ {{ end }} +{{ define "list" }} +
+

your knots

+
+ {{ range $registration := .Registrations }} + {{ template "knots/fragments/knotListing" . }} + {{ else }} +
+ no knots registered yet +
+ {{ end }} +
+
+
+{{ end }} + {{ define "register" }} -
+

register a knot

-

Enter the hostname of your knot to generate a key.

+

Enter the hostname of your knot to get started.

@@ -53,7 +69,7 @@ > {{ i "plus" "w-4 h-4" }} - generate + register
{{ end }} diff --git a/appview/pages/templates/spindles/fragments/addMemberModal.html b/appview/pages/templates/spindles/fragments/addMemberModal.html index 47f4d8e9..23732423 100644 --- a/appview/pages/templates/spindles/fragments/addMemberModal.html +++ b/appview/pages/templates/spindles/fragments/addMemberModal.html @@ -14,11 +14,11 @@ id="add-member-{{ .Instance }}" popover class="bg-white w-full md:w-96 dark:bg-gray-800 p-4 rounded border border-gray-200 dark:border-gray-700 drop-shadow dark:text-white backdrop:bg-gray-400/50 dark:backdrop:bg-gray-800/50"> - {{ block "addMemberPopover" . }} {{ end }} + {{ block "addSpindleMemberPopover" . }} {{ end }} {{ end }} -{{ define "addMemberPopover" }} +{{ define "addSpindleMemberPopover" }}
- {{ block "leftSide" . }} {{ end }} - {{ block "rightSide" . }} {{ end }} + {{ block "spindleLeftSide" . }} {{ end }} + {{ block "spindleRightSide" . }} {{ end }} {{ end }} -{{ define "leftSide" }} +{{ define "spindleLeftSide" }} {{ if .Verified }} {{ i "hard-drive" "w-4 h-4" }} @@ -25,7 +25,7 @@ {{ end }} {{ end }} -{{ define "rightSide" }} +{{ define "spindleRightSide" }}
{{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2 text-sm" }} {{ if .Verified }} @@ -33,13 +33,13 @@ {{ template "spindles/fragments/addMemberModal" . }} {{ else }} {{ i "shield-off" "w-4 h-4" }} unverified - {{ block "retryButton" . }} {{ end }} + {{ block "spindleRetryButton" . }} {{ end }} {{ end }} - {{ block "deleteButton" . }} {{ end }} + {{ block "spindleDeleteButton" . }} {{ end }}
{{ end }} -{{ define "deleteButton" }} +{{ define "spindleDeleteButton" }}