Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor User Settings #3900

Merged
merged 11 commits into from
May 15, 2018
Merged

Conversation

daviian
Copy link
Member

@daviian daviian commented May 5, 2018

Targets #2271 and reduces amount of menu items by combining contextual settings.

I've already prepared a followup PR refactoring the affected code to be more maintainable.

UI before PR:
old-menu

UI after PR:

  • Profile

profile

  • Account

account

  • Security

security

@codecov-io
Copy link

codecov-io commented May 5, 2018

Codecov Report

Merging #3900 into master will increase coverage by <.01%.
The diff coverage is 1.93%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3900      +/-   ##
==========================================
+ Coverage   20.27%   20.28%   +<.01%     
==========================================
  Files         146      146              
  Lines       29320    29302      -18     
==========================================
- Hits         5945     5944       -1     
+ Misses      22474    22457      -17     
  Partials      901      901
Impacted Files Coverage Δ
routers/user/setting_openid.go 0% <0%> (ø) ⬆️
routers/user/setting.go 2.6% <2.08%> (-0.16%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1546458...efde1ac. Read the comment docs.

@bkcsoft bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 5, 2018
@jonasfranz
Copy link
Member

I think that Security is not the best place for Application Tokens.

@Mauladen
Copy link

Mauladen commented May 5, 2018

It looks good, but it is worth considering the comment @JonasFranzDEV

@daviian
Copy link
Member Author

daviian commented May 5, 2018

@JonasFranzDEV What would you do instead? Keep it as a separate entry?

@lafriks
Copy link
Member

lafriks commented May 5, 2018

Maybe move 2fa to account and rename security to something else but I have no ideas what :)

@jonasfranz
Copy link
Member

@daviian Maybe an extra category "Applications" or "API" including access tokens.

@daviian daviian force-pushed the settings-menu-refactoring branch from 4bf97e9 to bbee0a4 Compare May 9, 2018 16:21
@daviian
Copy link
Member Author

daviian commented May 9, 2018

UI after moving access tokens to separate page:

security

applications

@daviian daviian force-pushed the settings-menu-refactoring branch from bbee0a4 to 52db324 Compare May 9, 2018 16:53
@lafriks lafriks added the type/refactoring Existing code has been cleaned up. There should be no new functionality. label May 9, 2018
@lafriks lafriks added this to the 1.5.0 milestone May 9, 2018
@thehowl
Copy link
Contributor

thehowl commented May 10, 2018

big 👍

Can you create redirects from the old pages to the new locations? Such as /user/settings/avatar becoming /user/settings and so on.

Can you update templates/user/profile.tmpl link to "Change avatar"?

@daviian
Copy link
Member Author

daviian commented May 11, 2018

@thehowl
Which link do you mean? Do you want me to change the "Update Avatar" button to "Change Avatar"?

Redirects can be added of course, if needed. Do we already have them on other migrated routes as well?

@lunny
Copy link
Member

lunny commented May 11, 2018

He means maybe other system (i.e. drone) reference some of these changed URLs.

@lafriks
Copy link
Member

lafriks commented May 11, 2018

I don't think they should reference user settings url's

@daviian
Copy link
Member Author

daviian commented May 11, 2018

IMHO if an external service depends on frontend urls instead of the API it has to cope with from their perspective breaking changes.

@thehowl
Copy link
Contributor

thehowl commented May 11, 2018

@daviian I am referring to the link on the avatar if you're visiting your own profile (grep for user/settings on the template i mentioned).

And no, while this may break Drone in some way, I was actually referring to documentation or otherwise linking to those pages outside of gitea itself. Say I linked to https://try.gitea.io/user/settings/avatar . Currently, the URL works but after the PR it won't. We should try to avoid 404s.

@daviian
Copy link
Member Author

daviian commented May 11, 2018

@thehowl Ah that one. Will fix that. And you've got me convinced that those redirects aren't only sugar 😉

@daviian daviian force-pushed the settings-menu-refactoring branch from 6942633 to e4601ce Compare May 11, 2018 14:58
ctx.Redirect(setting.AppSubURL + "/user/settings/security")
})
m.Get("/account_link", func(ctx *context.Context) {
ctx.Redirect(setting.AppSubURL + "/user/settings/security")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add , http.StatusMovedPermanently to each Redirect? This way it can be properly cached by browsers

@thehowl
Copy link
Contributor

thehowl commented May 12, 2018

Other than that, LGTM 👍

@bkcsoft bkcsoft added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 12, 2018
@techknowlogick
Copy link
Member

LGTM

@bkcsoft bkcsoft added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 13, 2018
Copy link
Member

@appleboy appleboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

build fail. try to make fmt to fix code format.

@daviian
Copy link
Member Author

daviian commented May 14, 2018

@appleboy How can it be that make fmt is now reporting issues despite a fine fmt check at the commit before without changing anything at the claimed code?

@thehowl
Copy link
Contributor

thehowl commented May 14, 2018

Probably drone built the wrong commit. Happens sometimes.

@daviian
Copy link
Member Author

daviian commented May 15, 2018

@appleboy need your approval.

@lafriks lafriks merged commit 099372d into go-gitea:master May 15, 2018
@daviian daviian deleted the settings-menu-refactoring branch May 15, 2018 10:11
@lafriks lafriks added the type/changelog Adds the changelog for a new Gitea version label Jul 3, 2018
aswild added a commit to aswild/gitea that referenced this pull request Jul 6, 2018
* SECURITY
  * Limit uploaded avatar image-size to 4096x3072 by default (go-gitea#4353)
  * Do not allow to reuse TOTP passcode (go-gitea#3878)
* FEATURE
  * Add cli commands to regen hooks & keys (go-gitea#3979)
  * Add support for FIDO U2F (go-gitea#3971)
  * Added user language setting (go-gitea#3875)
  * LDAP Public SSH Keys synchronization (go-gitea#1844)
  * Add topic support (go-gitea#3711)
  * Multiple assignees (go-gitea#3705)
  * Add protected branch whitelists for merging (go-gitea#3689)
  * Global code search support (go-gitea#3664)
  * Add label descriptions (go-gitea#3662)
  * Add issue search via API (go-gitea#3612)
  * Add repository setting to enable/disable health checks (go-gitea#3607)
  * Emoji Autocomplete (go-gitea#3433)
  * Implements generator cli for secrets (go-gitea#3531)
* ENHANCEMENT
  * Add more webhooks support and refactor webhook templates directory (go-gitea#3929)
  * Add new option to allow only OAuth2/OpenID user registration (go-gitea#3910)
  * Add option to use paged LDAP search when synchronizing users (go-gitea#3895)
  * Symlink icons (go-gitea#1416)
  * Improve release page UI (go-gitea#3693)
  * Add admin dashboard option to run health checks (go-gitea#3606)
  * Add branch link in branch list (go-gitea#3576)
  * Reduce sql query times in retrieveFeeds (go-gitea#3547)
  * Option to enable or disable swagger endpoints (go-gitea#3502)
  * Add missing licenses (go-gitea#3497)
  * Reduce repo indexer disk usage (go-gitea#3452)
  * Enable caching on assets and avatars (go-gitea#3376)
  * Add repository search ordered by stars/forks. Forks column in admin repo list (go-gitea#3969)
  * Add Environment Variables to Docker template (go-gitea#4012)
  * LFS: make HTTP auth period configurable (go-gitea#4035)
  * Add config path as an optionial flag when changing pass via CLI (go-gitea#4184)
  * Refactor User Settings sections (go-gitea#3900)
  * Allow square brackets in external issue patterns (go-gitea#3408)
  * Add Attachment API (go-gitea#3478)
  * Add EnableTimetracking option to app settings (go-gitea#3719)
  * Add config option to enable or disable log executed SQL (go-gitea#3726)
  * Shows total tracked time in issue and milestone list (go-gitea#3341)
* TRANSLATION
  * Improve English grammar and consistency (go-gitea#3614)
* DEPLOYMENT
  * Allow Gitea to run as different USER in Docker (go-gitea#3961)
  * Provide compressed release binaries (go-gitea#3991)
  * Sign release binaries (go-gitea#4188)
@go-gitea go-gitea locked and limited conversation to collaborators Nov 24, 2020
@delvh delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/refactoring Existing code has been cleaned up. There should be no new functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.