diff --git a/app/src/main/menuBar.js b/app/src/main/menuBar.js index f08ff2f..953d23c 100644 --- a/app/src/main/menuBar.js +++ b/app/src/main/menuBar.js @@ -20,17 +20,6 @@ const template = [ } ] }, - { - label: "Edit", - submenu: [ - { label: "Undo", accelerator: "CmdOrCtrl+Z", selector: "undo:" }, - { label: "Redo", accelerator: "Shift+CmdOrCtrl+Z", selector: "redo:" }, - { type: "separator" }, - { label: "Cut", accelerator: "CmdOrCtrl+X", selector: "cut:" }, - { label: "Copy", accelerator: "CmdOrCtrl+C", selector: "copy:" }, - { label: "Paste", accelerator: "CmdOrCtrl+V", selector: "paste:" }, - { label: "Select All", accelerator: "CmdOrCtrl+A", selector: "selectAll:" } - ]}, { label: 'About', submenu: [ @@ -76,6 +65,17 @@ const template = [ } } ] - } + }, + { + label: 'Edit', + submenu: [ + { label: 'Undo', accelerator: 'CmdOrCtrl+Z', selector: 'undo:' }, + { label: 'Redo', accelerator: 'Shift+CmdOrCtrl+Z', selector: 'redo:' }, + { type: 'separator' }, + { label: 'Cut', accelerator: 'CmdOrCtrl+X', selector: 'cut:' }, + { label: 'Copy', accelerator: 'CmdOrCtrl+C', selector: 'copy:' }, + { label: 'Paste', accelerator: 'CmdOrCtrl+V', selector: 'paste:' }, + { label: 'Select All', accelerator: 'CmdOrCtrl+A', selector: 'selectAll:' } + ]} ] export const menu = Menu.buildFromTemplate(template) diff --git a/app/src/renderer/App.vue b/app/src/renderer/App.vue index 8211d39..fa5508b 100644 --- a/app/src/renderer/App.vue +++ b/app/src/renderer/App.vue @@ -134,13 +134,13 @@ export default { }, keyup (e) { // left - if ((e.keyCode || e.which) === 37) { + if ((e.keyCode || e.which) === 37 && this.$route.name !== 'About') { this.decViewIndex() this.$router.push({ path: `/${this.view.names[this.view.index]}` }) // right - } else if ((e.keyCode || e.which) === 39) { + } else if ((e.keyCode || e.which) === 39 && this.$route.name !== 'About') { this.incViewIndex() this.$router.push({ path: `/${this.view.names[this.view.index]}` diff --git a/app/src/renderer/components/layout/Alerts.vue b/app/src/renderer/components/layout/Alerts.vue index d09fcbc..e0785da 100644 --- a/app/src/renderer/components/layout/Alerts.vue +++ b/app/src/renderer/components/layout/Alerts.vue @@ -32,7 +32,7 @@ const openMessage = (propsData = { message: '', type: '', direction: '', - duration: 1500, + duration: 4500, container: '.messages' }) => { return new MessageComponent({ diff --git a/app/src/renderer/components/layout/Navbar.vue b/app/src/renderer/components/layout/Navbar.vue index 07b2a34..8917970 100644 --- a/app/src/renderer/components/layout/Navbar.vue +++ b/app/src/renderer/components/layout/Navbar.vue @@ -1,7 +1,7 @@ + + diff --git a/app/src/renderer/views/home/Index.vue b/app/src/renderer/views/home/Index.vue index 43324cb..4f3ea4a 100644 --- a/app/src/renderer/views/home/Index.vue +++ b/app/src/renderer/views/home/Index.vue @@ -8,14 +8,14 @@ A tool that lets you take a deeper look at the packets traveling through your networks.
Go checkout whats happening on your current network. - + + - -
Click here if its your first time
+
About Herbivore

Hint: you can also use the ← and → arrow keys to navigate.

@@ -35,20 +35,17 @@ export default { view: 'view' }), methods: { - toggle () { - if (this.test === '1111') { - this.test = '2222' - } else { - this.test = '1111' - } - }, goRight: function () { - console.log('there') this.incViewIndex() this.$router.push({ path: `/${this.view.names[this.view.index]}` }) }, + goAbout: function () { + this.$router.push({ + path: `/about` + }) + }, ...mapActions([ 'incViewIndex', 'newMessage', diff --git a/app/src/renderer/vuex/modules/menu.js b/app/src/renderer/vuex/modules/menu.js index b3dc6a6..0750682 100644 --- a/app/src/renderer/vuex/modules/menu.js +++ b/app/src/renderer/vuex/modules/menu.js @@ -12,7 +12,7 @@ const state = { path: '/network', meta: { icon: 'fa-info', - link: 'network/index.vue' + link: 'network/Index.vue' }, component: require('../../views/network') }, diff --git a/app/src/renderer/vuex/modules/sniffer.js b/app/src/renderer/vuex/modules/sniffer.js index ec95858..ea99cc3 100644 --- a/app/src/renderer/vuex/modules/sniffer.js +++ b/app/src/renderer/vuex/modules/sniffer.js @@ -17,7 +17,6 @@ const actions = { commit(types.NEW_PACKET, packet) }, clearPackets ({ commit, state }) { - console.log('here') commit(types.CLEAR_PACKETS) }, startSniffer ({ commit, state }) { diff --git a/webpack.renderer.config.js b/webpack.renderer.config.js index 6acbb68..775b094 100644 --- a/webpack.renderer.config.js +++ b/webpack.renderer.config.js @@ -85,7 +85,7 @@ let rendererConfig = { template: './app/index.ejs', appModules: process.env.NODE_ENV !== 'production' ? path.resolve(__dirname, 'app/node_modules') - : false, + : false }), new webpack.NoEmitOnErrorsPlugin() ], @@ -150,4 +150,4 @@ if (process.env.NODE_ENV === 'production') { ) } -module.exports = rendererConfig \ No newline at end of file +module.exports = rendererConfig