Merge pull request #549 from cosmos/jordan/464-sorts

Jordan/464 sorts
luniehq · Mar 12, 2018 · 2358981 · 2358981
2 parents 69de2d8 + 56e48d2
commit 2358981
Show file tree

Hide file tree

Showing 8 changed files with 1,506 additions and 30 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -21,7 +21,7 @@ module.exports = {
     'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
     // unify spacing in objects
     'object-curly-spacing': ["error", "always"],
-    'object-curly-newline': ["error", { 
+    'object-curly-newline': ["error", {
       "ObjectExpression": { "multiline": true, "minProperties": 3 },
       "ImportDeclaration": "never"
     }]

diff --git a/app/src/renderer/components/staking/LiDelegate.vue b/app/src/renderer/components/staking/LiDelegate.vue
@@ -7,12 +7,12 @@
   .li-delegate__value.number_of_votes.num.bar
     span {{ num.prettyInt(delegate.voting_power) }}
     .bar(:style='vpStyles')
-  .li-delegate__value.bonded_by_you
-    span {{ bondedByYou }}
+  .li-delegate__value.your-votes
+    span {{ yourVotes }}
   .li-delegate__value.status
     span {{ delegateType }}
   template(v-if="userCanDelegate")
-    .li-delegate__value.checkbox(v-if="bondedByYou > 0")
+    .li-delegate__value.checkbox(v-if="yourVotes > 0")
       i.material-icons lock
     .li-delegate__value.checkbox#remove-from-cart(v-else-if="inCart" @click='rm(delegate)')
       i.material-icons check_box
@@ -33,12 +33,15 @@ export default {
   components: { Btn },
   computed: {
     ...mapGetters(['shoppingCart', 'delegates', 'config', 'committedDelegations', 'user']),
-    bondedByYou () {
-      return this.num.prettyInt(this.committedDelegations[this.delegate.id])
+    yourVotes () {
+      let yourVotes = this.num.prettyInt(this.committedDelegations[this.delegate.id])
+      this.delegate.your_votes = yourVotes
+
+      return yourVotes
     },
     styles () {
       let value = ''
-      if (this.inCart || this.bondedByYou > 0) value += 'li-delegate-active '
+      if (this.inCart || this.yourVotes > 0) value += 'li-delegate-active '
       if (this.delegate.isValidator) value += 'li-delegate-validator '
       return value
     },
@@ -84,7 +87,7 @@ export default {
     }
   },
   watch: {
-    bondedByYou (newVal, oldVal) {
+    yourVotes (newVal, oldVal) {
       if (newVal > 0) {
         this.$store.commit('addToCart', this.delegate)
       }

diff --git a/app/src/renderer/components/staking/PageDelegates.vue b/app/src/renderer/components/staking/PageDelegates.vue
@@ -29,7 +29,7 @@ page(title='Validators and Candidates')
 
 <script>
 import { mapGetters } from 'vuex'
-import { includes, orderBy } from 'lodash'
+import { includes, orderBy, forEach } from 'lodash'
 import Mousetrap from 'mousetrap'
 import LiDelegate from 'staking/LiDelegate'
 import Btn from '@nylira/vue-button'
@@ -64,11 +64,16 @@ export default {
     },
     filteredDelegates () {
       let query = this.filters.delegates.search.query
-      let list = orderBy(this.delegates.delegates, [this.sort.property], [this.sort.order])
+
+      forEach(this.delegates.delegates, function (v) {
+        v.small_moniker = v.moniker.toLowerCase()
+      })
+      let delegates = orderBy(this.delegates.delegates, [this.sort.property], [this.sort.order])
+
       if (this.filters.delegates.search.visible) {
-        return list.filter(i => includes(JSON.stringify(i).toLowerCase(), query.toLowerCase()))
+        return delegates.filter(i => includes(JSON.stringify(i).toLowerCase(), query.toLowerCase()))
       } else {
-        return list
+        return delegates
       }
     },
     userCanDelegate () {
@@ -82,22 +87,22 @@ export default {
       order: 'desc',
       properties: [
         {
-          title: 'Name', value: 'description.moniker', class: 'name'
+          title: 'Name', value: 'small_moniker', class: 'name'
         },
         {
           title: '% of Vote', value: 'shares', class: 'percent_of_vote'
         },
         {
-          title: 'Total Votes', value: 'voting_power', class: 'number_of_votes'
+          title: 'Total Votes', value: 'voting_power', class: 'voting_power'
         },
         {
-          title: 'Your Votes', value: 'bonded', class: 'bonded_by_you'
+          title: 'Your Votes', value: 'your_votes', class: 'your-votes'
         },
         {
-          title: 'Status', value: 'status', class: 'status'
+          title: 'Status', value: 'isValidator', class: 'status'
         },
         {
-          title: '', value: '', class: 'action'
+          title: '', value: '', class: 'action hidden'
         }
       ]
     }

diff --git a/app/src/renderer/components/staking/PanelSort.vue b/app/src/renderer/components/staking/PanelSort.vue
@@ -89,6 +89,9 @@ export default {
   &.action
     flex 0.5
 
+  &.hidden
+    visibility hidden
+
 @media screen and (max-width: 768px)
   .sort-by
     &.id