appview/settings: add account management UI for tngl.sh users #1151

+2 -24

11 changed files

Interdiff #0 → #1

expand all

appview

config

config.go

knots

knots.go

oauth

handler.go

oauth.go

pages

htmx.go

pages.go

templates

user

settings

profile.html

settings

danger.go

settings.go

spindles

spindles.go

state

appview/config/config.go

This file has not been changed.

+1 -7

appview/knots/knots.go

··· 71 71 k.Pages.Knots(w, pages.KnotsParams{ 72 72 LoggedInUser: user, 73 73 Registrations: registrations, 74 - IsTnglSh: k.isTnglShUser(user.Pds()), 75 74 }) 76 75 } 77 76 ··· 134 133 Members: members, 135 134 Repos: repoMap, 136 135 IsOwner: true, 137 - IsTnglSh: k.isTnglShUser(user.Pds()), 138 136 }) 139 137 } 140 138 ··· 681 679 682 680 // ok 683 681 k.Pages.HxRefresh(w) 684 - } 685 - 686 - func (k *Knots) isTnglShUser(pdsHost string) bool { 687 - return k.Config.Pds.IsTnglShUser(pdsHost) 688 - } 682 + }

appview/oauth/handler.go

This file has not been changed.

appview/oauth/oauth.go

This file has not been changed.

appview/pages/htmx.go

This file has not been changed.

-7

appview/pages/pages.go

··· 406 406 type UserKeysSettingsParams struct { 407 407 LoggedInUser *oauth.MultiAccountUser 408 408 PubKeys []models.PublicKey 409 - IsTnglSh bool 410 409 Tab string 411 410 } 412 411 ··· 418 417 type UserEmailsSettingsParams struct { 419 418 LoggedInUser *oauth.MultiAccountUser 420 419 Emails []models.Email 421 - IsTnglSh bool 422 420 Tab string 423 421 } 424 422 ··· 430 428 type UserNotificationSettingsParams struct { 431 429 LoggedInUser *oauth.MultiAccountUser 432 430 Preferences *models.NotificationPreferences 433 - IsTnglSh bool 434 431 Tab string 435 432 } 436 433 ··· 465 462 type KnotsParams struct { 466 463 LoggedInUser *oauth.MultiAccountUser 467 464 Registrations []models.Registration 468 - IsTnglSh bool 469 465 Tab string 470 466 } 471 467 ··· 480 476 Members []string 481 477 Repos map[string][]models.Repo 482 478 IsOwner bool 483 - IsTnglSh bool 484 479 Tab string 485 480 } 486 481 ··· 499 494 type SpindlesParams struct { 500 495 LoggedInUser *oauth.MultiAccountUser 501 496 Spindles []models.Spindle 502 - IsTnglSh bool 503 497 Tab string 504 498 } 505 499 ··· 522 516 Spindle models.Spindle 523 517 Members []string 524 518 Repos map[string][]models.Repo 525 - IsTnglSh bool 526 519 Tab string 527 520 } 528 521

appview/pages/templates/user/settings/profile.html

This file has not been changed.

appview/settings/danger.go

This file has not been changed.

-3

appview/settings/settings.go

··· 278 278 s.Pages.UserNotificationSettings(w, pages.UserNotificationSettingsParams{ 279 279 LoggedInUser: user, 280 280 Preferences: prefs, 281 - IsTnglSh: s.isTnglShUser(user.Pds()), 282 281 }) 283 282 } 284 283 ··· 319 318 s.Pages.UserKeysSettings(w, pages.UserKeysSettingsParams{ 320 319 LoggedInUser: user, 321 320 PubKeys: pubKeys, 322 - IsTnglSh: s.isTnglShUser(user.Pds()), 323 321 }) 324 322 } 325 323 ··· 333 331 s.Pages.UserEmailsSettings(w, pages.UserEmailsSettingsParams{ 334 332 LoggedInUser: user, 335 333 Emails: emails, 336 - IsTnglSh: s.isTnglShUser(user.Pds()), 337 334 }) 338 335 } 339 336

+1 -7

appview/spindles/spindles.go

··· 70 70 s.Pages.Spindles(w, pages.SpindlesParams{ 71 71 LoggedInUser: user, 72 72 Spindles: all, 73 - IsTnglSh: s.isTnglShUser(user.Pds()), 74 73 Tab: "spindles", 75 74 }) 76 75 } ··· 130 129 Spindle: spindle, 131 130 Members: members, 132 131 Repos: repoMap, 133 - IsTnglSh: s.isTnglShUser(user.Pds()), 134 132 Tab: "spindles", 135 133 }) 136 134 } ··· 718 716 719 717 // ok 720 718 s.Pages.HxRefresh(w) 721 - } 722 - 723 - func (s *Spindles) isTnglShUser(pdsHost string) bool { 724 - return s.Config.Pds.IsTnglShUser(pdsHost) 725 - } 719 + }

appview/state/login.go

This file has not been changed.