Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jordan/1754 forms #1807

Merged
merged 83 commits into from
Jan 23, 2019
Merged
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
2dc18ce
consistent toolbar styling
jbibla Dec 19, 2018
b8af3f2
gitignore task folder
jbibla Dec 19, 2018
6a253c4
clean up connected-network styles
jbibla Dec 19, 2018
9aa1f5b
cleanup styles on balance header, shortbech32, and tabs
jbibla Dec 20, 2018
879fe6e
minor changes to TmSession, ToolBar, and hover color for links
jbibla Dec 20, 2018
248bca8
cleaned up form styles and action modals
jbibla Dec 20, 2018
0249590
remove password toggle
jbibla Dec 20, 2018
e8d071f
remove modal receive
jbibla Dec 20, 2018
a32a583
created ActionModal component, now using action modal for send!!!
jbibla Dec 20, 2018
4ae546a
fixed up all the action modals and cleaned up form styles
jbibla Dec 21, 2018
6fba3a4
snapshots
jbibla Jan 3, 2019
704ad93
update notification styling, fixed undelegation max bug
jbibla Jan 3, 2019
7ea2993
action modals close with click outside or clicking the x
jbibla Jan 3, 2019
ca7421e
fixed lint issues
jbibla Jan 3, 2019
de43f12
rename PageSend to SendModal
jbibla Jan 4, 2019
4d0908e
responsive style fixes
jbibla Jan 7, 2019
159ef6f
fix shadow
jbibla Jan 7, 2019
deb0275
action modal events working as expected!!!
jbibla Jan 7, 2019
9c1d900
added v-focus, cleaned up button copy
jbibla Jan 7, 2019
eedd7a3
fixed page proposal toolbar
jbibla Jan 7, 2019
95760ae
form styling fix
jbibla Jan 7, 2019
c44ff44
cha cha cha changelog
jbibla Jan 7, 2019
461b610
remove mockedConnector (was accidentally re-added in merge conflicts)
jbibla Jan 7, 2019
118d0ea
style fixes
jbibla Jan 8, 2019
5f2beb5
click.native
jbibla Jan 8, 2019
295e4c8
cleaned up send modal validations
jbibla Jan 8, 2019
364f1d7
updated vuelidate library (fixes some bugs)
jbibla Jan 9, 2019
a598bac
updated delegation action modal
jbibla Jan 10, 2019
4f13bfb
minor style improvements
jbibla Jan 10, 2019
65673f0
send modal updates and fixes
jbibla Jan 10, 2019
68e3749
removed unusual forcing behaviour from tm-field
jbibla Jan 10, 2019
e42c952
Merge remote-tracking branch 'origin/develop' into jordan/1754-forms
Jan 16, 2019
c8a0776
Merge remote-tracking branch 'origin/Develop' into jordan/1754-forms
Jan 17, 2019
7e38b1b
several
faboweb Jan 17, 2019
ab206dd
fixed tests
faboweb Jan 17, 2019
b360292
addressed comments
Jan 17, 2019
46b8a8a
several fixes
faboweb Jan 17, 2019
bed7f05
fixed getters
faboweb Jan 17, 2019
fb3a52f
fixed on develop
Jan 16, 2019
691c9dd
fixed several modals
Jan 17, 2019
6f56361
fixed modal propose tests
Jan 17, 2019
23f25ce
Merge remote-tracking branch 'origin/develop' into jordan/1754-forms
Jan 17, 2019
636b5ad
fixed tests releated to new tmpage
Jan 17, 2019
e03ffe7
fixed undelegation modal tests
Jan 17, 2019
24f408c
fixed more tests
Jan 17, 2019
5499be4
linted
Jan 17, 2019
352516f
several refactors
Jan 18, 2019
492be0f
refactored modal submit logic into actionmodal
Jan 20, 2019
f80c3f1
adjusted several tests
Jan 20, 2019
d6c56f4
linted
Jan 20, 2019
6fb350d
increased coverage
Jan 20, 2019
0001fda
removed signactionmodal for now
Jan 20, 2019
d3886df
Update app/src/renderer/components/common/PageProfile.vue
fedekunze Jan 20, 2019
7813db6
brought back missing SendModal
jbibla Jan 21, 2019
59aa767
removed unused method and fixed error message language
jbibla Jan 21, 2019
e25fa47
delegation and undelegation fixes and tests
jbibla Jan 21, 2019
448d30a
e2e fixes
jbibla Jan 21, 2019
9875e09
fixed snaperoos
jbibla Jan 21, 2019
51b6c79
the ol' linteroo
jbibla Jan 21, 2019
0058586
unused method
jbibla Jan 21, 2019
90adda5
unused computed property
jbibla Jan 21, 2019
a1f7373
action modal tests
jbibla Jan 21, 2019
ac9c816
forever linting
jbibla Jan 21, 2019
e55d0c3
bumped coverage for PageValidator
jbibla Jan 21, 2019
44521a0
fixed send modal
Jan 22, 2019
f298955
fixed depoit e2e test
Jan 22, 2019
1a9175e
fixed sendmodal snaps
Jan 22, 2019
db3f42b
fixed e2e test for modal vote opening
Jan 22, 2019
1f72550
added coverage for pagewallet
Jan 22, 2019
36463a6
addressed comments
Jan 22, 2019
14ddecf
fixed tests
Jan 22, 2019
4f51f38
Update .gitignore
faboweb Jan 22, 2019
a6b0a55
addressed feedback
Jan 23, 2019
2c39bbe
fixed styling
Jan 23, 2019
e8d6e64
Merge branch 'jordan/1754-forms' of https://github.com/cosmos/voyager…
Jan 23, 2019
b65c250
changed $direty to $error for form validation
Jan 23, 2019
9cc0e4f
added suggestion
Jan 23, 2019
ce1b82f
fixed typo
Jan 23, 2019
56daa93
added absolute back, fix broken styling on sign up
jbibla Jan 23, 2019
3fdefbb
Merge branch 'jordan/1754-forms' of https://github.com/cosmos/voyager…
jbibla Jan 23, 2019
af82cdb
improved messaging around no funds
Jan 23, 2019
f72b9b4
Merge branch 'jordan/1754-forms' of https://github.com/cosmos/voyager…
Jan 23, 2019
4803fe0
fixed typo
Jan 23, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ yarn-error.log
testArtifacts/*
app/networks/local-testnet/*
.idea/*
tasks/
7 changes: 4 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +124,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [\#1617](https://github.com/cosmos/voyager/pull/1617) Fixed send buttons not clickable @faboweb
- [\#1303](https://github.com/cosmos/voyager/issues/1303) Fixed spamming of setSubscription @faboweb
- [\#1603](https://github.com/cosmos/voyager/issues/1603) Fixed inactive sidebar links @jbibla
- [\#1614](https://github.com/cosmos/voyager/issues/1614) Fixed an error that prevented a proposal to be updated optimisticaly after a successful deposit or vote @fedekunze
- [\#1386](https://github.com/cosmos/voyager/issues/1386) Cleaned up onboarding @jbibla
- [\#1614](https://github.com/cosmos/voyager/issues/1614) Fixed an error that prevented a proposal to be updated optimistically after a successful deposit or vote @fedekunze
- [\#1386](https://github.com/cosmos/voyager/issues/1386) Cleaned up on-boarding @jbibla
- [\#1640](https://github.com/cosmos/voyager/issues/1640) Hide the table proposals when there are no available ones @fedekunze
- [\#1640](https://github.com/cosmos/voyager/issues/1640) Fixed an error that prevented the search bar to be displayed using `Ctrl+F` @fedekunze
- Fixed testnet config build script @faboweb
- [\#1677](https://github.com/cosmos/voyager/issues/1677) Fixed inconsistent status colors on proposals @faboweb
- [\#1687](https://github.com/cosmos/voyager/issues/1687) Removing cached state if decrypting fails. @faboweb
- [\#1662](https://github.com/cosmos/voyager/issues/1662) Fixed wrong node version in readme @faboweb
[\#1642](https://github.com/cosmos/voyager/issues/1642) Refactor table styles and fixed bad aligned headers @faboweb
- [\#1677](https://github.com/cosmos/voyager/issues/1677) Fixed inconstistent status colors on proposals @fedekunze
- [\#1677](https://github.com/cosmos/voyager/issues/1677) Fixed inconsistent status colors on proposals @fedekunze
- [\#1696](https://github.com/cosmos/voyager/issues/1696) Fixed broken css variables @jbibla
- [\#1687](https://github.com/cosmos/voyager/issues/1687) Removing cached state if decrypting fails. @faboweb
- [\#1662](https://github.com/cosmos/voyager/issues/1662) Fixed wrong node version in readme @faboweb
Expand All @@ -145,6 +145,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- [\#1749](https://github.com/cosmos/voyager/issues/1749) Fixed proposal tally update after voting @fedekunze
- [\#1765](https://github.com/cosmos/voyager/pull/1765) Fixed proposal deposit update after submitting a deposit @fedekunze
- [\#1791](https://github.com/cosmos/voyager/pull/1791) Fixed a problem with initializing the Voyager config dir @faboweb
- [\#1754](https://github.com/cosmos/voyager/pull/1754) Fixed form UX, UI and other miscellaneous styling issues @jbibla

## [0.10.7] - 2018-10-10

Expand Down
3 changes: 0 additions & 3 deletions app/src/renderer/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
<template v-else>
<app-header />
<div id="app-content"><router-view /></div>
<modal-receive />
</template>
<tm-notifications :notifications="notifications" theme="cosmos" />
<modal-error
Expand All @@ -26,7 +25,6 @@ import ModalError from "common/TmModalError"
import ModalHelp from "common/TmModalHelp"
import ModalLcdApproval from "common/TmModalLCDApproval"
import ModalNodeHalted from "common/TmModalNodeHalted"
import ModalReceive from "common/TmModalReceive"
import Onboarding from "common/TmOnboarding"
import Session from "common/TmSession"
import store from "./vuex/store"
Expand All @@ -37,7 +35,6 @@ export default {
ModalError,
ModalHelp,
ModalLcdApproval,
ModalReceive,
TmNotifications,
ModalNodeHalted,
Onboarding,
Expand Down
126 changes: 126 additions & 0 deletions app/src/renderer/components/common/ActionModal.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<template>
jbibla marked this conversation as resolved.
Show resolved Hide resolved
<transition name="slide-fade">
<div v-click-outside="close" class="action-modal">
<div class="action-modal-header">
<img
class="icon action-modal-atom"
src="~assets/images/cosmos-logo.png"
/><span class="action-modal-title">{{ title }}</span>
<div
id="closeBtn"
class="action-modal-icon action-modal-close"
@click="close"
>
<i class="material-icons">close</i>
</div>
</div>
<div class="action-modal-form"><slot></slot></div>
<div class="action-modal-footer">
<slot name="action-modal-footer"></slot>
</div>
</div>
</transition>
</template>

<script>
import ClickOutside from "vue-click-outside"

export default {
name: `action-modal`,
directives: {
ClickOutside
},
props: {
title: {
type: String,
required: true
}
},
methods: {
close() {
this.$emit(`close-action-modal`)
}
}
}
</script>

<style>
.action-modal {
background: var(--app-nav);
display: flex;
flex-direction: column;
justify-content: space-between;
right: 2rem;
padding: 3rem;
position: fixed;
bottom: 0;
width: 100%;
max-width: 664px;
z-index: var(--z-modal);
border-top-left-radius: 0.25rem;
border-top-right-radius: 0.25rem;
box-shadow: 0 2px 8px rgba(200, 200, 200, 0.1);
}

.action-modal-header {
align-items: center;
display: flex;
padding-bottom: 2rem;
}

.action-modal-atom {
height: 3rem;
width: 3rem;
}

.action-modal-title {
flex: 1;
font-size: var(--h3);
font-weight: 500;
color: var(--bright);
padding-left: 1rem;
}

.action-modal-icon {
display: flex;
align-items: center;
justify-content: center;
}

.action-modal-icon i {
font-size: var(--lg);
}

.action-modal-icon.action-modal-close {
cursor: pointer;
}

.action-modal-icon.action-modal-close:hover i {
color: var(--link);
}

.action-modal-form .tm-form-group {
display: block;
padding: 0.5rem 0;
}

.action-modal-footer {
display: flex;
justify-content: flex-end;
padding: 2rem 0 0;
}

/* Enter and leave animations can use different */
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The world look smoother 🥇

/* durations and timing functions. */
.slide-fade-enter-active {
transition: all 0.1s ease;
}
.slide-fade-leave-active {
transition: all 0.2s cubic-bezier(1, 0.5, 0.8, 1);
}
.slide-fade-enter, .slide-fade-leave-to
/* .slide-fade-leave-active below version 2.1.8 */ {
transform: translateX(2rem);
opacity: 0;
}
</style>
1 change: 1 addition & 0 deletions app/src/renderer/components/common/AppHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ export default {
<style>
#app-header {
z-index: var(--z-appHeader);
position: relative;
}

#app-header .container {
Expand Down
4 changes: 2 additions & 2 deletions app/src/renderer/components/common/PageProfile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export default {
display: flex;
margin-bottom: 1rem;
padding: 2rem;
min-width: 63rem;
/* min-width: 63rem; */
jbibla marked this conversation as resolved.
Show resolved Hide resolved
}

.column {
Expand Down Expand Up @@ -149,7 +149,7 @@ export default {
align-items: center;
display: flex;
flex-direction: column;
width: 7rem;
/* width: 7rem; */
Copy link
Contributor

@fedekunze fedekunze Jan 8, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

Suggested change
/* width: 7rem; */

faboweb marked this conversation as resolved.
Show resolved Hide resolved
}

.colored_dl:not(:last-child) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/renderer/components/common/ShortBech32.vue
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ export default {
}

.short-bech32 .address {
color: var(--dim);
color: var(--link);
cursor: pointer;
font-size: 14px;
line-height: 14px;
}

.short-bech32 .address:hover {
color: var(--link);
color: var(--link-hover);
}

.short-bech32 .copied {
Expand Down
6 changes: 5 additions & 1 deletion app/src/renderer/components/common/TmBalance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ export default {
color: var(--bright);
font-size: var(--h1);
font-weight: 500;
line-height: 40px;
}
.header-balance .top .icon-container {
display: block;
Expand Down Expand Up @@ -123,12 +124,15 @@ export default {
.tabs .tab {
cursor: pointer;
margin-right: 2rem;
font-weight: 500;
letter-spacing: -1px;
font-size: 1rem;
}
.tabs .tab a {
color: var(--dim);
display: block;
padding-bottom: 1rem;
padding-left: 0;
}
.tabs .tab a:hover {
color: var(--link);
Expand All @@ -141,7 +145,7 @@ export default {
}
.tm-btn {
position: absolute;
right: 0rem;
right: 1rem;
bottom: 1rem;
}
</style>
5 changes: 5 additions & 0 deletions app/src/renderer/components/common/TmConnectedNetwork.vue
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,11 @@ export default {
justify-content: space-between;
margin: 0.5rem;
padding: 0.5rem;
position: absolute;
bottom: 0;
left: 0;
right: 0;
max-width: 240px;
}

.tm-connected-network .chain-id {
Expand Down
3 changes: 2 additions & 1 deletion app/src/renderer/components/common/TmModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ export default {

.tm-modal-title {
flex: 1;
font-size: h3;
font-size: var(--h3);
font-weight: 500;
color: var(--bright);
padding-left: 1rem;
}

.tm-modal-main {
Expand Down
4 changes: 3 additions & 1 deletion app/src/renderer/components/common/TmNotification.vue
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,13 @@ export default {

<style>
.tm-notification {
background: var(--app-fg);
background: var(--app-nav);
font-size: 0.75rem;
cursor: pointer;
user-select: none;
margin: 0.5rem 0.5rem 0;
border-radius: 0.25rem;
border: 1px solid var(--bc-dim);
}

.tm-notification.tm-notification-warning header {
Expand Down Expand Up @@ -152,6 +153,7 @@ export default {

.tm-notification:hover menu .close {
display: block;
cursor: pointer;
faboweb marked this conversation as resolved.
Show resolved Hide resolved
}

@media screen and (min-width: 360px) {
Expand Down
7 changes: 1 addition & 6 deletions app/src/renderer/components/common/TmSession.vue
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ export default {
color: var(--dim);
font-size: var(--sm);
line-height: var(--xl);
display: inline;
}

.tm-session-footer > div {
Expand Down Expand Up @@ -234,10 +235,4 @@ export default {
display: block !important;
}
}

.tm-connected-network {
position: absolute;
bottom: 0;
left: 0;
}
</style>
25 changes: 14 additions & 11 deletions app/src/renderer/components/common/ToolBar.vue
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<template>
<div class="tm-tool-bar">
<div class="tool-bar">
<a
v-tooltip.bottom="'Back'"
:disabled="user.history.length === 0"
class="back"
@click="back"
><i class="material-icons">arrow_back</i></a
>
<slot /><a v-tooltip.bottom="'Help'" class="help" @click="enableModalHelp"
<slot />
<a v-tooltip.bottom="'Help'" class="help" @click="enableModalHelp"
><i class="material-icons">help_outline</i></a
>
<router-link
Expand All @@ -24,7 +25,6 @@
<script>
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: `tool-bar`,
computed: {
...mapGetters([`user`, `lastPage`])
Expand All @@ -49,20 +49,23 @@ export default {
}
</script>
<style>
.tm-page-header-text {
padding-right: 1rem;
.tool-bar {
height: 100%;
display: flex;
justify-content: center;
align-items: center;
}

.tm-page-header-text i {
padding: 1rem;
.tool-bar a {
padding-left: 0.5rem;
position: relative;
top: 1rem;
right: 1rem;
color: var(--dim);
}

.tm-page-header-text i:hover {
.tool-bar a:hover {
cursor: pointer;
}

.tm-page-header-text i:hover {
color: var(--bright);
}
</style>
Loading