From 487ab2f951e5e3e45b3f406705777f634723ab4a Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Wed, 23 Jan 2019 13:18:21 -0500 Subject: [PATCH 1/5] cleaned up preferences page --- .../components/common/PagePreferences.vue | 22 +-- .../components/common/PagePreferences.spec.js | 9 +- .../PagePreferences.spec.js.snap | 128 +----------------- 3 files changed, 6 insertions(+), 153 deletions(-) diff --git a/app/src/renderer/components/common/PagePreferences.vue b/app/src/renderer/components/common/PagePreferences.vue index a29b2b7393..93212447e8 100644 --- a/app/src/renderer/components/common/PagePreferences.vue +++ b/app/src/renderer/components/common/PagePreferences.vue @@ -4,15 +4,12 @@ - - - - + + {{ nodeURL }} @@ -33,17 +30,6 @@ /> - - - - - @@ -90,10 +76,6 @@ export default { this.themeSelectActive = this.themes.active }, methods: { - signOut({ $store } = this) { - $store.dispatch(`signOut`) - $store.commit(`notifySignOut`) - }, setAppTheme({ $store, themes } = this) { if (themes.active === `dark`) { $store.commit(`setTheme`, `light`) diff --git a/test/unit/specs/components/common/PagePreferences.spec.js b/test/unit/specs/components/common/PagePreferences.spec.js index c30c9851b5..3b74202636 100644 --- a/test/unit/specs/components/common/PagePreferences.spec.js +++ b/test/unit/specs/components/common/PagePreferences.spec.js @@ -25,16 +25,9 @@ describe(`PagePreferences`, () => { it(`has the expected html structure if connected`, async () => { store.commit(`setStakingParameters`, stakingParameters.parameters) expect(wrapper.vm.$el).toMatchSnapshot() + expect(wrapper.vm.$el.outerHTML).toContain(`Node IP`) expect(wrapper.vm.$el.outerHTML).toContain(`View tutorial`) expect(wrapper.vm.$el.outerHTML).toContain(`Automatically send`) - expect(wrapper.vm.$el.outerHTML).toContain(`Switch account`) - expect(wrapper.vm.$el.outerHTML).toContain(`Sign Out`) - }) - - it(`should sign the user out`, async () => { - wrapper.vm.signOut() - expect(store.dispatch).toHaveBeenCalledWith(`signOut`) - expect(store.commit).toHaveBeenCalledWith(`notifySignOut`) }) it(`should set the error collection opt in`, async () => { 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 30bc291695..6a8d8ea856 100644 --- a/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap +++ b/test/unit/specs/components/common/__snapshots__/PagePreferences.spec.js.snap @@ -172,23 +172,7 @@ exports[`PagePreferences has the expected html structure if connected 1`] = `
-
-
-
- Settings -
- - -
-
+
- +
@@ -282,12 +251,7 @@ exports[`PagePreferences has the expected html structure if connected 1`] = ` - + @@ -373,92 +337,6 @@ exports[`PagePreferences has the expected html structure if connected 1`] = ` - -
-
-
-
-
- Account -
- - -
-
- -
-
-
-
- -
- -
-
- Switch account -
- -
- -
-
- -
- -
-
-
-
-
-
`; From 66724ba39f77ccae9a0d8b9f6e52ae65dc050114 Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Wed, 23 Jan 2019 13:18:40 -0500 Subject: [PATCH 2/5] border css bug --- app/src/renderer/components/common/TmPageHeader.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/renderer/components/common/TmPageHeader.vue b/app/src/renderer/components/common/TmPageHeader.vue index 0c2e036e48..65d35698ee 100644 --- a/app/src/renderer/components/common/TmPageHeader.vue +++ b/app/src/renderer/components/common/TmPageHeader.vue @@ -56,7 +56,7 @@ export default { .tm-page-header-container { min-height: 4.22rem; flex-wrap: wrap; - border-bottom: px solid var(--bc); + border-bottom: 1px solid var(--bc-dim); display: flex; padding: 0 1rem 0 1rem; } From ac56854431eafec01499b090eea0947b4ae7b3ab Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Wed, 23 Jan 2019 13:19:11 -0500 Subject: [PATCH 3/5] hiding preferences unless devMode --- app/src/renderer/components/common/ToolBar.vue | 3 ++- .../staking/__snapshots__/PageValidator.spec.js.snap | 11 +---------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/app/src/renderer/components/common/ToolBar.vue b/app/src/renderer/components/common/ToolBar.vue index cacd502fab..ec50693644 100644 --- a/app/src/renderer/components/common/ToolBar.vue +++ b/app/src/renderer/components/common/ToolBar.vue @@ -31,6 +31,7 @@ help_outline - - - settings - - + Date: Wed, 23 Jan 2019 13:20:57 -0500 Subject: [PATCH 4/5] changelog and lint --- CHANGELOG.md | 1 + app/src/renderer/components/common/ToolBar.vue | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a03d269fd2..71685285b2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -158,6 +158,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [\#1815](https://github.com/cosmos/voyager/pull/1815) Fixed getters for proposals denominator, reverted to 945803d586b83d65547cd16f4cd5994eac2957ea until interfaces are ready @sabau - Fixed build process @ƒaboweb - Fixed error locations sucked up by Sentry @faboweb +- - [\#1815](https://github.com/cosmos/voyager/pull/1785) Fixed small bug on preferences page @jbibla ## [0.10.7] - 2018-10-10 diff --git a/app/src/renderer/components/common/ToolBar.vue b/app/src/renderer/components/common/ToolBar.vue index ec50693644..d395d52414 100644 --- a/app/src/renderer/components/common/ToolBar.vue +++ b/app/src/renderer/components/common/ToolBar.vue @@ -31,8 +31,8 @@ help_outline From a1134e860e293c2500471264a555d12a99eaaad2 Mon Sep 17 00:00:00 2001 From: Jordan Bibla Date: Wed, 23 Jan 2019 14:10:56 -0500 Subject: [PATCH 5/5] fixed e2e --- test/e2e/preferences.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/e2e/preferences.js b/test/e2e/preferences.js index 3f8f61b007..5c0786c1d4 100644 --- a/test/e2e/preferences.js +++ b/test/e2e/preferences.js @@ -17,8 +17,7 @@ test(`preferences`, async function(t) { await navigateToPreferences(app) t.test(`shows preferences`, async function(t) { - t.ok(await $(`div*=Settings`).waitForExist(), `shows Settings`) - t.ok(await $(`div*=Account`).waitForExist(), `shows Account`) + t.ok(await $(`div*=Node IP`).waitForExist(), `shows Node IP`) t.end() })