From 2dc18cef4a4b285e8d020573199744c55b37846b Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Tue, 18 Dec 2018 19:31:45 -0500 Subject: [PATCH 001/306] consistent toolbar styling --- app/src/renderer/components/common/ToolBar.vue | 17 ++++++++++++----- .../renderer/components/wallet/PageWallet.vue | 11 +++++------ 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/src/renderer/components/common/ToolBar.vue b/app/src/renderer/components/common/ToolBar.vue index aa4af2a2f4..3cce9f1037 100644 --- a/app/src/renderer/components/common/ToolBar.vue +++ b/app/src/renderer/components/common/ToolBar.vue @@ -1,5 +1,5 @@ diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue index e39870c843..587aff2e9e 100644 --- a/app/src/renderer/components/wallet/PageSend.vue +++ b/app/src/renderer/components/wallet/PageSend.vue @@ -1,138 +1,130 @@ - - diff --git a/app/src/renderer/components/wallet/PageWallet.vue b/app/src/renderer/components/wallet/PageWallet.vue index 2086fdd027..bf727f711c 100644 --- a/app/src/renderer/components/wallet/PageWallet.vue +++ b/app/src/renderer/components/wallet/PageWallet.vue @@ -6,7 +6,7 @@ > refresh @@ -34,6 +34,7 @@ + + + @@ -53,6 +61,7 @@ import { includes, orderBy } from "lodash" import Mousetrap from "mousetrap" import DataEmptySearch from "common/TmDataEmptySearch" import TmDataConnecting from "common/TmDataConnecting" +import PageSend from "wallet/PageSend" import LiCopy from "common/TmLiCopy" import LiCoin from "./LiCoin" import TmListItem from "common/TmListItem" @@ -77,9 +86,10 @@ export default { ModalSearch, TmPage, TmPart, - ToolBar + ToolBar, + PageSend }, - data: () => ({ num }), + data: () => ({ num, showSendModal: false, denomination: null }), computed: { ...mapGetters([ `filters`, @@ -131,6 +141,13 @@ export default { setSearch(bool = !this.filters[`balances`].search.visible) { if (!this.somethingToSearch) return false this.$store.commit(`setSearchVisible`, [`balances`, bool]) + }, + updateBalances() { + this.queryWalletState() + }, + showModal(denomination) { + this.showSendModal = true + this.denomination = denomination.toLowerCase() } } } From 4ae546ae4344c195232a06a99a34ed73f8588e22 Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Fri, 21 Dec 2018 13:56:30 -0500 Subject: [PATCH 010/306] fixed up all the action modals and cleaned up form styles --- .../components/common/ActionModal.vue | 8 +- .../components/governance/ModalDeposit.vue | 100 ++------- .../components/governance/ModalPropose.vue | 97 ++------- .../components/governance/ModalVote.vue | 192 +++++++----------- .../components/staking/DelegationModal.vue | 130 ++++-------- .../components/staking/PageValidator.vue | 3 +- .../components/staking/UndelegationModal.vue | 121 ++++------- app/src/renderer/styles/app.css | 25 ++- 8 files changed, 200 insertions(+), 476 deletions(-) diff --git a/app/src/renderer/components/common/ActionModal.vue b/app/src/renderer/components/common/ActionModal.vue index b290ff7e83..5a1262ca23 100644 --- a/app/src/renderer/components/common/ActionModal.vue +++ b/app/src/renderer/components/common/ActionModal.vue @@ -59,11 +59,11 @@ export default { position: fixed; bottom: 0; width: 100%; - max-width: 600px; + max-width: 664px; z-index: var(--z-modal); border-top-left-radius: 0.25rem; border-top-right-radius: 0.25rem; - box-shadow: 0 8px 16px rgba(200, 200, 200, 0.15); + box-shadow: 0 8px 16px rgba(200, 200, 200, 0.1); } .action-modal-header { @@ -114,10 +114,6 @@ export default { padding: 2rem 0 0; } -.action-modal-form .tm-form-group button { - margin-left: 1rem; -} - /* Enter and leave animations can use different */ /* durations and timing functions. */ .slide-fade-enter-active { diff --git a/app/src/renderer/components/governance/ModalDeposit.vue b/app/src/renderer/components/governance/ModalDeposit.vue index 017cd64fe5..f3a694bf6d 100644 --- a/app/src/renderer/components/governance/ModalDeposit.vue +++ b/app/src/renderer/components/governance/ModalDeposit.vue @@ -1,30 +1,12 @@ - - diff --git a/app/src/renderer/components/governance/ModalPropose.vue b/app/src/renderer/components/governance/ModalPropose.vue index 572796d395..57923d7782 100644 --- a/app/src/renderer/components/governance/ModalPropose.vue +++ b/app/src/renderer/components/governance/ModalPropose.vue @@ -1,17 +1,8 @@ - diff --git a/app/src/renderer/components/governance/ModalVote.vue b/app/src/renderer/components/governance/ModalVote.vue index 07f5dbd549..4ebc9feebe 100644 --- a/app/src/renderer/components/governance/ModalVote.vue +++ b/app/src/renderer/components/governance/ModalVote.vue @@ -1,59 +1,55 @@ diff --git a/app/src/renderer/components/staking/DelegationModal.vue b/app/src/renderer/components/staking/DelegationModal.vue index 7eda6fff97..a3a062dff5 100644 --- a/app/src/renderer/components/staking/DelegationModal.vue +++ b/app/src/renderer/components/staking/DelegationModal.vue @@ -1,26 +1,38 @@ - - diff --git a/app/src/renderer/components/staking/PageValidator.vue b/app/src/renderer/components/staking/PageValidator.vue index 25bd86131a..a6558fcd19 100644 --- a/app/src/renderer/components/staking/PageValidator.vue +++ b/app/src/renderer/components/staking/PageValidator.vue @@ -169,7 +169,8 @@ diff --git a/app/src/renderer/components/staking/UndelegationModal.vue b/app/src/renderer/components/staking/UndelegationModal.vue index d296c989b3..01f86486c9 100644 --- a/app/src/renderer/components/staking/UndelegationModal.vue +++ b/app/src/renderer/components/staking/UndelegationModal.vue @@ -1,29 +1,37 @@ - - diff --git a/app/src/renderer/styles/app.css b/app/src/renderer/styles/app.css index 399a9f249b..e98d38b160 100644 --- a/app/src/renderer/styles/app.css +++ b/app/src/renderer/styles/app.css @@ -52,12 +52,22 @@ a:hover { .tm-field { border-radius: 0.25rem !important; } +input[readonly], +input[disabled] { + background: var(--bc-dim) !important; + border-color: var(--bc) !important; +} + +input[type="radio"] { + margin: 0; +} input.tm-field { height: inherit !important; } .tm-select .tm-field-select-addon { height: 100% !important; - border-left: 1px solid var(--bc, #ddd); + border-left: 1px solid var(--input-bc, #ccc); + width: 29px !important; } .tm-part-main { padding-right: 0 !important; @@ -79,6 +89,19 @@ input.tm-field { .tm-li-container { margin-right: 1rem; } +.input-suffix { + background: var(--bc-dim); + display: inline-block; + position: absolute; + padding: 6px 8px; + font-size: var(--sm); + bottom: 9px; + right: 30px; + letter-spacing: 1px; + text-align: right; + font-weight: 500; + border-radius: 2px; +} #app-content { flex: 1; display: flex; From 6fba3a413b42c6facb033f57fe3762292a53e862 Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Thu, 3 Jan 2019 10:21:10 -0500 Subject: [PATCH 011/306] snapshots --- .../renderer/components/wallet/PageSend.vue | 6 +- .../PagePreferences.spec.js.snap | 4 +- .../common/__snapshots__/ToolBar.spec.js.snap | 4 +- .../__snapshots__/ModalDeposit.spec.js.snap | 155 +- .../__snapshots__/ModalPropose.spec.js.snap | 218 +- .../__snapshots__/ModalVote.spec.js.snap | 243 +- .../__snapshots__/PageGovernance.spec.js.snap | 6 +- .../__snapshots__/PageProposal.spec.js.snap | 8 +- .../DelegationModal.spec.js.snap | 288 +- .../__snapshots__/PageStaking.spec.js.snap | 3 +- .../__snapshots__/PageValidator.spec.js.snap | 34 +- .../wallet/__snapshots__/LiCoin.spec.js.snap | 27 +- .../__snapshots__/PageSend.spec.js.snap | 4281 ++++------------- .../PageTransactions.spec.js.snap | 6 +- .../__snapshots__/PageWallet.spec.js.snap | 118 +- 15 files changed, 1527 insertions(+), 3874 deletions(-) diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue index 587aff2e9e..fc12a8e255 100644 --- a/app/src/renderer/components/wallet/PageSend.vue +++ b/app/src/renderer/components/wallet/PageSend.vue @@ -180,11 +180,7 @@ export default { showPassword: false }), computed: { -<<<<<<< HEAD - ...mapGetters([`wallet`, `lastHeader`, `config`, `connected`]), -======= - ...mapGetters([`wallet`, `config`, `mockedConnector`, `connected`]), ->>>>>>> created ActionModal component, now using action modal for send!!! + ...mapGetters([`wallet`, `mockedConnector`, `connected`]), max() { let denom = this.wallet.balances.find(b => b.denom === this.denom) return (denom && denom.amount) || 0 diff --git a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap index 66e71112b3..6d429b6775 100644 --- a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap +++ b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap @@ -96,7 +96,7 @@ exports[`PagePreferences has the expected html structure if connected 1`] = `
- + diff --git a/test/unit/specs/components/common/__snapshots__/ToolBar.spec.js.snap b/test/unit/specs/components/common/__snapshots__/ToolBar.spec.js.snap index f7b5ae6b91..4b680f3cd9 100644 --- a/test/unit/specs/components/common/__snapshots__/ToolBar.spec.js.snap +++ b/test/unit/specs/components/common/__snapshots__/ToolBar.spec.js.snap @@ -2,7 +2,7 @@ exports[`ToolBar has the expected html structure 1`] = `
- + diff --git a/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap b/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap index 19b91f4a8a..d5a8f3602b 100644 --- a/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap +++ b/test/unit/specs/components/governance/__snapshots__/ModalDeposit.spec.js.snap @@ -2,24 +2,24 @@ exports[`ModalDeposit component matches snapshot has the expected html structure 1`] = `