raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update login modal for resending confirmations

Browse Source
This commit is contained in:
Matt-Yorkley
2017-08-15 17:32:13 +01:00
committed by Rob Harrington
parent 179cf6e484
commit 522aaee1a3
4 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/darkswarm/controllers/authentication/login_controller.js.coffee
View File

@@ -11,3 +11,10 @@ Darkswarm.controller "LoginCtrl", ($scope, $http, $window, AuthenticationService
.error (data) ->
Loading.clear()
$scope.errors = data.message || data.error
$scope.user_unconfirmed = (data.error == t('devise.failure.unconfirmed'))
$scope.resend_confirmation = ->
$http.post("/user/spree_user/confirmation", {spree_user: $scope.spree_user}).success (data)->
$scope.messages = t('devise.confirmations.send_instructions')
.error (data) ->
$scope.errors = t('devise.confirmations.failed_to_send')

4
app/assets/javascripts/templates/login.html.haml
View File

@@ -4,6 +4,10 @@
.large-12.columns
.alert-box.alert{"ng-show" => "errors != null"}
{{ errors }}
%a{ng: {show: 'user_unconfirmed', click: 'resend_confirmation()'}}
= t('devise.confirmations.resend_confirmation_email')
.alert-box.success{ng: {show: 'messages != null'}}
{{ messages }}
.row
.large-12.columns
%label{for: "email"} {{'email' | t}}

12
app/assets/stylesheets/darkswarm/modal-login.css.scss
View File

@@ -10,4 +10,16 @@
background: #fff;
padding-top: 10px;
}
.alert-box {
a {
color: white;
text-decoration: underline;
&:hover {
color: rgba(255, 255, 255, 0.7);
text-decoration: underline;
}
}
}
}

4
config/locales/en.yml
View File

@@ -71,6 +71,10 @@ en:
email:
taken: "There's already an account for this email. Please login or reset your password."
devise:
confirmations:
send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
failed_to_send: "An error occurred whilst sending your confirmation email."
resend_confirmation_email: "Resend confirmation email."
user_registrations:
spree_user:
signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please open the link to activate your account."