Removed reload button, moved functionality to tab icon

This commit is contained in:
Joel Collins 2019-02-15 13:39:32 +00:00
parent d50673e2d1
commit f9c4df28f4
4 changed files with 15 additions and 20 deletions

View file

@ -1,11 +1,12 @@
{ {
"name": "vue3", "name": "openflexure-microscope-vue",
"version": "0.1.0", "version": "0.1.0",
"private": true, "private": true,
"scripts": { "scripts": {
"serve": "vue-cli-service serve", "serve": "vue-cli-service serve",
"build": "vue-cli-service build", "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": { "dependencies": {
"axios": "^0.18.0", "axios": "^0.18.0",

View file

@ -3,13 +3,16 @@ const app = electron.app
const BrowserWindow = electron.BrowserWindow const BrowserWindow = electron.BrowserWindow
let url let url
console.log(process.env.NODE_ENV)
if (process.env.NODE_ENV === 'DEV') { if (process.env.NODE_ENV === 'DEV') {
console.log("Loading from localhost")
url = 'http://localhost:8080/' url = 'http://localhost:8080/'
} else { } else {
console.log("Loading from dist")
url = `file://${process.cwd()}/dist/index.html` url = `file://${process.cwd()}/dist/index.html`
} }
app.on('ready', () => { app.on('ready', () => {
let window = new BrowserWindow({width: 800, height: 600}) let window = new BrowserWindow({width: 1124, height: 800})
window.loadURL(url) window.loadURL(url)
}) })

View file

@ -1,10 +1,6 @@
<template> <template>
<div class="galleryDisplay uk-padding uk-padding-remove-right"> <div class="galleryDisplay uk-padding uk-padding-remove-right">
<div id="refresh-btn">
<a href="#" v-on:click="updateCaptureList()" class="refresh-icon-align uk-icon-button uk-box-shadow-small uk-box-shadow-hover-medium action-btn-outline" uk-icon="refresh"></a>
</div>
<div uk-lightbox="toggle: .lightbox-link"> <div uk-lightbox="toggle: .lightbox-link">
<div class="uk-grid-medium uk-padding uk-padding-remove-right uk-grid-match" uk-grid> <div class="uk-grid-medium uk-padding uk-padding-remove-right uk-grid-match" uk-grid>
@ -79,17 +75,5 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
#refresh-btn {
width: 0px;
height: 30px;
z-index: 999;
margin-top: -57px;
margin-left: 48px;
position: absolute;
}
.refresh-icon-align {
padding-bottom: 3px;
}
</style> </style>

View file

@ -2,7 +2,7 @@
<div id="panelDisplay" class="uk-flex uk-flex-column uk-margin-remove uk-padding-remove uk-height-1-1"> <div id="panelDisplay" class="uk-flex uk-flex-column uk-margin-remove uk-padding-remove uk-height-1-1">
<ul class="uk-flex-none uk-flex-center uk-margin-remove-bottom uk-text-center" uk-tab="swiping: false"> <ul class="uk-flex-none uk-flex-center uk-margin-remove-bottom uk-text-center" uk-tab="swiping: false">
<li><a href="#" uk-switcher-item="preview" uk-icon="play-circle" uk-tooltip="Live"></a></li> <li><a href="#" uk-switcher-item="preview" uk-icon="play-circle" uk-tooltip="Live"></a></li>
<li v-bind:class="disableIfDisconnected"><a href="#" uk-switcher-item="gallery" uk-icon="image" uk-tooltip="Captures"></a></li> <li v-bind:class="disableIfDisconnected"><a href="#" v-on:click="updateCaptureList()" uk-switcher-item="gallery" uk-icon="image" uk-tooltip="Captures"></a></li>
</ul> </ul>
<ul class="uk-switcher uk-flex uk-flex-1"> <ul class="uk-switcher uk-flex uk-flex-1">
<li class="uk-height-1-1 uk-width-1-1 "><streamDisplay/></li> <li class="uk-height-1-1 uk-width-1-1 "><streamDisplay/></li>
@ -25,6 +25,12 @@ export default {
galleryDisplay galleryDisplay
}, },
methods: {
updateCaptureList: function () {
this.$root.$emit('globalUpdateCaptureList')
},
},
computed: { computed: {
disableIfDisconnected: function () { disableIfDisconnected: function () {
return { return {
@ -37,4 +43,5 @@ export default {
</script> </script>
<style scoped lang="less"> <style scoped lang="less">
</style> </style>