BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Glidera routes

This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-16 14:46:25 -03:00
parent 1998d78b4a
commit bcb6f97385
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
12 changed files with 95 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/views/buyGlidera.html
View File

@ -1,7 +1,7 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="glidera.main"> <button class="button back-button" ui-sref="tabs.buyandsell.glidera">
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
@ -65,10 +65,10 @@
class="postfix" class="postfix"
on-tap="showAlternative = false; fiat = null; buy.buyPrice = null">USD</a> on-tap="showAlternative = false; fiat = null; buy.buyPrice = null">USD</a>
</label> </label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div> </div>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<div class="text-center text-gray size-12 m20b" ng-show="!buy.gettingBuyPrice && buy.buyPrice.qty"> <div class="text-center text-gray size-12 m20b" ng-show="!buy.gettingBuyPrice && buy.buyPrice.qty">
Buy Buy
<span ng-show="qty">{{buy.buyPrice.subtotal|currency:'':2}} {{buy.buyPrice.currency}} in Bitcoin</span> <span ng-show="qty">{{buy.buyPrice.subtotal|currency:'':2}} {{buy.buyPrice.currency}} in Bitcoin</span>
@ -120,7 +120,7 @@
A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days. A transfer has been initiated from your bank account. Your bitcoins should arrive to your wallet in 2-4 business days.
</p> </p>
<button class="button button-block button-positive" ui-sref="glidera.main">OK</button> <button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

5
public/views/buyandsell.html
View File

@ -9,8 +9,9 @@
</ion-nav-bar> </ion-nav-bar>
<ion-content> <ion-content>
<ion-list> <ion-list>
<ion-item class="item" ui-sref="glidera.main"> <ion-item class="item item-icon-right" ui-sref="tabs.buyandsell.glidera">
<img src="img/glidera-logo.png" width="100"> <img src="img/glidera-logo.png" width="90">
<i class="icon nav-item-arrow-right"></i>
</ion-item> </ion-item>
</ion-list> </ion-list>
</ion-content> </ion-content>

19
public/views/glidera.html
View File

@ -1,10 +1,9 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary"> <ion-nav-back-button>
<button class="button button-clear" ui-sref="tabs.home"> <i class="icon ion-ios-arrow-thin-left"></i>
Close </ion-nav-back-button>
</button>
</ion-nav-buttons>
<ion-nav-title>Glidera</ion-nav-title> <ion-nav-title>Glidera</ion-nav-title>
</ion-nav-bar> </ion-nav-bar>
@ -84,7 +83,7 @@
<img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="200"> <img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="200">
</div> </div>
<div class="list"> <div class="list">
<a class="item item-icon-left item-icon-right" href ui-sref="glidera.preferences"> <a class="item item-icon-left item-icon-right" href ui-sref="tabs.buyandsell.glidera.preferences">
<i class="icon ion-ios-gear"></i> <i class="icon ion-ios-gear"></i>
<span ng-show="personalInfo">{{personalInfo.firstName}} {{personalInfo.lastName}}</span> <span ng-show="personalInfo">{{personalInfo.firstName}} {{personalInfo.lastName}}</span>
<span class="item-note" ng-show="email"> <span class="item-note" ng-show="email">
@ -112,15 +111,15 @@
ng-show="status && status.userCanTransact"> ng-show="status && status.userCanTransact">
<a ng-show="status.userCanBuy" <a ng-show="status.userCanBuy"
class="item item-icon-right" class="item item-icon-right"
href ui-sref="glidera.buy"> href ui-sref="tabs.buyandsell.glidera.buy">
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="35"> <img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="30">
Buy Bitcoin Buy Bitcoin
<i class="icon nav-item-arrow-right"></i> <i class="icon nav-item-arrow-right"></i>
</a> </a>
<a class="item item-icon-right" <a class="item item-icon-right"
ng-show="status.userCanSell" ng-show="status.userCanSell"
href ui-sref="glidera.sell"> href ui-sref="tabs.buyandsell.glidera.sell">
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="35"> <img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="30">
Sell Bitcoin Sell Bitcoin
<i class="icon nav-item-arrow-right"></i> <i class="icon nav-item-arrow-right"></i>
</a> </a>

14
public/views/modals/glidera-confirmation.html
View File

@ -1,14 +0,0 @@
<ion-modal-view>
<ion-content ng-controller="glideraConfirmationController">
<div class="text-center">
<h1 class="text-center m20b p20h">Are you sure you would like to log out of your Glidera account?</h1>
<p class="text-gray p20h">You will need to log back in to buy or sell bitcoin in Copay.</p>
<button class="button" ng-click="cancel()">
Cancel
</button>
<button class="button" ng-click="ok()">
Log out
</button>
</div>
</ion-content>
</ion-modal-view>

2
public/views/preferencesGlidera.html
View File

@ -1,7 +1,7 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="glidera.main"> <button class="button back-button" ui-sref="tabs.buyandsell.glidera">
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>

8
public/views/sellGlidera.html
View File

@ -1,7 +1,7 @@
<ion-view> <ion-view>
<ion-nav-bar class="bar-royal"> <ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary"> <ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="glidera.main"> <button class="button back-button" ui-sref="tabs.buyandsell.glidera">
<i class="icon ion-ios-arrow-thin-left"></i> <i class="icon ion-ios-arrow-thin-left"></i>
</button> </button>
</ion-nav-buttons> </ion-nav-buttons>
@ -64,10 +64,10 @@
class="postfix" class="postfix"
on-tap="showAlternative = false; fiat = null; sell.sellPrice = null">USD</a> on-tap="showAlternative = false; fiat = null; sell.sellPrice = null">USD</a>
</label> </label>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
</div> </div>
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
<div class="text-center text-gray size-12 m20b" ng-show="!sell.gettingSellPrice && sell.sellPrice.qty"> <div class="text-center text-gray size-12 m20b" ng-show="!sell.gettingSellPrice && sell.sellPrice.qty">
Sell Sell
<span ng-show="qty">{{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin</span> <span ng-show="qty">{{sell.sellPrice.subtotal|currency:'':2}} {{sell.sellPrice.currency}} in Bitcoin</span>
@ -121,7 +121,7 @@
A transfer has been initiated to your bank account and should arrive in 4-6 business days. A transfer has been initiated to your bank account and should arrive in 4-6 business days.
</p> </p>
<button class="button button-block button-positive" ui-sref="glidera.main">OK</button> <button class="button button-block button-positive" ui-sref="tabs.buyandsell.glidera">OK</button>
</div> </div>
</ion-content> </ion-content>
</ion-view> </ion-view>

63
public/views/tab-home.html
View File

@ -44,10 +44,13 @@
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/> <img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
</i> </i>
<h2>{{wallet.name || wallet.id}}</h2> <h2>
<span ng-show="wallet.n > 1" class="text-light"> {{wallet.name || wallet.id}}
{{wallet.m}}-of-{{wallet.n}} <span class="size-12 text-light" ng-show="wallet.n > 1">
</span> {{wallet.m}}-of-{{wallet.n}}
</span>
</h2>
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate> <span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
Incomplete Incomplete
</span> </span>
@ -59,22 +62,26 @@
</p> </p>
<i class="icon nav-item-arrow-right"></i> <i class="icon nav-item-arrow-right"></i>
</a> </a>
<a ui-sref="bitpayCard.main" ng-show="externalServices.BitpayCard" class="item item-icon-left"> <a ui-sref="bitpayCard.main"
<i class="icon ion-card"></i> ng-show="externalServices.BitpayCard"
class="item item-icon-left item-big-icon-left item-icon-right">
<i class="icon big-icon-svg">
<div class="bg icon-bitpay-card"></div>
</i>
<h2>BitPay Card</h2> <h2>BitPay Card</h2>
</a> <p translate>Add funds to get started</p>
<a ui-sref="amazon.main" ng-show="externalServices.AmazonGiftCards" class="item item-icon-left"> <i class="icon nav-item-arrow-right"></i>
<i class="icon ion-ios-cart"></i>
<h2>Gift Cards</h2>
</a> </a>
</div> </div>
<div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)"> <div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
<div class="item item-heading" translate> <div class="item item-icon-right item-heading" translate>
Buy & Sell Bitcoin Buy &amp; Sell Bitcoin
<a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
</div> </div>
<a ng-show="glideraEnabled" ui-sref="glidera.main" class="item"> <a ng-show="glideraEnabled" ui-sref="tabs.buyandsell.glidera" class="item item-icon-right">
<img src="img/glidera-logo.png" width="90"/> <img src="img/glidera-logo.png" width="90"/>
<i class="icon nav-item-arrow-right"></i>
</a> </a>
<!-- disable coinbase for this release --> <!-- disable coinbase for this release -->
<!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item"> <!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
@ -82,25 +89,28 @@
</a> --> </a> -->
</div> </div>
<div class="list card" ng-show="externalServices.AmazonGiftCards">
<a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="amazon.main">
<i class="icon big-icon-svg">
<div class="bg icon-gift"></div>
</i>
<span translate>Buy Amazon.com Gift Card</span>
<i class="icon nav-item-arrow-right"></i>
</a>
</div>
<div class="list card" <div class="list card"
ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[1]"> ng-show="!externalServices.AmazonGiftCards || !externalServices.BitpayCard || !externalServices.BuyAndSell || !wallets[0]">
<div class="item item-heading" translate> <div class="item item-heading" translate>
Next steps Next steps
</div> </div>
<a ng-show="!wallets[1]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step"> <a ng-show="!wallets[0]" ui-sref="tabs.add" class="item item-icon-left item-big-icon-left item-icon-right next-step">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<div class="bg icon-create-wallet"></div> <div class="bg icon-create-wallet"></div>
</i> </i>
<span translate>Create a bitcoin wallet</span> <span translate>Create a bitcoin wallet</span>
<i class="icon nav-item-arrow-right"></i> <i class="icon nav-item-arrow-right"></i>
</a> </a>
<a ng-show="!externalServices.BuyAndSell" ui-sref="buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
<i class="icon big-icon-svg">
<div class="bg icon-buy-bitcoin"></div>
</i>
<span translate>Buy Bitcoin</span>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ui-sref="bitpayCard.main" ng-show="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right next-step"> <a ui-sref="bitpayCard.main" ng-show="!externalServices.BitpayCard" class="item item-icon-left item-big-icon-left item-icon-right next-step">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<div class="bg icon-bitpay-card"></div> <div class="bg icon-bitpay-card"></div>
@ -108,11 +118,18 @@
<span translate>Add BitPay Card</span> <span translate>Add BitPay Card</span>
<i class="icon nav-item-arrow-right"></i> <i class="icon nav-item-arrow-right"></i>
</a> </a>
<a ng-show="!externalServices.BuyAndSell" ui-sref="tabs.buyandsell" class="item item-icon-left item-big-icon-left item-icon-right next-step">
<i class="icon big-icon-svg">
<div class="bg icon-buy-bitcoin"></div>
</i>
<span translate>Buy or Sell Bitcoin</span>
<i class="icon nav-item-arrow-right"></i>
</a>
<a ui-sref="amazon.main" ng-show="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step"> <a ui-sref="amazon.main" ng-show="!externalServices.AmazonGiftCards" class="item item-icon-left item-big-icon-left item-icon-right next-step">
<i class="icon big-icon-svg"> <i class="icon big-icon-svg">
<div class="bg icon-gift"></div> <div class="bg icon-gift"></div>
</i> </i>
<span translate>Add Amazon Gift Card</span> <span translate>Buy Amazon.com Gift Card</span>
<i class="icon nav-item-arrow-right"></i> <i class="icon nav-item-arrow-right"></i>
</a> </a>
</div> </div>

2
src/js/controllers/glideraUri.js
View File

@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('glideraUriController',
} else if (data && data.access_token) { } else if (data && data.access_token) {
storageService.setGlideraToken($scope.network, data.access_token, function() { storageService.setGlideraToken($scope.network, data.access_token, function() {
$timeout(function() { $timeout(function() {
$state.go('glidera.main'); $state.go('tabs.buyandsell.glidera');
$scope.$apply(); $scope.$apply();
}, 500); }, 500);
}); });

18
src/js/controllers/modals/glideraConfirmation.js
View File

@ -1,18 +0,0 @@
'use strict';
angular.module('copayApp.controllers').controller('glideraConfirmationController', function($scope, $timeout, $state, glideraService) {
$scope.ok = function() {
glideraService.removeToken(function() {
$timeout(function() {
$state.go('glidera.main');
}, 100);
});
$scope.cancel();
};
$scope.cancel = function() {
$scope.glideraConfirmationModal.hide();
};
});

2
src/js/controllers/preferencesGlidera.js
View File

@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
if (res) { if (res) {
glideraService.removeToken(function() { glideraService.removeToken(function() {
$timeout(function() { $timeout(function() {
$state.go('glidera.main'); $state.go('tabs.buyandsell.glidera');
}, 100); }, 100);
}); });
} }

56
src/js/routes.js
View File

@ -109,11 +109,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
templateUrl: 'views/starting.html' templateUrl: 'views/starting.html'
}) })
.state('buyandsell', {
url: '/buyandsell',
templateUrl: 'views/buyandsell.html'
})
/* /*
* *
* URI * URI
@ -636,46 +631,57 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
}, },
}) })
/*
*
* Glidera
*
*
*/
.state('glidera', { /*
url: '/glidera', *
abstract: true, * Buy or Sell Bitcoin
template: '<ion-nav-view name="glidera"></ion-nav-view>' *
}) */
.state('glidera.main', {
url: '/main', .state('tabs.buyandsell', {
url: '/buyandsell',
views: { views: {
'glidera': { 'tab-home': {
templateUrl: 'views/buyandsell.html'
}
}
})
/*
*
* Glidera
*
*
*/
.state('tabs.buyandsell.glidera', {
url: '/glidera',
views: {
'tab-home@tabs': {
templateUrl: 'views/glidera.html' templateUrl: 'views/glidera.html'
} }
} }
}) })
.state('glidera.buy', { .state('tabs.buyandsell.glidera.buy', {
url: '/buy', url: '/buy',
views: { views: {
'glidera': { 'tab-home@tabs': {
templateUrl: 'views/buyGlidera.html' templateUrl: 'views/buyGlidera.html'
} }
} }
}) })
.state('glidera.sell', { .state('tabs.buyandsell.glidera.sell', {
url: '/sell', url: '/sell',
views: { views: {
'glidera': { 'tab-home@tabs': {
templateUrl: 'views/sellGlidera.html' templateUrl: 'views/sellGlidera.html'
} }
} }
}) })
.state('glidera.preferences', { .state('tabs.buyandsell.glidera.preferences', {
url: '/preferences', url: '/preferences',
views: { views: {
'glidera': { 'tab-home@tabs': {
templateUrl: 'views/preferencesGlidera.html' templateUrl: 'views/preferencesGlidera.html'
} }
} }

2
src/js/services/glideraService.js
View File

@ -1,6 +1,6 @@
'use strict'; 'use strict';
angular.module('copayApp.services').factory('glideraService', function($http, $log, $window, platformInfo, storageService, configService, $rootScope) { angular.module('copayApp.services').factory('glideraService', function($http, $log, $window, platformInfo, storageService) {
var root = {}; var root = {};
var credentials = {}; var credentials = {};
var isCordova = platformInfo.isCordova; var isCordova = platformInfo.isCordova;