From 589e3480dd488836d219297e382a7e490d87ef0c Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Wed, 2 Jan 2019 18:21:52 +0700
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D1=80=D0=B0=D0=B1=D0=BE=D1=82?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83=D1=82=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/components/App.vue                     | 30 +++++++++++--------
 client/components/NotFound404/NotFound404.vue | 20 +++++++++++++
 client/router.js                              |  2 ++
 3 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 client/components/NotFound404/NotFound404.vue

diff --git a/client/components/App.vue b/client/components/App.vue
index 999f1ac8..59b3d77d 100644
--- a/client/components/App.vue
+++ b/client/components/App.vue
@@ -3,32 +3,32 @@
         <el-aside :width="asideWidth">
             <div class="app-name"><span v-html="appName"></span></div>
             <el-button class="el-button-collapse" @click="toggleCollapse" :icon="buttonCollapseIcon"></el-button>
-            <el-menu class="el-menu-vertical" @select="handleSelect" :collapse="isCollapse" router>
-              <el-menu-item index="cardindex">
+            <el-menu class="el-menu-vertical" :default-active="rootRoute" :collapse="isCollapse" router>
+              <el-menu-item index="/cardindex">
                 <i class="el-icon-search"></i>
-                <span slot="title">Картотека</span>
+                <span style="font-weight: bold" slot="title">Картотека</span>
               </el-menu-item>
-              <el-menu-item index="reader">
+              <el-menu-item index="/reader">
                 <i class="el-icon-tickets"></i>
                 <span slot="title">Читалка</span>
               </el-menu-item>
-              <el-menu-item index="forum" disabled>
+              <el-menu-item index="/forum" disabled>
                 <i class="el-icon-message"></i>
                 <span slot="title">Форум-чат</span>
               </el-menu-item>
-              <el-menu-item index="income">
+              <el-menu-item index="/income">
                 <i class="el-icon-upload"></i>
                 <span slot="title">Поступления</span>
               </el-menu-item>
-              <el-menu-item index="sources">
+              <el-menu-item index="/sources">
                 <i class="el-icon-menu"></i>
                 <span slot="title">Источники</span>
               </el-menu-item>
-              <el-menu-item index="settings">
+              <el-menu-item index="/settings">
                 <i class="el-icon-setting"></i>
                 <span slot="title">Параметры</span>
               </el-menu-item>
-              <el-menu-item index="help">
+              <el-menu-item index="/help">
                 <i class="el-icon-question"></i>
                 <span slot="title">Справка</span>
               </el-menu-item>
@@ -70,10 +70,6 @@ class App extends Vue {
         });
     }
 
-    handleSelect(key, keyPath) {
-        console.log(key, keyPath);
-    }
-
     toggleCollapse() {
         this.commit('uistate/setAsideBarCollapse', !this.uistate.asideBarCollapse);
     }
@@ -108,6 +104,14 @@ class App extends Vue {
     get apiError() {
         return this.state.apiError;
     }
+
+    get rootRoute() {
+        const m = this.$route.path.match(/^(\/[^\/]*).*$/i);
+        if (m) 
+            return m[1];
+        else
+            return this.$route.path;
+    }
 }
 //-----------------------------------------------------------------------------
 </script>
diff --git a/client/components/NotFound404/NotFound404.vue b/client/components/NotFound404/NotFound404.vue
new file mode 100644
index 00000000..3ba5df9c
--- /dev/null
+++ b/client/components/NotFound404/NotFound404.vue
@@ -0,0 +1,20 @@
+<template>
+    <el-container>
+        Страница не найдена
+    </el-container>
+</template>
+
+<script>
+//-----------------------------------------------------------------------------
+import Vue from 'vue';
+import Component from 'vue-class-component';
+
+export default @Component({
+})
+class NotFound404 extends Vue {
+    created() {
+    }
+
+}
+//-----------------------------------------------------------------------------
+</script>
diff --git a/client/router.js b/client/router.js
index 29aae2be..7f7c167d 100644
--- a/client/router.js
+++ b/client/router.js
@@ -8,6 +8,7 @@ import Income from './components/Income/Income.vue';
 import Sources from './components/Sources/Sources.vue';
 import Settings from './components/Settings/Settings.vue';
 import Help from './components/Help/Help.vue';
+import NotFound404 from './components/NotFound404/NotFound404.vue';
 
 Vue.use(VueRouter);
 
@@ -19,6 +20,7 @@ let routes = [
     { path: '/sources', component: Sources },
     { path: '/settings', component: Settings },
     { path: '/help', component: Help },
+    { path: '*', component: NotFound404 },
 ];
 
 export default new VueRouter({