fedekunze/1718 remove session pt 1

CHANGELOG.md

@@ -117,6 +117,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - [\#1846](https://github.com/cosmos/voyager/issues/1846) Allow node endpoints to be set from the URL @faboweb
 - [\#1221](https://github.com/cosmos/voyager/issues/1221) individual linter check on GitHub @faboweb
 - [\#1922](https://github.com/cosmos/voyager/issues/1922) removed font awesome @jbibla
+- [\#1916](https://github.com/cosmos/voyager/pull/1916) redirect to session modal when user hasn't logged in @fedekunze
 
 ### Fixed
 

app/src/renderer/components/common/AppMenu.vue

@@ -26,7 +26,8 @@
       <router-link
         id="app-menu__staking"
         class="app-menu-item"
-        to="/staking"
+        to="/staking/validators/"
+        exact="exact"
         title="Staking"
         @click.native="close"
       >

app/src/renderer/components/common/TmBalance.vue

@@ -4,16 +4,19 @@
       <div class="icon-container">
         <img class="icon" src="~assets/images/cosmos-logo.png" />
       </div>
-      <div class="total-atoms top-section">
+      <div v-if="user.signedIn" class="total-atoms top-section">
         <h3>Total {{ bondDenom }}</h3>
         <h2 class="total-atoms__value">{{ num.shortNumber(totalAtoms) }}</h2>
       </div>
-      <div v-if="unbondedAtoms" class="unbonded-atoms top-section">
+      <div
+        v-if="unbondedAtoms && user.signedIn"
+        class="unbonded-atoms top-section"
+      >
         <h3>Available {{ bondDenom }}</h3>
         <h2>{{ unbondedAtoms }}</h2>
       </div>
     </div>
-    <short-bech32 :address="user.address || ''" />
+    <short-bech32 v-if="user.signedIn" :address="user.address || ''" />
     <div class="tabs">
       <div
         v-for="tab in tabs"

app/src/renderer/components/common/ToolBar.vue

@@ -1,13 +1,5 @@
 <template>
   <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>
     <a
       v-tooltip.bottom="'Refresh'"
       v-if="!!refresh"
@@ -32,7 +24,7 @@
     </a>
     <router-link
       v-tooltip.bottom="'Preferences'"
-      v-if="config.devMode"
+      v-if="config.devMode && user.signedIn"
       id="settings"
       to="/preferences"
     >
@@ -45,7 +37,7 @@
 </template>
 
 <script>
-import { mapGetters, mapMutations } from "vuex"
+import { mapGetters } from "vuex"
 export default {
   name: `tool-bar`,
   props: {
@@ -59,7 +51,7 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([`user`, `lastPage`, `config`]),
+    ...mapGetters([`user`, `config`]),
     searchEnabled() {
       return !!this.searching
     },
@@ -71,15 +63,6 @@ export default {
     }
   },
   methods: {
-    ...mapMutations([`pauseHistory`, `popHistory`]),
-    back() {
-      if (!this.lastPage) return
-      this.pauseHistory(true)
-      this.$router.push(this.lastPage, () => {
-        this.popHistory()
-        this.pauseHistory(false)
-      })
-    },
     enableModalHelp() {
       this.$store.commit(`setModalHelp`, true)
     },

app/src/renderer/components/governance/PageGovernance.vue

@@ -51,7 +51,13 @@ export default {
     ]
   }),
   computed: {
-    ...mapGetters([`proposals`, `filters`, `depositDenom`, `connected`]),
+    ...mapGetters([
+      `proposals`,
+      `filters`,
+      `depositDenom`,
+      `connected`,
+      `user`
+    ]),
     proposalList() {
       return Object.values(this.proposals.proposals)
     }
@@ -61,7 +67,11 @@ export default {
   },
   methods: {
     onPropose() {
-      this.$refs.modalPropose.open()
+      if (this.user.signedIn) {
+        this.$refs.modalPropose.open()
+      } else {
+        this.$store.commit(`setModalSession`, true)
+      }
     }
   }
 }

app/src/renderer/components/governance/PageProposal.vue

@@ -177,7 +177,8 @@ export default {
       `connected`,
       `wallet`,
       `votes`,
-      `config`
+      `config`,
+      `user`
     ]),
     proposal() {
       return this.proposals.proposals[this.proposalId]
@@ -250,15 +251,23 @@ export default {
   },
   methods: {
     async onVote() {
-      this.$refs.modalVote.open()
-      // The error is already handled with notifyError in votes.js
-      await this.$store.dispatch(`getProposalVotes`, this.proposalId)
-      this.lastVote =
-        this.votes[this.proposalId] &&
-        this.votes[this.proposalId].find(e => e.voter === this.wallet.address)
+      if (this.user.signedIn) {
+        this.$refs.modalVote.open()
+        // The error is already handled with notifyError in votes.js
+        await this.$store.dispatch(`getProposalVotes`, this.proposalId)
+        this.lastVote =
+          this.votes[this.proposalId] &&
+          this.votes[this.proposalId].find(e => e.voter === this.wallet.address)
+      } else {
+        this.$store.commit(`setModalSession`, true)
+      }
     },
     onDeposit() {
-      this.$refs.modalDeposit.open()
+      if (this.user.signedIn) {
+        this.$refs.modalDeposit.open()
+      } else {
+        this.$store.commit(`setModalSession`, true)
+      }
     }
   }
 }

app/src/renderer/components/staking/PageStaking.vue

@@ -19,10 +19,6 @@ export default {
   data: () => ({
     query: ``,
     tabs: [
-      {
-        displayName: `My Delegations`,
-        pathName: `My Delegations`
-      },
       {
         displayName: `Validators`,
         pathName: `Validators`
@@ -34,7 +30,15 @@ export default {
     ]
   }),
   computed: {
-    ...mapGetters([`connected`, `delegates`, `filters`])
+    ...mapGetters([`connected`, `delegates`, `filters`, `user`])
+  },
+  mounted() {
+    if (this.user.signedIn) {
+      this.tabs.unshift({
+        displayName: `My Delegations`,
+        pathName: `My Delegations`
+      })
+    }
   },
   methods: {
     ...mapActions([`updateDelegates`])

app/src/renderer/components/staking/PageValidator.vue

@@ -231,6 +231,7 @@ export default {
       `config`,
       `keybase`,
       `liquidAtoms`,
+      `user`,
       `wallet`,
       `connected`
     ]),
@@ -315,19 +316,27 @@ export default {
       this.showCannotModal = false
     },
     onDelegation() {
-      this.action = `delegate`
-      if (this.liquidAtoms > 0) {
-        this.$refs.delegationModal.open()
+      if (this.user.signedIn) {
+        this.action = `delegate`
+        if (this.liquidAtoms > 0) {
+          this.$refs.delegationModal.open()
+        } else {
+          this.showCannotModal = true
+        }
       } else {
-        this.showCannotModal = true
+        this.$store.commit(`setModalSession`, true)
       }
     },
     onUndelegation() {
-      this.action = `undelegate`
-      if (this.myBond.isGreaterThan(0)) {
-        this.$refs.undelegationModal.open()
+      if (this.user.signedIn) {
+        this.action = `undelegate`
+        if (this.myBond.isGreaterThan(0)) {
+          this.$refs.undelegationModal.open()
+        } else {
+          this.showCannotModal = true
+        }
       } else {
-        this.showCannotModal = true
+        this.$store.commit(`setModalSession`, true)
       }
     },
     delegationTargetOptions() {

app/src/renderer/components/staking/TableValidators.vue

@@ -170,9 +170,6 @@ export default {
   async mounted() {
     Mousetrap.bind([`command+f`, `ctrl+f`], () => this.setSearch(true))
     Mousetrap.bind(`esc`, () => this.setSearch(false))
-
-    // XXX temporary because querying the shares shows old shares after bonding
-    // this.updateDelegates()
   },
   methods: {
     updateDelegates() {

app/src/renderer/main.js

@@ -110,8 +110,21 @@ async function _startApp(
   })
 
   router.beforeEach((to, from, next) => {
-    if (from.fullPath !== to.fullPath && !store.getters.user.pauseHistory)
+    if (from.fullPath !== to.fullPath && !store.getters.user.pauseHistory) {
       store.commit(`addHistory`, from.fullPath)
+    }
+    // redirect to session page if auth required
+    if (
+      [
+        `/staking/my-delegationg`,
+        `/wallet`,
+        `/wallet/send/:denom?`,
+        `/transactions`
+      ].includes(to.path) &&
+      !store.state.user.signedIn
+    ) {
+      store.commit(`setModalSession`, true)
+    }
     next()
   })
 

app/src/renderer/routes.js

@@ -40,7 +40,8 @@ export default [
       {
         path: `my-delegations`,
         name: `My Delegations`,
-        component: require(`./components/staking/TabMyDelegations`).default
+        component: require(`./components/staking/TabMyDelegations`).default,
+        meta: { requiresAuth: true }
       },
       {
         path: `validators`,
@@ -67,18 +68,21 @@ export default [
   {
     path: `/`,
     name: `wallet`,
-    component: require(`./components/wallet/PageWallet`).default
+    component: require(`./components/wallet/PageWallet`).default,
+    meta: { requiresAuth: true }
   },
   {
     path: `/wallet/send/:denom?`,
     name: `send`,
     props: true,
-    component: require(`./components/wallet/SendModal`).default
+    component: require(`./components/wallet/SendModal`).default,
+    meta: { requiresAuth: true }
   },
   {
     path: `/transactions`,
     name: `transactions`,
-    component: require(`./components/wallet/PageTransactions`).default
+    component: require(`./components/wallet/PageTransactions`).default,
+    meta: { requiresAuth: true }
   },
   {
     path: `/network`,

app/src/renderer/vuex/modules/connection.js

@@ -63,7 +63,7 @@ export default function({ node }) {
         }, 1000)
       }
     },
-    async rpcSubscribe({ commit, dispatch }) {
+    async rpcSubscribe({ commit, dispatch, rootState }) {
       const { node } = state.externals
       if (state.stopConnecting) return
 
@@ -103,8 +103,9 @@ export default function({ node }) {
           dispatch(`setLastHeader`, header)
         }
       )
-
-      dispatch(`walletSubscribe`)
+      if (rootState.user.signedIn) {
+        dispatch(`walletSubscribe`)
+      }
       dispatch(`checkNodeHalted`)
       dispatch(`pollRPCConnection`)
     },

app/src/renderer/vuex/modules/delegation.js

@@ -57,8 +57,8 @@ export default ({ node }) => {
     }
   }
   const actions = {
-    reconnected({ state, dispatch }) {
-      if (state.loading) {
+    reconnected({ state, dispatch, rootState }) {
+      if (state.loading && rootState.user.signedIn) {
         dispatch(`getBondedDelegates`)
       }
     },

app/src/renderer/vuex/modules/transactions.js

@@ -46,8 +46,9 @@ export default ({ node }) => {
       // clear previous account state
       rootState.transactions = JSON.parse(JSON.stringify(emptyState))
     },
-    async reconnected({ state, dispatch }) {
-      if (state.loading) {
+    async reconnected({ state, dispatch, rootState }) {
+      // TODO: remove signedIn check when we support the option for setting a custom address for txs page
+      if (state.loading && rootState.user.signedIn) {
         await dispatch(`getAllTxs`)
       }
     },

app/src/renderer/vuex/modules/user.js

@@ -71,13 +71,9 @@ export default ({}) => {
     },
     async showInitialScreen({ state, dispatch, commit }) {
       dispatch(`resetSessionData`)
-
       await dispatch(`loadAccounts`)
       commit(`setModalSessionState`, `welcome`)
-
-      state.externals.track(`pageview`, {
-        dl: `/session/welcome`
-      })
+      state.externals.track(`pageview`, { dl: `/` })
     },
     async loadAccounts({ commit, state }) {
       state.loading = true

app/src/renderer/vuex/modules/wallet.js

@@ -42,8 +42,8 @@ export default ({ node }) => {
   }
 
   const actions = {
-    async reconnected({ state, dispatch }) {
-      if (state.loading && state.address) {
+    async reconnected({ rootState, state, dispatch }) {
+      if (state.loading && state.address && rootState.user.signedIn) {
         await dispatch(`queryWalletBalances`)
       }
     },