mirror of https://github.com/BTCPrivate/copay.git
Fix Glidera routes
This commit is contained in:
parent
1998d78b4a
commit
bcb6f97385
|
@ -1,7 +1,7 @@
|
|||
<ion-view>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<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>
|
||||
</button>
|
||||
</ion-nav-buttons>
|
||||
|
@ -65,10 +65,10 @@
|
|||
class="postfix"
|
||||
on-tap="showAlternative = false; fiat = null; buy.buyPrice = null">USD</a>
|
||||
</label>
|
||||
|
||||
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
|
||||
</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">
|
||||
Buy
|
||||
<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.
|
||||
</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>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
@ -9,8 +9,9 @@
|
|||
</ion-nav-bar>
|
||||
<ion-content>
|
||||
<ion-list>
|
||||
<ion-item class="item" ui-sref="glidera.main">
|
||||
<img src="img/glidera-logo.png" width="100">
|
||||
<ion-item class="item item-icon-right" ui-sref="tabs.buyandsell.glidera">
|
||||
<img src="img/glidera-logo.png" width="90">
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</ion-item>
|
||||
</ion-list>
|
||||
</ion-content>
|
||||
|
|
|
@ -1,10 +1,9 @@
|
|||
<ion-view>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<ion-nav-buttons side="primary">
|
||||
<button class="button button-clear" ui-sref="tabs.home">
|
||||
Close
|
||||
</button>
|
||||
</ion-nav-buttons>
|
||||
<ion-nav-back-button>
|
||||
<i class="icon ion-ios-arrow-thin-left"></i>
|
||||
</ion-nav-back-button>
|
||||
|
||||
<ion-nav-title>Glidera</ion-nav-title>
|
||||
</ion-nav-bar>
|
||||
|
||||
|
@ -84,7 +83,7 @@
|
|||
<img src="img/glidera-logo.png" ng-click="update(token, permissions)" width="200">
|
||||
</div>
|
||||
<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>
|
||||
<span ng-show="personalInfo">{{personalInfo.firstName}} {{personalInfo.lastName}}</span>
|
||||
<span class="item-note" ng-show="email">
|
||||
|
@ -112,15 +111,15 @@
|
|||
ng-show="status && status.userCanTransact">
|
||||
<a ng-show="status.userCanBuy"
|
||||
class="item item-icon-right"
|
||||
href ui-sref="glidera.buy">
|
||||
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="35">
|
||||
href ui-sref="tabs.buyandsell.glidera.buy">
|
||||
<img src="img/buy-bitcoin.svg" alt="buy bitcoin" width="30">
|
||||
Buy Bitcoin
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
<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="35">
|
||||
href ui-sref="tabs.buyandsell.glidera.sell">
|
||||
<img src="img/sell-bitcoin.svg" alt="buy bitcoin" width="30">
|
||||
Sell Bitcoin
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
|
|
|
@ -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>
|
|
@ -1,7 +1,7 @@
|
|||
<ion-view>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<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>
|
||||
</button>
|
||||
</ion-nav-buttons>
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<ion-view>
|
||||
<ion-nav-bar class="bar-royal">
|
||||
<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>
|
||||
</button>
|
||||
</ion-nav-buttons>
|
||||
|
@ -64,10 +64,10 @@
|
|||
class="postfix"
|
||||
on-tap="showAlternative = false; fiat = null; sell.sellPrice = null">USD</a>
|
||||
</label>
|
||||
|
||||
<wallets ng-if="wallets[0]" wallets="wallets"></wallets>
|
||||
</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">
|
||||
Sell
|
||||
<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.
|
||||
</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>
|
||||
</ion-content>
|
||||
</ion-view>
|
||||
|
|
|
@ -44,10 +44,13 @@
|
|||
<i class="icon big-icon-svg">
|
||||
<img src="img/icon-wallet.svg" ng-style="{'background-color': wallet.color}" class="bg"/>
|
||||
</i>
|
||||
<h2>{{wallet.name || wallet.id}}</h2>
|
||||
<span ng-show="wallet.n > 1" class="text-light">
|
||||
{{wallet.m}}-of-{{wallet.n}}
|
||||
</span>
|
||||
<h2>
|
||||
{{wallet.name || wallet.id}}
|
||||
<span class="size-12 text-light" ng-show="wallet.n > 1">
|
||||
{{wallet.m}}-of-{{wallet.n}}
|
||||
</span>
|
||||
</h2>
|
||||
|
||||
<span class="badge badge-assertive" ng-show="!wallet.isComplete()" translate>
|
||||
Incomplete
|
||||
</span>
|
||||
|
@ -59,22 +62,26 @@
|
|||
</p>
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
<a ui-sref="bitpayCard.main" ng-show="externalServices.BitpayCard" class="item item-icon-left">
|
||||
<i class="icon ion-card"></i>
|
||||
<a ui-sref="bitpayCard.main"
|
||||
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>
|
||||
</a>
|
||||
<a ui-sref="amazon.main" ng-show="externalServices.AmazonGiftCards" class="item item-icon-left">
|
||||
<i class="icon ion-ios-cart"></i>
|
||||
<h2>Gift Cards</h2>
|
||||
<p translate>Add funds to get started</p>
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="list card" ng-show="externalServices.BuyAndSell && (glideraEnabled || coinbaseEnabled)">
|
||||
<div class="item item-heading" translate>
|
||||
Buy & Sell Bitcoin
|
||||
<div class="item item-icon-right item-heading" translate>
|
||||
Buy & Sell Bitcoin
|
||||
<a ui-sref="tabs.buyandsell"><i class="icon ion-ios-plus-empty list-add-button"></i></a>
|
||||
</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"/>
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
<!-- disable coinbase for this release -->
|
||||
<!-- <a ng-show="coinbaseEnabled" ui-sref="exchange.coinbase" class="item">
|
||||
|
@ -82,25 +89,28 @@
|
|||
</a> -->
|
||||
</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"
|
||||
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>
|
||||
Next steps
|
||||
</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">
|
||||
<div class="bg icon-create-wallet"></div>
|
||||
</i>
|
||||
<span translate>Create a bitcoin wallet</span>
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</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">
|
||||
<i class="icon big-icon-svg">
|
||||
<div class="bg icon-bitpay-card"></div>
|
||||
|
@ -108,11 +118,18 @@
|
|||
<span translate>Add BitPay Card</span>
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</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">
|
||||
<i class="icon big-icon-svg">
|
||||
<div class="bg icon-gift"></div>
|
||||
</i>
|
||||
<span translate>Add Amazon Gift Card</span>
|
||||
<span translate>Buy Amazon.com Gift Card</span>
|
||||
<i class="icon nav-item-arrow-right"></i>
|
||||
</a>
|
||||
</div>
|
||||
|
|
|
@ -14,7 +14,7 @@ angular.module('copayApp.controllers').controller('glideraUriController',
|
|||
} else if (data && data.access_token) {
|
||||
storageService.setGlideraToken($scope.network, data.access_token, function() {
|
||||
$timeout(function() {
|
||||
$state.go('glidera.main');
|
||||
$state.go('tabs.buyandsell.glidera');
|
||||
$scope.$apply();
|
||||
}, 500);
|
||||
});
|
||||
|
|
|
@ -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();
|
||||
};
|
||||
|
||||
});
|
|
@ -68,7 +68,7 @@ angular.module('copayApp.controllers').controller('preferencesGlideraController'
|
|||
if (res) {
|
||||
glideraService.removeToken(function() {
|
||||
$timeout(function() {
|
||||
$state.go('glidera.main');
|
||||
$state.go('tabs.buyandsell.glidera');
|
||||
}, 100);
|
||||
});
|
||||
}
|
||||
|
|
|
@ -109,11 +109,6 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
templateUrl: 'views/starting.html'
|
||||
})
|
||||
|
||||
.state('buyandsell', {
|
||||
url: '/buyandsell',
|
||||
templateUrl: 'views/buyandsell.html'
|
||||
})
|
||||
|
||||
/*
|
||||
*
|
||||
* URI
|
||||
|
@ -636,46 +631,57 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
|
|||
},
|
||||
})
|
||||
|
||||
/*
|
||||
*
|
||||
* Glidera
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
.state('glidera', {
|
||||
url: '/glidera',
|
||||
abstract: true,
|
||||
template: '<ion-nav-view name="glidera"></ion-nav-view>'
|
||||
})
|
||||
.state('glidera.main', {
|
||||
url: '/main',
|
||||
/*
|
||||
*
|
||||
* Buy or Sell Bitcoin
|
||||
*
|
||||
*/
|
||||
|
||||
.state('tabs.buyandsell', {
|
||||
url: '/buyandsell',
|
||||
views: {
|
||||
'glidera': {
|
||||
'tab-home': {
|
||||
templateUrl: 'views/buyandsell.html'
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
/*
|
||||
*
|
||||
* Glidera
|
||||
*
|
||||
*
|
||||
*/
|
||||
|
||||
.state('tabs.buyandsell.glidera', {
|
||||
url: '/glidera',
|
||||
views: {
|
||||
'tab-home@tabs': {
|
||||
templateUrl: 'views/glidera.html'
|
||||
}
|
||||
}
|
||||
})
|
||||
.state('glidera.buy', {
|
||||
.state('tabs.buyandsell.glidera.buy', {
|
||||
url: '/buy',
|
||||
views: {
|
||||
'glidera': {
|
||||
'tab-home@tabs': {
|
||||
templateUrl: 'views/buyGlidera.html'
|
||||
}
|
||||
}
|
||||
})
|
||||
.state('glidera.sell', {
|
||||
.state('tabs.buyandsell.glidera.sell', {
|
||||
url: '/sell',
|
||||
views: {
|
||||
'glidera': {
|
||||
'tab-home@tabs': {
|
||||
templateUrl: 'views/sellGlidera.html'
|
||||
}
|
||||
}
|
||||
})
|
||||
.state('glidera.preferences', {
|
||||
.state('tabs.buyandsell.glidera.preferences', {
|
||||
url: '/preferences',
|
||||
views: {
|
||||
'glidera': {
|
||||
'tab-home@tabs': {
|
||||
templateUrl: 'views/preferencesGlidera.html'
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
'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 credentials = {};
|
||||
var isCordova = platformInfo.isCordova;
|
||||
|
|
Loading…
Reference in New Issue