Merge pull request #1029 from h3poteto/iss-1027

closes #1027 Block to root path when user use brower-back

src/renderer/components/Authorize.vue

@@ -4,8 +4,7 @@
       <el-header>
         <el-row>
           <el-col :span="24" class="close">
-          <el-button type="text" icon="el-icon-close" @click="close" class="close-button">
+            <el-button type="text" icon="el-icon-close" @click="close" class="close-button"> </el-button>
-          </el-button>
           </el-col>
         </el-row>
       </el-header>
@@ -15,7 +14,14 @@
           <p>{{ $t('authorize.manually_2') }}</p>
           <p class="url">{{ $route.query.url }}</p>
         </div>
-      <el-form ref="form" :model="authorizeForm" label-width="120px" label-position="top" class="authorize-form" v-on:submit.prevent="authorizeSubmit">
+        <el-form
+          ref="form"
+          :model="authorizeForm"
+          label-width="120px"
+          label-position="top"
+          class="authorize-form"
+          v-on:submit.prevent="authorizeSubmit"
+        >
           <el-form-item :label="$t('authorize.code_label')">
             <el-input v-model="authorizeForm.code"></el-input>
           </el-form-item>
@@ -24,11 +30,7 @@
             <el-input></el-input>
           </el-form-item>
           <el-form-item class="submit">
-          <el-button
+            <el-button type="primary" @click="authorizeSubmit" v-loading="submitting" element-loading-background="rgba(0, 0, 0, 0.8)">
-            type="primary"
-            @click="authorizeSubmit"
-            v-loading="submitting"
-            element-loading-background="rgba(0, 0, 0, 0.8)">
               {{ $t('authorize.submit') }}
             </el-button>
           </el-form-item>
@@ -61,14 +63,15 @@ export default {
   methods: {
     authorizeSubmit() {
       this.submitting = true
-      this.$store.dispatch('Authorize/submit', this.authorizeForm.code)
+      this.$store
+        .dispatch('Authorize/submit', this.authorizeForm.code)
         .finally(() => {
           this.submitting = false
         })
-        .then((id) => {
+        .then(id => {
           this.$router.push({ path: `/${id}/home` })
         })
-        .catch((err) => {
+        .catch(err => {
           if (err.name === 'DuplicateRecordError') {
             this.$message({
               message: this.$t('message.authorize_duplicate_error'),
@@ -83,7 +86,7 @@ export default {
         })
     },
     close() {
-      return this.$router.push({ path: '/' })
+      return this.$router.push({ path: '/', query: { redirect: 'home' } })
     }
   }
 }

src/renderer/components/Login.vue

@@ -3,8 +3,7 @@
     <el-header>
       <el-row>
         <el-col :span="24" class="close">
-        <el-button type="text" icon="el-icon-close" @click="close" class="close-button">
+          <el-button type="text" icon="el-icon-close" @click="close" class="close-button"> </el-button>
-        </el-button>
         </el-col>
       </el-row>
     </el-header>
@@ -30,7 +29,7 @@ export default {
   methods: {
     close() {
       this.$store.dispatch('Login/pageBack')
-      return this.$router.push({ path: '/' })
+      return this.$router.push({ path: '/', query: { redirect: 'home' } })
     }
   }
 }

src/renderer/components/Preferences.vue

@@ -18,7 +18,8 @@
           class="setting-menu"
           :text-color="primaryColor"
           :background-color="backgroundColor"
-          :router="true">
+          :router="true"
+        >
           <el-menu-item index="/preferences/general">
             <icon name="cog" class="icon" scale="1.3"></icon>
             <span>{{ $t('preferences.general.title') }}</span>
@@ -61,7 +62,7 @@ export default {
   },
   methods: {
     close() {
-      this.$router.push('/')
+      this.$router.push({ path: '/', query: { redirect: 'home' } })
     },
     activeRoute() {
       return this.$route.path

src/renderer/store/GlobalHeader.ts

@@ -46,6 +46,13 @@ const actions: ActionTree<GlobalHeaderState, RootState> = {
       console.error(err)
     }
     const accounts = await dispatch('listAccounts')
+    // Block to root path when user use browser-back, like mouse button.
+    // Because any contents are not rendered when browser back to / from home.
+    router.beforeEach((to, from, next) => {
+      if (!(to.fullPath === '/' && from.name)) {
+        return next()
+      }
+    })
     return accounts
   },
   startStreamings: async ({ dispatch }) => {