diff --git a/consts/consts.go b/consts/consts.go new file mode 100644 --- /dev/null +++ b/consts/consts.go @@ -0,0 +1,9 @@ +package consts + +const ( + TangledDid = "did:plc:wshs7t2adsemcrrd4snkeqli" + IcyDid = "did:plc:hwevmowznbiukdf6uk5dwrrq" + + DefaultSpindle = "spindle.tangled.sh" + DefaultKnot = "knot1.tangled.sh" +) diff --git a/appview/repo/router.go b/appview/repo/router.go --- a/appview/repo/router.go +++ b/appview/repo/router.go @@ -82,10 +82,10 @@ r.With(mw.RepoPermissionMiddleware("repo:settings")).Route("/settings", func(r chi.Router) { r.Get("/", rp.RepoSettings) r.With(mw.RepoPermissionMiddleware("repo:owner")).Post("/spindle", rp.EditSpindle) - r.With(mw.RepoPermissionMiddleware("repo:owner")).Put("/label", rp.AddLabel) - r.With(mw.RepoPermissionMiddleware("repo:owner")).Delete("/label", rp.DeleteLabel) - r.With(mw.RepoPermissionMiddleware("repo:owner")).Put("/label/subscribe", rp.SubscribeLabel) - r.With(mw.RepoPermissionMiddleware("repo:owner")).Delete("/label/subscribe", rp.UnsubscribeLabel) + r.With(mw.RepoPermissionMiddleware("repo:owner")).Put("/label", rp.AddLabelDef) + r.With(mw.RepoPermissionMiddleware("repo:owner")).Delete("/label", rp.DeleteLabelDef) + r.With(mw.RepoPermissionMiddleware("repo:owner")).Post("/label/subscribe", rp.SubscribeLabel) + r.With(mw.RepoPermissionMiddleware("repo:owner")).Post("/label/unsubscribe", rp.UnsubscribeLabel) r.With(mw.RepoPermissionMiddleware("repo:invite")).Put("/collaborator", rp.AddCollaborator) r.With(mw.RepoPermissionMiddleware("repo:delete")).Delete("/delete", rp.DeleteRepo) r.Put("/branches/default", rp.SetDefaultBranch) diff --git a/appview/pages/templates/repo/settings/general.html b/appview/pages/templates/repo/settings/general.html --- a/appview/pages/templates/repo/settings/general.html +++ b/appview/pages/templates/repo/settings/general.html @@ -7,7 +7,8 @@
{{ template "branchSettings" . }} - {{ template "labelSettings" . }} + {{ template "defaultLabelSettings" . }} + {{ template "customLabelSettings" . }} {{ template "deleteRepo" . }}
@@ -43,18 +44,55 @@ {{ end }} -{{ define "labelSettings" }} +{{ define "defaultLabelSettings" }} +
+

Default Labels

+

+ Manage your issues and pulls by creating labels to categorize them. Only + repository owners may configure labels. You may choose to subscribe to + default labels, or create entirely custom labels. +

+
+ {{ range .DefaultLabels }} +
+ {{ template "repo/settings/fragments/labelListing" (list $ .) }} + {{ $action := "subscribe" }} + {{ $icon := "plus" }} + {{ if mapContains $.SubscribedLabels .AtUri.String }} + {{ $action = "unsubscribe" }} + {{ $icon = "minus" }} + {{ end }} + +
+ {{ else }} +
+ no labels added yet +
+ {{ end }} +
+
+
+{{ end }} + +{{ define "customLabelSettings" }}
-

Labels

-

- Manage your issues and pulls by creating labels to categorize them. - Only repository owners may configure labels. -

+

Custom Labels

{{ range .Labels }} - {{ template "repo/settings/fragments/labelListing" (list $ .) }} +
+ {{ template "repo/settings/fragments/labelListing" (list $ .) }} + {{ if $.RepoInfo.Roles.IsOwner }} + + {{ end }} +
{{ else }}
no labels added yet diff --git a/appview/pages/templates/repo/settings/fragments/labelListing.html b/appview/pages/templates/repo/settings/fragments/labelListing.html --- a/appview/pages/templates/repo/settings/fragments/labelListing.html +++ b/appview/pages/templates/repo/settings/fragments/labelListing.html @@ -1,34 +1,32 @@ {{ define "repo/settings/fragments/labelListing" }} {{ $root := index . 0 }} {{ $label := index . 1 }} -
-
- {{ template "labels/fragments/labelDef" $label }} -
+
+ {{ template "labels/fragments/labelDef" $label }} +
+ {{ if $label.ValueType.IsNull }} + basic + {{ else }} {{ $label.ValueType.Type }} type - {{ if $label.ValueType.IsEnumType }} - - {{ join $label.ValueType.Enum ", " }} - {{ end }} - {{ if $label.ValueType.IsDidFormat }} - - DID format - {{ end }} -
+ {{ end }} + + {{ if $label.ValueType.IsEnum }} + + {{ join $label.ValueType.Enum ", " }} + {{ end }} + + {{ if $label.ValueType.IsDidFormat }} + + DID format + {{ end }} + + {{ if $label.Multiple }} + + multiple + {{ end }} + + + {{ join $label.Scope ", " }}
- {{ if $root.RepoInfo.Roles.IsOwner }} - - {{ end }}
{{ end }}