tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add progress indicator to sign-up flow (#24545)

Browse Source
This commit is contained in:
Eugen Rochko
2023-04-16 07:01:24 +02:00
committed by GitHub
parent 955ec252a4
commit e5c0b16735
76 changed files with 157 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/auth/setup_controller.rb
View File

@@ -10,15 +10,7 @@ class Auth::SetupController < ApplicationController
skip_before_action :require_functional!
def show
flash.now[:notice] = begin
if @user.pending?
I18n.t('devise.registrations.signed_up_but_pending')
else
I18n.t('devise.registrations.signed_up_but_unconfirmed')
end
end
end
def show; end
def update
# This allows updating the e-mail without entering a password as is required
@@ -26,14 +18,13 @@ class Auth::SetupController < ApplicationController
# that were not confirmed yet
if @user.update(user_params)
redirect_to auth_setup_path, notice: I18n.t('devise.confirmations.send_instructions')
@user.resend_confirmation_instructions unless @user.confirmed?
redirect_to auth_setup_path, notice: I18n.t('auth.setup.new_confirmation_instructions_sent')
else
render :show
end
end
helper_method :missing_email?
private
def require_unconfirmed_or_pending!
@@ -51,8 +42,4 @@ class Auth::SetupController < ApplicationController
def user_params
params.require(:user).permit(:email)
end
def missing_email?
truthy_param?(:missing_email)
end
end