Commit f9c4df28 authored by Joel Collins's avatar Joel Collins
Browse files

Removed reload button, moved functionality to tab icon

parent d50673e2

package.json

+3 −2
Original line number Diff line number Diff line 
{

  "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",

src/app.js

+4 −1
Original line number Diff line number Diff line
@@ -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

src/components/paneDisplayComponents/galleryDisplay.vue

+0 −16
Original line number Diff line number Diff line 
<template>

	<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 class="uk-grid-medium uk-padding uk-padding-remove-right uk-grid-match" uk-grid>
@@ -79,17 +75,5 @@ export default { 
</script>



<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>

src/components/panelDisplay.vue

+8 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
  <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">

      <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 class="uk-switcher uk-flex uk-flex-1">

      <li class="uk-height-1-1 uk-width-1-1 "><streamDisplay/></li>
@@ -25,6 +25,12 @@ export default { 
    galleryDisplay

  },



  methods: {

    updateCaptureList: function () {

      this.$root.$emit('globalUpdateCaptureList')

    },

  },



  computed: {

    disableIfDisconnected: function () {

      return {
@@ -37,4 +43,5 @@ export default { 
</script>



<style scoped lang="less">



</style>