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

began update for wallet module and receive screen

Browse source
This commit is contained in:
Jamal Jackson 2016-09-07 09:46:00 -04:00
commit 21a2f41ef9
7 changed files with 135 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

22
public/views/includes/wallets.html
View file

@ -1,16 +1,18 @@
<div class="wallets" ng-show="wallets[0]">
<ion-slides class="slides" slider="data.slider">
<ion-slide-page ng-repeat="wallet in wallets track by $index">
<div class="item item-icon-left item-icon-right">
<i class="icon ion-briefcase size-21" ng-style="{'color':wallet.color}"></i>
{{wallet.name || wallet.id}}
<span class="item-note" ng-show="wallet.n > 1 && wallet.isComplete()">
{{wallet.m}}-of-{{wallet.n}}
</span>
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
Incomplete
</span>
<i ng-show="wallet.needsBackup" class="icon ion-android-warning assertive"></i>
<div class="card">
<div class="item item-icon-left text-right">
<i class="icon ion-briefcase size-21" ng-style="{'color':wallet.color}"></i>
<span>{{wallet.name || wallet.id}}</span>
<span class="item-note" ng-show="wallet.n > 1 && wallet.isComplete()">
{{wallet.m}}-of-{{wallet.n}}
</span>
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
Incomplete
</span>
<!-- <i ng-show="wallet.needsBackup" class="icon ion-android-warning assertive"></i> -->
</div>
</div>
</ion-slide-page>
</ion-slides>

68
public/views/tab-receive.html
View file

@ -1,36 +1,52 @@
<ion-view>
<ion-view id="tab-receive">
<ion-nav-bar class="bar-royal">
<ion-nav-title>{{'Receive' | translate}}</ion-nav-title>
</ion-nav-bar>
<ion-content ng-controller="tabReceiveController" ng-init="init()">
<div class="m30v text-center" copy-to-clipboard="addr">
<qrcode size="220" data="bitcoin:{{addr}}"></qrcode>
<div ng-if="wallet.needsBackup" class="assertive" translate>
Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
<article id="address">
<div class="row">
<div class="m15t text-center" copy-to-clipboard="addr">
<qrcode size="220" data="bitcoin:{{addr}}"></qrcode>
<div ng-if="wallet.needsBackup" class="assertive m10t" translate>
Before receiving funds, you must backup your wallet. If this device is lost, it is impossible to access your funds without a backup.
</div>
</div>
</div>
</div>
<div class="list card padding text-center" ng-if="!wallets[0]">
<span translate>No Wallet</span>
</div>
<div class="list" ng-if="wallets[0]">
<div class="item item-icon-left" ng-click="shareAddress(addr)" ng-show="isCordova && addr">
<i class="icon ion-ios-upload-outline"></i>
<span translate>Share address</span>
<div class="row">
<div class="col" ng-show="isCordova && addr">
<div class="item item-icon-left" ng-click="shareAddress(addr)">
<i class="icon ion-ios-upload-outline"></i>
<span translate>Share</span>
</div>
</div>
<div class="col" ng-class="{'center-block col-50': !isCordova || !addr}">
<div class="item item-icon-left" ng-click="setAddress(null, true)">
<i class="icon ion-ios-loop"></i>
<span translate>Next Address</span>
</div>
</div>
</div>
<div class="item item-icon-left" ng-click="setAddress(null, true)">
<i class="icon ion-ios-loop"></i>
<span translate>Next Address</span>
<div class="row border-top">
<div class="col col-90 center-block bit-address">
<div class="item item-icon-left">
<i class="icon ion-social-bitcoin-outline"></i>
<span ng-if="generatingAddress">...</span>
<span class="bit-address-gen-address" ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
</div>
</div>
</div>
<div class="item item-icon-left">
<i class="icon ion-social-bitcoin-outline"></i>
<span ng-if="generatingAddress">...</span>
<span ng-if="!generatingAddress" copy-to-clipboard="addr">{{addr}}</span>
</article>
<article id="wallets">
<div class="list card padding text-center" ng-if="!wallets[0]">
<span translate>No Wallet</span>
</div>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
<div class="list" ng-if="wallets[0]">
<!-- <div class="item item-icon-left" ng-click="setAddress(null, true)">
<i class="icon ion-ios-loop"></i>
<span translate>Next Address</span>
</div> -->
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div>
</article>
</ion-content>
</ion-view>

4
src/sass/common.scss
View file

@ -63,3 +63,7 @@ ion-header-bar{
border:none;
}
}
.border-top{
border-top:1px solid rgb(228,228,228);
}

6
src/sass/main.scss
View file

@ -772,6 +772,10 @@ ul.wallet-selection.wallets {
margin: 30px 0;
}
.m15v {
margin: 15px 0;
}
.m10h {
margin: 0 10px;
}
@ -995,6 +999,8 @@ input[type=number] {
@import 'mixins/mixins';
@import "views/add";
@import "views/tab-home";
@import "views/tab-receive";
@import "views/walletDetails";
@import 'views/onboarding/onboarding';
@import "views/includes/walletActivity";
@import "views/includes/wallets";

4
src/sass/mixins/layout.scss
View file

@ -1,4 +1,8 @@
@mixin center-block($topBottom: 0) {
float:none;
margin: $topBottom auto;
}
.center-block{
@include center-block();
}

33
src/sass/views/includes/wallets.scss Normal file
View file

@ -0,0 +1,33 @@
.wallets{
.slides{
.swiper-container{
width:75% !important;
overflow:visible;
}
.card{
padding: .7rem;
padding-left:.25rem;
padding-right:.25rem;
border-radius: .25rem;
}
.swiper-slide{
width:100% !important;
&.swiper-slide-prev, &.swiper-slide-next{
opacity: .2;
}
&.swiper-slide-prev{
left:-5%;
}
&.swiper-slide-next{
left:4%;
}
span{
float:right;
clear:both;
}
}
}
.swiper-pagination{
visibility: hidden;
}
}

34
src/sass/views/tab-receive.scss Normal file
View file

@ -0,0 +1,34 @@
#tab-receive {
#address {
background: #fff;
.item {
border: none;
font-size: .9rem;
i {
font-size: 1.3rem;
&.ion-social-bitcoin-outline {
border-right: 1px solid rgb(228, 228, 228);
}
}
}
.bit-address {
font-size: .8rem;
.item {
padding-top: 5px;
padding-bottom: 5px;
}
&-gen-address {}
}
}
#wallets {
&:before {
content: "";
display: inline-block;
width: 0;
height: 0;
border-style: solid;
border-width: 0 20px 20px 20px;
border-color: transparent transparent #6980fe transparent;
}
}
}