anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2201 from matiu/feature/confirm-email-msg

Browse source 
add message after profile creation on the cloud
This commit is contained in:
Gustavo Maximiliano Cortez 2014-12-19 11:18:17 -03:00
commit 89d8aaeffe
5 changed files with 28 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
css/src/main.css
View file

@ -396,7 +396,7 @@ input:-webkit-autofill, textarea:-webkit-autofill, select:-webkit-autofill, inpu
.box-notification a.close-notification { a.close-notification {
position: absolute; position: absolute;
top: 8px; top: 8px;
right: 10px; right: 10px;

21
index.html
View file

@ -48,11 +48,9 @@
<div class="off-canvas-wrap" id="off-canvas-wrap" ng-show="!signingOut"> <div class="off-canvas-wrap" id="off-canvas-wrap" ng-show="!signingOut">
<div class="inner-wrap"> <div class="inner-wrap">
<span class="status" ng-if="$root.reconnecting">
<i class="fi-loop icon-rotate"></i> <span class="status" ng-if="$root.needsEmailConfirmation && !$root.pleaseConfirmEmailAck">
<span translate> <strong class="size-16">Network Error</strong>.<br> Attempting to reconnect..</span> <a class="close-notification text-white" ng-click="$root.pleaseConfirmEmailAck=true">&#215;</a>
</span>
<span class="status" ng-if="$root.needsEmailConfirmation">
<a class="text-white button warning tiny m0 right" ng-click="resendVerificationEmail()">Resend</a> <a class="text-white button warning tiny m0 right" ng-click="resendVerificationEmail()">Resend</a>
<i class="fi-alert size-36 left m20r"></i> <i class="fi-alert size-36 left m20r"></i>
<span translate> <span translate>
@ -60,6 +58,19 @@
Please confirm your email address using the confirmation link at the message we sent you Please confirm your email address using the confirmation link at the message we sent you
</span> </span>
</span> </span>
<span class="status" ng-if="$root.pleaseConfirmEmail">
<a class="close-notification text-white" ng-click="$root.pleaseConfirmEmail=null">&#215;</a>
<i class="fi-alert size-36 left m20r"></i>
<span translate>
<strong class="size-16">Confirm your email address</strong>.<br>
An email was sent to {{$root.iden.getName()}}. Please follow the link on it to confirm it. Unconfirmed profiles could be deleted from server.
</span>
</span>
<span class="status" ng-if="$root.reconnecting">
<i class="fi-loop icon-rotate"></i>
<span translate> <strong class="size-16">Network Error</strong>.<br> Attempting to reconnect..</span>
</span>
<div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation"> <div ng-controller="SidebarController" ng-show="$root.iden && !$root.hideNavigation">
<nav class="tab-bar"> <nav class="tab-bar">

7
js/controllers/createProfile.js
View file

@ -94,6 +94,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
}, 1); }, 1);
}; };
/* Last step. Will emit after creation so the UX gets updated */
$scope.createDefaultWallet = function() { $scope.createDefaultWallet = function() {
$rootScope.hideNavigation = false; $rootScope.hideNavigation = false;
identityService.createDefaultWallet(function(err) { identityService.createDefaultWallet(function(err) {
@ -102,7 +103,12 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
if (err) { if (err) {
var msg = err.toString(); var msg = err.toString();
$scope.error = msg; $scope.error = msg;
} else {
if (!$scope.useLocalstorage) {
$rootScope.pleaseConfirmEmail = true;
}
} }
}); });
}; };
@ -127,6 +133,7 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
$scope.createStep = 'email'; $scope.createStep = 'email';
} }
$scope.error = msg; $scope.error = msg;
$scope.passwordStrength = null;
} else { } else {
// mobile // mobile
if ($scope.isMobile) { if ($scope.isMobile) {

3
js/models/Wallet.js
View file

@ -1442,7 +1442,8 @@ Wallet.prototype.getPendingTxProposalsCount = function() {
_.each(txps, function(inTxp, ntxid) { _.each(txps, function(inTxp, ntxid) {
if (!inTxp.isPending(maxRejectCount)) if (!inTxp.isPending(maxRejectCount))
return; return;
// TODO: are the uxtos availables?
//
pending++; pending++;
if (!inTxp.signedBy[myId] && !inTxp.rejectedBy[myId]) if (!inTxp.signedBy[myId] && !inTxp.rejectedBy[myId])

4
views/createProfile.html
View file

@ -34,7 +34,7 @@
<div class="text-gray text-center m20b">{{userOrEmail}}</div> <div class="text-gray text-center m20b">{{userOrEmail}}</div>
</div> </div>
<div class="box-notification" ng-show="error"> <div class="box-notification" ng-show="error && !passwordStrength">
<div class="box-icon error"> <div class="box-icon error">
<i class="fi-x size-24"></i> <i class="fi-x size-24"></i>
</div> </div>
@ -202,7 +202,7 @@
<img src="img/clipo-pin.png" alt="clipo" width="380"> <img src="img/clipo-pin.png" alt="clipo" width="380">
</div> </div>
<div class="box-notification" ng-show="error"> <div class="box-notification" ng-show="error && !passwordStrength">
<div class="box-icon error"> <div class="box-icon error">
<i class="fi-x size-24"></i> <i class="fi-x size-24"></i>
</div> </div>