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

Merge pull request #131 from cmgustavo/ref/design-35 

Fix Amazon route
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-16 16:27:23 -03:00 committed by GitHub
parent 5bd450270b 2f547520b4
commit fd637184e4
6 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
public/views/amazon.html
View File

@ -1,11 +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-title>Gift cards</ion-nav-title>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Amazon.com Gift Cards</ion-nav-title>
</ion-nav-bar>
<ion-content ng-controller="amazonController as amazon" ng-init="amazon.init()">
@ -21,7 +19,7 @@
<div ng-if="!giftCards" class="m20t padding text-center">
<button class="button button-block button-positive" ui-sref="amazon.buy">
<button class="button button-block button-positive" ui-sref="tabs.giftcards.amazon.buy">
Buy now
</button>
@ -33,7 +31,7 @@
<div class="m20t" ng-if="giftCards">
<div class="list">
<a class="item item-icon-left item-icon-right" href ui-sref="amazon.buy">
<a class="item item-icon-left item-icon-right" href ui-sref="tabs.giftcards.amazon.buy">
<i class="icon ion-bag"></i>
Buy Gift Card
<i class="icon nav-item-arrow-right"></i>

8
public/views/buyAmazon.html
View File

@ -1,10 +1,8 @@
<ion-view>
<ion-nav-bar class="bar-royal">
<ion-nav-buttons side="primary">
<button class="button back-button" ui-sref="amazon.main">
<i class="icon ion-ios-arrow-thin-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-back-button>
<i class="icon ion-ios-arrow-thin-left"></i>
</ion-nav-back-button>
<ion-nav-title>Buy</ion-nav-title>
</ion-nav-bar>

2
public/views/modals/amazon-card-details.html
View File

@ -1,6 +1,6 @@
<ion-modal-view ng-controller="amazonCardDetailsController">
<ion-header-bar align-title="center" class="bar-royal">
<button class="button button-clear" ng-click="cancel()">
<button class="button button-back button-clear" ng-click="cancel()">
Close
</button>
<h1 class="title">Details</h1>

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

@ -90,7 +90,7 @@
</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">
<a class="item item-icon-left item-icon-right item-big-icon-left" ui-sref="tabs.giftcards.amazon">
<i class="icon big-icon-svg">
<div class="bg icon-gift"></div>
</i>
@ -125,7 +125,7 @@
<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="tabs.giftcards.amazon" 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>

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

@ -208,7 +208,7 @@ angular.module('copayApp.controllers').controller('buyAmazonController',
$log.debug("Saving new gift card with status: " + newData.status);
self.giftCard = newData;
if (newData.status == 'PENDING') $state.transitionTo('amazon.main');
if (newData.status == 'PENDING') $state.transitionTo('tabs.giftcards.amazon');
$timeout(function() {
$scope.$digest();
});

35
src/js/routes.js
View File

@ -710,30 +710,35 @@ angular.module('copayApp').config(function(historicLogProvider, $provide, $logPr
templateUrl: 'views/sellCoinbase.html'
})
/*
*
* Gift Cards
*
*/
/*
*
* Amazon Gift Card
*
*/
.state('amazon', {
url: '/amazon',
abstract: true,
template: '<ion-nav-view name="amazon"></ion-nav-view>'
.state('tabs.giftcards', {
url: '/giftcards',
abstract: true
})
.state('amazon.main', {
url: '/main',
/*
*
* Amazon.com Gift Card
*
*/
.state('tabs.giftcards.amazon', {
url: '/amazon',
views: {
'amazon': {
'tab-home@tabs': {
templateUrl: 'views/amazon.html'
}
}
})
.state('amazon.buy', {
.state('tabs.giftcards.amazon.buy', {
url: '/buy',
views: {
'amazon': {
'tab-home@tabs': {
templateUrl: 'views/buyAmazon.html'
}
}