appview/state: Move /knots & /spindles under /settings #660

-10

appview/state/router.go

··· 161 161 162 162 r.Mount("/settings", s.SettingsRouter()) 163 163 r.Mount("/strings", s.StringsRouter(mw)) 164 164 - 165 165 - 166 166 - r.Mount("/knots", s.Redirect("/settings/knots")) 167 167 - r.Mount("/spindles", s.Redirect("/settings/spindles")) 168 164 169 165 r.Mount("/settings/knots", s.KnotsRouter()) 170 166 r.Mount("/settings/spindles", s.SpindlesRouter()) ··· 183 179 184 180 185 181 return r 186 186 - } 187 187 - 188 188 - func (s *State) Redirect(destination string) http.HandlerFunc { 189 189 - return func(w http.ResponseWriter, r *http.Request) { 190 190 - http.Redirect(w, r, destination, http.StatusFound) 191 191 - } 192 182 } 193 183 194 184 // Core serves tangled.org/core go-import meta tags, and redirects

+20 -4

appview/pages/templates/knots/dashboard.html

··· 1 1 - {{ define "title" }}{{ .Registration.Domain }} &middot; knots{{ end }} 1 1 + {{ define "title" }}{{ .Registration.Domain }} &middot; {{ .Tab }} settings{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4"> 4 4 + <div class="p-6"> 5 5 + <p class="text-xl font-bold dark:text-white">Settings</p> 6 6 + </div> 7 7 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 8 8 + <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6"> 9 9 + <div class="col-span-1"> 10 10 + {{ template "user/settings/fragments/sidebar" . }} 11 11 + </div> 12 12 + <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 13 13 + {{ template "knotDash" . }} 14 14 + </div> 15 15 + </section> 16 16 + </div> 17 17 + {{ end }} 18 18 + 19 19 + {{ define "knotDash" }} 20 20 + <div> 5 21 <div class="flex justify-between items-center"> 6 6 - <h1 class="text-xl font-bold dark:text-white">{{ .Registration.Domain }}</h1> 22 22 + <h2 class="text-sm pb-2 uppercase font-bold">{{ .Tab }} &middot; {{ .Registration.Domain }}</h2> 7 23 <div id="right-side" class="flex gap-2"> 8 24 {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} 9 25 {{ $isOwner := and .LoggedInUser (eq .LoggedInUser.Did .Registration.ByDid) }} ··· 35 51 </div> 36 52 37 53 {{ if .Members }} 38 38 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 54 54 + <section class="bg-white dark:bg-gray-800 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 39 55 <div class="flex flex-col gap-2"> 40 56 {{ block "member" . }} {{ end }} 41 57 </div>

appview/pages/templates/knots/fragments/addMemberModal.html

This file has not been changed.

appview/pages/templates/knots/fragments/knotListing.html

This file has not been changed.

+41 -10

appview/pages/templates/knots/index.html

··· 1 1 - {{ define "title" }}knots{{ end }} 1 1 + {{ define "title" }}{{ .Tab }} settings{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4 flex items-center justify-between gap-4 align-bottom"> 5 5 - <h1 class="text-xl font-bold dark:text-white">Knots</h1> 6 6 - <span class="flex items-center gap-1"> 7 7 - {{ i "book" "w-3 h-3" }} 8 8 - <a href="https://tangled.org/@tangled.org/core/blob/master/docs/knot-hosting.md">docs</a> 9 9 - </span> 10 10 - </div> 4 4 + <div class="p-6"> 5 5 + <p class="text-xl font-bold dark:text-white">Settings</p> 6 6 + </div> 7 7 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 8 8 + <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6"> 9 9 + <div class="col-span-1"> 10 10 + {{ template "user/settings/fragments/sidebar" . }} 11 11 + </div> 12 12 + <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 13 13 + {{ template "knotsList" . }} 14 14 + </div> 15 15 + </section> 16 16 + </div> 17 17 + {{ end }} 11 18 12 12 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 19 19 + {{ define "knotsList" }} 20 20 + <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center"> 21 21 + <div class="col-span-1 md:col-span-2"> 22 22 + <h2 class="text-sm pb-2 uppercase font-bold">Knots</h2> 23 23 + {{ block "about" . }} {{ end }} 24 24 + </div> 25 25 + <div class="col-span-1 md:col-span-1 md:justify-self-end"> 26 26 + {{ template "docsButton" . }} 27 27 + </div> 28 28 + </div> 29 29 + 30 30 + <section> 13 31 <div class="flex flex-col gap-6"> 14 14 - {{ block "about" . }} {{ end }} 15 32 {{ block "list" . }} {{ end }} 16 33 {{ block "register" . }} {{ end }} 17 34 </div> ··· 83 100 84 101 85 102 </section> 103 103 + {{ end }} 104 104 + 105 105 + {{ define "docsButton" }} 106 106 + <a 107 107 + class="btn flex items-center gap-2" 108 108 + href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md"> 109 109 + {{ i "book" "size-4" }} 110 110 + docs 111 111 + </a> 112 112 + <div 113 113 + id="add-email-modal" 114 114 + popover 115 115 + 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"> 116 116 + </div> 86 117 {{ end }}

-3

appview/pages/templates/layouts/fragments/topbar.html

··· 65 65 <a href="/{{ $user }}">profile</a> 66 66 <a href="/{{ $user }}?tab=repos">repositories</a> 67 67 <a href="/{{ $user }}?tab=strings">strings</a> 68 68 - <a href="/settings/knots">knots</a> 69 69 - <a href="/settings/spindles">spindles</a> 70 68 <a href="/settings">settings</a> 71 69 <a href="#" 72 72 - hx-post="/logout" 73 70 hx-post="/logout"

appview/pages/templates/repo/fork.html

This file has not been changed.

appview/pages/templates/repo/new.html

This file has not been changed.

-25

docs/hacking.md

··· 140 140 hit verify. You can then configure each repository to use 141 141 this spindle and run CI jobs. 142 142 143 143 - 144 144 - 145 145 - 146 146 - 147 147 - 148 148 - 149 149 - 150 150 - 151 151 - 152 152 - 153 153 - 154 154 - 155 155 - 156 156 - 157 157 - 158 158 - 159 159 - 160 160 - 161 161 - ### running a spindle 162 162 - 163 163 - The above VM should already be running a spindle on 164 164 - `localhost:6555`. Head to http://localhost:3000/spindles and 165 165 - hit verify. You can then configure each repository to use 166 166 - this spindle and run CI jobs. 167 167 -

docs/knot-hosting.md

This patch was likely rebased, as context lines do not match.

docs/migrations.md

This patch was likely rebased, as context lines do not match.

+19 -3

appview/pages/templates/spindles/dashboard.html

··· 1 1 - {{ define "title" }}{{.Spindle.Instance}} &middot; spindles{{ end }} 1 1 + {{ define "title" }}{{.Spindle.Instance}} &middot; {{ .Tab }} settings{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4"> 4 4 + <div class="p-6"> 5 5 + <p class="text-xl font-bold dark:text-white">Settings</p> 6 6 + </div> 7 7 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 8 8 + <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6"> 9 9 + <div class="col-span-1"> 10 10 + {{ template "user/settings/fragments/sidebar" . }} 11 11 + </div> 12 12 + <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 13 13 + {{ template "spindleDash" . }} 14 14 + </div> 15 15 + </section> 16 16 + </div> 17 17 + {{ end }} 18 18 + 19 19 + {{ define "spindleDash" }} 20 20 + <div> 5 21 <div class="flex justify-between items-center"> 6 6 - <h1 class="text-xl font-bold dark:text-white">{{ .Spindle.Instance }}</h1> 22 22 + <h2 class="text-sm pb-2 uppercase font-bold">{{ .Tab }} &middot; {{ .Spindle.Instance }}</h2> 7 23 <div id="right-side" class="flex gap-2"> 8 24 {{ $style := "px-2 py-1 rounded flex items-center flex-shrink-0 gap-2" }} 9 25 {{ $isOwner := and .LoggedInUser (eq .LoggedInUser.Did .Spindle.Owner) }}

appview/pages/templates/spindles/fragments/addMemberModal.html

This file has not been changed.

appview/pages/templates/spindles/fragments/spindleListing.html

This file has not been changed.

+90 -59

appview/pages/templates/spindles/index.html

··· 1 1 - {{ define "title" }}spindles{{ end }} 1 1 + {{ define "title" }}{{ .Tab }} settings{{ end }} 2 2 3 3 {{ define "content" }} 4 4 - <div class="px-6 py-4 flex items-center justify-between gap-4 align-bottom"> 5 5 - <h1 class="text-xl font-bold dark:text-white">Spindles</h1> 6 6 - <span class="flex items-center gap-1"> 7 7 - {{ i "book" "w-3 h-3" }} 8 8 - <a href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md">docs</a> 9 9 - </span> 4 4 + <div class="p-6"> 5 5 + <p class="text-xl font-bold dark:text-white">Settings</p> 6 6 + </div> 7 7 + <div class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 8 8 + <section class="w-full grid grid-cols-1 md:grid-cols-4 gap-6"> 9 9 + <div class="col-span-1"> 10 10 + {{ template "user/settings/fragments/sidebar" . }} 11 11 + </div> 12 12 + <div class="col-span-1 md:col-span-3 flex flex-col gap-6"> 13 13 + {{ template "spindleList" . }} 14 14 + </div> 15 15 + </section> 16 16 + </div> 17 17 + {{ end }} 18 18 + 19 19 + {{ define "spindleList" }} 20 20 + <div class="grid grid-cols-1 md:grid-cols-3 gap-4 items-center"> 21 21 + <div class="col-span-1 md:col-span-2"> 22 22 + <h2 class="text-sm pb-2 uppercase font-bold">Spindle</h2> 23 23 + {{ block "about" . }} {{ end }} 24 24 + </div> 25 25 + <div class="col-span-1 md:col-span-1 md:justify-self-end"> 26 26 + {{ template "docsButton" . }} 27 27 + </div> 10 28 </div> 11 29 12 12 - <section class="bg-white dark:bg-gray-800 p-6 rounded relative w-full mx-auto drop-shadow-sm dark:text-white"> 30 30 + <section> 13 31 <div class="flex flex-col gap-6"> 14 14 - {{ block "about" . }} {{ end }} 15 32 {{ block "list" . }} {{ end }} 16 33 {{ block "register" . }} {{ end }} 17 34 </div> ··· 20 37 21 38 {{ define "about" }} 22 39 <section class="rounded flex items-center gap-2"> 23 23 - <p class="text-gray-500 dark:text-gray-400"> 24 24 - Spindles are small CI runners. 25 25 - </p> 40 40 + <p class="text-gray-500 dark:text-gray-400"> 41 41 + Spindles are small CI runners. 42 42 + </p> 26 43 </section> 27 44 {{ end }} 28 45 29 46 {{ define "list" }} 30 30 - <section class="rounded w-full flex flex-col gap-2"> 31 31 - <h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">your spindles</h2> 32 32 - <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 w-full"> 33 33 - {{ range $spindle := .Spindles }} 34 34 - {{ template "spindles/fragments/spindleListing" . }} 35 35 - {{ else }} 36 36 - <div class="flex items-center justify-center p-2 border-b border-gray-200 dark:border-gray-700 text-gray-500"> 37 37 - no spindles registered yet 38 38 - </div> 39 39 - {{ end }} 47 47 + <section class="rounded w-full flex flex-col gap-2"> 48 48 + <h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">your spindles</h2> 49 49 + <div class="flex flex-col rounded border border-gray-200 dark:border-gray-700 w-full"> 50 50 + {{ range $spindle := .Spindles }} 51 51 + {{ template "spindles/fragments/spindleListing" . }} 52 52 + {{ else }} 53 53 + <div class="flex items-center justify-center p-2 border-b border-gray-200 dark:border-gray-700 text-gray-500"> 54 54 + no spindles registered yet 40 55 </div> 41 41 - <div id="operation-error" class="text-red-500 dark:text-red-400"></div> 42 42 - </section> 56 56 + {{ end }} 57 57 + </div> 58 58 + <div id="operation-error" class="text-red-500 dark:text-red-400"></div> 59 59 + </section> 43 60 {{ end }} 44 61 45 62 {{ define "register" }} 46 46 - <section class="rounded w-full lg:w-fit flex flex-col gap-2"> 47 47 - <h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">register a spindle</h2> 48 48 - <p class="mb-2 dark:text-gray-300">Enter the hostname of your spindle to get started.</p> 49 49 - <form 50 50 - hx-post="/settings/spindles/register" 51 51 - class="max-w-2xl mb-2 space-y-4" 52 52 - hx-indicator="#register-button" 53 53 - hx-swap="none" 54 54 - > 55 55 - <div class="flex gap-2"> 56 56 - <input 57 57 - type="text" 58 58 - id="instance" 59 59 - name="instance" 60 60 - placeholder="spindle.example.com" 61 61 - required 62 62 - class="flex-1 w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded" 63 63 - > 64 64 - <button 65 65 - type="submit" 66 66 - id="register-button" 67 67 - class="btn rounded flex items-center py-2 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 group" 68 68 - > 69 69 - <span class="inline-flex items-center gap-2"> 70 70 - {{ i "plus" "w-4 h-4" }} 71 71 - register 72 72 - </span> 73 73 - <span class="pl-2 hidden group-[.htmx-request]:inline"> 74 74 - {{ i "loader-circle" "w-4 h-4 animate-spin" }} 75 75 - </span> 76 76 - </button> 77 77 - </div> 63 63 + <section class="rounded w-full lg:w-fit flex flex-col gap-2"> 64 64 + <h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">register a spindle</h2> 65 65 + <p class="mb-2 dark:text-gray-300">Enter the hostname of your spindle to get started.</p> 66 66 + <form 67 67 + hx-post="/settings/spindles/register" 68 68 + class="max-w-2xl mb-2 space-y-4" 69 69 + hx-indicator="#register-button" 70 70 + hx-swap="none" 71 71 + > 72 72 + <div class="flex gap-2"> 73 73 + <input 74 74 + type="text" 75 75 + id="instance" 76 76 + name="instance" 77 77 + placeholder="spindle.example.com" 78 78 + required 79 79 + class="flex-1 w-full dark:bg-gray-700 dark:text-white dark:border-gray-600 dark:placeholder-gray-400 px-3 py-2 border rounded" 80 80 + > 81 81 + <button 82 82 + type="submit" 83 83 + id="register-button" 84 84 + class="btn rounded flex items-center py-2 dark:bg-gray-700 dark:text-white dark:hover:bg-gray-600 group" 85 85 + > 86 86 + <span class="inline-flex items-center gap-2"> 87 87 + {{ i "plus" "w-4 h-4" }} 88 88 + register 89 89 + </span> 90 90 + <span class="pl-2 hidden group-[.htmx-request]:inline"> 91 91 + {{ i "loader-circle" "w-4 h-4 animate-spin" }} 92 92 + </span> 93 93 + </button> 94 94 + </div> 78 95 79 79 - <div id="register-error" class="dark:text-red-400"></div> 80 80 - </form> 96 96 + <div id="register-error" class="dark:text-red-400"></div> 97 97 + </form> 81 98 82 82 - </section> 99 99 + </section> 100 100 + {{ end }} 101 101 + 102 102 + {{ define "docsButton" }} 103 103 + <a 104 104 + class="btn flex items-center gap-2" 105 105 + href="https://tangled.org/@tangled.org/core/blob/master/docs/spindle/hosting.md"> 106 106 + {{ i "book" "size-4" }} 107 107 + docs 108 108 + </a> 109 109 + <div 110 110 + id="add-email-modal" 111 111 + popover 112 112 + 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"> 113 113 + </div> 83 114 {{ end }}

+17

appview/knots/knots.go

··· 38 38 Knotstream *eventconsumer.Consumer 39 39 } 40 40 41 41 + type tab = map[string]any 42 42 + 43 43 + var ( 44 44 + knotsTabs []tab = []tab{ 45 45 + {"Name": "profile", "Icon": "user"}, 46 46 + {"Name": "keys", "Icon": "key"}, 47 47 + {"Name": "emails", "Icon": "mail"}, 48 48 + {"Name": "notifications", "Icon": "bell"}, 49 49 + {"Name": "knots", "Icon": "volleyball"}, 50 50 + {"Name": "spindles", "Icon": "spool"}, 51 51 + } 52 52 + ) 53 53 + 41 54 func (k *Knots) Router() http.Handler { 42 55 r := chi.NewRouter() 43 56 ··· 69 82 k.Pages.Knots(w, pages.KnotsParams{ 70 83 LoggedInUser: user, 71 84 Registrations: registrations, 85 85 + Tabs: knotsTabs, 86 86 + Tab: "knots", 72 87 }) 73 88 } 74 89 ··· 131 146 Members: members, 132 147 Repos: repoMap, 133 148 IsOwner: true, 149 149 + Tabs: knotsTabs, 150 150 + Tab: "knots", 134 151 }) 135 152 } 136 153

+10

appview/pages/pages.go

··· 410 410 type KnotsParams struct { 411 411 LoggedInUser *oauth.User 412 412 Registrations []models.Registration 413 413 + Tabs []map[string]any 414 414 + Tab string 413 415 } 414 416 415 417 func (p *Pages) Knots(w io.Writer, params KnotsParams) error { ··· 422 424 Members []string 423 425 Repos map[string][]models.Repo 424 426 IsOwner bool 427 427 + Tabs []map[string]any 428 428 + Tab string 425 429 } 426 430 427 431 func (p *Pages) Knot(w io.Writer, params KnotParams) error { ··· 439 443 type SpindlesParams struct { 440 444 LoggedInUser *oauth.User 441 445 Spindles []models.Spindle 446 446 + Tabs []map[string]any 447 447 + Tab string 442 448 } 443 449 444 450 func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error { ··· 447 453 448 454 type SpindleListingParams struct { 449 455 models.Spindle 456 456 + Tabs []map[string]any 457 457 + Tab string 450 458 } 451 459 452 460 func (p *Pages) SpindleListing(w io.Writer, params SpindleListingParams) error { ··· 458 466 Spindle models.Spindle 459 467 Members []string 460 468 Repos map[string][]models.Repo 469 469 + Tabs []map[string]any 470 470 + Tab string 461 471 } 462 472 463 473 func (p *Pages) SpindleDashboard(w io.Writer, params SpindleDashboardParams) error {

+2

appview/settings/settings.go

··· 43 43 {"Name": "keys", "Icon": "key"}, 44 44 {"Name": "emails", "Icon": "mail"}, 45 45 {"Name": "notifications", "Icon": "bell"}, 46 46 + {"Name": "knots", "Icon": "volleyball"}, 47 47 + {"Name": "spindles", "Icon": "spool"}, 46 48 } 47 49 ) 48 50

+17

appview/spindles/spindles.go

··· 37 37 Logger *slog.Logger 38 38 } 39 39 40 40 + type tab = map[string]any 41 41 + 42 42 + var ( 43 43 + spindlesTabs []tab = []tab{ 44 44 + {"Name": "profile", "Icon": "user"}, 45 45 + {"Name": "keys", "Icon": "key"}, 46 46 + {"Name": "emails", "Icon": "mail"}, 47 47 + {"Name": "notifications", "Icon": "bell"}, 48 48 + {"Name": "knots", "Icon": "volleyball"}, 49 49 + {"Name": "spindles", "Icon": "spool"}, 50 50 + } 51 51 + ) 52 52 + 40 53 func (s *Spindles) Router() http.Handler { 41 54 r := chi.NewRouter() 42 55 ··· 68 81 s.Pages.Spindles(w, pages.SpindlesParams{ 69 82 LoggedInUser: user, 70 83 Spindles: all, 84 84 + Tabs: spindlesTabs, 85 85 + Tab: "spindles", 71 86 }) 72 87 } 73 88 ··· 126 141 Spindle: spindle, 127 142 Members: members, 128 143 Repos: repoMap, 144 144 + Tabs: spindlesTabs, 145 145 + Tab: "spindles", 129 146 }) 130 147 } 131 148