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

Migrated status to about tab

parent 58f1dcdb

src/components/appContent.vue

+22 −1
Original line number Diff line number Diff line
@@ -79,6 +79,17 @@ 
      >

        <i class="material-icons">{{ plugin.icon || "extension" }}</i>

      </tabIcon>



      <tabIcon

        id="about-tab-icon"

        class="uk-margin-auto-top"

        tab-i-d="about"

        :require-connection="false"

        :current-tab="currentTab"

        @set-tab="setTab"

      >

        <i class="material-icons">info</i>

      </tabIcon>

    </div>



    <!-- Corresponding vertical tab content -->
@@ -137,6 +148,14 @@ 
          @reloadForms="updatePlugins()"

        />

      </tabContent>



      <tabContent

        tab-i-d="about"

        :require-connection="false"

        :current-tab="currentTab"

      >

        <aboutContent class="section-content" />

      </tabContent>

    </div>

  </div>

</template>
@@ -155,6 +174,7 @@ import viewContent from "./tabContentComponents/viewContent.vue"; 
import settingsContent from "./tabContentComponents/settingsContent.vue";

import galleryContent from "./tabContentComponents/galleryContent.vue";

import extensionContent from "./tabContentComponents/extensionContent.vue";

import aboutContent from "./tabContentComponents/aboutContent.vue";



// Import modal components for device initialisation

import calibrationModal from "./modalComponents/calibrationModal.vue";
@@ -172,7 +192,8 @@ export default { 
    settingsContent,

    galleryContent,

    extensionContent,

    calibrationModal

    calibrationModal,

    aboutContent

  },



  data: function() {

src/components/controlComponents/devTools.vue

+2 −5
Original line number Diff line number Diff line 
<template>

  <div>

    <form

      class="uk-form-stacked uk-width-medium"

      @submit.prevent="overrideAPIHost"

    >

      <label class="uk-form-label">API origin</label>

    <form class="uk-form-stacked" @submit.prevent="overrideAPIHost">

      <label class="uk-form-label">Override API origin</label>

      <input v-model="currentOrigin" class="uk-input" type="text" />

    </form>

  </div>

src/components/loadingContent.vue

+1 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
      {{ $store.state.error }}

    </div>

    <div class="uk-align-center">

      <devTools></devTools>

      <devTools class="uk-width-medium"></devTools>

    </div>

  </div>

</template>

src/components/tabContentComponents/aboutContent.vue

0 → 100644
+35 −0
Original line number Diff line number Diff line 
<template>

  <!-- Grid managing tab content -->

  <div class="uk-height-1-1 view-component">

    <div class="uk-padding-small">

      <statusPane class="uk-width-large" />

    </div>

    <div class="uk-padding-small">

      <h2>Links</h2>

      <a

        class="uk-link"

        target="_blank"

        href="https://gitlab.com/openflexure/openflexure-microscope-jsclient/-/issues"

        >Report an issue</a

      >

    </div>

    <div class="uk-padding-small">

      <h2>Developer tools</h2>

      <devTools class="uk-width-large" />

    </div>

  </div>

</template>



<script>

import devTools from "../controlComponents/devTools.vue";

import statusPane from "../viewComponents/statusPane.vue";



export default {

  name: "AboutContent",



  components: {

    devTools,

    statusPane

  }

};

</script>

src/components/viewComponents/settingsDisplay.vue

+2 −27
Original line number Diff line number Diff line
@@ -4,19 +4,6 @@ 
    <div class="settings-nav">

      <ul class="uk-nav uk-nav-default">

        <li class="uk-nav-header">Application settings</li>

        <li>

          <tabIcon

            id="settings-status-icon"

            tab-i-d="status"

            :show-title="false"

            :show-tooltip="false"

            :require-connection="false"

            :current-tab="currentTab"

            @set-tab="setTab"

          >

            Status

          </tabIcon>

        </li>

        <li>

          <tabIcon

            id="settings-display-icon"
@@ -73,16 +60,6 @@ 
      </ul>

    </div>

    <div class="view-component uk-width-expand uk-padding-small">

      <tabContent

        tab-i-d="status"

        :require-connection="false"

        :current-tab="currentTab"

      >

        <div class="settings-pane uk-padding-small">

          <statusPane />

        </div>

      </tabContent>



      <tabContent

        tab-i-d="display"

        :require-connection="false"
@@ -135,7 +112,6 @@ 
</template>



<script>

import statusPane from "./settingsComponents/statusPane.vue";

import streamSettings from "./settingsComponents/streamSettings.vue";

import microscopeSettings from "./settingsComponents/microscopeSettings.vue";

import cameraSettings from "./settingsComponents/cameraSettings.vue";
@@ -151,7 +127,6 @@ export default { 
  name: "SettingsDisplay",



  components: {

    statusPane,

    streamSettings,

    cameraSettings,

    microscopeSettings,
@@ -163,8 +138,8 @@ export default { 


  data: function() {

    return {

      selected: "status",

      currentTab: "status"

      selected: "display",

      currentTab: "display"

    };

  },