patch of appview/state: Move /knots & /spindles under /settings · round #0 · pull #660 · tangled.org/core

+14 -2

appview/state/router.go

···

       161
       161
        
       

     

       162
       162
        
       	r.Mount("/settings", s.SettingsRouter())

     

       163
       163
        
       	r.Mount("/strings", s.StringsRouter(mw))

     

       164
       164
       -
       	r.Mount("/knots", s.KnotsRouter())

     

       165
       165
       -
       	r.Mount("/spindles", s.SpindlesRouter())

     

       164
       164
       +
       

     

       165
       165
       +
       

     

       166
       166
       +
       	r.Mount("/knots", s.Redirect("/settings/knots"))

     

       167
       167
       +
       	r.Mount("/spindles", s.Redirect("/settings/spindles"))

     

       168
       168
       +
       	

     

       169
       169
       +
       	r.Mount("/settings/knots", s.KnotsRouter())

     

       170
       170
       +
       	r.Mount("/settings/spindles", s.SpindlesRouter())

     

       171
       171
       +
       

     

       166
       172
        
       	r.Mount("/notifications", s.NotificationsRouter(mw))

     

       167
       173
        
       

     

       168
       174
        
       	r.Mount("/signup", s.SignupRouter())

     
···

       179
       185
        
       	return r

     

       180
       186
        
       }

     

       181
       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
       192
       +
       }

     

       193
       193
       +
       

     

       182
       194
        
       // Core serves tangled.org/core go-import meta tags, and redirects

     

       183
       195
        
       // to the core repository if accessed normally.

     

       184
       196
        
       func (s *State) Core() http.HandlerFunc {

+3 -3

appview/pages/templates/knots/dashboard.html

···

       79
       79
        
         <button

     

       80
       80
        
           class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       81
       81
        
           title="Delete knot"

     

       82
       82
       -
           hx-delete="/knots/{{ .Domain }}"

     

       82
       82
       +
           hx-delete="/settings/knots/{{ .Domain }}"

     

       83
       83
        
           hx-swap="outerHTML"

     

       84
       84
        
           hx-confirm="Are you sure you want to delete the knot '{{ .Domain }}'?"

     

       85
       85
        
           hx-headers='{"shouldRedirect": "true"}'

     
···

       95
       95
        
         <button

     

       96
       96
        
           class="btn gap-2 group"

     

       97
       97
        
           title="Retry knot verification"

     

       98
       98
       -
           hx-post="/knots/{{ .Domain }}/retry"

     

       98
       98
       +
           hx-post="/settings/knots/{{ .Domain }}/retry"

     

       99
       99
        
           hx-swap="none"

     

       100
       100
        
           hx-headers='{"shouldRefresh": "true"}'

     

       101
       101
        
         >

     
···

       113
       113
        
           <button

     

       114
       114
        
             class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       115
       115
        
             title="Remove member"

     

       116
       116
       -
             hx-post="/knots/{{ $root.Registration.Domain }}/remove"

     

       116
       116
       +
             hx-post="/settings/knots/{{ $root.Registration.Domain }}/remove"

     

       117
       117
        
             hx-swap="none"

     

       118
       118
        
             hx-vals='{"member": "{{$member}}" }'

     

       119
       119
        
             hx-confirm="Are you sure you want to remove {{ $memberHandle }} from this knot?"

+1 -1

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

···

       20
       20
        
       

     

       21
       21
        
       {{ define "addKnotMemberPopover" }}

     

       22
       22
        
       <form

     

       23
       23
       -
         hx-post="/knots/{{ .Domain }}/add"

     

       23
       23
       +
         hx-post="/settings/knots/{{ .Domain }}/add"

     

       24
       24
        
         hx-indicator="#spinner"

     

       25
       25
        
         hx-swap="none"

     

       26
       26
        
         class="flex flex-col gap-2"

+3 -3

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

···

       7
       7
        
       

     

       8
       8
        
       {{ define "knotLeftSide" }}

     

       9
       9
        
         {{ if .Registered }}

     

       10
       10
       -
         <a href="/knots/{{ .Domain }}" class="hover:no-underline flex items-center gap-2 min-w-0 max-w-[60%]">

     

       10
       10
       +
         <a href="/settings/knots/{{ .Domain }}" class="hover:no-underline flex items-center gap-2 min-w-0 max-w-[60%]">

     

       11
       11
        
           {{ i "hard-drive" "w-4 h-4" }}

     

       12
       12
        
           <span class="hover:underline">

     

       13
       13
        
             {{ .Domain }}

     
···

       56
       56
        
         <button

     

       57
       57
        
           class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       58
       58
        
           title="Delete knot"

     

       59
       59
       -
           hx-delete="/knots/{{ .Domain }}"

     

       59
       59
       +
           hx-delete="/settings/knots/{{ .Domain }}"

     

       60
       60
        
           hx-swap="outerHTML"

     

       61
       61
        
           hx-target="#knot-{{.Id}}"

     

       62
       62
        
           hx-confirm="Are you sure you want to delete the knot '{{ .Domain }}'?"

     
···

       72
       72
        
         <button

     

       73
       73
        
           class="btn gap-2 group"

     

       74
       74
        
           title="Retry knot verification"

     

       75
       75
       -
           hx-post="/knots/{{ .Domain }}/retry"

     

       75
       75
       +
           hx-post="/settings/knots/{{ .Domain }}/retry"

     

       76
       76
        
           hx-swap="none"

     

       77
       77
        
           hx-target="#knot-{{.Id}}"

     

       78
       78
        
         >

+1 -1

appview/pages/templates/knots/index.html

···

       50
       50
        
           <h2 class="text-sm font-bold py-2 uppercase dark:text-gray-300">register a knot</h2>

     

       51
       51
        
           <p class="mb-2 dark:text-gray-300">Enter the hostname of your knot to get started.</p>

     

       52
       52
        
           <form

     

       53
       53
       -
             hx-post="/knots/register"

     

       53
       53
       +
             hx-post="/settings/knots/register"

     

       54
       54
        
             class="max-w-2xl mb-2 space-y-4"

     

       55
       55
        
             hx-indicator="#register-button"

     

       56
       56
        
             hx-swap="none"

+1 -1

appview/pages/templates/repo/fork.html

···

       33
       33
        
               {{ end }}

     

       34
       34
        
               </div>

     

       35
       35
        
             </div>

     

       36
       36
       -
             <p class="text-sm text-gray-500 dark:text-gray-400">A knot hosts repository data. <a href="/knots" class="underline">Learn how to register your own knot.</a></p>

     

       36
       36
       +
             <p class="text-sm text-gray-500 dark:text-gray-400">A knot hosts repository data. <a href="/settings/knots" class="underline">Learn how to register your own knot.</a></p>

     

       37
       37
        
           </fieldset>

     

       38
       38
        
       

     

       39
       39
        
           <div class="space-y-2">

+1 -1

appview/pages/templates/repo/new.html

···

       164
       164
        
           </div>

     

       165
       165
        
           <p class="text-sm text-gray-500 dark:text-gray-400 mt-1">

     

       166
       166
        
             A knot hosts repository data and handles Git operations.

     

       167
       167
       -
             You can also <a href="/knots" class="underline">register your own knot</a>.

     

       167
       167
       +
             You can also <a href="/settings/knots" class="underline">register your own knot</a>.

     

       168
       168
        
           </p>

     

       169
       169
        
         </div>

     

       170
       170
        
       {{ end }}

+1 -1

docs/knot-hosting.md

···

       130
       130
        
       

     

       131
       131
        
       You should now have a running knot server! You can finalize

     

       132
       132
        
       your registration by hitting the `verify` button on the

     

       133
       133
       -
       [/knots](https://tangled.org/knots) page. This simply creates

     

       133
       133
       +
       [/settings/knots](https://tangled.org/settings/knots) page. This simply creates

     

       134
       134
        
       a record on your PDS to announce the existence of the knot.

     

       135
       135
        
       

     

       136
       136
        
       ### custom paths

+3 -3

appview/pages/templates/spindles/dashboard.html

···

       71
       71
        
         <button

     

       72
       72
        
           class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       73
       73
        
           title="Delete spindle"

     

       74
       74
       -
           hx-delete="/spindles/{{ .Instance }}"

     

       74
       74
       +
           hx-delete="/settings/spindles/{{ .Instance }}"

     

       75
       75
        
           hx-swap="outerHTML"

     

       76
       76
        
           hx-confirm="Are you sure you want to delete the spindle '{{ .Instance }}'?"

     

       77
       77
        
           hx-headers='{"shouldRedirect": "true"}'

     
···

       87
       87
        
         <button

     

       88
       88
        
           class="btn gap-2 group"

     

       89
       89
        
           title="Retry spindle verification"

     

       90
       90
       -
           hx-post="/spindles/{{ .Instance }}/retry"

     

       90
       90
       +
           hx-post="/settings/spindles/{{ .Instance }}/retry"

     

       91
       91
        
           hx-swap="none"

     

       92
       92
        
           hx-headers='{"shouldRefresh": "true"}'

     

       93
       93
        
         >

     
···

       104
       104
        
           <button

     

       105
       105
        
             class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       106
       106
        
             title="Remove member"

     

       107
       107
       -
             hx-post="/spindles/{{ $root.Spindle.Instance }}/remove"

     

       107
       107
       +
             hx-post="/settings/spindles/{{ $root.Spindle.Instance }}/remove"

     

       108
       108
        
             hx-swap="none"

     

       109
       109
        
             hx-vals='{"member": "{{$member}}" }'

     

       110
       110
        
             hx-confirm="Are you sure you want to remove {{ resolve $member }} from this instance?"

+1 -1

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

···

       20
       20
        
       

     

       21
       21
        
       {{ define "addSpindleMemberPopover" }}

     

       22
       22
        
       <form

     

       23
       23
       -
         hx-post="/spindles/{{ .Instance }}/add"

     

       23
       23
       +
         hx-post="/settings/spindles/{{ .Instance }}/add"

     

       24
       24
        
         hx-indicator="#spinner"

     

       25
       25
        
         hx-swap="none"

     

       26
       26
        
         class="flex flex-col gap-2"

+3 -3

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

···

       7
       7
        
       

     

       8
       8
        
       {{ define "spindleLeftSide" }}

     

       9
       9
        
         {{ if .Verified }}

     

       10
       10
       -
         <a href="/spindles/{{ .Instance }}" class="hover:no-underline flex items-center gap-2 min-w-0 max-w-[60%]">

     

       10
       10
       +
         <a href="/settings/spindles/{{ .Instance }}" class="hover:no-underline flex items-center gap-2 min-w-0 max-w-[60%]">

     

       11
       11
        
           {{ i "hard-drive" "w-4 h-4" }}

     

       12
       12
        
           <span class="hover:underline">

     

       13
       13
        
             {{ .Instance }}

     
···

       50
       50
        
         <button

     

       51
       51
        
           class="btn text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 gap-2 group"

     

       52
       52
        
           title="Delete spindle"

     

       53
       53
       -
           hx-delete="/spindles/{{ .Instance }}"

     

       53
       53
       +
           hx-delete="/settings/spindles/{{ .Instance }}"

     

       54
       54
        
           hx-swap="outerHTML"

     

       55
       55
        
           hx-target="#spindle-{{.Id}}"

     

       56
       56
        
           hx-confirm="Are you sure you want to delete the spindle '{{ .Instance }}'?"

     
···

       66
       66
        
         <button

     

       67
       67
        
           class="btn gap-2 group"

     

       68
       68
        
           title="Retry spindle verification"

     

       69
       69
       -
           hx-post="/spindles/{{ .Instance }}/retry"

     

       69
       69
       +
           hx-post="/settings/spindles/{{ .Instance }}/retry"

     

       70
       70
        
           hx-swap="none"

     

       71
       71
        
           hx-target="#spindle-{{.Id}}"

     

       72
       72
        
         >

+1 -1

appview/pages/templates/spindles/index.html

···

       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="/spindles/register"

     

       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"