From 6053ca6c0ee2246d36bb7ae8707c16386431ae73 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 7 Nov 2021 15:38:17 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=80=D0=B5=D0=B4=D0=B8=D1=80=D0=B5=D0=BA=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2=20=D1=80=D0=BE=D1=83=D1=82=D0=B5=D1=80=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/CardIndex/CardIndex.vue | 20 +++++++++++++++++++-
 client/components/Reader/Reader.vue       |  9 +++++++++
 client/router.js                          |  2 +-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/client/components/CardIndex/CardIndex.vue b/client/components/CardIndex/CardIndex.vue
index 9e85a749..5bbcfd18 100644
--- a/client/components/CardIndex/CardIndex.vue
+++ b/client/components/CardIndex/CardIndex.vue
@@ -1,6 +1,5 @@
 <template>
     <div>
-
         <router-view v-slot="{ Component }">
             <keep-alive>
                 <component :is="Component" />
@@ -38,6 +37,17 @@ class CardIndex {
     _options = componentOptions;
     selectedTab = null;
 
+    created() {
+        this.$watch(
+            () => this.$route.path,
+            (newValue) => {
+                if (newValue == '/cardindex' && this.isReader) {
+                    this.$router.replace({ path: '/reader' });
+                }
+            }
+        )
+    }
+
     mounted() {
         this.setTabByRoute(this.curRoute);
     }
@@ -60,11 +70,19 @@ class CardIndex {
         }
     }
 
+    get mode() {
+        return this.$store.state.config.mode;
+    }
+
     get curRoute() {
         const m = this.$route.path.match(/^(\/[^/]*\/[^/]*).*$/i);
         return (m ? m[1] : this.$route.path);
     }
 
+    get isReader() {
+        return (this.mode !== null && (this.mode == 'reader' || this.mode == 'omnireader' || this.mode == 'liberama.top'));
+    }
+
 }
 
 export default vueComponent(CardIndex);
diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue
index 1774149f..4709b1a8 100644
--- a/client/components/Reader/Reader.vue
+++ b/client/components/Reader/Reader.vue
@@ -288,6 +288,15 @@ class Reader {
 
         this.lastActivePage = false;
 
+        this.$watch(
+            () => this.$route.path,
+            (newValue) => {
+                if (newValue == '/reader') {
+                    this.updateRoute();
+                }
+            }
+        );
+
         this.debouncedSetRecentBook = _.debounce(async(newValue) => {
             const recent = this.mostRecentBook();
             if (recent && (recent.bookPos != newValue || recent.bookPosSeen !== this.bookPosSeen)) {
diff --git a/client/router.js b/client/router.js
index 95acbbee..0f89c1d2 100644
--- a/client/router.js
+++ b/client/router.js
@@ -35,7 +35,7 @@ const myRoutes = [
     ['/settings', Settings],
     ['/help', Help],
     ['/404', NotFound404],
-    ['/(.*)', null, null, '/cardindex'],
+    ['/:pathMatch(.*)*', null, null, '/cardindex'],
 ];
 
 let routes = {};