Merge branch 'ref/design' of github.com:bitpay/bitpay-wallet into feature/topBarColor
This commit is contained in:
Nick Cardin
commit
3a771e0e21
116 changed files with 1732 additions and 1371 deletions
|
|
@ -10,38 +10,14 @@
|
|||
|
||||
<ion-content ng-controller="glideraController as glidera" ng-init="init()">
|
||||
|
||||
<div class="box-notification text-center size-12 text-warning" ng-show="network == 'testnet'">
|
||||
<i class="fi-info"></i>
|
||||
<div class="box-notification warning" ng-show="network == 'testnet'">
|
||||
Testnet wallets only work with Glidera Sandbox Accounts
|
||||
</div>
|
||||
<div class="m20b box-notification" ng-if="error">
|
||||
<div class="text-warning">
|
||||
<span>{{error}}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="m10t text-center" ng-show="error">
|
||||
<button
|
||||
class="button"
|
||||
ng-show="error.indexOf('Forbidden') == 40"
|
||||
ng-click="token = null; error = null">
|
||||
Request a new token
|
||||
</button>
|
||||
<div ng-show="error.indexOf('Forbidden') != 40">
|
||||
<button
|
||||
class="button"
|
||||
ng-click="init(token)">
|
||||
Retry
|
||||
</button>
|
||||
<div class="m20t size-12">
|
||||
<a class="text-gray" href ui-sref="glidera.preferences">Preferences</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div ng-if="!token && !error">
|
||||
<div ng-if="!token">
|
||||
|
||||
<div ng-init="showOauthForm = false">
|
||||
<div class="text-center m20b">
|
||||
<div class="text-center m20v">
|
||||
<img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="200">
|
||||
</div>
|
||||
<div class="text-center small-10 small-centered columns" ng-show="!showOauthForm">
|
||||
|
|
@ -70,9 +46,6 @@
|
|||
</div>
|
||||
</div>
|
||||
<div ng-show="showOauthForm">
|
||||
<div class="text-left box-notification size-12 text-warning" ng-show="error">
|
||||
{{error}}
|
||||
</div>
|
||||
<form name="oauthCodeForm" ng-submit="glidera.submitOauthCode(code)" novalidate>
|
||||
<div class="list">
|
||||
<label class="item item-input item-stacked-label">
|
||||
|
|
@ -87,7 +60,7 @@
|
|||
<input type="button"
|
||||
value="Cancel"
|
||||
class="button button-block"
|
||||
ng-click="showOauthForm = false; error = null">
|
||||
ng-click="showOauthForm = false">
|
||||
</div>
|
||||
<div class="col">
|
||||
<input
|
||||
|
|
@ -103,16 +76,17 @@
|
|||
</div>
|
||||
|
||||
<div ng-if="token && permissions">
|
||||
<div class="p20v text-center">
|
||||
<img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="100">
|
||||
<div class="text-center m20v">
|
||||
<img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="200">
|
||||
</div>
|
||||
<div class="list">
|
||||
<a class="item item-icon-left" href ui-sref="glidera.preferences">
|
||||
<i class="icon ion-gear-a"></i>
|
||||
<a class="item item-icon-left item-icon-right" href ui-sref="glidera.preferences">
|
||||
<i class="icon ion-ios-gear"></i>
|
||||
<span ng-show="personalInfo">{{personalInfo.firstName}} {{personalInfo.lastName}}</span>
|
||||
<span class="item-note" ng-show="email">
|
||||
{{email}}
|
||||
</span>
|
||||
<i class="icon ion-ios-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
<div class="padding">
|
||||
|
|
@ -133,54 +107,56 @@
|
|||
<div class="list"
|
||||
ng-show="status && status.userCanTransact">
|
||||
<a ng-show="status.userCanBuy"
|
||||
class="item item-avatar"
|
||||
class="item item-icon-right"
|
||||
href ui-sref="glidera.buy">
|
||||
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="40">
|
||||
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="25">
|
||||
Buy Bitcoin
|
||||
<i class="icon ion-ios-arrow-right"></i>
|
||||
</a>
|
||||
<a class="item item-avatar"
|
||||
<a class="item item-icon-right"
|
||||
ng-show="status.userCanSell"
|
||||
href ui-sref="glidera.sell">
|
||||
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="40">
|
||||
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="25">
|
||||
Sell Bitcoin
|
||||
<i class="icon ion-ios-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div ng-show="permissions.transaction_history">
|
||||
<h4>Activity</h4>
|
||||
<div class="card" ng-show="permissions.transaction_history">
|
||||
<div class="item item-divider">
|
||||
Activity
|
||||
</div>
|
||||
<div ng-show="txs.length == 0 "
|
||||
class="size-12 p10 text-center text-gray">
|
||||
class="item">
|
||||
No activity in your account
|
||||
</div>
|
||||
<div class="list">
|
||||
<a ng-repeat="tx in txs"
|
||||
ng-click="glidera.openTxModal(token, tx)"
|
||||
class="item item-avatar">
|
||||
<img src="img/bought.svg" alt="bought" width="39" ng-show="tx.type == 'BUY' && tx.status == 'COMPLETE'">
|
||||
<img src="img/bought-pending.svg" alt="bought" width="33" ng-show="tx.type == 'BUY' && tx.status == 'PROCESSING'">
|
||||
<img src="img/sold.svg" alt="bought" width="39" ng-show="tx.type == 'SELL' && tx.status == 'COMPLETE'">
|
||||
<img src="img/sold-pending.svg" alt="bought" width="33" ng-show="tx.type == 'SELL' && tx.status == 'PROCESSING'">
|
||||
<a ng-repeat="tx in txs"
|
||||
ng-click="glidera.openTxModal(token, tx)"
|
||||
class="item">
|
||||
|
||||
<h2>
|
||||
<span ng-show="tx.type == 'BUY'">Bought</span>
|
||||
<span ng-show="tx.type == 'SELL'">Sold</span>
|
||||
<b>{{tx.qty}}</b> BTC
|
||||
</h2>
|
||||
<p>
|
||||
{{tx.subtotal|currency:'':2}} {{tx.currency}}
|
||||
</p>
|
||||
<div class="right">
|
||||
<div class="m5t size-12 text-gray">
|
||||
<div ng-show="tx.status == 'COMPLETE'">
|
||||
<time ng-if="tx.transactionDate">{{tx.transactionDate | amTimeAgo}}</time>
|
||||
</div>
|
||||
<div ng-show="tx.status == 'PROCESSING'">
|
||||
<span class="label outline gray radius text-gray text-info" ng-if="tx.status == 'PROCESSING'">Processing</span>
|
||||
</div>
|
||||
</div>
|
||||
<span class="item-note">
|
||||
<div ng-show="tx.status == 'COMPLETE'">
|
||||
<time ng-if="tx.transactionDate">{{tx.transactionDate | amTimeAgo}}</time>
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
<div ng-show="tx.status == 'PROCESSING'">
|
||||
<span ng-if="tx.status == 'PROCESSING'">Processing</span>
|
||||
</div>
|
||||
</span>
|
||||
|
||||
<img class="left m10r" src="img/bought.svg" alt="bought" width="39" ng-show="tx.type == 'BUY' && tx.status == 'COMPLETE'">
|
||||
<img class="left m10r" src="img/bought-pending.svg" alt="bought" width="33" ng-show="tx.type == 'BUY' && tx.status == 'PROCESSING'">
|
||||
<img class="left m10r" src="img/sold.svg" alt="bought" width="39" ng-show="tx.type == 'SELL' && tx.status == 'COMPLETE'">
|
||||
<img class="left m10r" src="img/sold-pending.svg" alt="bought" width="33" ng-show="tx.type == 'SELL' && tx.status == 'PROCESSING'">
|
||||
|
||||
<h2>
|
||||
<span ng-show="tx.type == 'BUY'">Bought</span>
|
||||
<span ng-show="tx.type == 'SELL'">Sold</span>
|
||||
<b>{{tx.qty}}</b> BTC
|
||||
</h2>
|
||||
<p>
|
||||
{{tx.subtotal|currency:'':2}} {{tx.currency}}
|
||||
</p>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</ion-content>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue