tangled.org / core
Monorepo for Tangled tangled.org
fork atom

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

merged opened by 5jiji.com targeting master from [deleted fork]: master

Closes https://tangled.org/@tangled.org/core/issues/248

I hope this go code is fine, because i have no damn clue how go works, so i just tried something and it worked If there is a better solution, i would like to know it!

NB: (I've checked if it compiled and worked, by removing commit '3ebdcd: knotserver: improve the logging situation', as for some reason, that commit is uncompilable (even your spindle is complaining))

Labels

None yet.

assignee

None yet.

Participants 3
AT URI
at://did:plc:uakrniojtddxh2juse64bgcm/sh.tangled.repo.pull/3m2z5niwb2y22
+4 -4
Interdiff #1 → #2
unified split
appview/knots/knots.go

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

appview/pages/pages.go

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

appview/pages/templates/knots/dashboard.html

This file has not been changed.

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

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

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

This file has not been changed.

appview/pages/templates/knots/index.html

This file has not been changed.

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

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

appview/pages/templates/repo/fork.html

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

appview/pages/templates/repo/new.html

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

appview/pages/templates/spindles/dashboard.html

This file has not been changed.

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

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

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

This file has not been changed.

appview/pages/templates/spindles/index.html

This file has not been changed.

appview/settings/settings.go

This file has not been changed.

appview/spindles/spindles.go

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

appview/state/router.go

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

+4 -4
docs/hacking.md
··· 111 111 with `ssh` exposed on port 2222. 112 112 113 113 Once the services are running, head to 114 - http://localhost:3000/settings/knots and hit verify. It should 114 + http://localhost:3000/knots and hit verify. It should 115 115 verify the ownership of the services instantly if everything 116 116 went smoothly. 117 117 ··· 121 121 with `ssh` exposed on port 2222. 122 122 123 123 Once the services are running, head to 124 - http://localhost:3000/knots and hit verify. It should 124 + http://localhost:3000/settings/knots and hit verify. It should 125 125 verify the ownership of the services instantly if everything 126 126 went smoothly. 127 127 ··· 136 136 ### running a spindle 137 137 138 138 The above VM should already be running a spindle on 139 - `localhost:6555`. Head to http://localhost:3000/settings/spindles and 139 + `localhost:6555`. Head to http://localhost:3000/spindles and 140 140 hit verify. You can then configure each repository to use 141 141 this spindle and run CI jobs. 142 142 ··· 146 146 ### running a spindle 147 147 148 148 The above VM should already be running a spindle on 149 - `localhost:6555`. Head to http://localhost:3000/spindles and 149 + `localhost:6555`. Head to http://localhost:3000/settings/spindles and 150 150 hit verify. You can then configure each repository to use 151 151 this spindle and run CI jobs. 152 152
docs/knot-hosting.md

This file has not been changed.

docs/migrations.md

This file has not been changed.

History

3 rounds 7 comments
sign up or login to add to the discussion
5jiji.com submitted #2
diff
9 commits
expand
bfa487d3
appview/state: Moved /knots & /spindle to /settings
07a7776b
appview/pages, docs: Update knots links
69207de2
appview/pages, docs: Update spindle links
ff1993a3
appview/pages: Remove links from dropdown
09cebe3c
appview/state: Remove Redirects
8df0b723
appview/{pages,knots}: Update knots page to be more settings like
efee07c6
appview/{pages,spindle}: Update knots page to be more settings like
8ccee251
appview/{knots,settings,spindle}: Added icons for knots & spindle
eee39bb4
appview/{knots,pages,state}: formating
expand 3 comments
5jiji.com

Resubmitted to format the code properly!

boltless.me

Generally lgtm! Can you squash the commits into single commit?

boltless.me

nvm I'll merge this PR and squash manually. Thank you for your contribution!

pull request successfully merged
5jiji.com submitted #1
diff interdiff
8 commits
expand
d0c19d4c
appview/state: Moved /knots & /spindle to /settings
572cf29a
appview/pages, docs: Update knots links
1e0f64f1
appview/pages, docs: Update spindle links
4d0f3209
appview/pages: Remove links from dropdown
cc9f5e64
appview/state: Remove Redirects
3a38512d
appview/{pages,knots}: Update knots page to be more settings like
37debd08
appview/{pages,spindle}: Update knots page to be more settings like
6206b22b
appview/{knots,settings,spindle}: Added icons for knots & spindle
expand 1 comment
5jiji.com

Hello there, finally could resubmit my patch (as i couldn't do that for some reason), so to update on what i updated:

  • Moved the knots & spindle pages to the settings page
    • I know that i currently have duplicated information, for the icons to be showed, but i have no clue on how to share that information (i still don't know go very much)
    • I tried making the knots & spindle pages fit in, but i have no idea if that's good enough or not
  • Removed the knots & spindle shortcuts from the user dropdown
    • Did not add them on the repo create page & spindle pages, as i don't really know how you'd like them to be set as

And i think that's about it! I may have forgotten a bit of what i did, as it's now been a while since i wrote all the stuff for the patch, as i couldn't resubmit, but i think i touched on all main points.

5jiji.com submitted #0
diff
3 commits
expand
6ccadcfa
appview/state: Moved /knots & /spindle to /settings
c021c3c5
appview/pages, docs: Update knots links
6d7337ce
appview/pages, docs: Update spindle links
expand 3 comments
oppi.li

thanks for the contribution! some high level thoughts on this work:

  • the original intent of the issue (it is not the clearest about this unfortunately) is to move the knots and spindles pages to be new tabs under the settings page
  • the code here seems to move the routers, which is a good chunk of this work, we also want to make UI changes here to completely move the pages
  • i personally do not think the redirect is necessary, we can move the router directly under settings, without using a redirect
5jiji.com

For the second point, does it mean that the links from the user submenu (when you click on your account in the topbar) will be removed, or will stay?

oppi.li

yes, we will remove the links from there. other areas of the UI can be later improved to indicate the existence of selfhosting (the new repo page can contain a link to selfhosted knots, the pipelienes page can have a link to spindles and selfhosting docs etc.)