From 4fc32eafd7d925b9ba58b573ef2982eeb3a9309d Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Thu, 15 Dec 2022 16:46:20 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D1=8B=20?=
 =?UTF-8?q?=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D1=83?=
 =?UTF-8?q?=D0=B5=D0=BC=D1=8B=D0=B5=20=D0=BA=D0=BE=D0=BC=D0=BF=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BD=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                     | 12 +--
 client/components/CardIndex/Book/Book.vue     | 19 ----
 client/components/CardIndex/Card/Card.vue     | 19 ----
 client/components/CardIndex/CardIndex.vue     | 93 -------------------
 .../components/CardIndex/History/History.vue  | 19 ----
 client/components/CardIndex/Search/Search.vue | 19 ----
 client/components/Help/Help.vue               | 19 ----
 client/components/Income/Income.vue           | 19 ----
 client/components/NotFound404/NotFound404.vue | 19 ----
 client/components/Settings/Settings.vue       | 19 ----
 client/components/Sources/Sources.vue         | 19 ----
 client/router.js                              | 29 +-----
 12 files changed, 3 insertions(+), 302 deletions(-)
 delete mode 100644 client/components/CardIndex/Book/Book.vue
 delete mode 100644 client/components/CardIndex/Card/Card.vue
 delete mode 100644 client/components/CardIndex/CardIndex.vue
 delete mode 100644 client/components/CardIndex/History/History.vue
 delete mode 100644 client/components/CardIndex/Search/Search.vue
 delete mode 100644 client/components/Help/Help.vue
 delete mode 100644 client/components/Income/Income.vue
 delete mode 100644 client/components/NotFound404/NotFound404.vue
 delete mode 100644 client/components/Settings/Settings.vue
 delete mode 100644 client/components/Sources/Sources.vue

diff --git a/client/components/App.vue b/client/components/App.vue
index 04015123..a71f2f55 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -39,16 +39,6 @@ class App {
     _options = componentOptions;
     showPage = false;
 
-    itemRuText = {
-        '/cardindex': 'Картотека',
-        '/reader': 'Читалка',
-        '/forum': 'Форум-чат',
-        '/income': 'Поступления',
-        '/sources': 'Источники',
-        '/settings': 'Параметры',
-        '/help': 'Справка',
-    };
-
     created() {
         this.commit = this.$store.commit;
         this.state = this.$store.state;
@@ -202,7 +192,7 @@ class App {
             } else if (this.mode == 'omnireader') {
                 document.title = `Omni Reader - всегда с вами`;
             } else if (this.config && this.mode !== null) {
-                document.title = `${this.config.name} - ${this.itemRuText[this.rootRoute]}`;
+                document.title = `Универсальная читалка книг и ресурсов интернета`;
             }
         } else {
             document.title = title;
diff --git a/client/components/CardIndex/Book/Book.vue b/client/components/CardIndex/Book/Book.vue
deleted file mode 100644
index beef252c..00000000
--- a/client/components/CardIndex/Book/Book.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Book в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../../vueComponent.js';
-
-class Book {
-    created() {
-    }
-
-}
-
-export default vueComponent(Book);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/CardIndex/Card/Card.vue b/client/components/CardIndex/Card/Card.vue
deleted file mode 100644
index 6da789f0..00000000
--- a/client/components/CardIndex/Card/Card.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Card в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../../vueComponent.js';
-
-class Card {
-    created() {
-    }
-
-}
-
-export default vueComponent(Card);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/CardIndex/CardIndex.vue b/client/components/CardIndex/CardIndex.vue
deleted file mode 100644
index 4c525b0c..00000000
--- a/client/components/CardIndex/CardIndex.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-    <div>
-        <router-view v-slot="{ Component }">
-            <keep-alive>
-                <component :is="Component" />
-            </keep-alive>
-        </router-view>        
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../vueComponent.js';
-import _ from 'lodash';
-
-const selfRoute = '/cardindex';
-const tab2Route = [
-    '/cardindex/search',
-    '/cardindex/card',
-    '/cardindex/book',
-    '/cardindex/history',
-];
-let lastActiveTab = null;
-
-const componentOptions = {
-    watch: {
-        selectedTab: function(newValue) {
-            lastActiveTab = newValue;
-            this.setRouteByTab(newValue);
-        },
-        curRoute: function(newValue) {
-            this.setTabByRoute(newValue);
-        },
-    },
-};
-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);
-    }
-
-    setTabByRoute(route) {
-        const t = _.indexOf(tab2Route, route);
-        if (t >= 0) {
-            if (t !== this.selectedTab)
-                this.selectedTab = t.toString();
-        } else {
-            if (route == selfRoute && lastActiveTab !== null)
-                this.setRouteByTab(lastActiveTab);
-        }
-    }
-
-    setRouteByTab(tab) {
-        const t = Number(tab);
-        if (tab2Route[t] !== this.curRoute) {
-            this.$router.replace(tab2Route[t]);
-        }
-    }
-
-    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'));
-    }
-
-}
-
-export default vueComponent(CardIndex);
-//-----------------------------------------------------------------------------
-</script>
-
-<style scoped>
-</style>
\ No newline at end of file
diff --git a/client/components/CardIndex/History/History.vue b/client/components/CardIndex/History/History.vue
deleted file mode 100644
index 9950a8c3..00000000
--- a/client/components/CardIndex/History/History.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел History в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../../vueComponent.js';
-
-class History {
-    created() {
-    }
-
-}
-
-export default vueComponent(History);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/CardIndex/Search/Search.vue b/client/components/CardIndex/Search/Search.vue
deleted file mode 100644
index 1e5072c9..00000000
--- a/client/components/CardIndex/Search/Search.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Search в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../../vueComponent.js';
-
-class Search {
-    created() {
-    }
-
-}
-
-export default vueComponent(Search);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/Help/Help.vue b/client/components/Help/Help.vue
deleted file mode 100644
index de1da849..00000000
--- a/client/components/Help/Help.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Help в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../vueComponent.js';
-
-class Help {
-    created() {
-    }
-
-}
-
-export default vueComponent(Help);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/Income/Income.vue b/client/components/Income/Income.vue
deleted file mode 100644
index 737aeb59..00000000
--- a/client/components/Income/Income.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Income в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../vueComponent.js';
-
-class Income {
-    created() {
-    }
-
-}
-
-export default vueComponent(Income);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/NotFound404/NotFound404.vue b/client/components/NotFound404/NotFound404.vue
deleted file mode 100644
index 336348d1..00000000
--- a/client/components/NotFound404/NotFound404.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Страница не найдена
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../vueComponent.js';
-
-class NotFound404 {
-    created() {
-    }
-
-}
-
-export default vueComponent(NotFound404);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/Settings/Settings.vue b/client/components/Settings/Settings.vue
deleted file mode 100644
index ca842378..00000000
--- a/client/components/Settings/Settings.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Settings в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../vueComponent.js';
-
-class Settings {
-    created() {
-    }
-
-}
-
-export default vueComponent(Settings);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/components/Sources/Sources.vue b/client/components/Sources/Sources.vue
deleted file mode 100644
index f9758e56..00000000
--- a/client/components/Sources/Sources.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-<template>
-    <div>
-        Раздел Sources в разработке
-    </div>
-</template>
-
-<script>
-//-----------------------------------------------------------------------------
-import vueComponent from '../vueComponent.js';
-
-class Sources {
-    created() {
-    }
-
-}
-
-export default vueComponent(Sources);
-//-----------------------------------------------------------------------------
-</script>
diff --git a/client/router.js b/client/router.js
index 0f89c1d2..30fc949b 100644
--- a/client/router.js
+++ b/client/router.js
@@ -1,41 +1,16 @@
 import { createRouter, createWebHashHistory } from 'vue-router';
 import _ from 'lodash';
 
-const CardIndex = () => import('./components/CardIndex/CardIndex.vue');
-const Search = () => import('./components/CardIndex/Search/Search.vue');
-const Card = () => import('./components/CardIndex/Card/Card.vue');
-const Book = () => import('./components/CardIndex/Book/Book.vue');
-const History = () => import('./components/CardIndex/History/History.vue');
-
 //немедленная загрузка
 //import Reader from './components/Reader/Reader.vue';
 const Reader = () => import('./components/Reader/Reader.vue');
 const ExternalLibs = () => import('./components/ExternalLibs/ExternalLibs.vue');
 
-const Income = () => import('./components/Income/Income.vue');
-const Sources = () => import('./components/Sources/Sources.vue');
-const Settings = () => import('./components/Settings/Settings.vue');
-const Help = () => import('./components/Help/Help.vue');
-const NotFound404 = () => import('./components/NotFound404/NotFound404.vue');
-
 const myRoutes = [
-    ['/', null, null, '/cardindex'],
-    ['/cardindex', CardIndex],
-    ['/cardindex~search', Search],
-    ['/cardindex~card', Card],
-    ['/cardindex~card/:authorId', Card],
-    ['/cardindex~book', Book],
-    ['/cardindex~book/:bookId', Book],
-    ['/cardindex~history', History],
-
+    ['/', null, null, '/reader'],
     ['/reader', Reader],
     ['/external-libs', ExternalLibs],
-    ['/income', Income],
-    ['/sources', Sources],
-    ['/settings', Settings],
-    ['/help', Help],
-    ['/404', NotFound404],
-    ['/:pathMatch(.*)*', null, null, '/cardindex'],
+    ['/:pathMatch(.*)*', null, null, '/reader'],
 ];
 
 let routes = {};