From df2811eebaead0ad824ff7b79dc7940befd17c7e Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 26 May 2016 15:02:00 -0300 Subject: [PATCH] homogenized modals - add addressbook modal --- public/views/modals/addressbook.html | 135 ++++++++ public/views/modals/destination-address.html | 150 --------- public/views/modals/paypro.html | 17 +- .../{searchTransactions.html => search.html} | 21 +- public/views/modals/tx-details.html | 288 +++++++++--------- public/views/walletHome.html | 2 +- src/css/ionic-migration.css | 4 + src/js/controllers/modals/addressbook.js | 153 ++++++++++ src/js/controllers/modals/paypro.js | 3 +- src/js/controllers/modals/search.js | 10 + src/js/controllers/modals/txDetails.js | 2 - src/js/controllers/walletHome.js | 206 ++----------- src/sass/main.scss | 5 +- 13 files changed, 499 insertions(+), 497 deletions(-) create mode 100644 public/views/modals/addressbook.html delete mode 100644 public/views/modals/destination-address.html rename public/views/modals/{searchTransactions.html => search.html} (86%) create mode 100644 src/js/controllers/modals/addressbook.js create mode 100644 src/js/controllers/modals/search.js diff --git a/public/views/modals/addressbook.html b/public/views/modals/addressbook.html new file mode 100644 index 000000000..6c83ae286 --- /dev/null +++ b/public/views/modals/addressbook.html @@ -0,0 +1,135 @@ + +
+ + + +
+
+
+
+ My wallets +
+
+ My contacts +
+
+
+
+
+
+ + Getting address for wallet {{selectedWalletName}} ... +
+
+ + +
+ +
+ + +
+

Add a new entry

+
+
{{error}}
+ + + + Not valid + + + + + + + +
+ +
+ +
+
+ + + +
+
+ +
+
+ +
+
+
+
+
+
+ +
+ \ No newline at end of file diff --git a/public/views/modals/destination-address.html b/public/views/modals/destination-address.html deleted file mode 100644 index 493ab09bf..000000000 --- a/public/views/modals/destination-address.html +++ /dev/null @@ -1,150 +0,0 @@ -
- - -
-
-
-
- My wallets -
-
- My contacts -
-
-
-
-
-
- - Getting address for wallet {{selectedWalletName}} ... -
-
- -
- -
-
- -
- - -
-

Add a new entry

-
-
{{error|translate}}
- - - - Not valid - - - - - - - -
- -
- -
-
- - - -
-
- -
-
- -
-
-
- -
- -
- -
-
-
diff --git a/public/views/modals/paypro.html b/public/views/modals/paypro.html index 278ecf555..11d977f61 100644 --- a/public/views/modals/paypro.html +++ b/public/views/modals/paypro.html @@ -1,10 +1,15 @@ - - - {{'Close'|translate}} - -

Payment request

- +
diff --git a/public/views/modals/searchTransactions.html b/public/views/modals/search.html similarity index 86% rename from public/views/modals/searchTransactions.html rename to public/views/modals/search.html index 7f528b8cf..c43fe8343 100644 --- a/public/views/modals/searchTransactions.html +++ b/public/views/modals/search.html @@ -1,12 +1,17 @@ - - - - {{'Close'|translate}} - -

Search Transactions

- - + + +
diff --git a/public/views/modals/tx-details.html b/public/views/modals/tx-details.html index 7a269d924..e7e1e87ef 100644 --- a/public/views/modals/tx-details.html +++ b/public/views/modals/tx-details.html @@ -1,158 +1,164 @@ - - - {{'Close'|translate}} - -

Transaction

- + + -
- +-{{btx.amountStr}} +
+
+
+
+ sync +

Received

+
+
+ sync +

Sent

+
+
+ sync +

Moved

+
+ +
+ +-{{btx.amountStr}} +
+
+ + {{alternativeAmountStr}} + + + {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) + +
-
- - {{alternativeAmountStr}} - - - {{rateStr}} ({{rateDate | amDateFormat:'MM/DD/YYYY HH:mm a'}}) - +
+ -
-
- - -
-
-

Details

+

Details

-
    - -
  • - To - - - {{btx.merchant.domain}} - {{btx.merchant.domain}} - - - {{btx.labelTo}} - - - -
    • - -
  • - Recipients - {{btx.recipientCount}} - - - -
    • - -
    -
    - -
  • - - This transaction has become invalid; possibly due to a double spend attempt. - -
    • -
  • - Date - - - - -
    • -
  • - Fee - {{btx.feeStr}} -
    • -
  • - Note - {{btx.message}} -
    • -
  • - Merchant message - - {{btx.merchant.pr.pd.memo}} - -
    • -
  • - Confirmations - - - Unconfirmed - - - {{btx.confirmations}} - - - {{btx.safeConfirmed}} - - - -
    • -
- -
-

Participants

    -
  • - - - - + +
  • + To + + + {{btx.merchant.domain}} + {{btx.merchant.domain}} - {{c.copayerName}} ({{'Me'|translate}}) + + {{btx.labelTo}} + + + +
    • + +
  • + Recipients + {{btx.recipientCount}} + + + +
    • + +
    +
    + +
  • + + This transaction has become invalid; possibly due to a double spend attempt. + +
    • +
  • + Date + + + + +
    • +
  • + Fee + {{btx.feeStr}} +
    • +
  • + Note + {{btx.message}} +
    • +
  • + Merchant message + + {{btx.merchant.pr.pd.memo}} + +
    • +
  • + Confirmations + + + Unconfirmed + + + {{btx.confirmations}} + + + {{btx.safeConfirmed}} + + +
-
-
-
- +
+

Participants

+
    +
  • + + + + + + {{c.copayerName}} ({{'Me'|translate}}) +
    • +
-
-
+
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/public/views/walletHome.html b/public/views/walletHome.html index c2353d779..f97a6cf48 100644 --- a/public/views/walletHome.html +++ b/public/views/walletHome.html @@ -391,7 +391,7 @@
+ ng-click="home.openAddressbookModal(index.otherWallets, _address)">
diff --git a/src/css/ionic-migration.css b/src/css/ionic-migration.css index 8d25ca3ff..b843e57dc 100644 --- a/src/css/ionic-migration.css +++ b/src/css/ionic-migration.css @@ -20,6 +20,10 @@ z-index: -1; } +.scroll { + height: 100%; +} + .bct { background-color: transparent !important; margin-top: -25px; diff --git a/src/js/controllers/modals/addressbook.js b/src/js/controllers/modals/addressbook.js new file mode 100644 index 000000000..02ecb0dd2 --- /dev/null +++ b/src/js/controllers/modals/addressbook.js @@ -0,0 +1,153 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('addressbookController', function($rootScope, $scope, $timeout, profileService, walletService, addressService, addressbookService) { + var self = $scope.self; + + var fc = profileService.focusedClient; + self.lockAddress = false; + self._address = null; + $scope.editAddressbook = false; + $scope.addAddressbookEntry = false; + $scope.selectedAddressbook = {}; + $scope.newAddress = address; + $scope.walletName = fc.credentials.walletName; + $scope.color = fc.backgroundColor; + $scope.addressbook = { + 'address': ($scope.newAddress || ''), + 'label': '' + }; + + $scope.checkClipboard = function() { + if (!$scope.newAddress) { + getClipboard(function(value) { + $scope.newAddress = value; + }); + } + }; + + $scope.beforeQrCodeScann = function() { + $scope.error = null; + $scope.addAddressbookEntry = true; + $scope.editAddressbook = false; + }; + + $scope.onQrCodeScanned = function(data, addressbookForm) { + $timeout(function() { + var form = addressbookForm; + if (data && form) { + data = data.replace('bitcoin:', ''); + form.address.$setViewValue(data); + form.address.$isValid = true; + form.address.$render(); + } + $scope.$digest(); + }, 100); + }; + + $scope.toggleEditAddressbook = function() { + $scope.editAddressbook = !$scope.editAddressbook; + $scope.selectedAddressbook = {}; + $scope.addAddressbookEntry = false; + }; + + $scope.selectAddressbook = function(addr) { + self.setForm(addr); + $scope.cancel(); + }; + + $scope.toggleSelectAddressbook = function(addr) { + $scope.selectedAddressbook[addr] = $scope.selectedAddressbook[addr] ? false : true; + }; + + $scope.toggleAddAddressbookEntry = function() { + $scope.error = null; + $scope.addressbook = { + 'address': '', + 'label': '' + }; + $scope.addAddressbookEntry = !$scope.addAddressbookEntry; + }; + + $scope.list = function() { + $scope.error = null; + addressbookService.list(function(err, ab) { + if (err) { + $scope.error = err; + return; + } + $scope.list = ab; + $timeout(function() { + $scope.$digest(); + }); + }); + }; + + $scope.add = function(addressbook) { + $scope.error = null; + $timeout(function() { + addressbookService.add(addressbook, function(err, ab) { + if (err) { + $scope.error = err; + return; + } + $rootScope.$emit('Local/AddressbookUpdated', ab); + $scope.list = ab; + $scope.editAddressbook = true; + $scope.toggleEditAddressbook(); + $scope.$digest(); + }); + }, 100); + }; + + $scope.remove = function(addr) { + $scope.error = null; + $timeout(function() { + addressbookService.remove(addr, function(err, ab) { + if (err) { + $scope.error = err; + return; + } + $rootScope.$emit('Local/AddressbookUpdated', ab); + $scope.list = ab; + $scope.$digest(); + }); + }, 100); + }; + + $scope.selectWallet = function(walletId, walletName) { + var client = profileService.getClient(walletId); + $scope.errorSelectedWallet = {}; + + walletService.isReady(client, function(err) { + if (err) $scope.errorSelectedWallet[walletId] = err; + else { + $scope.gettingAddress = true; + $scope.selectedWalletName = walletName; + $timeout(function() { + $scope.$apply(); + }); + + addressService.getAddress(walletId, false, function(err, addr) { + $scope.gettingAddress = false; + if (err) { + self.error = err; + $scope.cancelAddress(); + return; + } + + self.setForm(addr); + $scope.cancel(); + }); + } + }); + }; + + $scope.cancelAddress = function() { + self.resetForm(); + $scope.cancel(); + }; + + $scope.cancel = function() { + $scope.addressbookModal.hide(); + }; +}); diff --git a/src/js/controllers/modals/paypro.js b/src/js/controllers/modals/paypro.js index 87c4a66ff..8d17ac21f 100644 --- a/src/js/controllers/modals/paypro.js +++ b/src/js/controllers/modals/paypro.js @@ -1,6 +1,6 @@ 'use strict'; -angular.module('copayApp.controllers').controller('payproController', function($scope, profileService) { +angular.module('copayApp.controllers').controller('payproController', function($scope) { var self = $scope.self; $scope.alternative = self.alternativeAmount; @@ -11,6 +11,5 @@ angular.module('copayApp.controllers').controller('payproController', function($ $scope.cancel = function() { $scope.payproModal.hide(); - $scope.payproModal.remove(); }; }); diff --git a/src/js/controllers/modals/search.js b/src/js/controllers/modals/search.js new file mode 100644 index 000000000..684773325 --- /dev/null +++ b/src/js/controllers/modals/search.js @@ -0,0 +1,10 @@ +'use strict'; + +angular.module('copayApp.controllers').controller('searchController', function($scope) { + var self = $scope.self; + $scope.search = ''; + + $scope.cancel = function() { + $scope.searchModal.hide(); + }; +}); diff --git a/src/js/controllers/modals/txDetails.js b/src/js/controllers/modals/txDetails.js index 7230a0886..fd9fd97ca 100644 --- a/src/js/controllers/modals/txDetails.js +++ b/src/js/controllers/modals/txDetails.js @@ -49,7 +49,5 @@ angular.module('copayApp.controllers').controller('txDetailsController', functio $scope.cancel = function() { $scope.txDetailsModal.hide(); - $scope.txDetailsModal.remove(); }; - }); diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 2c5c58ed1..1f63194d0 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -158,178 +158,16 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi var cancel_msg = gettextCatalog.getString('Cancel'); var confirm_msg = gettextCatalog.getString('Confirm'); - this.openDestinationAddressModal = function(wallets, address) { - $rootScope.modalOpened = true; - var fc = profileService.focusedClient; - self.lockAddress = false; - self._address = null; + this.openAddressbookModal = function(wallets, address) { + $scope.wallets = wallets; + $scope.address = address; + $scope.self = self; - var ModalInstanceCtrl = function($scope, $modalInstance) { - $scope.wallets = wallets; - $scope.editAddressbook = false; - $scope.addAddressbookEntry = false; - $scope.selectedAddressbook = {}; - $scope.newAddress = address; - $scope.walletName = fc.credentials.walletName; - $scope.color = fc.backgroundColor; - $scope.addressbook = { - 'address': ($scope.newAddress || ''), - 'label': '' - }; - - $scope.checkClipboard = function() { - if (!$scope.newAddress) { - getClipboard(function(value) { - $scope.newAddress = value; - }); - } - }; - - $scope.beforeQrCodeScann = function() { - $scope.error = null; - $scope.addAddressbookEntry = true; - $scope.editAddressbook = false; - }; - - $scope.onQrCodeScanned = function(data, addressbookForm) { - $timeout(function() { - var form = addressbookForm; - if (data && form) { - data = data.replace('bitcoin:', ''); - form.address.$setViewValue(data); - form.address.$isValid = true; - form.address.$render(); - } - $scope.$digest(); - }, 100); - }; - - $scope.selectAddressbook = function(addr) { - $modalInstance.close(addr); - }; - - $scope.toggleEditAddressbook = function() { - $scope.editAddressbook = !$scope.editAddressbook; - $scope.selectedAddressbook = {}; - $scope.addAddressbookEntry = false; - }; - - $scope.toggleSelectAddressbook = function(addr) { - $scope.selectedAddressbook[addr] = $scope.selectedAddressbook[addr] ? false : true; - }; - - $scope.toggleAddAddressbookEntry = function() { - $scope.error = null; - $scope.addressbook = { - 'address': ($scope.newAddress || ''), - 'label': '' - }; - $scope.addAddressbookEntry = !$scope.addAddressbookEntry; - }; - - $scope.list = function() { - $scope.error = null; - addressbookService.list(function(err, ab) { - if (err) { - $scope.error = err; - return; - } - $scope.list = ab; - $timeout(function() { - $scope.$digest(); - }); - }); - }; - - $scope.add = function(addressbook) { - $scope.error = null; - $timeout(function() { - addressbookService.add(addressbook, function(err, ab) { - if (err) { - $scope.error = err; - return; - } - $rootScope.$emit('Local/AddressbookUpdated', ab); - $scope.list = ab; - $scope.editAddressbook = true; - $scope.toggleEditAddressbook(); - $scope.$digest(); - }); - }, 100); - }; - - $scope.remove = function(addr) { - $scope.error = null; - $timeout(function() { - addressbookService.remove(addr, function(err, ab) { - if (err) { - $scope.error = err; - return; - } - $rootScope.$emit('Local/AddressbookUpdated', ab); - $scope.list = ab; - $scope.$digest(); - }); - }, 100); - }; - - $scope.cancel = function() { - $modalInstance.dismiss('cancel'); - }; - - $scope.selectWallet = function(walletId, walletName) { - var client = profileService.getClient(walletId); - $scope.errorSelectedWallet = {}; - - walletService.isReady(client, function(err) { - if (err) $scope.errorSelectedWallet[walletId] = err; - else { - $scope.gettingAddress = true; - $scope.selectedWalletName = walletName; - $timeout(function() { - $scope.$apply(); - }); - - addressService.getAddress(walletId, false, function(err, addr) { - $scope.gettingAddress = false; - - if (err) { - self.error = err; - $modalInstance.dismiss('cancel'); - return; - } - - $modalInstance.close(addr); - }); - } - }); - }; - }; - - var modalInstance = $modal.open({ - templateUrl: 'views/modals/destination-address.html', - windowClass: animationService.modalAnimated.slideUp, - controller: ModalInstanceCtrl, - }); - - var disableCloseModal = $rootScope.$on('closeModal', function() { - modalInstance.dismiss('cancel'); - }); - - modalInstance.result.finally(function() { - $rootScope.modalOpened = false; - disableCloseModal(); - var m = angular.element(document.getElementsByClassName('reveal-modal')); - m.addClass(animationService.modalAnimated.slideOutDown); - }); - - modalInstance.result.then(function(addr) { - if (addr) { - self.setForm(addr); - } - }, function() { - // onRejected - self.resetForm(); + $ionicModal.fromTemplateUrl('views/modals/addressbook.html', { + scope: $scope + }).then(function(modal) { + $scope.addressbookModal = modal; + $scope.addressbookModal.show(); }); }; @@ -1063,20 +901,18 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }); }; - $ionicModal.fromTemplateUrl('views/modals/searchTransactions.html', { - scope: $scope, - focusFirstInput: true, - animation: 'slide-in-up' - }).then(function(modal) { - $scope.modal = modal; - }); - $scope.openSearchModal = function() { - $scope.modal.show(); - }; + var fc = profileService.focusedClient; + $scope.color = fc.backgroundColor; + $scope.self = self; - $scope.closeModal = function() { - $scope.modal.hide(); + $ionicModal.fromTemplateUrl('views/modals/search.html', { + scope: $scope, + focusFirstInput: true + }).then(function(modal) { + $scope.searchModal = modal; + $scope.searchModal.show(); + }); }; this.setForm = function(to, amount, comment) { @@ -1136,8 +972,10 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi }; this.openPPModal = function(paypro) { - $scope.paypro = paypro; + var fc = profileService.focusedClient; + $scope.color = fc.backgroundColor; $scope.self = self; + $scope.paypro = paypro; $ionicModal.fromTemplateUrl('views/modals/paypro.html', { scope: $scope diff --git a/src/sass/main.scss b/src/sass/main.scss index cb1a5c3b9..3b3b51e4e 100644 --- a/src/sass/main.scss +++ b/src/sass/main.scss @@ -863,7 +863,7 @@ ul.manage li { .header-modal { background: #fff; width: 100%; - padding: 0.8rem; + padding-top: 60px; position: relative; } @@ -1974,11 +1974,10 @@ to prevent collapsing during animation*/ } .modal-content { - position: fixed; + position: relative; overflow-y: auto; height: 100%; width: 100%; - top: 45px; padding-bottom: 50px; -webkit-transform: translate3d(0, 0, 0); background: #f6f7f9;