luniehq · jbibla · Dec 21, 2017 · Dec 15, 2017 · Dec 18, 2017 · Dec 18, 2017
@@ -7,7 +7,7 @@ jobs:
   build:
     docker:
       # specify the version you desire here
-      - image: circleci/node:8.0.0-browsers
+      - image: circleci/node:8.9.3-browsers
 
     working_directory: ~/repo
 
@@ -42,6 +42,5 @@ jobs:
           key: v1-dependencies-app-{{ checksum "app/package.json" }}
 
       - run: yarn lint
-      # - run: npm run pack
-      - run: xvfb-run -e /dev/stdout -a npm run test
+      - run: yarn run test
       - run: codeclimate-test-reporter < test/unit/coverage/lcov.info
@@ -295,15 +295,17 @@ function setupLogging (root) {
   }
 }
 
-process.on('exit', shutdown)
-process.on('uncaughtException', function (err) {
-  logError('[Uncaught Exception]', err)
-  setTimeout(async () => {
-    await shutdown()
-    process.exit(1)
-  }, 200)
-  setTimeout(shutdown, 200)
-})
+if (!TEST) {
+  process.on('exit', shutdown)
+  process.on('uncaughtException', function (err) {
+    logError('[Uncaught Exception]', err)
+    setTimeout(async () => {
+      await shutdown()
+      process.exit(1)
+    }, 200)
+    setTimeout(shutdown, 200)
+  })
+}
 
 function consistentConfigDir (versionPath, genesisPath, configPath) {
   return exists(genesisPath) && exists(versionPath) && exists(configPath)

@@ -1,23 +1,27 @@
 <template lang="pug">
 #app
   app-header
-  #app-content: router-view
+  #app-content
+    router-view
+    app-footer
   notifications(:notifications='notifications' theme='cosmos')
   modal-help
   session
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import AppHeader from './components/common/AppHeader'
+import AppHeader from 'common/AppHeader'
+import AppFooter from 'common/AppFooter'
 import Notifications from '@nylira/vue-notifications'
-import ModalHelp from './components/common/NiModalHelp'
-import Session from './components/common/NiSession'
+import ModalHelp from 'common/NiModalHelp'
+import Session from 'common/NiSession'
 import store from './vuex/store'
 export default {
   name: 'app',
   components: {
     AppHeader,
+    AppFooter,
     ModalHelp,
     Notifications,
     Session

@@ -1,79 +1,56 @@
 <template lang="pug">
+mixin ni-li-thumb
+  .ni-li-thumb
+    template(v-if='icon'): i.material-icons {{ icon }}
+    template(v-else-if='image'): img(:src='image')
+    template(v-else-if="$slots['graphic']"): slot(name='graphic')
+mixin ni-li-dl
+  .ni-li-dl
+    .ni-li-dt {{ dt }}
+    .ni-li-dd.ni-li-dd-flush(v-if="$slots['dd']"): slot(name='dd')
+    .ni-li-dd(v-else) {{ dd }}
+mixin ni-li-icon
+  .ni-li-icon
+    i.material-icons.inactive chevron_right
+    i.material-icons.active my_location
+mixin ni-li-label
+  .ni-li-label
+    .ni-li-title {{ title }}
+    .ni-li-subtitle {{ subtitle }}
 transition(name="proposal")
   // dt/dd anchor
   a.ni-li.ni-li-link(v-if='dt && href' :href="href"): .ni-li-container
-    .ni-li-thumb
-      template(v-if='icon'): i.material-icons {{ icon }}
-      template(v-else-if='image'): img(:src='image')
-      template(v-else-if="$slots['graphic']"): slot(name='graphic')
-    .ni-li-dl
-      .ni-li-dt {{ dt }}
-      .ni-li-dd.ni-li-dd-flush(v-if="$slots['dd']"): slot(name='dd')
-      .ni-li-dd(v-else) {{ dd }}
-    .ni-li-icon
-      i.material-icons.inactive chevron_right
-      i.material-icons.active my_location
+    +ni-li-thumb
+    +ni-li-dl
+    +ni-li-icon
 
   // dt/dd router-link
   router-link.ni-li.ni-li-link(v-else-if='dt && to' :to="to"): .ni-li-container
-    .ni-li-thumb
-      template(v-if='icon'): i.material-icons {{ icon }}
-      template(v-else-if='image'): img(:src='image')
-      template(v-else-if="$slots['graphic']"): slot(name='graphic')
-    .ni-li-dl
-      .ni-li-dt {{ dt }}
-      .ni-li-dd.ni-li-dd-flush(v-if="$slots['dd']"): slot(name='dd')
-      .ni-li-dd(v-else) {{ dd }}
-    .ni-li-icon
-      i.material-icons.inactive chevron_right
-      i.material-icons.active my_location
+    +ni-li-thumb
+    +ni-li-dl
+    +ni-li-icon
 
   // dt/dd text
   .ni-li(v-else-if='dt'): .ni-li-container
-    .ni-li-thumb
-      template(v-if='icon'): i.material-icons {{ icon }}
-      template(v-else-if='image'): img(:src='image')
-      template(v-else-if="$slots['graphic']"): slot(name='graphic')
-    .ni-li-dl
-      .ni-li-dt {{ dt }}
-      .ni-li-dd.ni-li-dd-flush(v-if="$slots['dd']"): slot(name='dd')
-      .ni-li-dd(v-else) {{ dd }}
+    +ni-li-thumb
+    +ni-li-dl
 
   // title/subtitle anchor
   a.ni-li.ni-li-link(v-else-if="href" :href="href"): .ni-li-container
-    .ni-li-thumb
-      template(v-if='icon'): i.material-icons {{ icon }}
-      template(v-else-if='image'): img(:src='image')
-      template(v-else-if="$slots['graphic']"): slot(name='graphic')
-    .ni-li-label
-      .ni-li-title {{ title }}
-      .ni-li-subtitle {{ subtitle }}
-    .ni-li-icon
-      i.material-icons.inactive chevron_right
-      i.material-icons.active my_location
+    +ni-li-thumb
+    +ni-li-label
+    +ni-li-icon
 
   // title/subtitle router-link
   router-link.ni-li.ni-li-link(v-else-if="to" :to='to'): .ni-li-container
-    .ni-li-thumb
-      template(v-if='icon'): i.material-icons {{ icon }}
-      template(v-else-if='image'): img(:src='image')
-      template(v-else-if="$slots['graphic']"): slot(name='graphic')
-    .ni-li-label
-      .ni-li-title {{ title }}
-      .ni-li-subtitle {{ subtitle }}
-    .ni-li-icon
-      i.material-icons.inactive chevron_right
-      i.material-icons.active my_location
+    +ni-li-thumb
+    +ni-li-label
+    +ni-li-icon
 
   // title/subtitle text
   .ni-li(v-else-if='title'): .ni-li-container
-    .ni-li-thumb
-      template(v-if='icon'): i.material-icons {{ icon }}
-      template(v-else-if='image'): img(:src='image')
-      template(v-else-if="$slots['graphic']"): slot(name='graphic')
-    .ni-li-label
-      .ni-li-title {{ title }}
-      .ni-li-subtitle {{ subtitle }}
+    +ni-li-thumb
+    +ni-li-label
 
   // image
   .ni-li(v-else-if="type === 'image'"): .ni-li-container: slot

@@ -6,7 +6,7 @@ div(:class='cssClass' @click="close()")
         i.material-icons {{ icon }}
       .ni-modal-title
         slot(name='title')
-      .ni-modal-icon.ni-modal-close(@click="close(data)")
+      .ni-modal-icon.ni-modal-close(@click="close()")
         i.material-icons close
     main.ni-modal-main
       slot

@@ -1,5 +1,5 @@
 <template lang='pug'>
-.ni-modal-search: .ni-modal-search-container
+.ni-modal-search(v-if="open"): .ni-modal-search-container
   field.mousetrap(type="text" placeholder="Search..." v-model="query")
   btn(icon="close" @click.native="close")
 </template>
@@ -16,6 +16,9 @@ export default {
   },
   computed: {
     ...mapGetters(['filters']),
+    open () {
+      return this.filters[this.type].search.visible
+    },
     query: {
       get () {
         return this.filters[this.type].search.query
@@ -30,9 +33,13 @@ export default {
       this.$store.commit('setSearchVisible', [this.type, false])
     }
   },
-  mounted () {
-    let el = this.$el.querySelector('.ni-field')
-    el.select()
+  watch: {
+    open (open) {
+      if (open) {
+        let el = this.$el.querySelector('.ni-field')
+        el.select()
+      }
+    }
   },
   props: ['type']
 }

@@ -5,31 +5,27 @@
     div(slot='subtitle') {{ subtitle }}
     div(slot="menu"): slot(name="menu")
   main.ni-page-main: slot
-  app-footer
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import PerfectScrollbar from 'perfect-scrollbar'
 import PageHeader from 'common/NiPageHeader'
-import AppFooter from 'common/AppFooter'
+import PageFooter from 'common/NiPageFooter'
 export default {
   name: 'ni-page',
   props: ['title', 'subtitle', 'icon'],
   components: {
     PageHeader,
-    AppFooter
+    PageFooter
   },
   computed: {
     ...mapGetters(['config'])
   },
   mounted () {
-    let ps
-    if (this.config.desktop) {
-      ps = new PerfectScrollbar('.ni-page-main')
-    } else {
-      ps.destroy()
-    }
+    const container = this.$el.querySelector('.ni-page-main')
+    // eslint-disable-next-line no-new
+    new PerfectScrollbar(container)
   }
 }
 </script>

@@ -12,8 +12,7 @@ header.ni-page-header
 
 <script>
 export default {
-  name: 'ni-page-header',
-  props: ['icon']
+  name: 'ni-page-header'
 }
 </script>
 

@@ -5,7 +5,7 @@ list-item.ni-li-user(
   to="/profile"
   @click.native="close"
   icon="face"
-  title="CosmosUser01")
+  :title="'Account ' + user.account")
 div(v-else-if="user.signedIn")
   list-item.ni-li-user(
     type="link"
@@ -36,10 +36,6 @@ export default {
       this.$store.commit('setActiveMenu', '')
       noScroll.off()
     },
-    openSettings () {
-      window.alert('TODO: open user settings')
-      this.close()
-    },
     openSession () {
       this.$store.commit('setModalSession', true)
       this.close()

@@ -1,8 +1,8 @@
 <template lang="pug">
 page(title='404 - Page Not Found')
   part(title='Try another page...')
+    list-item(to='/' title='Balance')
     list-item(to='/staking' title='Staking')
-    list-item(to='/signin' title='Sign In')
 </template>
 
 <script>

@@ -7,7 +7,7 @@ page(title='Proposals')
     a(@click='setSearch(true)')
       i.material-icons search
       .label Search
-  modal-search(v-if="filters.proposals.search.visible" type="proposals")
+  modal-search(type="proposals")
 
   data-empty(v-if="proposals.length === 0")
   data-empty-search(v-else-if="filteredProposals.length === 0")

@@ -4,7 +4,7 @@ page(title='Validators')
     a(@click='setSearch(true)')
       i.material-icons search
       .label Search
-  modal-search(v-if="filters.validators.search.visible" type="validators")
+  modal-search(type="validators")
 
   data-empty(v-if="validators.length === 0")
   data-empty-search(v-else-if="filteredValidators.length === 0")

@@ -11,7 +11,7 @@ page(:title='pageTitle')
       i.material-icons check_circle
       .label Bond Atoms
 
-  modal-search(v-if="filters.delegates.search.visible" type="delegates")
+  modal-search(type="delegates")
 
   data-error(v-if="delegates.length === 0")
   data-empty-search(v-if="filteredDelegates.length === 0")

@@ -8,7 +8,7 @@ page(title='Balance')
       i.material-icons search
       .label Search
 
-  modal-search(v-if="filters.balances.search.visible" type="balances")
+  modal-search(type="balances")
 
   part(title='Your Address')
     li-copy(:value="wallet.key.address")

@@ -5,7 +5,7 @@ page(title='Transactions')
       i.material-icons search
       .label Search
 
-  modal-search(v-if="filters.transactions.search.visible" type="transactions")
+  modal-search(type="transactions")
 
   data-empty-tx(v-if='transactions.length === 0')
   data-empty-search(v-else-if="filteredTransactions.length === 0")

@@ -80,6 +80,8 @@ a
 
   #app-content
     flex 1
+    display flex
+    flex-flow column no-wrap
 
  .desktop-only
     display block
@@ -19,6 +19,9 @@ export default ({ commit, basecoin }) => {
     }
   }
   const mutations = {
+    setDevMode (state, value) {
+      state.devMode = value
+    },
     setModalHelp (state, value) {
       state.modals.help.active = value
     },

@@ -34,7 +34,7 @@ export default ({ commit, node }) => {
   }
 
   const actions = {
-    async showInitialScreen ({ dispatch }) {
+    async showInitialScreen ({ dispatch, commit }) {
       await dispatch('loadAccounts')
       let exists = state.accounts.length > 0
       let screen = exists ? 'sign-in' : 'welcome'

@@ -129,7 +129,7 @@ export default ({ commit, node }) => {
       done(null, args)
       dispatch('queryWalletBalances')
     },
-    async loadDenoms () {
+    async loadDenoms ({ state, commit }) {
       // read genesis.json to get default denoms
 
       // wait for genesis.json to exist