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

Merge pull request #129 from gabrielbazan7/feat/NewsEmail

Browse source 
Feat/news email
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-16 14:59:25 -03:00 • committed by GitHub
commit 8a2db79345
4 changed files with 56 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

5
public/views/onboarding/collectEmail.html
View file

@ -14,9 +14,12 @@
<form name="emailForm" ng-submit="confirm(emailForm)" novalidate> <form name="emailForm" ng-submit="confirm(emailForm)" novalidate>
<label class="item item-input col col-75"> <label class="item item-input col col-75">
<i class="icon ion-arrow-right-c"></i> <i class="icon ion-arrow-right-c"></i>
<input type="email" id="email" name="email" ng-model="email" laceholder="satoshi@example.com" required></input> <input type="email" id="email" name="email" ng-model="email" placeholder="satoshi@example.com" required></input>
</label> </label>
</form> </form>
<ion-list>
<ion-checkbox ng-model="data.accept"><span translate>Get news and updates from Bitpay</span></ion-checkbox>
</ion-list>
</div> </div>
<div ng-if="confirmation"> <div ng-if="confirmation">
<div class="row text-center"> <div class="row text-center">

2
public/views/onboarding/disclaimer.html
View file

@ -8,7 +8,7 @@
Bitcoin is different - it cannot be safely held with a bank or web service Bitcoin is different - it cannot be safely held with a bank or web service
</p> </p>
</div> </div>
<ion-list class="disclaimer"> <ion-list>
<ion-checkbox ng-model="accept1"><span translate>I understand my funds are held securely on this device, not by a company.</span></ion-checkbox> <ion-checkbox ng-model="accept1"><span translate>I understand my funds are held securely on this device, not by a company.</span></ion-checkbox>
<ion-checkbox ng-model="accept2"><span translate>I understand if this wallet is lost or deleted, my bitcoin can only be recovered with the backup phrase.</span></ion-checkbox> <ion-checkbox ng-model="accept2"><span translate>I understand if this wallet is lost or deleted, my bitcoin can only be recovered with the backup phrase.</span></ion-checkbox>
</ion-list> </ion-list>

3
src/js/controllers/onboarding/collectEmail.js
View file

@ -9,13 +9,14 @@ angular.module('copayApp.controllers').controller('collectEmailController', func
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet($stateParams.walletId);
var walletId = wallet.credentials.walletId; var walletId = wallet.credentials.walletId;
$scope.data = {};
$scope.data.accept = false;
$scope.save = function() { $scope.save = function() {
var opts = { var opts = {
emailFor: {} emailFor: {}
}; };
opts.emailFor[walletId] = $scope.email; opts.emailFor[walletId] = $scope.email;
walletService.updateRemotePreferences(wallet, { walletService.updateRemotePreferences(wallet, {
email: $scope.email, email: $scope.email,
}, function(err) { }, function(err) {

57
src/sass/views/onboarding/onboard-collect-email.scss
View file

@ -47,18 +47,59 @@
z-index: 5; z-index: 5;
margin-top: 0; margin-top: 0;
width: 100%; width: 100%;
label { form {
background: rgba(200, 200, 200, 0.20); label {
height: 3rem; background: rgba(200, 200, 200, 0.20);
margin-top:0; height: 3rem;
i { margin-top:0;
position: absolute; i {
right: 3%; position: absolute;
top: 1rem; right: 3%;
top: 1rem;
}
} }
} }
} }
.item {
border: none;
label{
background: none;
}
.checkbox input:before,
.checkbox .checkbox-icon:before {
border-radius: 50% !important;
background: none;
border-width: 2px;
padding: .9rem;
position: relative;
left: -7px;
top: -8px;
}
.checkbox input:checked:after,
input:checked + .checkbox-icon:after {
border-color: rgb(19, 229, 182);
top:20%;
left:11%;
}
.item-content {
width: 90%;
margin-left: 10%;
}
}
.item-checkbox .checkbox {
margin-left: 10%;
top: 55%;
}
.checkbox input:before,
.checkbox .checkbox-icon:before{
border-color:$soft-blue;
}
.checkbox input:checked:before,
.checkbox input:checked + .checkbox-icon:before {
border-color: rgb(19, 229, 182);
}
} }
@media (min-width: 1000px){ @media (min-width: 1000px){
#onboarding-collect-email{ #onboarding-collect-email{
#collect-email{ #collect-email{