From 605dca04a9d6aace708137db6566e73cc725b0c8 Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Wed, 2 Jan 2019 19:15:05 +0700 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BC=D0=B0=D1=80=D1=88=D1=80=D1=83?= =?UTF-8?q?=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/router.js | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/client/router.js b/client/router.js index 7f7c167d..3b950fd5 100644 --- a/client/router.js +++ b/client/router.js @@ -1,5 +1,7 @@ import Vue from 'vue'; import VueRouter from 'vue-router'; +import _ from 'lodash'; + import App from './components/App.vue'; import CardIndex from './components/CardIndex/CardIndex.vue'; import Reader from './components/Reader/Reader.vue'; @@ -10,19 +12,27 @@ import Settings from './components/Settings/Settings.vue'; import Help from './components/Help/Help.vue'; import NotFound404 from './components/NotFound404/NotFound404.vue'; -Vue.use(VueRouter); - -let routes = [ - { path: '/', redirect: '/cardindex' }, - { path: '/cardindex', component: CardIndex }, - { path: '/reader', component: Reader }, - { path: '/income', component: Income }, - { path: '/sources', component: Sources }, - { path: '/settings', component: Settings }, - { path: '/help', component: Help }, - { path: '*', component: NotFound404 }, +const myRoutes = [ + ['/', null, null, '/cardindex'], + ['/cardindex', CardIndex ], + ['/reader', Reader ], + ['/income', Income ], + ['/sources', Sources ], + ['/settings', Settings ], + ['/help', Help ], + ['*', NotFound404 ], ]; +let routes = []; + +for (let route of myRoutes) { + const [path, component, name, redirect] = route; + let r = _.pickBy({path, component, name, redirect}, _.identity); + routes.push(r); +} + +Vue.use(VueRouter); + export default new VueRouter({ routes });