Monorepo for Tangled tangled.org

appview: specify current tab from pages package #1017

merged opened by boltless.me targeting master from sl/rusppvknyzsy
Labels

None yet.

assignee

None yet.

Participants 2
AT URI
at://did:plc:xasnlahkri4ewmbuzly2rlc5/sh.tangled.repo.pull/3mdadsnl6sv22
+9 -9
Diff #0
-2
appview/knots/knots.go
··· 71 k.Pages.Knots(w, pages.KnotsParams{ 72 LoggedInUser: user, 73 Registrations: registrations, 74 - Tab: "knots", 75 }) 76 } 77 ··· 134 Members: members, 135 Repos: repoMap, 136 IsOwner: true, 137 - Tab: "knots", 138 }) 139 } 140
··· 71 k.Pages.Knots(w, pages.KnotsParams{ 72 LoggedInUser: user, 73 Registrations: registrations, 74 }) 75 } 76 ··· 133 Members: members, 134 Repos: repoMap, 135 IsOwner: true, 136 }) 137 } 138
+9
appview/pages/pages.go
··· 342 } 343 344 func (p *Pages) UserProfileSettings(w io.Writer, params UserProfileSettingsParams) error { 345 return p.execute("user/settings/profile", w, params) 346 } 347 ··· 380 } 381 382 func (p *Pages) UserKeysSettings(w io.Writer, params UserKeysSettingsParams) error { 383 return p.execute("user/settings/keys", w, params) 384 } 385 ··· 390 } 391 392 func (p *Pages) UserEmailsSettings(w io.Writer, params UserEmailsSettingsParams) error { 393 return p.execute("user/settings/emails", w, params) 394 } 395 ··· 400 } 401 402 func (p *Pages) UserNotificationSettings(w io.Writer, params UserNotificationSettingsParams) error { 403 return p.execute("user/settings/notifications", w, params) 404 } 405 ··· 419 } 420 421 func (p *Pages) Knots(w io.Writer, params KnotsParams) error { 422 return p.execute("knots/index", w, params) 423 } 424 ··· 450 } 451 452 func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error { 453 return p.execute("spindles/index", w, params) 454 } 455 ··· 883 884 func (p *Pages) RepoGeneralSettings(w io.Writer, params RepoGeneralSettingsParams) error { 885 params.Active = "settings" 886 return p.executeRepo("repo/settings/general", w, params) 887 } 888 ··· 896 897 func (p *Pages) RepoAccessSettings(w io.Writer, params RepoAccessSettingsParams) error { 898 params.Active = "settings" 899 return p.executeRepo("repo/settings/access", w, params) 900 } 901 ··· 911 912 func (p *Pages) RepoPipelineSettings(w io.Writer, params RepoPipelineSettingsParams) error { 913 params.Active = "settings" 914 return p.executeRepo("repo/settings/pipelines", w, params) 915 } 916
··· 342 } 343 344 func (p *Pages) UserProfileSettings(w io.Writer, params UserProfileSettingsParams) error { 345 + params.Tab = "profile" 346 return p.execute("user/settings/profile", w, params) 347 } 348 ··· 381 } 382 383 func (p *Pages) UserKeysSettings(w io.Writer, params UserKeysSettingsParams) error { 384 + params.Tab = "keys" 385 return p.execute("user/settings/keys", w, params) 386 } 387 ··· 392 } 393 394 func (p *Pages) UserEmailsSettings(w io.Writer, params UserEmailsSettingsParams) error { 395 + params.Tab = "emails" 396 return p.execute("user/settings/emails", w, params) 397 } 398 ··· 403 } 404 405 func (p *Pages) UserNotificationSettings(w io.Writer, params UserNotificationSettingsParams) error { 406 + params.Tab = "notifications" 407 return p.execute("user/settings/notifications", w, params) 408 } 409 ··· 423 } 424 425 func (p *Pages) Knots(w io.Writer, params KnotsParams) error { 426 + params.Tab = "knots" 427 return p.execute("knots/index", w, params) 428 } 429 ··· 455 } 456 457 func (p *Pages) Spindles(w io.Writer, params SpindlesParams) error { 458 + params.Tab = "spindles" 459 return p.execute("spindles/index", w, params) 460 } 461 ··· 889 890 func (p *Pages) RepoGeneralSettings(w io.Writer, params RepoGeneralSettingsParams) error { 891 params.Active = "settings" 892 + params.Tab = "general" 893 return p.executeRepo("repo/settings/general", w, params) 894 } 895 ··· 903 904 func (p *Pages) RepoAccessSettings(w io.Writer, params RepoAccessSettingsParams) error { 905 params.Active = "settings" 906 + params.Tab = "access" 907 return p.executeRepo("repo/settings/access", w, params) 908 } 909 ··· 919 920 func (p *Pages) RepoPipelineSettings(w io.Writer, params RepoPipelineSettingsParams) error { 921 params.Active = "settings" 922 + params.Tab = "pipelines" 923 return p.executeRepo("repo/settings/pipelines", w, params) 924 } 925
-3
appview/repo/settings.go
··· 251 DefaultLabels: defaultLabels, 252 SubscribedLabels: subscribedLabels, 253 ShouldSubscribeAll: shouldSubscribeAll, 254 - Tab: "general", 255 }) 256 } 257 ··· 296 rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ 297 LoggedInUser: user, 298 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 299 - Tab: "access", 300 Collaborators: collaborators, 301 }) 302 } ··· 356 rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ 357 LoggedInUser: user, 358 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 359 - Tab: "pipelines", 360 Spindles: spindles, 361 CurrentSpindle: f.Spindle, 362 Secrets: niceSecret,
··· 251 DefaultLabels: defaultLabels, 252 SubscribedLabels: subscribedLabels, 253 ShouldSubscribeAll: shouldSubscribeAll, 254 }) 255 } 256 ··· 295 rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{ 296 LoggedInUser: user, 297 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 298 Collaborators: collaborators, 299 }) 300 } ··· 354 rp.pages.RepoPipelineSettings(w, pages.RepoPipelineSettingsParams{ 355 LoggedInUser: user, 356 RepoInfo: rp.repoResolver.GetRepoInfo(r, user), 357 Spindles: spindles, 358 CurrentSpindle: f.Spindle, 359 Secrets: niceSecret,
-4
appview/settings/settings.go
··· 72 73 s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ 74 LoggedInUser: user, 75 - Tab: "profile", 76 }) 77 } 78 ··· 90 s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ 91 LoggedInUser: user, 92 Preferences: prefs, 93 - Tab: "notifications", 94 }) 95 } 96 ··· 131 s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ 132 LoggedInUser: user, 133 PubKeys: pubKeys, 134 - Tab: "keys", 135 }) 136 } 137 ··· 145 s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ 146 LoggedInUser: user, 147 Emails: emails, 148 - Tab: "emails", 149 }) 150 } 151
··· 72 73 s.Pages.UserProfileSettings(w, pages.UserProfileSettingsParams{ 74 LoggedInUser: user, 75 }) 76 } 77 ··· 89 s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ 90 LoggedInUser: user, 91 Preferences: prefs, 92 }) 93 } 94 ··· 129 s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ 130 LoggedInUser: user, 131 PubKeys: pubKeys, 132 }) 133 } 134 ··· 142 s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ 143 LoggedInUser: user, 144 Emails: emails, 145 }) 146 } 147

History

1 round 1 comment
sign up or login to add to the discussion
boltless.me submitted #0
1 commit
expand
appview: specify current tab from pages package
2/3 failed, 1/3 success
expand
expand 1 comment
pull request successfully merged