From 8af1668b615d031f53a29dd6e6d160c6374b07b1 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sat, 27 Mar 2021 11:33:01 -0500
Subject: [PATCH 01/17] chore: add additional file system waits

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/components/widgets/filesystem/FileSystem.vue |  8 ++++++--
 src/globals.ts                                   |  6 +++---
 src/mixins/state.ts                              |  5 +++--
 src/socketActions.ts                             | 14 +++++++++++---
 todo.md                                          |  6 ++++--
 5 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/components/widgets/filesystem/FileSystem.vue b/src/components/widgets/filesystem/FileSystem.vue
index 9983dc3624..bafd845f4e 100644
--- a/src/components/widgets/filesystem/FileSystem.vue
+++ b/src/components/widgets/filesystem/FileSystem.vue
@@ -248,7 +248,11 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
 
   // Determine if we're waiting for a directory load on our current path.
   get filesLoading () {
-    return this.hasWait(`${Waits.onGetDirectory}${this.currentPath}`)
+    return this.hasWait([
+      `${Waits.onUpload}`,
+      Waits.onFileSystem,
+      `${Waits.onFileSystem}${this.currentPath}`
+    ])
   }
 
   // Get a list of currently active uploads.
@@ -459,7 +463,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
     )
       .then(res => {
         if (res) {
-          if (file.type === 'directory') SocketActions.serverFilesDeleteDirectory(`${this.currentPath}/${file.name}`)
+          if (file.type === 'directory') SocketActions.serverFilesDeleteDirectory(`${this.currentPath}/${file.name}`, true)
           if (file.type === 'file') SocketActions.serverFilesDeleteFile(`${this.currentPath}/${file.name}`)
         }
       })
diff --git a/src/globals.ts b/src/globals.ts
index 9208b9d7cf..c8613e0112 100644
--- a/src/globals.ts
+++ b/src/globals.ts
@@ -236,7 +236,6 @@ export const Waits = Object.freeze({
   onPrintCancel: 'onPrintCancel',
   onPrintResume: 'onPrintResume',
   onMacro: 'onMacro',
-  onGetDirectory: 'getDirectory',
   onSetSpeed: 'onSetSpeed',
   onSetFlow: 'onSetFlow',
   onSetFanSpeed: 'onSetFanSpeed',
@@ -251,9 +250,10 @@ export const Waits = Object.freeze({
   onSetAcceleration: 'onSetAcceleration',
   onSetDeceleration: 'onSetDeceleration',
   onSetSCV: 'onSetSCV',
-  onUpload: 'onUpload',
   onExtruderChange: 'onExtruderChange',
-  onLoadLanguage: 'onLoadLanguage'
+  onLoadLanguage: 'onLoadLanguage',
+  onFileSystem: 'onFileSystem',
+  onUpload: 'onUpload'
 })
 
 export const defaultPlotLayout = Object.freeze({
diff --git a/src/mixins/state.ts b/src/mixins/state.ts
index 3ba1e72d3c..2bd4031662 100644
--- a/src/mixins/state.ts
+++ b/src/mixins/state.ts
@@ -76,9 +76,10 @@ export default class UtilsMixin extends Vue {
   }
 
   /**
-   * Indicates if we have a valid wait.
+   * Indicates if we have a valid wait(s).
+   * Supports a single string or a list of.
    */
-  hasWait (wait: string) {
+  hasWait (wait: string | string[]) {
     return this.$store.getters['wait/hasWait'](wait)
   }
 
diff --git a/src/socketActions.ts b/src/socketActions.ts
index ddd0b056a8..3613f7b4a8 100644
--- a/src/socketActions.ts
+++ b/src/socketActions.ts
@@ -348,7 +348,7 @@ export const SocketActions = {
    * for brevity.
    */
   async serverFilesGetDirectory (root: string, path: string) {
-    const wait = `${Waits.onGetDirectory}${path}`
+    const wait = `${Waits.onFileSystem}${path}`
     baseEmit(
       'server.files.get_directory',
       {
@@ -359,9 +359,11 @@ export const SocketActions = {
     )
   },
   async serverFilesMove (source: string, dest: string) {
+    const wait = Waits.onFileSystem
     baseEmit(
       'server.files.move', {
         dispatch: 'void',
+        wait,
         params: {
           source,
           dest
@@ -375,9 +377,11 @@ export const SocketActions = {
    * Root should be included in the path.
    */
   async serverFilesPostDirectory (path: string) {
+    const wait = Waits.onFileSystem
     baseEmit(
       'server.files.post_directory', {
         dispatch: 'void',
+        wait,
         params: {
           path
         }
@@ -386,9 +390,11 @@ export const SocketActions = {
   },
 
   async serverFilesDeleteFile (path: string) {
+    const wait = Waits.onFileSystem
     baseEmit(
       'server.files.delete_file', {
         dispatch: 'void',
+        wait,
         params: {
           path
         }
@@ -396,13 +402,15 @@ export const SocketActions = {
     )
   },
 
-  async serverFilesDeleteDirectory (path: string) {
+  async serverFilesDeleteDirectory (path: string, force = false) {
+    const wait = Waits.onFileSystem
     baseEmit(
       'server.files.delete_directory', {
         dispatch: 'void',
+        wait,
         params: {
           path,
-          force: false
+          force
         }
       }
     )
diff --git a/todo.md b/todo.md
index d4e524339e..e7f685482b 100644
--- a/todo.md
+++ b/todo.md
@@ -2,12 +2,13 @@
 
 ## Next Up
 
+- hide enabled flag for collapsable card for camera panel on dashboard
+- use components instead of plugins with moonraker
+
 - add git history
   - move versions to configure page
   - reogranize service restarts / vs klipper firmware restarts
 
-- use components instead of plugins with moonraker
-
 - More macro layout options (categorize macros, ability to define layout in some way, color)
 
 - alternate bed mesh scales
@@ -26,6 +27,7 @@
 - update docs re: output pins
 
 - bulk actions to delete or move?
+- copy file
 - move dialog
 - bulk action move
 - cleanup card layout stuff

From be96c5025530e347c08a353f09e42525d36028b0 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sat, 27 Mar 2021 15:37:31 -0500
Subject: [PATCH 02/17] feat: allow single cams to fill the card space

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/components/cards/dashboard/CameraCard.vue | 17 ++++-
 src/components/dialogs/CameraDialog.vue       |  2 +-
 src/components/inputs/FluiddSetting.vue       | 23 ++++++-
 src/components/widgets/camera/Camera.vue      | 62 ++++++++++---------
 .../widgets/settings/CameraSettings.vue       | 23 +++++++
 src/locales/en.yaml                           |  2 +
 src/store/cameras/actions.ts                  |  8 +++
 src/store/cameras/index.ts                    |  1 +
 src/store/cameras/mutations.ts                |  7 +++
 src/store/cameras/types.ts                    |  1 +
 10 files changed, 113 insertions(+), 33 deletions(-)

diff --git a/src/components/cards/dashboard/CameraCard.vue b/src/components/cards/dashboard/CameraCard.vue
index 15e326e69f..b5fc595e33 100644
--- a/src/components/cards/dashboard/CameraCard.vue
+++ b/src/components/cards/dashboard/CameraCard.vue
@@ -15,7 +15,11 @@
       :camera="dialogState.camera"
     ></camera-dialog>
 
-    <v-row class="ma-2" justify="space-around">
+    <v-row
+      v-if="cameras.length > 1 || !fillSpace"
+      class="ma-2"
+      justify="space-around"
+    >
       <template v-for="camera in cameras">
         <v-col
           v-if="!collapsed"
@@ -28,6 +32,12 @@
         </v-col>
       </template>
     </v-row>
+    <camera
+      v-if="!collapsed && fillSpace && cameras.length === 1"
+      :camera="cameras[0]"
+      flat
+      @click="handleCameraClick(cameras[0])"
+    ></camera>
 
   </collapsable-card>
 </template>
@@ -56,10 +66,15 @@ export default class CameraCard extends Mixins(StateMixin) {
   collapsed = false
 
   get cols () {
+    if (this.fillSpace) return 12
     if (this.cameras.length <= 2) return 6
     if (this.cameras.length > 2) return 4
   }
 
+  get fillSpace (): boolean {
+    return this.$store.state.cameras.fillSpace && this.cameras.length === 1
+  }
+
   get inLayout (): boolean {
     return (this.$store.state.config.layoutMode)
   }
diff --git a/src/components/dialogs/CameraDialog.vue b/src/components/dialogs/CameraDialog.vue
index ff38fe473b..83529f76ad 100644
--- a/src/components/dialogs/CameraDialog.vue
+++ b/src/components/dialogs/CameraDialog.vue
@@ -2,7 +2,7 @@
   <v-dialog
     @input="$emit('input', $event)"
     :value="value"
-    :width="640"
+    max-width="90vh"
   >
     <camera
       :camera="camera"
diff --git a/src/components/inputs/FluiddSetting.vue b/src/components/inputs/FluiddSetting.vue
index 55e88d30f1..9a7aa2aff4 100644
--- a/src/components/inputs/FluiddSetting.vue
+++ b/src/components/inputs/FluiddSetting.vue
@@ -8,8 +8,10 @@
   >
     <v-col :cols="cols[0]" class="setting-title">
       <slot name="title">{{ title }}</slot>
-      <div v-if="hasSubTitle">
-        <slot name="subtitle"></slot>
+      <div class="setting-sub-title grey--text" v-if="hasSubTitle">
+        <slot name="subtitle">
+            {{ subTitle }}
+        </slot>
       </div>
     </v-col>
     <v-col :cols="cols[1]" class="setting-controls" align-self="center">
@@ -26,6 +28,12 @@ export default class Setting extends Vue {
   @Prop({ type: String, default: '' })
   title!: string;
 
+  @Prop({ type: String })
+  subTitle!: string;
+
+  @Prop({ type: String })
+  help!: string;
+
   @Prop({ type: Number, default: 6 })
   rCols!: number;
 
@@ -38,7 +46,11 @@ export default class Setting extends Vue {
   }
 
   get hasSubTitle () {
-    return (this.$slots.subtitle || this.$scopedSlots.subtitle)
+    return (
+      this.$slots.subtitle ||
+      this.$scopedSlots.subtitle ||
+      this.subTitle
+    )
   }
 
   get classes () {
@@ -71,6 +83,11 @@ export default class Setting extends Vue {
     padding-bottom: 12px;
     padding-right: 12px;
   }
+
+  .col.setting-title > .setting-sub-title {
+    font-size: 0.875rem;
+  }
+
   .setting__link {
     cursor: pointer;
     user-select: none;
diff --git a/src/components/widgets/camera/Camera.vue b/src/components/widgets/camera/Camera.vue
index b1a5c60a1e..97a6130e84 100644
--- a/src/components/widgets/camera/Camera.vue
+++ b/src/components/widgets/camera/Camera.vue
@@ -1,33 +1,36 @@
 <template>
-  <v-card
-    color="secondary"
-    :elevation="6"
-    v-on="$listeners"
-  >
-    <img
-      v-if="camera.type === 'mjpgstream' || camera.type === 'mjpgadaptive'"
-      :src="cameraUrl"
-      class="webcam"
-      :style="cameraTransformStyle"
-      @load="handleImgLoad"
-    />
-
-    <video
-      v-if="camera.type === 'ipstream'"
-      :src="cameraUrl"
-      autoplay
-      class="webcam"
-      :style="cameraTransformStyle"
-    />
-
-    <v-card-text
-      v-if="camera.name"
-      class="card-heading py-1 d-flex align-center justify-space-between"
+  <div>
+    <v-card
+      :elevation="(flat) ? 0 : 6"
+      v-on="$listeners"
+      color="secondary"
+      class="rounded-t-0"
     >
-      <span class="font-weight-light" style="font-size: 1.0rem;">{{ camera.name }}</span>
-      <small v-if="this.camera.type === 'mjpgadaptive' && this.time">FPS: {{ currentFPS }}</small>
-    </v-card-text>
-  </v-card>
+      <img
+        v-if="camera.type === 'mjpgstream' || camera.type === 'mjpgadaptive'"
+        :src="cameraUrl"
+        class="webcam"
+        :style="cameraTransformStyle"
+        @load="handleImgLoad"
+      />
+
+      <video
+        v-if="camera.type === 'ipstream'"
+        :src="cameraUrl"
+        autoplay
+        class="webcam"
+        :style="cameraTransformStyle"
+      />
+
+      <v-card-text
+        v-if="camera.name"
+        class="card-heading py-1 d-flex align-center justify-space-between"
+      >
+        <span class="font-weight-light" style="font-size: 1.0rem;">{{ camera.name }}</span>
+        <small v-if="this.camera.type === 'mjpgadaptive' && this.time">FPS: {{ currentFPS }}</small>
+      </v-card-text>
+    </v-card>
+  </div>
 </template>
 
 <script lang="ts">
@@ -42,6 +45,9 @@ export default class CameraCard extends Vue {
   @Prop({ type: Object, required: true })
   camera!: CameraConfig
 
+  @Prop({ type: Boolean, default: false })
+  flat!: boolean
+
   // Adaptive load counters
   request_start_time = performance.now()
   start_time = performance.now()
diff --git a/src/components/widgets/settings/CameraSettings.vue b/src/components/widgets/settings/CameraSettings.vue
index ec61188b64..ae1a533db9 100644
--- a/src/components/widgets/settings/CameraSettings.vue
+++ b/src/components/widgets/settings/CameraSettings.vue
@@ -18,6 +18,21 @@
         </btn>
       </fluidd-setting>
 
+      <v-divider></v-divider>
+
+      <fluidd-setting
+        :title="$t('app.setting.label.camera_fillspace')"
+        :r-cols="2"
+        :sub-title="$t('app.setting.label.camera_fillspace_help')"
+      >
+        <v-switch
+          @click.native.stop
+          v-model="fillSpace"
+          hide-details
+          class="mb-5"
+        ></v-switch>
+      </fluidd-setting>
+
       <v-divider v-if="cameras.length > 0"></v-divider>
 
       <template v-for="(camera, i) in cameras">
@@ -68,6 +83,14 @@ export default class CameraSettingsCard extends Vue {
     camera: null
   }
 
+  get fillSpace () {
+    return this.$store.state.cameras.fillSpace
+  }
+
+  set fillSpace (value: boolean) {
+    this.$store.dispatch('cameras/updateFillSpace', value)
+  }
+
   get cameras () {
     return this.$store.getters['cameras/getCameras']
   }
diff --git a/src/locales/en.yaml b/src/locales/en.yaml
index adc60850af..2de7c39ee8 100644
--- a/src/locales/en.yaml
+++ b/src/locales/en.yaml
@@ -214,6 +214,8 @@ app:
       tool: Tool
       thermal_presets: Thermal Presets
     label:
+      camera_fillspace: Fill space
+      camera_fillspace_help: With only one enabled camera, fill the dashboard camera space.
       camera_url: Camera Url
       printer_name: Printer Name
       language: Display Language
diff --git a/src/store/cameras/actions.ts b/src/store/cameras/actions.ts
index a02b90f7f2..d7fe624e5d 100644
--- a/src/store/cameras/actions.ts
+++ b/src/store/cameras/actions.ts
@@ -32,5 +32,13 @@ export const actions: ActionTree<CamerasState, RootState> = {
   async removeCamera ({ commit, state }, payload) {
     commit('setRemoveCamera', payload)
     SocketActions.serverWrite('cameras.cameras', state.cameras)
+  },
+
+  /**
+   * Sets fillspace
+   */
+  async updateFillSpace ({ commit }, payload) {
+    commit('setFillSpace', payload)
+    SocketActions.serverWrite('cameras.fillSpace', payload)
   }
 }
diff --git a/src/store/cameras/index.ts b/src/store/cameras/index.ts
index d16a085678..b980102b3e 100644
--- a/src/store/cameras/index.ts
+++ b/src/store/cameras/index.ts
@@ -8,6 +8,7 @@ import { v4 as uuidv4 } from 'uuid'
 
 export const defaultState = (): CamerasState => {
   return {
+    fillSpace: true,
     cameras: [
       {
         id: uuidv4(),
diff --git a/src/store/cameras/mutations.ts b/src/store/cameras/mutations.ts
index 00f8806ea9..ab93164ee5 100644
--- a/src/store/cameras/mutations.ts
+++ b/src/store/cameras/mutations.ts
@@ -42,5 +42,12 @@ export const mutations: MutationTree<CamerasState> = {
   setRemoveCamera (state, payload) {
     const i = state.cameras.findIndex(camera => camera.id === payload.id)
     state.cameras.splice(i, 1)
+  },
+
+  /**
+   * Sets Fillspace
+   */
+  setFillSpace (state, payload) {
+    state.fillSpace = payload
   }
 }
diff --git a/src/store/cameras/types.ts b/src/store/cameras/types.ts
index 24957d87b3..cbb9cb4c30 100644
--- a/src/store/cameras/types.ts
+++ b/src/store/cameras/types.ts
@@ -1,4 +1,5 @@
 export interface CamerasState {
+  fillSpace: boolean;
   cameras: CameraConfig[];
 }
 

From 56e3a0ae917ee813aeeb691c4ec8fc8920d7f2bb Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sat, 27 Mar 2021 15:37:58 -0500
Subject: [PATCH 03/17] chore: resolve minor state issues

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 .../settings/TemperaturePresetSettings.vue     |  2 +-
 .../widgets/settings/ThemePicker.vue           |  1 -
 .../widgets/settings/ToolheadSettings.vue      | 17 ++++++++---------
 src/mixins/services.ts                         |  7 ++++++-
 src/store/charts/actions.ts                    | 18 ++++++++++--------
 src/store/printer/actions.ts                   |  2 +-
 src/store/socket/mutations.ts                  |  4 ++--
 7 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/components/widgets/settings/TemperaturePresetSettings.vue b/src/components/widgets/settings/TemperaturePresetSettings.vue
index 86e33a7ea1..641a3a1da0 100644
--- a/src/components/widgets/settings/TemperaturePresetSettings.vue
+++ b/src/components/widgets/settings/TemperaturePresetSettings.vue
@@ -31,7 +31,7 @@
               v-for="(value, k) in preset.values"
               :key="k"
               v-show="value.active"
-              class="grey--text mr-2"
+              class="mr-2"
             >
               {{ k }}: {{ value.value }}<small>°C</small>
             </span>
diff --git a/src/components/widgets/settings/ThemePicker.vue b/src/components/widgets/settings/ThemePicker.vue
index a94468c795..5133c7d754 100644
--- a/src/components/widgets/settings/ThemePicker.vue
+++ b/src/components/widgets/settings/ThemePicker.vue
@@ -3,7 +3,6 @@
       v-model="menu"
       bottom
       left
-      offset-y
       :close-on-content-click="false"
     >
       <template v-slot:activator="{ on, attrs }">
diff --git a/src/components/widgets/settings/ToolheadSettings.vue b/src/components/widgets/settings/ToolheadSettings.vue
index 152f808386..bf63e0a089 100644
--- a/src/components/widgets/settings/ToolheadSettings.vue
+++ b/src/components/widgets/settings/ToolheadSettings.vue
@@ -9,6 +9,7 @@
       <fluidd-setting :title="$t('app.setting.label.invert_x_control')">
         <v-switch
           v-model="invertX"
+          hide-details
           class="mt-0 mb-4"
         >
         </v-switch>
@@ -19,6 +20,7 @@
       <fluidd-setting :title="$t('app.setting.label.invert_y_control')">
         <v-switch
           v-model="invertY"
+          hide-details
           class="mt-0 mb-4"
         >
         </v-switch>
@@ -29,6 +31,7 @@
       <fluidd-setting :title="$t('app.setting.label.invert_z_control')">
         <v-switch
           v-model="invertZ"
+          hide-details
           class="mt-0 mb-4"
         >
         </v-switch>
@@ -36,17 +39,13 @@
 
       <v-divider />
 
-      <fluidd-setting>
-        <template v-slot:title>
-          {{ $t('app.setting.label.gcode_coords') }}
-          <inline-help
-            small
-            top
-            :tooltip="$t('app.setting.tooltip.gcode_coords')"
-          ></inline-help>
-        </template>
+      <fluidd-setting
+        :title="$t('app.setting.label.gcode_coords')"
+        :subTitle="$t('app.setting.tooltip.gcode_coords')"
+        :r-cols="2">
         <v-switch
           v-model="useGcodeCoords"
+          hide-details
           class="mt-0 mb-4"
         >
         </v-switch>
diff --git a/src/mixins/services.ts b/src/mixins/services.ts
index 155714048e..e4cb9a7309 100644
--- a/src/mixins/services.ts
+++ b/src/mixins/services.ts
@@ -23,8 +23,9 @@ export default class ServicesMixin extends Vue {
    * Restart the klipper service itself.
    */
   async serviceRestartKlipper () {
-    // Partially reset, since config might have changed.
+    this.$store.commit('socket/setAcceptNotifications', false)
     await store.dispatch('reset', [
+      'server',
       'printer',
       'charts',
       'wait'
@@ -52,7 +53,9 @@ export default class ServicesMixin extends Vue {
    * Restart klippy / std restart.
    */
   async restartKlippy () {
+    this.$store.commit('socket/setAcceptNotifications', false)
     await store.dispatch('reset', [
+      'server',
       'printer',
       'charts',
       'wait'
@@ -65,7 +68,9 @@ export default class ServicesMixin extends Vue {
    * Restart klippy and the mcu's.
    */
   async firmwareRestartKlippy () {
+    this.$store.commit('socket/setAcceptNotifications', false)
     await store.dispatch('reset', [
+      'server',
       'printer',
       'charts',
       'wait'
diff --git a/src/store/charts/actions.ts b/src/store/charts/actions.ts
index 02b747b9f0..98dd0d1a1c 100644
--- a/src/store/charts/actions.ts
+++ b/src/store/charts/actions.ts
@@ -74,15 +74,17 @@ export const actions: ActionTree<ChartState, RootState> = {
         let label = key
         if (key.includes(' ')) label = key.split(' ')[1]
 
-        const temp = rootState.printer?.printer[key].temperature || 0
-        const target = rootState.printer?.printer[key].target || 0
-        const power = rootState.printer?.printer[key].power || 0
-        const speed = rootState.printer?.printer[key].speed || 0
+        if (rootState.printer?.printer[key]) {
+          const temp = rootState.printer?.printer[key].temperature || 0
+          const target = rootState.printer?.printer[key].target || 0
+          const power = rootState.printer?.printer[key].power || 0
+          const speed = rootState.printer?.printer[key].speed || 0
 
-        r[label] = payload[key].temperatures[i] || temp
-        if ('targets' in payload[key]) r[`${label}Target`] = payload[key].targets[i] || target
-        if ('powers' in payload[key]) r[`${label}Power`] = payload[key].powers[i] || power
-        if ('speeds' in payload[key]) r[`${label}Speed`] = payload[key].speeds[i] || speed
+          r[label] = payload[key].temperatures[i] || temp
+          if ('targets' in payload[key]) r[`${label}Target`] = payload[key].targets[i] || target
+          if ('powers' in payload[key]) r[`${label}Power`] = payload[key].powers[i] || power
+          if ('speeds' in payload[key]) r[`${label}Speed`] = payload[key].speeds[i] || speed
+        }
       })
       d.push(r)
     }
diff --git a/src/store/printer/actions.ts b/src/store/printer/actions.ts
index e51e74017a..1994d0bb72 100644
--- a/src/store/printer/actions.ts
+++ b/src/store/printer/actions.ts
@@ -97,7 +97,7 @@ export const actions: ActionTree<PrinterState, RootState> = {
 
   async onPrinterObjectsSubscribe ({ commit, dispatch }, payload) {
     // Accept notifications, and commit the first subscribe.
-    commit('socket/setAcceptNotifications', {}, { root: true })
+    commit('socket/setAcceptNotifications', true, { root: true })
     await dispatch('onNotifyStatusUpdate', payload.status)
 
     SocketActions.serverGcodeStore()
diff --git a/src/store/socket/mutations.ts b/src/store/socket/mutations.ts
index c87bf54599..8b0a6166ea 100644
--- a/src/store/socket/mutations.ts
+++ b/src/store/socket/mutations.ts
@@ -23,8 +23,8 @@ export const mutations: MutationTree<SocketState> = {
     state.ready = payload
   },
 
-  setAcceptNotifications (state) {
-    state.acceptingNotifications = true
+  setAcceptNotifications (state, payload) {
+    state.acceptingNotifications = payload
   },
 
   setSocketDisconnecting (state, payload) {

From 7bce337889e79f58626b097628e63ae4e723b5cd Mon Sep 17 00:00:00 2001
From: Constantine <dizirt@yandex.ru>
Date: Sat, 27 Mar 2021 18:23:34 +0300
Subject: [PATCH 04/17] Russian language added

I have made the translation into russian

Update ru.yaml

time_estimates fix

Update index.ts
---
 src/locales/ru.yaml       | 327 ++++++++++++++++++++++++++++++++++++++
 src/store/config/index.ts |   3 +-
 2 files changed, 329 insertions(+), 1 deletion(-)
 create mode 100644 src/locales/ru.yaml

diff --git a/src/locales/ru.yaml b/src/locales/ru.yaml
new file mode 100644
index 0000000000..777d2b2822
--- /dev/null
+++ b/src/locales/ru.yaml
@@ -0,0 +1,327 @@
+app:
+  general:
+    title:
+      camera: Камера | Камеры
+      console: Консоль
+      bedmesh: Сетка стола
+      home: Панель управления
+      add_printer: Добавить принтер
+      endstops: Точки остановки
+      fans_outputs: Куллеры и Выходы
+      jobs: Задачи
+      macros: Макросы
+      limits: Лимиты принтера
+      logs: Логи принтера
+      system_control: Управление системой
+      runout_sensors: Датчик контроля филамента
+      status: Статус
+      temperature: Температуры
+      tool: Инструмент
+      tune: Подстройка
+      configure: Конфигурация
+      interface: Интерфейс
+      stats: Состояние принтера
+      history: История задач
+      config_files: Файлы конфигурации
+    label:
+      accel_to_decel: Ускорения и торможения
+      acceleration: Ускорение
+      sqv: Скорость прохождения квадратного угла
+      velocity: Скорость
+      api_url: API URL
+      host: Хост
+      layout: Копоновка интерфейса
+      name: Имя
+      power: Питание
+      printers: Принтеры
+      requested_speed: Запрошенная скорость
+      services: Сервисы
+      speed: Скорость
+      flow: Поток
+      z_offset: Смещение Z
+      high: Выше
+      low: Ниже
+      off: Выключить
+      used: Использованно
+      free: Свободно
+      total_jobs: Общее количество печатных задач
+      longest_job: Самая долгая печать
+      total_time: Общее время
+      total_time_avg: Общее среднее время на печать
+      total_print_time: Общее время печати
+      total_print_time_avg: Среднее время 
+      total_filament: Общее количество использованного филамента
+      total_filament_avg: Среднее на печать
+      variance: Различие
+      save_as: Сохранить как
+      edit_preset: Редактировать предустановку
+      add_preset: Добавить предустановку
+      edit_camera: Редактировать камеру
+      add_camera: Добавить камеру
+      extrude_length: Длинна экструзии
+      extrude_speed: Скорость эуструзии
+      confirm: Подтвердить
+    btn:
+      all: Все
+      all_off: Отключить все
+      quad_gantry_level: QGL
+      add: Добавить
+      pause: Пауза
+      reboot: Перезагрузка
+      shutdown: Отключение
+      remove: Удалить
+      remove_all: Удалить всё
+      rename: Переименовать
+      resume: Возобновить
+      cancel: Отменить
+      save: Сохранить
+      save_as: Сохарнить как
+      upload: Загрузить
+      upload_print: Загрузить и напечатать
+      preheat: Предпрогрев
+      reprint: Перепечатать
+      save_restart: Сохранить и перезагрузить
+      adjust_layout: Настроить компановку интерфейма панели управления
+      calibrate: Калибровка
+      clear_profile: Очистить профиль
+      download: Скачать
+      add_printer: Добваить принетер
+      edit: Редактировать
+      extrude: Экструдировать
+      retract: Откатить
+      restart_firmware: Перезагрузить прошивку
+      restart_service_klipper: Перезагрузить Klipper
+      restart_service_moonraker: Перезагрузить Moonraker
+      restart_service_webcamd: Перезагрузить вебкамеру
+      socket_refresh: Принудительно обновление
+      reset_file: Сбросить файл
+      reset_layout: Сбпросить компановку интерфейса
+      view: Вид
+      close: Закрыть
+      config_reference: Пример конфигурации
+      add_file: Добавить файл
+      add_dir: Добавить папку
+    table:
+      header:
+        filament_used: Филамент
+        name: Имя
+        slicer: Слайсер
+        status: Статус
+        height: Высота
+        layer_height: Высота слоя
+        estimated_time: Ожидаемое время
+        last_printed: Последняя печать
+        modified: Изменён
+        size: Размер
+        start_time: Время начала
+        print_duration: Продолжительность печати
+        actions: Действия
+    simple_form:
+      msg:
+        confirm: Вы уверены?
+        confirm_reboot_host: Вы уверены? Это приведёт к перезагрузке вашей хост системы.
+        confirm_shutdown_host: Вы уверены? Это приведёт к выключению вашей хост системы.
+      error:
+        invalid_url: Невалидный URL
+        max: Макс %{max}
+        min: Мин %{min}
+        min_or_0: Мин %{min} или 0
+        required: Требуется
+    tooltip:
+      estop: Немедленная Остановка
+    error:
+      app_warnings_found: '%{appName} Найдены предупреждения.'
+      app_setup_link: >-
+        Требования для установки Fluidd можно посмотреть <a target="_blank"
+        href="%{url}">здесь.</a>
+      failed_components: >-
+        Moonraker не смог запустить некоторые плагины, пожалуйста проверьте логи, обновите конфигурацию
+        и перезагрузите moonraker.
+      components_config: >-
+        Конфигруцию для плагинов Moonraker можно посмотреть <a target="_blank"
+        href="%{url}">здесь.</a>
+  socket:
+    msg:
+      connecting: Подключение к moonraker...
+      no_connection: Нет подключения к moonraker. Пожалуйста проеверьте статус работы moonraker и / или перезагрузите страницу.
+  version:
+    title: Обновления ПО
+    btn:
+      update: Обновление
+      finish: Закончено
+      check_for_updates: Проверить обновления
+    label:
+      dirty: DIRTY
+      invalid: Ошибка
+      up_to_date: Актуальная версия
+    status:
+      updating: Обновление...
+      finished: Обвноление завершено
+    tooltip:
+      dirty: Оповещает о отсоединенном состоянии указателя HEAD, не в мастер-ветке или невалидный оригинальный репозиторий
+      invalid: Оповещает о локальных изменениях в репозитории
+  console:
+    label:
+      hide_temp_waits: Скрыть временные ожидания
+    placeholder:
+      command: '''tab'' для автокомплита, ''help'' для списка комманд ''стрелки вверх и вниз'' для перемещения по истории'
+  tool:
+    btn:
+      home_x: X
+      home_y: Y
+    tooltip:
+      home_xy: Домой XY
+      home_z: Домой Z
+      extruder_disabled: >-
+        экструдер отключён, ниже чем min_extrude_temp (%{min}<small>°C</small>)
+  bedmesh:
+    label:
+      profile_name: Имя профиля
+      remove_profile: Удалить %{name} профиль
+    msg:
+      not_found: Не найдённо существующих сеток стола.
+      hint: >-
+        Если сохранить не как %{name}, вы так же можете выбрать - удалить %{name} профиль
+    tooltip:
+      calibrate: Начать новую калибровку, будет сохранено как профиль 'default'
+      delete: Удалить профиль. Это приведёт к ПЕРЕЗАГРУЗКЕ вашего принтера
+      save: >-
+        Сохранить откалиброванный профиль в printer.cfg. Это приведёт к ПЕРЕЗАГРУЗКЕ вашего принтера
+      load: Загрузить профиль
+  printer:
+    status:
+      used_filament: использованно филамента
+      time_left: осталось расчётного времени
+      duration: длительность
+      duration_total: продолжительность и общее время
+    state:
+      printing: Идёт печать
+      loading: Загрузка
+      complete: Готово
+      paused: Пауза
+      standby: Режим ожидания
+      idle: Ждёт задачу
+      ready: Готов
+      busy: Занят
+  setting:
+    title:
+      camera: Камера | Камеры
+      macros: Макросы
+      general: Общие
+      theme: Тема
+      tool: Инструмент
+      thermal_presets: Температурные профили
+    label:
+      camera_url: URL камеры
+      printer_name: Имя принтера
+      language: Язык интерфейса
+      default_toolhead_move_length: Длина перемещения инструментальной головки по умолчанию
+      default_extrude_speed: Скорость экструдера по умолчанию
+      default_extrude_length: Длина экструдирования по умолчанию
+      default_toolhead_z_speed: Скорость инструмента для оси Z по умолчанию
+      default_toolhead_xy_speed: Скорость инструмента для осей XY по умолчанию
+      camera_flip_x: Отразить по горизонтали
+      camera_flip_y: Отразить по вертикали
+      camera_stream_type: Тип потока
+      thermal_preset_name: Имя профиля
+      all_on: Всё включить
+      all_off: Всё выключить
+      toggle: Переключатель
+      dark_mode: Тёмная тема
+      primary_color: Основной цвет
+      reset: Сбросить настройки
+      z_adjust_values: Значения подстройки оси Z
+      gcode_coords: Испрользовать координаты GCode
+      time_estimates: Оценки времени
+      invert_z_control: Инвертировать управление по оси Z
+      invert_y_control: Инвертировать управление по оси Y
+      invert_x_control: Инвертировать управление по оси X
+      enable: Включить
+      fps_target: Целевой FPS
+    btn:
+      add_camera: Добавить камеру
+      select_theme: Выбрать тему
+      add_thermal_preset: Добавить пресет температур
+      reset: Сбросить
+    timer_options:
+      duration: Только продолжительность
+      duration_description: Подобно ЖК-дисплею klipper, он показывает только продолжительность без каких-либо оценок.
+      file: Оценка времени на основе файла
+      file_description: >-
+        Использует процент прогресса печати и длительность из файла для оценки общей длительности.<br />
+        Точность повышается в течение времени печати.
+      filament: Оценка филамента
+      filament_description: >-
+        Используется отношение значения потраченного филамента к расчётному значению, для расчёта общей продолжительности.<br />
+        Точность повышается в течение времени печати.
+      slicer: Слайсер
+      slicer_description: Использует оценку слайсера для отображения. Вы должны включить эту опцию в вашем слайсере.
+    camera_type_options:
+      video: IP Камера
+      mjpegstream: MJPEG поток
+      mjpegadaptive: MJPEG Адаптивный
+    tooltip:
+      gcode_coords: Использовать GCode положение вместо положение инструментальной головки на панели управления
+  chart:
+    tooltip:
+      help: >-
+        Удерживайте shift для увеличения.<br />Кликните на элемент, чтобы изменить его видимость на графике.<br
+        />Кликните на мощность чтобы изменить видимость шкалы на графике.
+    label:
+      item: Элемент
+      current: Текущее значение
+      target: Цель
+      power: Мощность
+  file_system:
+    title:
+      rename_file: Переименовать файл
+      rename_dir: Переименовать папку
+      add_file: Добавить файл
+      add_dir: Добавить папку
+    label:
+      dir_name: Имя папки
+      file_name: Имя файла
+      disk_usage: Использованно дискового пространства
+    msg:
+      not_found: Файлы не найдены
+      uploading: Загрузка...
+      processing: Обработка...
+      confirm: Вы уверены? Это приведет к удалению всех файлов и папок внутри.
+    tooltip:
+      disabled: Задания на печать отключены до подключения к klippy
+      low_on_space: Мало места на диске
+    overlay:
+      label: <strong>Перетащите</strong> файл сюда
+      uploading: <strong>Загрузка</strong> файлов
+    filters:
+      label:
+        print_start_time: Отфильтровать напечатанное
+        print_start_time_desc: Отфильтровывает уже напечатанные элементы.
+  endstop:
+    label:
+      open: Открыто
+      triggered: Есть контакт
+    msg:
+      subtitle: Используйте кнопку обновить, чтобы обновить состояние концевика.
+  history:
+    msg:
+      confirm: Вы уверены? Это очистит историю и сбросит статистику принтера
+      load_count: Представляет последние {num} заданий
+  endpoint:
+    hint:
+      add_printer: Например, http://fluiddpi.local
+    msg:
+      trouble: >-
+        Столкнулись с проблемами? <a href="%{url}" target="_blank">Посмотрите здесь</a> для получения дополнительной информации.
+    tooltip:
+      endpoint_examples: >-
+        Введите URL вашего API.<br />В качестве примера, может быть что-то подобное:;<br
+        /><blockquote>http://fluidd.local, http://192.168.1.150</blockquote>
+    error:
+      cant_connect: >-
+        Что-то пошло не так, fluidd не может подключиться. Вы уверены,
+        что это правильный адрес?
+      cors_error: Заблокировано CORS политикой
+      cors_note: >-
+        Это значит, что вы должны изменить вашу конфигурацию для moonraker. Пожалуйста посмотрите документацию для установки нескольких принтеров <a href="%{url}"
+        target="_blank">здесь</a>
diff --git a/src/store/config/index.ts b/src/store/config/index.ts
index 379cff91fb..1a665a0434 100644
--- a/src/store/config/index.ts
+++ b/src/store/config/index.ts
@@ -19,7 +19,8 @@ export const defaultState = (): ConfigState => {
         { name: 'English', code: 'en' },
         { name: 'Français', code: 'fr' },
         { name: 'Chinese', code: 'cn' },
-        { name: 'Nederlands', code: 'nl' }
+        { name: 'Nederlands', code: 'nl' },
+        { name: 'Русский', code: 'ru' }
       ]
     },
     cardState: {},

From c87fdc8431423cff27c2c26d7e6b25a0e2b4eb10 Mon Sep 17 00:00:00 2001
From: Raabi91 <38133278+Raabi91@users.noreply.github.com>
Date: Fri, 26 Mar 2021 22:57:56 +0100
Subject: [PATCH 05/17] Create de.yaml

---
 src/locales/de.yaml | 331 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 331 insertions(+)
 create mode 100644 src/locales/de.yaml

diff --git a/src/locales/de.yaml b/src/locales/de.yaml
new file mode 100644
index 0000000000..a005f8f795
--- /dev/null
+++ b/src/locales/de.yaml
@@ -0,0 +1,331 @@
+app:
+  general:
+    title:
+      camera: Kamera | Kameras
+      console: Konsole
+      bedmesh: Bett Mesh
+      home: Dashboard
+      add_printer: Drucker hinzufügen
+      endstops: Endschalter
+      fans_outputs: Fans & Ausgänge
+      jobs: Aufträge
+      macros: Macros
+      limits: Drucker Limits
+      logs: Drucker Logs
+      system_control: Systemsteuerung
+      runout_sensors: Runout Sensors
+      status: Status
+      temperature: Temperaturen
+      tool: Tool
+      tune: Tune
+      configure: Konfiguration
+      interface: Interface
+      stats: Drucker Status
+      history: Auftragsverlauf
+      config_files: Konfigurations Dateien
+    label:
+      accel_to_decel: Accel zu Decel
+      acceleration: Acceleration
+      sqv: Square Corner Velocity
+      velocity: Velocity
+      api_url: API URL
+      host: Host
+      layout: Layout
+      name: Name
+      power: Power
+      printers: Drucker
+      requested_speed: Gewünschte Geschwindigkeit
+      services: Services
+      speed: Geschwindigkeit
+      flow: Flow
+      z_offset: Z Offset
+      high: High
+      low: Low
+      off: Aus
+      used: gebraucht
+      free: frei
+      total_jobs: Druckaufträge insgesamt
+      longest_job: Längester Auftrag
+      total_time: Gesamtzeit
+      total_time_avg: Durchschnitt pro Druck
+      total_print_time: Gesamte Druckzeit
+      total_print_time_avg: Durchschnitt pro Druck
+      total_filament: Gesamt gebrauchtes Filament
+      total_filament_avg: Durchschnitt pro Druck
+      variance: Abweichung
+      save_as: Speichern als
+      edit_preset: Preset ändern
+      add_preset: Preset hinzufügen
+      edit_camera: Kamera ändern
+      add_camera: Camera hinzufügen
+      extrude_length: Extrusionslänge
+      extrude_speed: Extrusionsgeschwindigkeit
+      confirm: Bestätigen
+    btn:
+      all: Alle
+      all_off: Alle aus
+      quad_gantry_level: QGL
+      add: Hinzufügen
+      pause: Pause
+      reboot: Neustart
+      shutdown: Herunterfahren
+      remove: Entfernen
+      remove_all: Alle Entfernen 
+      rename: umbenennen
+      resume: fortfahren
+      cancel: Abbrechen
+      save: Speichern
+      save_as: Speichern als
+      upload: Upload
+      upload_print: Upload & Drucken
+      preheat: Preheat
+      reprint: Druck wiederholen
+      save_restart: Sepichern & Neustarten
+      adjust_layout: Dashboard layout einstellen
+      calibrate: Kalibrieren
+      clear_profile: Profile reinigen
+      download: Download
+      add_printer: Drucker hinzufügen
+      edit: bearbeiten
+      extrude: Extrudieren
+      retract: Retracten
+      restart_firmware: Firmware Neustarten
+      restart_service_klipper: Klipper Neustarten
+      restart_service_moonraker: Moonraker Neustarten
+      restart_service_webcamd: Webcam Neustarten
+      socket_refresh: Aktualisieren erzwingen
+      reset_file: Datei zurücksetzen
+      reset_layout: Layout zurücksetzen
+      view: Ansicht
+      close: Schließen
+      config_reference: Config Referenz
+      add_file: Datei hinzufügen
+      add_dir: Ordner hinzufügen
+    table:
+      header:
+        filament_used: Filament
+        name: Name
+        slicer: Slicer
+        status: Status
+        height: Höhe
+        layer_height: Layerhöhe
+        estimated_time: Geschätzte Zeit
+        last_printed: Zuletzt gedruckt
+        modified: Geändert
+        size: Größe
+        start_time: Gestartet
+        print_duration: Druckdauer
+        actions: Aktionen
+    simple_form:
+      msg:
+        confirm: Bist du Sicher?
+        confirm_reboot_host: Bist du Sichern? Das wird dein Host-System neustarten.
+        confirm_shutdown_host: Bist du Sichern? Das wird dein Host-System herunterfahren.
+      error:
+        invalid_url: Ungültig URL
+        max: Max %{max}
+        min: Min %{min}
+        min_or_0: Min %{min} oder 0
+        required: Erforderlich
+    tooltip:
+      estop: NOT-AUS
+    error:
+      app_warnings_found: '%{appName} gefundene Warnungen.'
+      app_setup_link: >-
+        Die Anforderungen für die Fluidd-Einrichtung finden Sie hier <a target="_blank"
+        href="%{url}">.</a>
+      failed_components: >-
+        Moonraker hat fehlerhafte Plugins, bitte überprüfen Sie Ihre Logs, 
+        aktualisieren Sie Ihre Konfiguration und starten Sie Moonraker neu.
+      components_config: >-
+        Die Konfiguration des Moonraker-Plugins finden Sie hier <a target="_blank"
+        href="%{url}">.</a>
+  socket:
+    msg:
+      connecting: Verbinde mit moonraker...
+      no_connection: Keine moonraker-Verbindung. Bitte überprüfen Sie den Moonraker-Status und / oder aktualisieren Sie Moonraker.
+  version:
+    title: Software Updates
+    btn:
+      update: Aktualisieren
+      finish: Beendet
+      check_for_updates: Check for updates
+    label:
+      dirty: DIRTY
+      invalid: INVALID
+      up_to_date: AKTUELL
+    status:
+      updating: Aktualisieren...
+      finished: Aktualisieren beendet
+    tooltip:
+      dirty: zeigt einen fehlerhaften gitrepo an
+      invalid: zeigt locale änderungen im gitrepo an
+  console:
+    label:
+      hide_temp_waits: Temp-bestätigungen ausblenden
+    placeholder:
+      command: '''tab'' für die Autovervollständigung, ''help'' für die Kommandos ''arrows'' für den Verlauf '
+  tool:
+    btn:
+      home_x: X
+      home_y: Y
+    tooltip:
+      home_xy: Home XY
+      home_z: Home Z
+      extruder_disabled: >-
+        Extruder deaktiviert, da unter der min_extrude_temp (%{min}<small>°C</small>)
+  bedmesh:
+    label:
+      profile_name: Profile Name
+      remove_profile: Entferne %{name} profile
+    msg:
+      not_found: Keine bed meshes gefunden.
+      hint: >-
+        If saving as something other than %{name}, you can choose to also remove
+        the %{name} profile
+    tooltip:
+      calibrate: Begins a new calibration, saving as profile 'default'
+      delete: Delete Profile. This WILL restart your printer
+      save: >-
+        Commits calibrated profile to printer.cfg. This WILL restart your
+        printer
+      load: Load Profile
+  printer:
+    status:
+      used_filament: used filament
+      time_left: estimated time left
+      duration: duration
+      duration_total: duration & total
+    state:
+      printing: Printing
+      loading: Loading
+      complete: Complete
+      paused: Paused
+      standby: Standby
+      idle: Idle
+      ready: Ready
+      busy: Busy
+  setting:
+    title:
+      camera: Camera | Cameras
+      macros: Macros
+      general: General
+      theme: Theme
+      tool: Tool
+      thermal_presets: Thermal Presets
+    label:
+      camera_url: Camera Url
+      printer_name: Printer Name
+      language: Display Language
+      default_toolhead_move_length: Default toolhead move length
+      default_extrude_speed: Default extrude speed
+      default_extrude_length: Default extrude length
+      default_toolhead_z_speed: Default toolhead Z speed
+      default_toolhead_xy_speed: Default toolhead XY speed
+      camera_flip_x: Flip horizontally
+      camera_flip_y: Flip vertically
+      camera_stream_type: Stream type
+      thermal_preset_name: Preset Name
+      all_on: All on
+      all_off: All off
+      toggle: Toggle
+      dark_mode: Dark mode
+      primary_color: Primary color
+      reset: Reset settings
+      z_adjust_values: Z Adjust values
+      gcode_coords: Use GCode Coordinates
+      time_estimates: Time estimates
+      invert_z_control: Invert Z control
+      invert_y_control: Invert Y control
+      invert_x_control: Invert X control
+      enable: Enable
+      fps_target: FPS Target
+    btn:
+      add_camera: Add Camera
+      select_theme: Select Theme
+      add_thermal_preset: Add Preset
+      reset: Reset
+    timer_options:
+      duration: Duration only
+      duration_description: Similar to a klipper LCD, this only shows duration with no estimates.
+      file: File Estimation
+      file_description: >-
+        Takes progress percent, and duration to estimate total duration.<br />
+        More accurate over time.
+      filament: Filament Estimation
+      filament_description: >-
+        Takes used filament vs estimated filament to estimate total duration.<br />
+        More accurate over time.
+      slicer: Slicer
+      slicer_description: Uses slicer estimates for display. You must enable this in your slicer.
+    camera_type_options:
+      video: IP Camera
+      mjpegstream: MJPEG Stream
+      mjpegadaptive: MJPEG Adaptive
+    tooltip:
+      gcode_coords: Use GCode position instead of toolhead position on dashboard
+  chart:
+    tooltip:
+      help: >-
+        Hold shift to zoom.<br />Click an item to toggle in the graph.<br
+        />Click a power to toggle in the graph.
+    label:
+      item: Item
+      current: Current
+      target: Target
+      power: Power
+  file_system:
+    title:
+      rename_file: Rename File
+      rename_dir: Rename Directory
+      add_file: Add File
+      add_dir: Add Directory
+    label:
+      dir_name: Directory name
+      file_name: Filename
+      disk_usage: Disk Usage
+    msg:
+      not_found: No files found
+      uploading: Uploading...
+      processing: Processing...
+      confirm: Are you sure? This will delete all files and folders within.
+    tooltip:
+      disabled: Jobs are disabled prior to initial communcation with klippy
+      low_on_space: Low on disk space
+    overlay:
+      label: <strong>Drag</strong> a file here
+      uploading: <strong>Uploading</strong> files
+    filters:
+      label:
+        print_start_time: Filter printed
+        print_start_time_desc: Filters out items you've already printed.
+  endstop:
+    label:
+      open: OPEN
+      triggered: TRIGGERED
+    msg:
+      subtitle: Use the refresh button to update endstop status.
+  history:
+    msg:
+      confirm: Are you sure? This will clear all history, and printer statistics
+      load_count: Represents the last {num} Jobs
+  endpoint:
+    hint:
+      add_printer: E.g., http://fluiddpi.local
+    msg:
+      trouble: >-
+        Having trouble? <a href="%{url}" target="_blank">See here</a> for
+        more information.
+    tooltip:
+      endpoint_examples: >-
+        Enter your API URL.<br />Some examples might be;<br
+        /><blockquote>http://fluidd.local, http://192.168.1.150</blockquote>
+    error:
+      cant_connect: >-
+        Something went wrong, and fluidd can't reach the destination. Are you
+        sure this is the correct address?
+      cors_error: blocked by CORS policy
+      cors_note: >-
+        This may mean you need to modify your moonraker configuration. Please
+        see the documentation on multi printer setups <a href="%{url}"
+        target="_blank">here</a>

From c6dbe3672e7f922b9000c29770d3e611d3d61521 Mon Sep 17 00:00:00 2001
From: Raabi91 <38133278+Raabi91@users.noreply.github.com>
Date: Sat, 27 Mar 2021 08:01:34 +0100
Subject: [PATCH 06/17] Update de.yaml

---
 src/locales/de.yaml | 196 ++++++++++++++++++++++----------------------
 1 file changed, 98 insertions(+), 98 deletions(-)

diff --git a/src/locales/de.yaml b/src/locales/de.yaml
index a005f8f795..b8e6adffd7 100644
--- a/src/locales/de.yaml
+++ b/src/locales/de.yaml
@@ -177,155 +177,155 @@ app:
   bedmesh:
     label:
       profile_name: Profile Name
-      remove_profile: Entferne %{name} profile
+      remove_profile: Entferne %{name} profil
     msg:
       not_found: Keine bed meshes gefunden.
       hint: >-
-        If saving as something other than %{name}, you can choose to also remove
-        the %{name} profile
+        Sepicherst du esanders als %{name}, dann 
+        kannst du auch das %{name} Profil löschen.
     tooltip:
-      calibrate: Begins a new calibration, saving as profile 'default'
-      delete: Delete Profile. This WILL restart your printer
+      calibrate: Begtint eine neue Kalibrierung und speichert es als 'default'
+      delete: Profil löchen. Das startet den Drucker neu
       save: >-
-        Commits calibrated profile to printer.cfg. This WILL restart your
-        printer
-      load: Load Profile
+      Fügt das Mesh Profil der printer.cfg hinzu.
+      Das startet den Drucker neu
+      load: Lade Profil
   printer:
     status:
-      used_filament: used filament
-      time_left: estimated time left
-      duration: duration
-      duration_total: duration & total
+      used_filament: gebrauchtes Filament
+      time_left: geschätzte verbleibende Zeit
+      duration: Dauer
+      duration_total: Dauer & Gesamt
     state:
-      printing: Printing
-      loading: Loading
-      complete: Complete
-      paused: Paused
+      printing: am Drucken
+      loading: Laden
+      complete: Komplett
+      paused: Pausiert
       standby: Standby
-      idle: Idle
-      ready: Ready
-      busy: Busy
+      idle: Untätig
+      ready: Bereit
+      busy: Beschäftigt
   setting:
     title:
-      camera: Camera | Cameras
+      camera: Kamera | Kameras
       macros: Macros
       general: General
-      theme: Theme
+      theme: Themen
       tool: Tool
-      thermal_presets: Thermal Presets
+      thermal_presets: Temperatur Presets
     label:
-      camera_url: Camera Url
-      printer_name: Printer Name
-      language: Display Language
-      default_toolhead_move_length: Default toolhead move length
-      default_extrude_speed: Default extrude speed
-      default_extrude_length: Default extrude length
-      default_toolhead_z_speed: Default toolhead Z speed
-      default_toolhead_xy_speed: Default toolhead XY speed
-      camera_flip_x: Flip horizontally
-      camera_flip_y: Flip vertically
+      camera_url: Kamera Url
+      printer_name: Drucker Name
+      language: Anzeige Sprache
+      default_toolhead_move_length: Standardverfahrlänge des Tools
+      default_extrude_speed: Standard Extrudiergeschwindigkeit
+      default_extrude_length: Standard Extrudierlänge
+      default_toolhead_z_speed: Standard Toolgeschwindigkeit für Z
+      default_toolhead_xy_speed: Standard Toolgeschwindigkeit für XY
+      camera_flip_x: Horizontal spiegeln
+      camera_flip_y: Vertikal spiegeln
       camera_stream_type: Stream type
       thermal_preset_name: Preset Name
-      all_on: All on
-      all_off: All off
-      toggle: Toggle
-      dark_mode: Dark mode
-      primary_color: Primary color
-      reset: Reset settings
-      z_adjust_values: Z Adjust values
-      gcode_coords: Use GCode Coordinates
-      time_estimates: Time estimates
-      invert_z_control: Invert Z control
-      invert_y_control: Invert Y control
-      invert_x_control: Invert X control
-      enable: Enable
-      fps_target: FPS Target
+      all_on: Alle an
+      all_off: Alle aus
+      toggle: Umschalten
+      dark_mode: Dunkler Modus
+      primary_color: Primärfarbe
+      reset: Einstellungen zurücksetzen
+      z_adjust_values: Z Adjust Werte
+      gcode_coords: GCode Koordinaten verwenden
+      time_estimates: geschätze Zeit
+      invert_z_control: Z-Steuerung invertieren
+      invert_y_control: Y-Steuerung invertieren
+      invert_x_control: X-Steuerung invertieren
+      enable: Aktivieren
+      fps_target: FPS Ziel
     btn:
-      add_camera: Add Camera
-      select_theme: Select Theme
-      add_thermal_preset: Add Preset
-      reset: Reset
+      add_camera: Kamera hinzufügen
+      select_theme: Thema auswählen
+      add_thermal_preset: Preset hinzufügen
+      reset: Zurücksetzen
     timer_options:
-      duration: Duration only
-      duration_description: Similar to a klipper LCD, this only shows duration with no estimates.
-      file: File Estimation
+      duration: Nur Dauer
+      duration_description: Ähnlich wie bei einem Klipper-LCD wird hier nur die Dauer ohne Schätzungen angezeigt.
+      file: Datei-Schätzung
       file_description: >-
-        Takes progress percent, and duration to estimate total duration.<br />
-        More accurate over time.
-      filament: Filament Estimation
+        Nimmt die Fortschrittsprozent und die Dauer, um die Gesamtdauer zu schätzen.<br />
+        Wird mit der Zeit genauer.
+      filament: Filament-Schätzung
       filament_description: >-
-        Takes used filament vs estimated filament to estimate total duration.<br />
-        More accurate over time.
+        Nimmt das verwendetes Filament vs. das geschätztes Filament, um die Gesamtdauer zu schätzen.<br />
+        Ist mit der Zeit genauer.
       slicer: Slicer
-      slicer_description: Uses slicer estimates for display. You must enable this in your slicer.
+      slicer_description: Verwendet Slicer Schätzungen für die Anzeige. Sie müssen dies in Ihrem Slicer aktivieren.
     camera_type_options:
       video: IP Camera
       mjpegstream: MJPEG Stream
       mjpegadaptive: MJPEG Adaptive
     tooltip:
-      gcode_coords: Use GCode position instead of toolhead position on dashboard
+      gcode_coords: GCode-Position anstelle der Toolhead-Position auf dem Dashboard verwenden
   chart:
     tooltip:
       help: >-
-        Hold shift to zoom.<br />Click an item to toggle in the graph.<br
-        />Click a power to toggle in the graph.
+        Halten Sie die Umschalttaste gedrückt, um zu zoomen.<br />Klicken Sie auf ein Element, um es im Diagramm umzuschalten.<br
+        />Klicken Sie auf eine Leistung, um es im Diagramm umzuschalten.
     label:
-      item: Item
-      current: Current
-      target: Target
-      power: Power
+      item: Element
+      current: Aktuell
+      target: Ziel
+      power: Leistung
   file_system:
     title:
-      rename_file: Rename File
-      rename_dir: Rename Directory
-      add_file: Add File
-      add_dir: Add Directory
+      rename_file: Datei umbennen
+      rename_dir: Ordner umbennen
+      add_file: Datei hinzufügen
+      add_dir: Ordner hinzufügen
     label:
-      dir_name: Directory name
-      file_name: Filename
-      disk_usage: Disk Usage
+      dir_name: Ordnername
+      file_name: Dateiname
+      disk_usage: Benutzter Sepicher
     msg:
-      not_found: No files found
-      uploading: Uploading...
-      processing: Processing...
-      confirm: Are you sure? This will delete all files and folders within.
+      not_found: Keine Dateien gefunden
+      uploading: Hochladen...
+      processing: Verarbeitung...
+      confirm: Bist du sicher? Dadurch werden alle darin enthaltenen Dateien und Ordner gelöscht.
     tooltip:
-      disabled: Jobs are disabled prior to initial communcation with klippy
-      low_on_space: Low on disk space
+      disabled: Aufträge werden vor der ersten Kommunikation mit klippy deaktiviert
+      low_on_space: Wenig Speicherplatz auf der Festplatte
     overlay:
-      label: <strong>Drag</strong> a file here
-      uploading: <strong>Uploading</strong> files
+      label: <strong>Ziehen</strong> Sie eine Datei hierher
+      uploading: <strong>Hochladen</strong> von Dateien
     filters:
       label:
-        print_start_time: Filter printed
-        print_start_time_desc: Filters out items you've already printed.
+        print_start_time: Filter gedruckt
+        print_start_time_desc: Filtert Elemente aus, die Sie bereits gedruckt haben.
   endstop:
     label:
-      open: OPEN
-      triggered: TRIGGERED
+      open: Offen
+      triggered: Ausgelöst
     msg:
-      subtitle: Use the refresh button to update endstop status.
+      subtitle: Verwenden Sie die Schaltfläche "Aktualisieren", um den Endstopp-Status zu aktualisieren.
   history:
     msg:
-      confirm: Are you sure? This will clear all history, and printer statistics
-      load_count: Represents the last {num} Jobs
+      confirm: Sind Sie sicher? Dadurch werden der gesamte Verlauf und die Druckerstatistiken gelöscht
+      load_count: Stellt die letzten {num} Jobs dar
   endpoint:
     hint:
-      add_printer: E.g., http://fluiddpi.local
+      add_printer: z.B., http://fluiddpi.local
     msg:
       trouble: >-
-        Having trouble? <a href="%{url}" target="_blank">See here</a> for
-        more information.
+        Haben Sie Probleme? <a href="%{url}" target="_blank">Siehe hier</a> für
+        mehr Informationen.
     tooltip:
       endpoint_examples: >-
-        Enter your API URL.<br />Some examples might be;<br
+        Geben Sie Ihre API-URL ein.<br />Ein paar Beispiele könnten sein:<br
         /><blockquote>http://fluidd.local, http://192.168.1.150</blockquote>
     error:
       cant_connect: >-
-        Something went wrong, and fluidd can't reach the destination. Are you
-        sure this is the correct address?
-      cors_error: blocked by CORS policy
+        Irgendetwas ist schief gelaufen, und Fluidd kann das Ziel nicht erreichen. Sind Sie
+        sicher, dass dies die richtige Adresse ist?
+      cors_error: durch CORS-Richtlinie blockiert
       cors_note: >-
-        This may mean you need to modify your moonraker configuration. Please
-        see the documentation on multi printer setups <a href="%{url}"
-        target="_blank">here</a>
+        Dies kann bedeuten, dass Sie Ihre Moonraker-Konfiguration ändern müssen. Bitte
+        sehen Sie sich die Dokumentation zur Einrichtung von mehreren Druckern <a href="%{url}"
+        target="_blank">hier</a>

From 45e034b1d22a08b4188a8afdbc17c0d99f843a4b Mon Sep 17 00:00:00 2001
From: Raabi91 <38133278+Raabi91@users.noreply.github.com>
Date: Sat, 27 Mar 2021 12:07:54 +0100
Subject: [PATCH 07/17] Update index.ts

---
 src/store/config/index.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/store/config/index.ts b/src/store/config/index.ts
index 1a665a0434..b2aae35bea 100644
--- a/src/store/config/index.ts
+++ b/src/store/config/index.ts
@@ -20,7 +20,8 @@ export const defaultState = (): ConfigState => {
         { name: 'Français', code: 'fr' },
         { name: 'Chinese', code: 'cn' },
         { name: 'Nederlands', code: 'nl' },
-        { name: 'Русский', code: 'ru' }
+        { name: 'Русский', code: 'ru' },
+        { name: 'Deutsch', code: 'de' }
       ]
     },
     cardState: {},

From b4520ceb96b9e3027ba5703e0910f4a48d5d8d11 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sat, 27 Mar 2021 16:47:11 -0500
Subject: [PATCH 08/17] refactor: fix minor issue with de translations

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/locales/de.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/locales/de.yaml b/src/locales/de.yaml
index b8e6adffd7..143b7d9b29 100644
--- a/src/locales/de.yaml
+++ b/src/locales/de.yaml
@@ -187,8 +187,8 @@ app:
       calibrate: Begtint eine neue Kalibrierung und speichert es als 'default'
       delete: Profil löchen. Das startet den Drucker neu
       save: >-
-      Fügt das Mesh Profil der printer.cfg hinzu.
-      Das startet den Drucker neu
+        Fügt das Mesh Profil der printer.cfg hinzu.
+        Das startet den Drucker neu
       load: Lade Profil
   printer:
     status:

From 08d2b8bafddc253cde5b513dc884b616f403b0ac Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 11:34:22 -0500
Subject: [PATCH 09/17] fix: reprint not working when history is off

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/components/cards/dashboard/StatusCard.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/cards/dashboard/StatusCard.vue b/src/components/cards/dashboard/StatusCard.vue
index c70ab9a843..1624368c64 100644
--- a/src/components/cards/dashboard/StatusCard.vue
+++ b/src/components/cards/dashboard/StatusCard.vue
@@ -62,7 +62,7 @@
 
       <btn
         v-if="!supportsHistoryPlugin && !printerPrinting && !printerPaused && filename"
-        @click="handleReprint(this.filename)"
+        @click="handleReprint(filename)"
         small
         class="ma-1">
         <v-icon small class="mr-1">$reprint</v-icon>
@@ -95,8 +95,6 @@ import { SocketActions } from '@/socketActions'
   }
 })
 export default class StatusCard extends Mixins(StateMixin, FilesMixin) {
-  showHistory = false
-
   get hidePrinterMenu () {
     if (!this.supportsHistoryPlugin) {
       return (!this.printerPrinting && !this.printerPaused && !this.filename)
@@ -150,7 +148,6 @@ export default class StatusCard extends Mixins(StateMixin, FilesMixin) {
   }
 
   handleReprint (filename: string) {
-    this.showHistory = false
     SocketActions.printerPrintStart(filename)
   }
 

From d1b0560c99b853142225fbfee0b28a24d726e66c Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 11:34:41 -0500
Subject: [PATCH 10/17] fix: error in console when initial locale not set

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/store/config/actions.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/store/config/actions.ts b/src/store/config/actions.ts
index 4afe74217f..c4906bfead 100644
--- a/src/store/config/actions.ts
+++ b/src/store/config/actions.ts
@@ -27,7 +27,12 @@ export const actions: ActionTree<ConfigState, RootState> = {
     }
 
     // Set the correct language.
-    dispatch('onLocaleChange', payload.general.locale)
+    if (
+      payload.general &&
+      payload.general.locale
+    ) {
+      dispatch('onLocaleChange', payload.general.locale)
+    }
   },
 
   /**

From 64f3a8fd7346ff8b28fa282f38847c14388de559 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 17:12:21 -0500
Subject: [PATCH 11/17] fix: thumbs failing to load

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/store/helpers.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/store/helpers.ts b/src/store/helpers.ts
index d2eb22311c..04273f385c 100644
--- a/src/store/helpers.ts
+++ b/src/store/helpers.ts
@@ -27,8 +27,8 @@ export const getThumb = (thumbnails: Thumbnail[], path: string, goLarge = true)
           return {
             ...thumb,
             absolute_path: (path === '')
-              ? `${apiUrl}/server/files/gcodes/${thumb.relative_path}`
-              : `${apiUrl}/server/files/gcodes/${path}/${thumb.relative_path}`
+              ? encodeURI(`${apiUrl}/server/files/gcodes/${thumb.relative_path}`)
+              : encodeURI(`${apiUrl}/server/files/gcodes/${path}/${thumb.relative_path}`)
           }
         }
         if (thumb.data) {

From 40f0071f895694d24e0c23495d4f8aa503c5ad2d Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 17:27:18 -0500
Subject: [PATCH 12/17] fix: ensure history items are updated without needing
 to refresh

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/socketActions.ts           |  4 ++--
 src/store/history/actions.ts   | 16 +++++++++++++---
 src/store/history/mutations.ts | 16 +++++++++++-----
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/socketActions.ts b/src/socketActions.ts
index 3613f7b4a8..57b67cd643 100644
--- a/src/socketActions.ts
+++ b/src/socketActions.ts
@@ -300,7 +300,7 @@ export const SocketActions = {
   async serverHistoryList (limit?: number) {
     baseEmit(
       'server.history.list', {
-        dispatch: 'history/onInit',
+        dispatch: 'history/onHistoryList',
         params: { limit }
       }
     )
@@ -309,7 +309,7 @@ export const SocketActions = {
   async serverHistoryTotals () {
     baseEmit(
       'server.history.totals', {
-        dispatch: 'history/onInit'
+        dispatch: 'history/onHistoryTotals'
       }
     )
   },
diff --git a/src/store/history/actions.ts b/src/store/history/actions.ts
index 4068a9d08e..e47020de71 100644
--- a/src/store/history/actions.ts
+++ b/src/store/history/actions.ts
@@ -24,11 +24,20 @@ export const actions: ActionTree<HistoryState, RootState> = {
   },
 
   /**
-   * Init the store with history data
+   * Update the store with history totals data
    */
-  async onInit ({ commit }, payload) {
+  async onHistoryTotals ({ commit }, payload) {
     if (payload) {
-      commit('setInitHistory', payload)
+      commit('setHistoryTotals', payload)
+    }
+  },
+
+  /**
+   * Update the store with history
+   */
+  async onHistoryList ({ commit }, payload) {
+    if (payload) {
+      commit('setHistoryList', payload)
     }
   },
 
@@ -36,6 +45,7 @@ export const actions: ActionTree<HistoryState, RootState> = {
    * History has changed, update the data.
    */
   async onHistoryChange ({ commit }, payload: { action: string; job: HistoryItem }) {
+    SocketActions.serverHistoryTotals()
     if (
       payload
     ) {
diff --git a/src/store/history/mutations.ts b/src/store/history/mutations.ts
index 70a0379b7f..4301cce8d5 100644
--- a/src/store/history/mutations.ts
+++ b/src/store/history/mutations.ts
@@ -12,12 +12,18 @@ export const mutations: MutationTree<HistoryState> = {
   },
 
   /**
-   * Inits the console history from db
+   * Applies currently known history totals
    */
-  setInitHistory (state, payload: HistoryState) {
-    if (payload) {
-      Object.assign(state, payload)
-    }
+  setHistoryTotals (state, payload: HistoryState) {
+    if (payload) Vue.set(state, 'job_totals', payload.job_totals)
+  },
+
+  /**
+   * Applies history list
+   */
+  setHistoryList (state, payload: HistoryState) {
+    if (payload.jobs !== undefined) Vue.set(state, 'jobs', payload.jobs)
+    if (payload.count !== undefined) Vue.set(state, 'count', payload.count)
   },
 
   /**

From 11bf045cdcd9ef7146b3c347127298379ec4e884 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 17:27:40 -0500
Subject: [PATCH 13/17] refactor: cleanup new version notifications

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/components/AppBar.vue                     | 23 ++++---------------
 .../widgets/versions/SystemVersions.vue       | 10 ++++++++
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/components/AppBar.vue b/src/components/AppBar.vue
index 605ece111b..c06867e7ca 100644
--- a/src/components/AppBar.vue
+++ b/src/components/AppBar.vue
@@ -32,24 +32,11 @@
         <v-icon small class="mr-md-1">$tune</v-icon>
         <span>{{ $t('app.general.title.tune') }}</span>
       </btn>
-      <v-badge
-        bordered
-        color="warning"
-        left
-        overlap
-        :value="hasUpdates"
-        offset-y="17"
-        offset-x="22"
-        class="d-none d-md-flex mx-1"
-      >
-        <template v-slot:badge>
-          <strong class="black--text">!</strong>
-        </template>
-        <btn text to="/configure" color="" class="d-none d-md-flex mx-1">
-          <v-icon small class="mr-md-1">$cogs</v-icon>
-          <span>{{ $t('app.general.title.configure') }}</span>
-        </btn>
-      </v-badge>
+      <btn text to="/configure" color="" class="d-none d-md-flex mx-1">
+        <v-icon small right color="warning" v-if="hasUpdates">$info</v-icon>
+        <v-icon small class="mr-md-1" v-else>$cogs</v-icon>
+        <span>{{ $t('app.general.title.configure') }}</span>
+      </btn>
       <v-tooltip bottom v-if="socketConnected">
         <template v-slot:activator="{ on, attrs }">
           <btn
diff --git a/src/components/widgets/versions/SystemVersions.vue b/src/components/widgets/versions/SystemVersions.vue
index 07d0ff97c2..f6234aaddf 100644
--- a/src/components/widgets/versions/SystemVersions.vue
+++ b/src/components/widgets/versions/SystemVersions.vue
@@ -4,6 +4,12 @@
     :collapsable="false"
     icon="$update">
 
+    <template v-slot:title>
+      <v-icon left color="warning" v-if="hasUpdates">$info</v-icon>
+      <v-icon left v-else>$update</v-icon>
+      <span class="font-weight-light">{{ $t('app.version.title') }}</span>
+    </template>
+
     <template v-slot:collapse-button>
       <btn
         @click="forceCheck()"
@@ -103,6 +109,10 @@ export default class SystemVersions extends Mixins(StateMixin) {
     return this.$store.getters['version/hasUpdate'](component)
   }
 
+  get hasUpdates () {
+    return this.$store.getters['version/hasUpdates']
+  }
+
   packageTitle (component: HashVersion | OSPackage | ArtifactVersion) {
     if (component.type === 'system') {
       return 'os packages'

From 94cc94e8dd90b592850a9b4fa5d1ab033e7f86b2 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 17:27:49 -0500
Subject: [PATCH 14/17] chore: general cleanup

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/components/cards/CollapsableCard.vue | 24 ------------------------
 src/store/config/mutations.ts            |  5 +----
 2 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/components/cards/CollapsableCard.vue b/src/components/cards/CollapsableCard.vue
index ce8bfd6587..54efe48738 100644
--- a/src/components/cards/CollapsableCard.vue
+++ b/src/components/cards/CollapsableCard.vue
@@ -4,22 +4,7 @@
     :rounded="rounded"
     :loading="isLoading">
 
-    <div v-if="hasTabbedTitleSlot()" :class="{ 'draggable': isInLayout }">
-      <slot
-        name="tabbed-title"
-        v-bind:attrs="{
-          enabled,
-          isCollapsed
-        }"
-        v-bind:on="{
-          'input': onCollapseChange,
-          'layout-enabled': onLayoutEnabled
-        }">
-      </slot>
-    </div>
-
     <v-card-title
-      v-if="!hasTabbedTitleSlot()"
       class="card-title card-heading py-1"
       :class="{ 'draggable': isInLayout }"
     >
@@ -346,15 +331,6 @@ export default class ToolheadCard extends Vue {
     return !!this.$slots['collapse-button'] || !!this.$scopedSlots['collapse-button']
   }
 
-  /**
-   * To overide the title with tabs.
-   * Note, this is not a computed prop because
-   * slots are not reactive.
-   */
-  hasTabbedTitleSlot () {
-    return !!this.$slots['tabbed-title'] || !!this.$scopedSlots['tabbed-title']
-  }
-
   mounted () {
     this.$emit('collapsed', this.isCollapsed)
     if (this.hasCollapseButtonSlot) {
diff --git a/src/store/config/mutations.ts b/src/store/config/mutations.ts
index bddfded469..7fbe22c066 100644
--- a/src/store/config/mutations.ts
+++ b/src/store/config/mutations.ts
@@ -18,10 +18,7 @@ export const mutations: MutationTree<ConfigState> = {
    * Inits UI settings from the db
    */
   setInitUiSettings (state, payload: UiSettings) {
-    if (payload) {
-      const settings = merge(state.uiSettings, payload)
-      Vue.set(state, 'uiSettings', settings)
-    }
+    if (payload) Vue.set(state, 'uiSettings', merge(state.uiSettings, payload))
   },
 
   /**

From 9314fe23c1dafcf651d00644936ea7d38dce6de5 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 18:10:25 -0500
Subject: [PATCH 15/17] fix: now inits plugins when no moonraker db data

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/init.ts                  | 2 +-
 src/store/version/actions.ts | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/init.ts b/src/init.ts
index 4b5af580a0..e63f9821cb 100644
--- a/src/init.ts
+++ b/src/init.ts
@@ -212,7 +212,7 @@ export const appInit = async (apiConfig?: ApiConfig, hostConfig?: HostConfig): P
               key,
               value: {}
             })
-            return null
+            return {}
           }
           consola.debug('API Down / Not Available:', r)
           apiConnected = false
diff --git a/src/store/version/actions.ts b/src/store/version/actions.ts
index dde798f743..4ed504ab26 100644
--- a/src/store/version/actions.ts
+++ b/src/store/version/actions.ts
@@ -13,7 +13,7 @@ export const actions: ActionTree<VersionState, RootState> = {
   },
 
   /**
-   * Make a socket request to init the power plugin.
+   * Make a socket request to init the version component.
    */
   async init () {
     SocketActions.machineUpdateStatus()
@@ -23,7 +23,6 @@ export const actions: ActionTree<VersionState, RootState> = {
    * Inits any file config we may have.
    */
   async onUpdateStatus ({ commit }, payload) {
-    consola.debug('Finished machine.update.status', payload)
     commit('setRefreshing', false)
     commit('setUpdateStatus', payload)
   },

From c31ab09f81875567360d2df41792e3d3085f3f9b Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 18:19:49 -0500
Subject: [PATCH 16/17] chore: cleanup todo

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 todo.md | 54 +++++++++++++++++++-----------------------------------
 1 file changed, 19 insertions(+), 35 deletions(-)

diff --git a/todo.md b/todo.md
index e7f685482b..9474a20c60 100644
--- a/todo.md
+++ b/todo.md
@@ -2,41 +2,36 @@
 
 ## Next Up
 
-- hide enabled flag for collapsable card for camera panel on dashboard
-- use components instead of plugins with moonraker
+### Features
 
 - add git history
-  - move versions to configure page
-  - reogranize service restarts / vs klipper firmware restarts
-
 - More macro layout options (categorize macros, ability to define layout in some way, color)
-
 - alternate bed mesh scales
+- file system enhancements
+  - bulk actions to delete or move?
+  - copy file
+  - move dialog
+  - bulk action move
+- allow deletion of all printers on fluidd.xyz
+- allow users to show / hide pin outputs
+
+### Refactors
 
-- move config widgets and sort into config vs tune
+- sync instances across moonraker db
+- use components instead of plugins with moonraker
+- rename device power store
+- refactor component file structure
+  - move config widgets and sort into config vs tune
   - general component layout re-arrangement
-  - rename device power store
+- cleanup card layout stuff
+  - hide enabled flag for collapsable card for camera panel on dashboard
 - change card states to db and be driven by getters..
-- move klipper restarts elsewhere so service restarts are their own thing
-  - allow users to restart webcamd service if webcam is enabled
 
-- allow different resolutions with bed mesh viewer
+### Docs
 
 - update docs to mention cura uploads
-- docs on configuring a camera
 - update docs re: output pins
 
-- bulk actions to delete or move?
-- copy file
-- move dialog
-- bulk action move
-- cleanup card layout stuff
-- sync instances across moonraker db
-
-- allow deletion of all printers on fluidd.xyz
-- show known meta data on print dialog (for dashboard jobs page..)?
-- allow users to show / hide pin outputs
-
 ## Filesystem Improvements
 
 - Bulk actions on files
@@ -58,12 +53,7 @@
 
 ## General Improvements
 
-- allow defining more than one camera
-- themes (pick a specific theme (red, green etc..)
-- figure out https
-- click / tap image camara update option (i.e., not constant image updates)
 - probed vs mesh bed level display option
-- should be able to force part speed fan during a print?
 
 ## [Page] Printer Configuration
 
@@ -76,20 +66,14 @@
 
 ## User wants (not necessarily something we'll implement in the suggested way...)
 
-- option to customize color of the logo at top-left (and subsequently on your browser tab and bookmark)
 - add QUERY_PROBE to endstops widget
-- parse underscores out of macro names
-- another request to have the current temps above the macors etc during a print, but not while not printing.
-- draggable dashboard panels?
 - maybe look at tightening the mobile ui. have fan's as a value, that you can click
   on which then makes a popout to adjust fan?
 - gcode viewer
 - gcode analyser
-- ability to categorise / group macros and expand contract them
-- Dry run. (print without extruding)
 - Cancel object, cancel area,
 - gcode viewer that works with more than 25mb
 - timelapses
 - plugins for raise cloud, astroprint and alike
 - to remote access without vpn
-- more security?
\ No newline at end of file
+- more security?

From bd8cc47b1daa1a2633b7456a5b5e58901596f6d9 Mon Sep 17 00:00:00 2001
From: Craig Bassett <craig.bassett@gmail.com>
Date: Sun, 28 Mar 2021 18:41:24 -0500
Subject: [PATCH 17/17] feat: add version update notification to collapsed
 hamburger menu

Signed-off-by: Craig Bassett <craig.bassett@gmail.com>
---
 src/components/AppDrawer.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/components/AppDrawer.vue b/src/components/AppDrawer.vue
index 327c5169c3..8325630195 100644
--- a/src/components/AppDrawer.vue
+++ b/src/components/AppDrawer.vue
@@ -37,7 +37,10 @@
           <v-icon>$cogs</v-icon>
         </v-list-item-icon>
         <v-list-item-content>
-          <v-list-item-title>{{ $t('app.general.title.configure') }}</v-list-item-title>
+          <v-list-item-title>
+            {{ $t('app.general.title.configure') }}
+            <v-icon small right color="warning" v-if="hasUpdates">$info</v-icon>
+          </v-list-item-title>
         </v-list-item-content>
       </v-list-item>
       <v-list-item to="/interface">
@@ -89,6 +92,10 @@ export default class AppDrawer extends Mixins(StateMixin) {
     return this.$store.getters['server/getInfo']
   }
 
+  get hasUpdates () {
+    return this.$store.getters['version/hasUpdates']
+  }
+
   close () {
     this.$emit('input', false)
   }