UX of link account (Step 1)

[coolaj86]

I'm working towards a solution for #3837

There are multiple issues that need to be addressed, but this pull request only attempts to address one complete unit of work which I consider to be of the highest immediate value and the lowest cost.

• Current: Show either sign up or sign in - a great first step
  • Show the most appropriate as selected tab and allow other to be selected
• When Creating Account via OAuth
  • "Register New Account" as tab name
  • display "Register" as "Add Email and Password (for Account Recovery)"
  • submit with "Complete Account"
• When Linking Account via OAuth
  • "Link to Existing Account" as tab name
  • display "Sign In" as "Sign In to Authorize Linked Account"
  • submit with "Link Account"

New Account

Link Account

Walkthrough

If you'd like to test it out

My pull request is against master, but I run it as backport to v1.5.2 (includes #5006, #5029, #5033):

git clone https://github.com/coolaj86/gitea.git gitea.coolaj86 -b v1.5.1-coolaj86
pushd gitea.coolaj86
TAGS="bindata sqlite" make generate all

I would not recommend replacing your existing gitea, but rather creating a symlink so that you can easily switch back if you don't like it. For example, if you keep gitea in /opt/gitea/bin:

rsync -av ./gitea /opt/gitea/bin/gitea-v1.5.1-coolaj86
pushd /opt/gitea/bin
mv gitea gitea-v1.5.1
ln -s gitea-v1.5.1-coolaj86 gitea

I've run a couple of manual tests so far, so I feel comfortable with someone else trying it out. I won't be pushing any additional changes to that branch (such as the upcoming changes to address the empty checkboxes in the issue) until I've tested them in production for myself.

[codecov-io]

Codecov Report

Merging #5006 into master will decrease coverage by <.01%.
The diff coverage is 0%.

@@            Coverage Diff            @@
##           master   #5006      +/-   ##
=========================================
- Coverage   37.51%   37.5%   -0.01%     
=========================================
  Files         309     309              
  Lines       45800   45820      +20     
=========================================
+ Hits        17180   17183       +3     
- Misses      26158   26176      +18     
+ Partials     2462    2461       -1

Impacted Files	Coverage Δ
routers/user/auth.go	13.34% <0%> (-0.28%)	⬇️
modules/process/manager.go	81.15% <0%> (+4.34%)	⬆️

---

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 a2ee2a3...a2ceaf2. Read the comment docs.

[coolaj86]

Progress. Here's a screencap and video of the requested changes:

[daviian]

Can you add screenshots of changed UI?

[coolaj86]

@daviian Does the screenshot and screencap that I already added not suffice? What else would you like to see?

Note: my personal branding in screenshot is not part of the change, it's my instance of gitea: https://git.coolaj86.com/ The change is isolated to the center of the screen as described in the PR.

[coolaj86]

Higher res screenshots:

[daviian]

@daviian Does the screenshot and screencap that I already added not suffice? What else would you like to see?

You've posted the screencap while I was doing the review, that's why I crossed out my request afterwards. Of course it would've been sufficient.

[coolaj86]

Note: We do want to ignore the error because the error is "user does not exist".

[coolaj86]

@daviian @lafriks This is ready for your re-review. I've made the changes you suggested, except as noted where they had unintended consequences.

Also, I'll be happy to rebase and force push to this branch once reviewed so that it shows up as a single commit.

[coolaj86]

@lafriks Will you click that the requested change has been resolved? I've clicked in on my end, and it looks like that's the only hold up.

[lafriks]

@coolaj86 I will check when we can start merging for 1.7