Skip to content

Commit

Permalink
Coreycosman/1277 rename-VmToolBar-to-ToolBar (#1745)
Browse files Browse the repository at this point in the history
* change VmToolBar to ToolBar, update all snapshots and import statements, all tests passing

* add change in CHANGELOG.md
  • Loading branch information
coreycosman authored and jbibla committed Dec 14, 2018
1 parent 9eb45c6 commit 422543d
Show file tree
Hide file tree
Showing 12 changed files with 32 additions and 31 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [\#1686](https://github.com/cosmos/voyager/issues/1686) Changed proposals from array to object @sabau
- [\#1626](https://github.com/cosmos/voyager/issues/1626) upgraded from raven to sentry/browser @jbibla
- [\#1724](https://github.com/cosmos/voyager/issues/1724) set tabindex attribute to -1 for readonly denom on ModalProposals. tab navgiation now skips element @enyan94
- [\#1277](https://github.com/cosmos/voyager/issues/1277) change name of VmToolBar to ToolBar, update all snapshots and import statements @coreycosman

### Fixed

Expand Down
6 changes: 3 additions & 3 deletions app/src/renderer/components/common/PagePreferences.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<tm-page data-title="Preferences"
><template slot="menu-body">
<tm-balance />
<vm-tool-bar />
<tool-bar />
</template>
<tm-part title="Settings">
<tm-list-item type="field" title="Select network to connect to">
Expand Down Expand Up @@ -60,7 +60,7 @@
<script>
import { mapGetters } from "vuex"
import { TmListItem, TmBtn, TmPage, TmPart, TmField } from "@tendermint/ui"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
import TmBalance from "common/TmBalance"
import TmModal from "common/TmModal"
Expand All @@ -73,7 +73,7 @@ export default {
TmListItem,
TmPage,
TmPart,
VmToolBar,
ToolBar,
TmModal
},
data: () => ({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
import { mapGetters, mapMutations } from "vuex"
export default {
// the name needs to be different from TmToolBar (tm-tool-bar) or else recursive rendering takes place
name: `vm-tool-bar`,
name: `tool-bar`,
computed: {
...mapGetters([`user`, `lastPage`])
},
Expand Down
8 changes: 4 additions & 4 deletions app/src/renderer/components/governance/PageGovernance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
@click.native="onPropose"
/>
</tm-balance>
<vm-tool-bar
<tool-bar
><a v-tooltip.bottom="'Search'" @click="setSearch()"
><i class="search material-icons">search</i></a
></vm-tool-bar
></tool-bar
>
</template>
<modal-search type="proposals" />
Expand All @@ -32,7 +32,7 @@ import { mapGetters } from "vuex"
import DataEmptySearch from "common/TmDataEmptySearch"
import ModalSearch from "common/TmModalSearch"
import ModalPropose from "./ModalPropose"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
import TmBalance from "common/TmBalance"
import { TmPage, TmDataEmpty, TmDataLoading, TmBtn } from "@tendermint/ui"
export default {
Expand All @@ -46,7 +46,7 @@ export default {
ModalPropose,
TmPage,
TmBtn,
VmToolBar
ToolBar
},
data: () => ({
query: ``,
Expand Down
4 changes: 2 additions & 2 deletions app/src/renderer/components/governance/TableProposals.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ import LiProposal from "./LiProposal"
import ModalSearch from "common/TmModalSearch"
import DataEmptySearch from "common/TmDataEmptySearch"
import PanelSort from "staking/PanelSort"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
export default {
name: `table-proposals`,
components: {
LiProposal,
DataEmptySearch,
ModalSearch,
PanelSort,
VmToolBar
ToolBar
},
props: {
proposals: {
Expand Down
8 changes: 4 additions & 4 deletions app/src/renderer/components/staking/PageStaking.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<tm-page class="staking" data-title="Staking"
><template slot="menu-body">
<tm-balance :tabs="tabs" />
<vm-tool-bar
<tool-bar
><a
v-tooltip.bottom="'Refresh'"
:disabled="!connected"
@click="connected && updateDelegates()"
><i class="material-icons">refresh</i></a
><a v-tooltip.bottom="'Search'" @click="setSearch()"
><i class="search material-icons">search</i></a
></vm-tool-bar
></tool-bar
>
</template>
<modal-search type="delegates" />
Expand All @@ -23,15 +23,15 @@ import { mapGetters, mapActions } from "vuex"
import Mousetrap from "mousetrap"
import { TmPage } from "@tendermint/ui"
import ModalSearch from "common/TmModalSearch"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
import TmBalance from "common/TmBalance"
export default {
name: `page-staking`,
components: {
ModalSearch,
TmPage,
TmBalance,
VmToolBar
ToolBar
},
data: () => ({
query: ``,
Expand Down
4 changes: 2 additions & 2 deletions app/src/renderer/components/staking/TableValidators.vue
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ import DataEmptySearch from "common/TmDataEmptySearch"
import { calculateTokens } from "scripts/common"
import ModalSearch from "common/TmModalSearch"
import PanelSort from "staking/PanelSort"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
export default {
name: `table-validators`,
components: {
LiValidator,
DataEmptySearch,
ModalSearch,
PanelSort,
VmToolBar
ToolBar
},
props: {
validators: {
Expand Down
6 changes: 3 additions & 3 deletions app/src/renderer/components/wallet/PageSend.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<tm-page data-title="Send">
<template slot="menu-body">
<tm-balance />
<vm-tool-bar />
<tool-bar />
</template>
<tm-form-struct :submit="onSubmit">
<tm-part title="Denomination Options">
Expand Down Expand Up @@ -169,7 +169,7 @@ import {
} from "@tendermint/ui"
import TmBalance from "common/TmBalance"
import FieldAddon from "common/TmFieldAddon"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
import TmModalSendConfirmation from "wallet/TmModalSendConfirmation"
const isInteger = amount => Number.isInteger(amount)
Expand All @@ -186,7 +186,7 @@ export default {
TmFormStruct,
TmPage,
TmPart,
VmToolBar,
ToolBar,
TmModalSendConfirmation
},
props: {
Expand Down
8 changes: 4 additions & 4 deletions app/src/renderer/components/wallet/PageTransactions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<tm-page data-title="Transactions"
><template slot="menu-body">
<tm-balance />
<vm-tool-bar
<tool-bar
><a
v-tooltip.bottom="'Refresh'"
:disabled="!connected"
Expand All @@ -13,7 +13,7 @@
:disabled="!somethingToSearch"
@click="setSearch()"
><i class="material-icons">search</i></a
></vm-tool-bar
></tool-bar
>
</template>
<modal-search v-if="somethingToSearch" type="transactions" />
Expand Down Expand Up @@ -50,7 +50,7 @@ import TmBalance from "common/TmBalance"
import TmDataError from "common/TmDataError"
import TmDataConnecting from "common/TmDataConnecting"
import { TmPage, TmDataLoading, TmLiAnyTransaction } from "@tendermint/ui"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
export default {
name: `page-transactions`,
components: {
Expand All @@ -63,7 +63,7 @@ export default {
DataEmptyTx,
ModalSearch,
TmPage,
VmToolBar
ToolBar
},
data: () => ({
shortid: shortid,
Expand Down
8 changes: 4 additions & 4 deletions app/src/renderer/components/wallet/PageWallet.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<tm-page data-title="Wallet">
<template slot="menu-body">
<tm-balance />
<vm-tool-bar>
<tool-bar>
<a
v-tooltip.bottom="'Refresh'"
:disabled="!connected"
Expand All @@ -17,7 +17,7 @@
>
<i class="material-icons">search</i>
</a>
</vm-tool-bar>
</tool-bar>
</template>
<modal-search v-if="somethingToSearch" type="balances" />
<tm-data-connecting v-if="!wallet.loaded && !connected" />
Expand Down Expand Up @@ -65,7 +65,7 @@ import {
} from "@tendermint/ui"
import TmBalance from "common/TmBalance"
import ModalSearch from "common/TmModalSearch"
import VmToolBar from "common/VmToolBar"
import ToolBar from "common/ToolBar"
export default {
name: `page-wallet`,
components: {
Expand All @@ -80,7 +80,7 @@ export default {
ModalSearch,
TmPage,
TmPart,
VmToolBar
ToolBar
},
data: () => ({ num }),
computed: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import setup from "../../../helpers/vuex-setup"
import htmlBeautify from "html-beautify"
import VmToolBar from "common/VmToolBar"
describe(`VmToolBar`, () => {
import ToolBar from "common/ToolBar"
describe(`ToolBar`, () => {
let wrapper, store, router
let { mount } = setup()

beforeEach(() => {
let instance = mount(VmToolBar)
let instance = mount(ToolBar)
router = instance.router
wrapper = instance.wrapper
store = instance.store
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`VmToolBar has the expected html structure 1`] = `
exports[`ToolBar has the expected html structure 1`] = `
"<div class=\\"tm-tool-bar\\">
<a disabled=\\"disabled\\" class=\\"back\\"><i class=\\"material-icons\\">arrow_back</i></a><a class=\\"help\\"><i class=\\"material-icons\\">help_outline</i></a><a href=\\"#/preferences\\" class=\\"\\" id=\\"settings\\"><i class=\\"material-icons\\">settings</i></a><a id=\\"signOut-btn\\"><i class=\\"material-icons\\">exit_to_app</i></a>
</div>"
Expand Down

0 comments on commit 422543d

Please sign in to comment.