From f9c4df28f4d191b219eb059df43caada2216b5ab Mon Sep 17 00:00:00 2001 From: Joel Collins Date: Fri, 15 Feb 2019 13:39:32 +0000 Subject: [PATCH] Removed reload button, moved functionality to tab icon --- package.json | 5 +++-- src/app.js | 5 ++++- .../paneDisplayComponents/galleryDisplay.vue | 16 ---------------- src/components/panelDisplay.vue | 9 ++++++++- 4 files changed, 15 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index eff6d01c..11fc3455 100644 --- a/package.json +++ b/package.json @@ -1,11 +1,12 @@ { - "name": "vue3", + "name": "openflexure-microscope-vue", "version": "0.1.0", "private": true, "scripts": { "serve": "vue-cli-service serve", "build": "vue-cli-service build", - "dev": "set NODE_ENV=DEV && electron src/app.js" + "dev": "set NODE_ENV=DEV&& electron src/app.js", + "run": "vue-cli-service build && electron src/app.js" }, "dependencies": { "axios": "^0.18.0", diff --git a/src/app.js b/src/app.js index 4898d8a6..d12438a0 100644 --- a/src/app.js +++ b/src/app.js @@ -3,13 +3,16 @@ const app = electron.app const BrowserWindow = electron.BrowserWindow let url +console.log(process.env.NODE_ENV) if (process.env.NODE_ENV === 'DEV') { + console.log("Loading from localhost") url = 'http://localhost:8080/' } else { + console.log("Loading from dist") url = `file://${process.cwd()}/dist/index.html` } app.on('ready', () => { - let window = new BrowserWindow({width: 800, height: 600}) + let window = new BrowserWindow({width: 1124, height: 800}) window.loadURL(url) }) \ No newline at end of file diff --git a/src/components/paneDisplayComponents/galleryDisplay.vue b/src/components/paneDisplayComponents/galleryDisplay.vue index fe98b5b1..24317cb1 100644 --- a/src/components/paneDisplayComponents/galleryDisplay.vue +++ b/src/components/paneDisplayComponents/galleryDisplay.vue @@ -1,9 +1,5 @@