diff --git a/mock/mock-server.js b/mock/mock-server.js index b29b7c3f..ccce04d2 100644 --- a/mock/mock-server.js +++ b/mock/mock-server.js @@ -1,6 +1,9 @@ const chokidar = require('chokidar') const bodyParser = require('body-parser') const chalk = require('chalk') +const path = require('path') + +const mockDir = path.join(process.cwd(), 'mock') function registerRoutes(app) { let mockLastIndex @@ -18,7 +21,7 @@ function registerRoutes(app) { function unregisterRoutes() { Object.keys(require.cache).forEach(i => { - if (i.includes('/mock')) { + if (i.includes(mockDir)) { delete require.cache[require.resolve(i)] } }) @@ -40,9 +43,8 @@ module.exports = app => { var mockStartIndex = mockRoutes.mockStartIndex // watch files, hot reload mock server - chokidar.watch(('./mock'), { - ignored: 'mock/mock-server.js', - persistent: true, + chokidar.watch(mockDir, { + ignored: /mock-server/, ignoreInitial: true }).on('all', (event, path) => { if (event === 'change' || event === 'add') { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 122a5db7..82d71d45 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -33,6 +33,9 @@ Docs + + Docs + Log Out diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 2a1ab741..fd09b6d7 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -16,6 +16,7 @@ placeholder="Username" name="username" type="text" + tabindex="1" auto-complete="on" /> @@ -32,6 +33,7 @@ :type="passwordType" placeholder="Password" name="password" + tabindex="2" auto-complete="on" @keyup.native="checkCapslock" @blur="capsTooltip = false"