From 4c40ecbbcd611b060ac851550aacd385d7dd4fd3 Mon Sep 17 00:00:00 2001
From: vajonam <152501+vajonam@users.noreply.github.com>
Date: Wed, 29 Nov 2023 15:01:01 +0000
Subject: [PATCH 1/5] fix: re-layout progress bar and thumbnail

Co-authored-by: Mathis Mensing <github@matmen.dev>
Signed-off-by: vajonam <152501+vajonam@users.noreply.github.com>
---
 src/components/widgets/status/StatusTab.vue | 137 ++++++++++++++------
 1 file changed, 95 insertions(+), 42 deletions(-)

diff --git a/src/components/widgets/status/StatusTab.vue b/src/components/widgets/status/StatusTab.vue
index 6a9fcf3bde..2ae8634138 100644
--- a/src/components/widgets/status/StatusTab.vue
+++ b/src/components/widgets/status/StatusTab.vue
@@ -4,7 +4,7 @@
     <v-progress-linear
       v-if="
         progressVisible &&
-          $vuetify.breakpoint.mdAndDown
+          $vuetify.breakpoint.smAndDown
       "
       :height="6"
       :value="estimates.progress"
@@ -13,21 +13,44 @@
 
     <v-card-text v-if="visible">
       <v-row>
-        <!-- Only show the circular progress for lgAndUp -->
+        <!-- Only show the circular progress for mdAndUp since its more compact now -->
         <v-col
-          v-if="progressVisible && $vuetify.breakpoint.lgAndUp"
+          v-if="progressVisible && $vuetify.breakpoint.mdAndUp"
           cols="auto"
           align-self="center"
+          class="position-relative"
         >
-          <v-progress-circular
-            :rotate="-90"
-            :size="90"
-            :width="7"
-            :value="estimates.progress"
-            color="primary"
+          <v-row>
+            <div
+              class="progress-wrapper"
+              style="cursor: pointer"
+              @click="handleViewThumbnail"
+            >
+              <v-progress-circular
+                :rotate="-90"
+                :size="90"
+                :width="7"
+                :value="estimates.progress"
+                color="primary"
+                class="progress-circle"
+              />
+              <div class="thumbnail-background" />
+
+              <div class="fill-height print-thumb">
+                <img
+                  class="print-thumb"
+                  :src="thumbnail"
+                >
+              </div>
+            </div>
+          </v-row>
+          <v-row
+            justify="center"
           >
-            <span class="percentComplete focus--text">{{ estimates.progress }}%</span>
-          </v-progress-circular>
+            <div class="percentage-wrapper">
+              <span class="primary--text">{{ estimates.progress }}%</span>
+            </div>
+          </v-row>
         </v-col>
 
         <v-col align-self="center">
@@ -165,25 +188,6 @@
             </v-col>
           </v-row>
         </v-col>
-
-        <!-- Only show the thumb if we're lgAndUp and have a thumb to show -->
-        <v-col
-          v-if="thumbVisible"
-          cols="auto"
-          align-self="center"
-          class="pa-0"
-        >
-          <v-btn
-            text
-            height="100%"
-            @click="handleViewThumbnail"
-          >
-            <img
-              class="print-thumb"
-              :src="thumbnail"
-            >
-          </v-btn>
-        </v-col>
       </v-row>
     </v-card-text>
 
@@ -422,17 +426,66 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin) {
 </script>
 
 <style lang="scss" scoped>
-  .print-thumb {
-    display: block;
-    max-height: 110px;
-  }
+.print-thumb {
+  display: block;
+  max-height: 110px;
+}
+
+.filename {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  // width: 200px;
+  direction: rtl;
+  text-align: left;
+}
+
+.position-relative {
+  position: relative;
+}
+
+.progress-wrapper {
+  position: relative;
+  width: 90px;
+  /* Set the width and height to match progress circle size */
+  height: 90px;
+  /* Set the width and height to match progress circle size */
+  overflow: hidden;
+  border-radius: 50%;
+}
+
+.progress-circle {
+  position: absolute;
+  z-index: 4;
+}
+
+.thumbnail-background {
+  position: absolute;
+  width: 85px;
+  /* 10% less than the size of the progress circle */
+  height: 85px;
+  /* 10% less than the size of the progress circle */
+  border-radius: 50%;
+  background-color: rgba(0, 0, 0, 0.5);
+  /* Adjust transparency here */
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 0;
+}
+
+.print-thumb {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 0;
+  max-height: 73px;
+  max-width: 73px;
+  /* Adjust as needed */
+  border-radius: 50%;
+  opacity: 0.8;
+  /* Adjust opacity as needed */
+}
 
-  .filename {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    // width: 200px;
-    direction: rtl;
-    text-align: left;
-  }
 </style>

From 5e382f2a7c5d1e71f84394e0806b396ffda02384 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Tue, 2 Jan 2024 11:30:59 +0000
Subject: [PATCH 2/5] chore: dependency updates

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 package-lock.json         | 383 +++++++++++++++++++++-----------------
 package.json              |  22 +--
 src/views/Dashboard.vue   |   2 +-
 src/views/Diagnostics.vue |   2 +-
 4 files changed, 228 insertions(+), 181 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index c0a66c47c6..f30acf4dc4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@fontsource/roboto": "^5.0.8",
         "@irojs/iro-core": "^1.2.1",
         "@jaames/iro": "^5.5.2",
-        "axios": "^1.6.2",
+        "axios": "^1.6.3",
         "consola": "^3.2.3",
         "deepmerge": "^4.3.1",
         "dompurify": "^3.0.6",
@@ -35,9 +35,9 @@
         "shlex": "^2.1.2",
         "sortablejs": "^1.15.1",
         "uuid": "^9.0.1",
-        "vue": "^2.7.15",
+        "vue": "^2.7.16",
         "vue-class-component": "^7.2.6",
-        "vue-echarts": "^6.6.5",
+        "vue-echarts": "^6.6.8",
         "vue-i18n": "^8.28.2",
         "vue-inline-svg": "^2.1.3",
         "vue-json-viewer": "^2.2.22",
@@ -50,18 +50,18 @@
         "vuex": "^3.6.2"
       },
       "devDependencies": {
-        "@mdi/js": "^7.3.67",
+        "@mdi/js": "^7.4.47",
         "@originjs/vite-plugin-content": "^1.0.5",
         "@types/dompurify": "^3.0.5",
         "@types/jsdom": "^21.1.6",
         "@types/lodash-es": "^4.17.12",
         "@types/md5": "^2.3.5",
-        "@types/node": "^20.10.5",
+        "@types/node": "^20.10.6",
         "@types/semver": "^7.5.6",
         "@types/sortablejs": "^1.15.7",
         "@types/uuid": "^9.0.7",
-        "@typescript-eslint/eslint-plugin": "^6.15.0",
-        "@typescript-eslint/parser": "^6.15.0",
+        "@typescript-eslint/eslint-plugin": "^6.17.0",
+        "@typescript-eslint/parser": "^6.17.0",
         "@vitejs/plugin-vue2": "^2.3.1",
         "@vue/eslint-config-standard": "^8.0.1",
         "@vue/eslint-config-typescript": "^12.0.0",
@@ -74,7 +74,7 @@
         "madge": "^6.1.0",
         "mockdate": "^3.0.5",
         "monaco-vscode-textmate-theme-converter": "^0.1.7",
-        "rollup": "^4.9.1",
+        "rollup": "^4.9.2",
         "sass": "~1.32.13",
         "shx": "^0.3.4",
         "standard-version": "^9.5.0",
@@ -84,11 +84,11 @@
         "vite-plugin-checker": "^0.6.2",
         "vite-plugin-monaco-editor": "^1.1.0",
         "vite-plugin-pwa": "^0.17.4",
-        "vitest": "^1.1.0",
+        "vitest": "^1.1.1",
         "vue-debounce-decorator": "^1.0.1",
         "vue-i18n-extract": "^2.0.7",
-        "vue-template-compiler": "^2.7.15",
-        "vue-tsc": "^1.8.26",
+        "vue-template-compiler": "^2.7.16",
+        "vue-tsc": "^1.8.27",
         "workbox-build": "^7.0.0",
         "workbox-core": "^7.0.0",
         "workbox-routing": "^7.0.0",
@@ -2668,9 +2668,9 @@
       }
     },
     "node_modules/@mdi/js": {
-      "version": "7.3.67",
-      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.3.67.tgz",
-      "integrity": "sha512-MnRjknFqpTC6FifhGHjZ0+QYq2bAkZFQqIj8JA2AdPZbBxUvr8QSgB2yPAJ8/ob/XkR41xlg5majDR3c1JP1hw==",
+      "version": "7.4.47",
+      "resolved": "https://registry.npmjs.org/@mdi/js/-/js-7.4.47.tgz",
+      "integrity": "sha512-KPnNOtm5i2pMabqZxpUz7iQf+mfrYZyKCZ8QNz85czgEt7cuHcGorWfdzUMWYA0SD+a6Hn4FmJ+YhzzzjkTZrQ==",
       "dev": true
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -2756,9 +2756,9 @@
       }
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.1.tgz",
-      "integrity": "sha512-6vMdBZqtq1dVQ4CWdhFwhKZL6E4L1dV6jUjuBvsavvNJSppzi6dLBbuV+3+IyUREaj9ZFvQefnQm28v4OCXlig==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.9.2.tgz",
+      "integrity": "sha512-RKzxFxBHq9ysZ83fn8Iduv3A283K7zPPYuhL/z9CQuyFrjwpErJx0h4aeb/bnJ+q29GRLgJpY66ceQ/Wcsn3wA==",
       "cpu": [
         "arm"
       ],
@@ -2769,9 +2769,9 @@
       ]
     },
     "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.1.tgz",
-      "integrity": "sha512-Jto9Fl3YQ9OLsTDWtLFPtaIMSL2kwGyGoVCmPC8Gxvym9TCZm4Sie+cVeblPO66YZsYH8MhBKDMGZ2NDxuk/XQ==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.9.2.tgz",
+      "integrity": "sha512-yZ+MUbnwf3SHNWQKJyWh88ii2HbuHCFQnAYTeeO1Nb8SyEiWASEi5dQUygt3ClHWtA9My9RQAYkjvrsZ0WK8Xg==",
       "cpu": [
         "arm64"
       ],
@@ -2782,9 +2782,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.1.tgz",
-      "integrity": "sha512-LtYcLNM+bhsaKAIGwVkh5IOWhaZhjTfNOkGzGqdHvhiCUVuJDalvDxEdSnhFzAn+g23wgsycmZk1vbnaibZwwA==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.9.2.tgz",
+      "integrity": "sha512-vqJ/pAUh95FLc/G/3+xPqlSBgilPnauVf2EXOQCZzhZJCXDXt/5A8mH/OzU6iWhb3CNk5hPJrh8pqJUPldN5zw==",
       "cpu": [
         "arm64"
       ],
@@ -2795,9 +2795,9 @@
       ]
     },
     "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.1.tgz",
-      "integrity": "sha512-KyP/byeXu9V+etKO6Lw3E4tW4QdcnzDG/ake031mg42lob5tN+5qfr+lkcT/SGZaH2PdW4Z1NX9GHEkZ8xV7og==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.2.tgz",
+      "integrity": "sha512-otPHsN5LlvedOprd3SdfrRNhOahhVBwJpepVKUN58L0RnC29vOAej1vMEaVU6DadnpjivVsNTM5eNt0CcwTahw==",
       "cpu": [
         "x64"
       ],
@@ -2808,9 +2808,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.1.tgz",
-      "integrity": "sha512-Yqz/Doumf3QTKplwGNrCHe/B2p9xqDghBZSlAY0/hU6ikuDVQuOUIpDP/YcmoT+447tsZTmirmjgG3znvSCR0Q==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.9.2.tgz",
+      "integrity": "sha512-ewG5yJSp+zYKBYQLbd1CUA7b1lSfIdo9zJShNTyc2ZP1rcPrqyZcNlsHgs7v1zhgfdS+kW0p5frc0aVqhZCiYQ==",
       "cpu": [
         "arm"
       ],
@@ -2821,9 +2821,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.1.tgz",
-      "integrity": "sha512-u3XkZVvxcvlAOlQJ3UsD1rFvLWqu4Ef/Ggl40WAVCuogf4S1nJPHh5RTgqYFpCOvuGJ7H5yGHabjFKEZGExk5Q==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.9.2.tgz",
+      "integrity": "sha512-pL6QtV26W52aCWTG1IuFV3FMPL1m4wbsRG+qijIvgFO/VBsiXJjDPE/uiMdHBAO6YcpV4KvpKtd0v3WFbaxBtg==",
       "cpu": [
         "arm64"
       ],
@@ -2834,9 +2834,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.1.tgz",
-      "integrity": "sha512-0XSYN/rfWShW+i+qjZ0phc6vZ7UWI8XWNz4E/l+6edFt+FxoEghrJHjX1EY/kcUGCnZzYYRCl31SNdfOi450Aw==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.9.2.tgz",
+      "integrity": "sha512-On+cc5EpOaTwPSNetHXBuqylDW+765G/oqB9xGmWU3npEhCh8xu0xqHGUA+4xwZLqBbIZNcBlKSIYfkBm6ko7g==",
       "cpu": [
         "arm64"
       ],
@@ -2847,9 +2847,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.1.tgz",
-      "integrity": "sha512-LmYIO65oZVfFt9t6cpYkbC4d5lKHLYv5B4CSHRpnANq0VZUQXGcCPXHzbCXCz4RQnx7jvlYB1ISVNCE/omz5cw==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.9.2.tgz",
+      "integrity": "sha512-Wnx/IVMSZ31D/cO9HSsU46FjrPWHqtdF8+0eyZ1zIB5a6hXaZXghUKpRrC4D5DcRTZOjml2oBhXoqfGYyXKipw==",
       "cpu": [
         "riscv64"
       ],
@@ -2860,9 +2860,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.1.tgz",
-      "integrity": "sha512-kr8rEPQ6ns/Lmr/hiw8sEVj9aa07gh1/tQF2Y5HrNCCEPiCBGnBUt9tVusrcBBiJfIt1yNaXN6r1CCmpbFEDpg==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.9.2.tgz",
+      "integrity": "sha512-ym5x1cj4mUAMBummxxRkI4pG5Vht1QMsJexwGP8547TZ0sox9fCLDHw9KCH9c1FO5d9GopvkaJsBIOkTKxksdw==",
       "cpu": [
         "x64"
       ],
@@ -2873,9 +2873,9 @@
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.1.tgz",
-      "integrity": "sha512-t4QSR7gN+OEZLG0MiCgPqMWZGwmeHhsM4AkegJ0Kiy6TnJ9vZ8dEIwHw1LcZKhbHxTY32hp9eVCMdR3/I8MGRw==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.9.2.tgz",
+      "integrity": "sha512-m0hYELHGXdYx64D6IDDg/1vOJEaiV8f1G/iO+tejvRCJNSwK4jJ15e38JQy5Q6dGkn1M/9KcyEOwqmlZ2kqaZg==",
       "cpu": [
         "x64"
       ],
@@ -2886,9 +2886,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.1.tgz",
-      "integrity": "sha512-7XI4ZCBN34cb+BH557FJPmh0kmNz2c25SCQeT9OiFWEgf8+dL6ZwJ8f9RnUIit+j01u07Yvrsuu1rZGxJCc51g==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.9.2.tgz",
+      "integrity": "sha512-x1CWburlbN5JjG+juenuNa4KdedBdXLjZMp56nHFSHTOsb/MI2DYiGzLtRGHNMyydPGffGId+VgjOMrcltOksA==",
       "cpu": [
         "arm64"
       ],
@@ -2899,9 +2899,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.1.tgz",
-      "integrity": "sha512-yE5c2j1lSWOH5jp+Q0qNL3Mdhr8WuqCNVjc6BxbVfS5cAS6zRmdiw7ktb8GNpDCEUJphILY6KACoFoRtKoqNQg==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.9.2.tgz",
+      "integrity": "sha512-VVzCB5yXR1QlfsH1Xw1zdzQ4Pxuzv+CPr5qpElpKhVxlxD3CRdfubAG9mJROl6/dmj5gVYDDWk8sC+j9BI9/kQ==",
       "cpu": [
         "ia32"
       ],
@@ -2912,9 +2912,9 @@
       ]
     },
     "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.1.tgz",
-      "integrity": "sha512-PyJsSsafjmIhVgaI1Zdj7m8BB8mMckFah/xbpplObyHfiXzKcI5UOUXRyOdHW7nz4DpMCuzLnF7v5IWHenCwYA==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.2.tgz",
+      "integrity": "sha512-SYRedJi+mweatroB+6TTnJYLts0L0bosg531xnQWtklOI6dezEagx4Q0qDyvRdK+qgdA3YZpjjGuPFtxBmddBA==",
       "cpu": [
         "x64"
       ],
@@ -3029,9 +3029,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.5",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.5.tgz",
-      "integrity": "sha512-nNPsNE65wjMxEKI93yOP+NPGGBJz/PoN3kZsVLee0XMiJolxSekEVD8wRwBUBqkwc7UWop0edW50yrCQW4CyRw==",
+      "version": "20.10.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.6.tgz",
+      "integrity": "sha512-Vac8H+NlRNNlAmDfGUP7b5h/KA+AtWIzuXy0E6OyP8f1tCLYAtPvKRRDJjAPqhpCb0t6U2j7/xqAuLEebW2kiw==",
       "dev": true,
       "dependencies": {
         "undici-types": "~5.26.4"
@@ -3088,16 +3088,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.15.0.tgz",
-      "integrity": "sha512-j5qoikQqPccq9QoBAupOP+CBu8BaJ8BLjaXSioDISeTZkVO3ig7oSIKh3H+rEpee7xCXtWwSB4KIL5l6hWZzpg==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.17.0.tgz",
+      "integrity": "sha512-Vih/4xLXmY7V490dGwBQJTpIZxH4ZFH6eCVmQ4RFkB+wmaCTDAx4dtgoWwMNGKLkqRY1L6rPqzEbjorRnDo4rQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "6.15.0",
-        "@typescript-eslint/type-utils": "6.15.0",
-        "@typescript-eslint/utils": "6.15.0",
-        "@typescript-eslint/visitor-keys": "6.15.0",
+        "@typescript-eslint/scope-manager": "6.17.0",
+        "@typescript-eslint/type-utils": "6.17.0",
+        "@typescript-eslint/utils": "6.17.0",
+        "@typescript-eslint/visitor-keys": "6.17.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -3123,15 +3123,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.15.0.tgz",
-      "integrity": "sha512-MkgKNnsjC6QwcMdlNAel24jjkEO/0hQaMDLqP4S9zq5HBAUJNQB6y+3DwLjX7b3l2b37eNAxMPLwb3/kh8VKdA==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.17.0.tgz",
+      "integrity": "sha512-C4bBaX2orvhK+LlwrY8oWGmSl4WolCfYm513gEccdWZj0CwGadbIADb0FtVEcI+WzUyjyoBj2JRP8g25E6IB8A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "6.15.0",
-        "@typescript-eslint/types": "6.15.0",
-        "@typescript-eslint/typescript-estree": "6.15.0",
-        "@typescript-eslint/visitor-keys": "6.15.0",
+        "@typescript-eslint/scope-manager": "6.17.0",
+        "@typescript-eslint/types": "6.17.0",
+        "@typescript-eslint/typescript-estree": "6.17.0",
+        "@typescript-eslint/visitor-keys": "6.17.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3151,13 +3151,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.15.0.tgz",
-      "integrity": "sha512-+BdvxYBltqrmgCNu4Li+fGDIkW9n//NrruzG9X1vBzaNK+ExVXPoGB71kneaVw/Jp+4rH/vaMAGC6JfMbHstVg==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.17.0.tgz",
+      "integrity": "sha512-RX7a8lwgOi7am0k17NUO0+ZmMOX4PpjLtLRgLmT1d3lBYdWH4ssBUbwdmc5pdRX8rXon8v9x8vaoOSpkHfcXGA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.15.0",
-        "@typescript-eslint/visitor-keys": "6.15.0"
+        "@typescript-eslint/types": "6.17.0",
+        "@typescript-eslint/visitor-keys": "6.17.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3168,13 +3168,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.15.0.tgz",
-      "integrity": "sha512-CnmHKTfX6450Bo49hPg2OkIm/D/TVYV7jO1MCfPYGwf6x3GO0VU8YMO5AYMn+u3X05lRRxA4fWCz87GFQV6yVQ==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.17.0.tgz",
+      "integrity": "sha512-hDXcWmnbtn4P2B37ka3nil3yi3VCQO2QEB9gBiHJmQp5wmyQWqnjA85+ZcE8c4FqnaB6lBwMrPkgd4aBYz3iNg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "6.15.0",
-        "@typescript-eslint/utils": "6.15.0",
+        "@typescript-eslint/typescript-estree": "6.17.0",
+        "@typescript-eslint/utils": "6.17.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3195,9 +3195,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.15.0.tgz",
-      "integrity": "sha512-yXjbt//E4T/ee8Ia1b5mGlbNj9fB9lJP4jqLbZualwpP2BCQ5is6BcWwxpIsY4XKAhmdv3hrW92GdtJbatC6dQ==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.17.0.tgz",
+      "integrity": "sha512-qRKs9tvc3a4RBcL/9PXtKSehI/q8wuU9xYJxe97WFxnzH8NWWtcW3ffNS+EWg8uPvIerhjsEZ+rHtDqOCiH57A==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3208,16 +3208,17 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.15.0.tgz",
-      "integrity": "sha512-7mVZJN7Hd15OmGuWrp2T9UvqR2Ecg+1j/Bp1jXUEY2GZKV6FXlOIoqVDmLpBiEiq3katvj/2n2mR0SDwtloCew==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.17.0.tgz",
+      "integrity": "sha512-gVQe+SLdNPfjlJn5VNGhlOhrXz4cajwFd5kAgWtZ9dCZf4XJf8xmgCTLIqec7aha3JwgLI2CK6GY1043FRxZwg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.15.0",
-        "@typescript-eslint/visitor-keys": "6.15.0",
+        "@typescript-eslint/types": "6.17.0",
+        "@typescript-eslint/visitor-keys": "6.17.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
         "semver": "^7.5.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3234,18 +3235,42 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
+      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+      "dev": true,
+      "dependencies": {
+        "brace-expansion": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.15.0.tgz",
-      "integrity": "sha512-eF82p0Wrrlt8fQSRL0bGXzK5nWPRV2dYQZdajcfzOD9+cQz9O7ugifrJxclB+xVOvWvagXfqS4Es7vpLP4augw==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.17.0.tgz",
+      "integrity": "sha512-LofsSPjN/ITNkzV47hxas2JCsNCEnGhVvocfyOcLzT9c/tSZE7SfhS/iWtzP1lKNOEfLhRTZz6xqI8N2RzweSQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "6.15.0",
-        "@typescript-eslint/types": "6.15.0",
-        "@typescript-eslint/typescript-estree": "6.15.0",
+        "@typescript-eslint/scope-manager": "6.17.0",
+        "@typescript-eslint/types": "6.17.0",
+        "@typescript-eslint/typescript-estree": "6.17.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -3260,12 +3285,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "6.15.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.15.0.tgz",
-      "integrity": "sha512-1zvtdC1a9h5Tb5jU9x3ADNXO9yjP8rXlaoChu0DQX40vf5ACVpYIVIZhIMZ6d5sDXH7vq4dsZBT1fEGj8D2n2w==",
+      "version": "6.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.17.0.tgz",
+      "integrity": "sha512-H6VwB/k3IuIeQOyYczyyKN8wH6ed8EwliaYHLxOIhyF0dYEIsN8+Bk3GE19qafeMKyZJJHP8+O1HiFhFLUNKSg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "6.15.0",
+        "@typescript-eslint/types": "6.17.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -3296,13 +3321,13 @@
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.1.0.tgz",
-      "integrity": "sha512-9IE2WWkcJo2BR9eqtY5MIo3TPmS50Pnwpm66A6neb2hvk/QSLfPXBz2qdiwUOQkwyFuuXEUj5380CbwfzW4+/w==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.1.1.tgz",
+      "integrity": "sha512-Qpw01C2Hyb3085jBkOJLQ7HRX0Ncnh2qV4p+xWmmhcIUlMykUF69zsnZ1vPmAjZpomw9+5tWEGOQ0GTfR8U+kA==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "1.1.0",
-        "@vitest/utils": "1.1.0",
+        "@vitest/spy": "1.1.1",
+        "@vitest/utils": "1.1.1",
         "chai": "^4.3.10"
       },
       "funding": {
@@ -3310,12 +3335,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.1.0.tgz",
-      "integrity": "sha512-zdNLJ00pm5z/uhbWF6aeIJCGMSyTyWImy3Fcp9piRGvueERFlQFbUwCpzVce79OLm2UHk9iwaMSOaU9jVHgNVw==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.1.1.tgz",
+      "integrity": "sha512-8HokyJo1SnSi3uPFKfWm/Oq1qDwLC4QDcVsqpXIXwsRPAg3gIDh8EbZ1ri8cmQkBxdOu62aOF9B4xcqJhvt4xQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "1.1.0",
+        "@vitest/utils": "1.1.1",
         "p-limit": "^5.0.0",
         "pathe": "^1.1.1"
       },
@@ -3351,9 +3376,9 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.1.0.tgz",
-      "integrity": "sha512-5O/wyZg09V5qmNmAlUgCBqflvn2ylgsWJRRuPrnHEfDNT6tQpQ8O1isNGgo+VxofISHqz961SG3iVvt3SPK/QQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.1.1.tgz",
+      "integrity": "sha512-WnMHjv4VdHLbFGgCdVVvyRkRPnOKN75JJg+LLTdr6ah7YnL75W+7CTIMdzPEPzaDxA8r5yvSVlc1d8lH3yE28w==",
       "dev": true,
       "dependencies": {
         "magic-string": "^0.30.5",
@@ -3365,9 +3390,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.1.0.tgz",
-      "integrity": "sha512-sNOVSU/GE+7+P76qYo+VXdXhXffzWZcYIPQfmkiRxaNCSPiLANvQx5Mx6ZURJ/ndtEkUJEpvKLXqAYTKEY+lTg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.1.1.tgz",
+      "integrity": "sha512-hDU2KkOTfFp4WFFPWwHFauddwcKuGQ7gF6Un/ZZkCogoAiTMN7/7YKvUDbywPZZ754iCQGjdUmXN3t4k0jm1IQ==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^2.2.0"
@@ -3377,9 +3402,9 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.1.0.tgz",
-      "integrity": "sha512-z+s510fKmYz4Y41XhNs3vcuFTFhcij2YF7F8VQfMEYAAUfqQh0Zfg7+w9xdgFGhPf3tX3TicAe+8BDITk6ampQ==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.1.1.tgz",
+      "integrity": "sha512-E9LedH093vST/JuBSyHLFMpxJKW3dLhe/flUSPFedoyj4wKiFX7Jm8gYLtOIiin59dgrssfmFv0BJ1u8P/LC/A==",
       "dev": true,
       "dependencies": {
         "diff-sequences": "^29.6.3",
@@ -3441,13 +3466,16 @@
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.15.tgz",
-      "integrity": "sha512-FCvIEevPmgCgqFBH7wD+3B97y7u7oj/Wr69zADBf403Tui377bThTjBvekaZvlRr4IwUAu3M6hYZeULZFJbdYg==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz",
+      "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==",
       "dependencies": {
-        "@babel/parser": "^7.18.4",
+        "@babel/parser": "^7.23.5",
         "postcss": "^8.4.14",
         "source-map": "^0.6.1"
+      },
+      "optionalDependencies": {
+        "prettier": "^1.18.2 || ^2.0.0"
       }
     },
     "node_modules/@vue/eslint-config-standard": {
@@ -3493,9 +3521,9 @@
       }
     },
     "node_modules/@vue/language-core": {
-      "version": "1.8.26",
-      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.26.tgz",
-      "integrity": "sha512-9cmza/Y2YTiOnKZ0Mi9zsNn7Irw+aKirP+5LLWVSNaL3fjKJjW1cD3HGBckasY2RuVh4YycvdA9/Q6EBpVd/7Q==",
+      "version": "1.8.27",
+      "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-1.8.27.tgz",
+      "integrity": "sha512-L8Kc27VdQserNaCUNiSFdDl9LWT24ly8Hpwf1ECy3aFb9m6bDhBGQYOujDm21N7EW3moKIOKEanQwe1q5BK+mA==",
       "dev": true,
       "dependencies": {
         "@volar/language-core": "~1.11.1",
@@ -3931,9 +3959,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.2.tgz",
-      "integrity": "sha512-7i24Ri4pmDRfJTR7LDBhsOTtcm+9kjX5WiY1X3wIisx6G9So3pfMkEiU7emUBe46oceVImccTEM3k6C5dbVW8A==",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.3.tgz",
+      "integrity": "sha512-fWyNdeawGam70jXSVlKl+SUNVcL6j6W79CuSIPfi6HnDUmSCH6gyUys/HrqHeA/wU0Az41rRgean494d0Jb+ww==",
       "dependencies": {
         "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
@@ -10690,6 +10718,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/prettier": {
+      "version": "2.8.8",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz",
+      "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==",
+      "optional": true,
+      "bin": {
+        "prettier": "bin-prettier.js"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
     "node_modules/pretty": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/pretty/-/pretty-2.0.0.tgz",
@@ -11335,9 +11378,9 @@
       }
     },
     "node_modules/rollup": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.1.tgz",
-      "integrity": "sha512-pgPO9DWzLoW/vIhlSoDByCzcpX92bKEorbgXuZrqxByte3JFk2xSW2JEeAcyLc9Ru9pqcNNW+Ob7ntsk2oT/Xw==",
+      "version": "4.9.2",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.9.2.tgz",
+      "integrity": "sha512-66RB8OtFKUTozmVEh3qyNfH+b+z2RXBVloqO2KCC/pjFaGaHtxP9fVfOQKPSGXg2mElmjmxjW/fZ7iKrEpMH5Q==",
       "dev": true,
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -11347,19 +11390,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.9.1",
-        "@rollup/rollup-android-arm64": "4.9.1",
-        "@rollup/rollup-darwin-arm64": "4.9.1",
-        "@rollup/rollup-darwin-x64": "4.9.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.9.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.9.1",
-        "@rollup/rollup-linux-arm64-musl": "4.9.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.9.1",
-        "@rollup/rollup-linux-x64-gnu": "4.9.1",
-        "@rollup/rollup-linux-x64-musl": "4.9.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.9.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.9.1",
-        "@rollup/rollup-win32-x64-msvc": "4.9.1",
+        "@rollup/rollup-android-arm-eabi": "4.9.2",
+        "@rollup/rollup-android-arm64": "4.9.2",
+        "@rollup/rollup-darwin-arm64": "4.9.2",
+        "@rollup/rollup-darwin-x64": "4.9.2",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.9.2",
+        "@rollup/rollup-linux-arm64-gnu": "4.9.2",
+        "@rollup/rollup-linux-arm64-musl": "4.9.2",
+        "@rollup/rollup-linux-riscv64-gnu": "4.9.2",
+        "@rollup/rollup-linux-x64-gnu": "4.9.2",
+        "@rollup/rollup-linux-x64-musl": "4.9.2",
+        "@rollup/rollup-win32-arm64-msvc": "4.9.2",
+        "@rollup/rollup-win32-ia32-msvc": "4.9.2",
+        "@rollup/rollup-win32-x64-msvc": "4.9.2",
         "fsevents": "~2.3.2"
       }
     },
@@ -12906,9 +12949,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.1.0.tgz",
-      "integrity": "sha512-jV48DDUxGLEBdHCQvxL1mEh7+naVy+nhUUUaPAZLd3FJgXuxQiewHcfeZebbJ6onDqNGkP4r3MhQ342PRlG81Q==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.1.1.tgz",
+      "integrity": "sha512-2bGE5w4jvym5v8llF6Gu1oBrmImoNSs4WmRVcavnG2me6+8UQntTqLiAMFyiAobp+ZXhj5ZFhI7SmLiFr/jrow==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -13070,16 +13113,16 @@
       }
     },
     "node_modules/vitest": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.1.0.tgz",
-      "integrity": "sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.1.1.tgz",
+      "integrity": "sha512-Ry2qs4UOu/KjpXVfOCfQkTnwSXYGrqTbBZxw6reIYEFjSy1QUARRg5pxiI5BEXy+kBVntxUYNMlq4Co+2vD3fQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/expect": "1.1.0",
-        "@vitest/runner": "1.1.0",
-        "@vitest/snapshot": "1.1.0",
-        "@vitest/spy": "1.1.0",
-        "@vitest/utils": "1.1.0",
+        "@vitest/expect": "1.1.1",
+        "@vitest/runner": "1.1.1",
+        "@vitest/snapshot": "1.1.1",
+        "@vitest/spy": "1.1.1",
+        "@vitest/utils": "1.1.1",
         "acorn-walk": "^8.3.0",
         "cac": "^6.7.14",
         "chai": "^4.3.10",
@@ -13094,7 +13137,7 @@
         "tinybench": "^2.5.1",
         "tinypool": "^0.8.1",
         "vite": "^5.0.0",
-        "vite-node": "1.1.0",
+        "vite-node": "1.1.1",
         "why-is-node-running": "^2.2.2"
       },
       "bin": {
@@ -13215,11 +13258,11 @@
       "dev": true
     },
     "node_modules/vue": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.15.tgz",
-      "integrity": "sha512-a29fsXd2G0KMRqIFTpRgpSbWaNBK3lpCTOLuGLEDnlHWdjB8fwl6zyYZ8xCrqkJdatwZb4mGHiEfJjnw0Q6AwQ==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz",
+      "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==",
       "dependencies": {
-        "@vue/compiler-sfc": "2.7.15",
+        "@vue/compiler-sfc": "2.7.16",
         "csstype": "^3.1.0"
       }
     },
@@ -13247,9 +13290,9 @@
       "dev": true
     },
     "node_modules/vue-echarts": {
-      "version": "6.6.5",
-      "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.6.5.tgz",
-      "integrity": "sha512-LO+jQrBu3OZMMp1O00VOdeU1Lnc1tqY1UFmTha8G5ntOsz7NxLYs3+S3l32E53dHdax+YlEh8ZWMHMZGAuELig==",
+      "version": "6.6.8",
+      "resolved": "https://registry.npmjs.org/vue-echarts/-/vue-echarts-6.6.8.tgz",
+      "integrity": "sha512-3EGrxKGCGjHnkhudRQQ4fkK5iJxxXNQ1fXvSWA/7mzR/oV7BBSHYvC3gDbG/WIW0A/Fcx2H8k5H3NDyWgjyi8g==",
       "hasInstallScript": true,
       "dependencies": {
         "resize-detector": "^0.3.0",
@@ -13257,12 +13300,16 @@
       },
       "peerDependencies": {
         "@vue/composition-api": "^1.0.5",
+        "@vue/runtime-core": "^3.0.0",
         "echarts": "^5.4.1",
         "vue": "^2.6.12 || ^3.1.1"
       },
       "peerDependenciesMeta": {
         "@vue/composition-api": {
           "optional": true
+        },
+        "@vue/runtime-core": {
+          "optional": true
         }
       }
     },
@@ -13428,9 +13475,9 @@
       "integrity": "sha512-VYXZQLtjuvKxxcshuRAwjHnciqZVoXAjTjcqBTz4rKc8qih9g9pI3hbDjmqXaHdgL3v8pV6P8Z335XvHzESxLQ=="
     },
     "node_modules/vue-template-compiler": {
-      "version": "2.7.15",
-      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.15.tgz",
-      "integrity": "sha512-yQxjxMptBL7UAog00O8sANud99C6wJF+7kgbcwqkvA38vCGF7HWE66w0ZFnS/kX5gSoJr/PQ4/oS3Ne2pW37Og==",
+      "version": "2.7.16",
+      "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz",
+      "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==",
       "dev": true,
       "dependencies": {
         "de-indent": "^1.0.2",
@@ -13438,13 +13485,13 @@
       }
     },
     "node_modules/vue-tsc": {
-      "version": "1.8.26",
-      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.26.tgz",
-      "integrity": "sha512-jMEJ4aqU/l1hdgmeExH5h1TFoN+hbho0A2ZAhHy53/947DGm7Qj/bpB85VpECOCwV00h7JYNVnvoD2ceOorB4Q==",
+      "version": "1.8.27",
+      "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-1.8.27.tgz",
+      "integrity": "sha512-WesKCAZCRAbmmhuGl3+VrdWItEvfoFIPXOvUJkjULi+x+6G/Dy69yO3TBRJDr9eUlmsNAwVmxsNZxvHKzbkKdg==",
       "dev": true,
       "dependencies": {
         "@volar/typescript": "~1.11.1",
-        "@vue/language-core": "1.8.26",
+        "@vue/language-core": "1.8.27",
         "semver": "^7.5.4"
       },
       "bin": {
diff --git a/package.json b/package.json
index 81dd465643..92ecab8f9d 100644
--- a/package.json
+++ b/package.json
@@ -39,7 +39,7 @@
     "@fontsource/roboto": "^5.0.8",
     "@irojs/iro-core": "^1.2.1",
     "@jaames/iro": "^5.5.2",
-    "axios": "^1.6.2",
+    "axios": "^1.6.3",
     "consola": "^3.2.3",
     "deepmerge": "^4.3.1",
     "dompurify": "^3.0.6",
@@ -60,9 +60,9 @@
     "shlex": "^2.1.2",
     "sortablejs": "^1.15.1",
     "uuid": "^9.0.1",
-    "vue": "^2.7.15",
+    "vue": "^2.7.16",
     "vue-class-component": "^7.2.6",
-    "vue-echarts": "^6.6.5",
+    "vue-echarts": "^6.6.8",
     "vue-i18n": "^8.28.2",
     "vue-inline-svg": "^2.1.3",
     "vue-json-viewer": "^2.2.22",
@@ -75,18 +75,18 @@
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@mdi/js": "^7.3.67",
+    "@mdi/js": "^7.4.47",
     "@originjs/vite-plugin-content": "^1.0.5",
     "@types/dompurify": "^3.0.5",
     "@types/jsdom": "^21.1.6",
     "@types/lodash-es": "^4.17.12",
     "@types/md5": "^2.3.5",
-    "@types/node": "^20.10.5",
+    "@types/node": "^20.10.6",
     "@types/semver": "^7.5.6",
     "@types/sortablejs": "^1.15.7",
     "@types/uuid": "^9.0.7",
-    "@typescript-eslint/eslint-plugin": "^6.15.0",
-    "@typescript-eslint/parser": "^6.15.0",
+    "@typescript-eslint/eslint-plugin": "^6.17.0",
+    "@typescript-eslint/parser": "^6.17.0",
     "@vitejs/plugin-vue2": "^2.3.1",
     "@vue/eslint-config-standard": "^8.0.1",
     "@vue/eslint-config-typescript": "^12.0.0",
@@ -99,7 +99,7 @@
     "madge": "^6.1.0",
     "mockdate": "^3.0.5",
     "monaco-vscode-textmate-theme-converter": "^0.1.7",
-    "rollup": "^4.9.1",
+    "rollup": "^4.9.2",
     "sass": "~1.32.13",
     "shx": "^0.3.4",
     "standard-version": "^9.5.0",
@@ -109,11 +109,11 @@
     "vite-plugin-checker": "^0.6.2",
     "vite-plugin-monaco-editor": "^1.1.0",
     "vite-plugin-pwa": "^0.17.4",
-    "vitest": "^1.1.0",
+    "vitest": "^1.1.1",
     "vue-debounce-decorator": "^1.0.1",
     "vue-i18n-extract": "^2.0.7",
-    "vue-template-compiler": "^2.7.15",
-    "vue-tsc": "^1.8.26",
+    "vue-template-compiler": "^2.7.16",
+    "vue-tsc": "^1.8.27",
     "workbox-build": "^7.0.0",
     "workbox-core": "^7.0.0",
     "workbox-routing": "^7.0.0",
diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue
index 2313a2f55f..06d31e061b 100644
--- a/src/views/Dashboard.vue
+++ b/src/views/Dashboard.vue
@@ -24,7 +24,7 @@
         >
           <transition-group
             type="transition"
-            :name="!inLayout ? 'flip-list' : null"
+            :name="!inLayout ? 'flip-list' : undefined"
           >
             <template v-for="c in container">
               <component
diff --git a/src/views/Diagnostics.vue b/src/views/Diagnostics.vue
index ea03e55f1d..093b949049 100644
--- a/src/views/Diagnostics.vue
+++ b/src/views/Diagnostics.vue
@@ -51,7 +51,7 @@
           >
             <transition-group
               type="transition"
-              :name="!inLayout ? 'flip-list' : null"
+              :name="!inLayout ? 'flip-list' : undefined"
             >
               <template v-for="c in container">
                 <diagnostics-card

From fd6757ec536eee1412657746f415fd9eac75e0f8 Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Wed, 3 Jan 2024 09:44:35 +0000
Subject: [PATCH 3/5] fix: default to user language as Intl format (#1299)

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 src/components/settings/GeneralSettings.vue |  4 ++--
 src/plugins/filters.ts                      | 13 ++++++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/components/settings/GeneralSettings.vue b/src/components/settings/GeneralSettings.vue
index df4282e62e..cbcb3663a6 100644
--- a/src/components/settings/GeneralSettings.vue
+++ b/src/components/settings/GeneralSettings.vue
@@ -239,7 +239,7 @@ export default class GeneralSettings extends Mixins(StateMixin) {
     return Object.entries(DateFormats)
       .map(([key, entry]) => ({
         value: key,
-        text: `${date.toLocaleDateString(entry.locales ?? this.$filters.getNavigatorLocales(), entry.options)}${entry.suffix ?? ''}`
+        text: `${date.toLocaleDateString(entry.locales ?? this.$filters.getAllLocales(), entry.options)}${entry.suffix ?? ''}`
       }))
   }
 
@@ -261,7 +261,7 @@ export default class GeneralSettings extends Mixins(StateMixin) {
     return Object.entries(TimeFormats)
       .map(([key, entry]) => ({
         value: key,
-        text: `${date.toLocaleTimeString(entry.locales ?? this.$filters.getNavigatorLocales(), entry.options)}${entry.suffix ?? ''}`
+        text: `${date.toLocaleTimeString(entry.locales ?? this.$filters.getAllLocales(), entry.options)}${entry.suffix ?? ''}`
       }))
   }
 
diff --git a/src/plugins/filters.ts b/src/plugins/filters.ts
index 575a035bde..5ee57610cf 100644
--- a/src/plugins/filters.ts
+++ b/src/plugins/filters.ts
@@ -71,16 +71,23 @@ export const Filters = {
     return navigator.languages ?? [navigator.language]
   },
 
+  getAllLocales: () => {
+    return [
+      i18n.locale,
+      ...Filters.getNavigatorLocales()
+    ]
+  },
+
   getDateFormat: (override?: string): DateTimeFormat => {
     return {
-      locales: Filters.getNavigatorLocales(),
+      locales: Filters.getAllLocales(),
       ...DateFormats[override ?? store.state.config.uiSettings.general.dateFormat]
     }
   },
 
   getTimeFormat: (override?: string): DateTimeFormat => {
     return {
-      locales: Filters.getNavigatorLocales(),
+      locales: Filters.getAllLocales(),
       ...TimeFormats[override ?? store.state.config.uiSettings.general.timeFormat]
     }
   },
@@ -157,7 +164,7 @@ export const Filters = {
   },
 
   formatRelativeTime (value: number, unit: Intl.RelativeTimeFormatUnit, options?: Intl.RelativeTimeFormatOptions) {
-    const rtf = new Intl.RelativeTimeFormat(Filters.getNavigatorLocales() as string[], {
+    const rtf = new Intl.RelativeTimeFormat(Filters.getAllLocales(), {
       numeric: 'auto',
       ...options
     })

From 45ebd1b502c08796fd06ce8272986a351ec7bf4f Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Thu, 4 Jan 2024 13:17:28 +0000
Subject: [PATCH 4/5] feat: adds "interrupted" job status support

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 .../widgets/history/JobHistoryItemStatus.vue  | 40 ++++++++++---------
 src/store/history/types.ts                    |  2 +-
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/src/components/widgets/history/JobHistoryItemStatus.vue b/src/components/widgets/history/JobHistoryItemStatus.vue
index 3c1d8771a5..c37d240aa8 100644
--- a/src/components/widgets/history/JobHistoryItemStatus.vue
+++ b/src/components/widgets/history/JobHistoryItemStatus.vue
@@ -22,6 +22,8 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import FilesMixin from '@/mixins/files'
 import type { HistoryItem } from '@/store/history/types'
 
+type JobHistoryItemState = 'error' | 'warning' | 'success'
+
 @Component({})
 export default class JobHistoryItemStatus extends Mixins(FilesMixin) {
   @Prop({ type: Object, required: true })
@@ -37,12 +39,13 @@ export default class JobHistoryItemStatus extends Mixins(FilesMixin) {
   // }
 
   get icon () {
-    const iconMap: { [index: string]: string } = {
+    const iconMap: Record<string, string> = {
       completed: '$checkedCircle',
       printing: '$inProgress',
       in_progress: '$inProgress',
       standby: '$inProgress',
-      cancelled: '$cancelled'
+      cancelled: '$cancelled',
+      interrupted: '$cancelled'
     }
 
     const icon = iconMap[this.job.status]
@@ -51,25 +54,26 @@ export default class JobHistoryItemStatus extends Mixins(FilesMixin) {
     return icon || '$warning'
   }
 
-  get state () {
-    if (
-      this.job.status === 'cancelled' ||
-      this.job.status === 'error' ||
-      this.job.status === 'server_exit'
-    ) return 'error'
+  get state (): JobHistoryItemState {
+    switch (this.job.status) {
+      case 'cancelled':
+      case 'error':
+      case 'interrupted':
+      case 'server_exit':
+        return 'error'
 
-    if (
-      this.job.status === 'printing' ||
-      this.job.status === 'completed' ||
-      this.job.status === 'in_progress'
-    ) return 'success'
+      case 'klippy_shutdown':
+      case 'klippy_disconnect':
+        return 'warning'
 
-    if (
-      this.job.status === 'klippy_shutdown' ||
-      this.job.status === 'klippy_disconnect'
-    ) return 'warning'
+      case 'completed':
+      case 'in_progress':
+      case 'printing':
+        return 'success'
 
-    return 'success'
+      default:
+        return 'success'
+    }
   }
 
   get inError () {
diff --git a/src/store/history/types.ts b/src/store/history/types.ts
index 2be3a0efaa..c32367827d 100644
--- a/src/store/history/types.ts
+++ b/src/store/history/types.ts
@@ -29,4 +29,4 @@ export interface HistoryRollUp {
   longest_print: number;
 }
 
-export type HistoryItemStatus = 'completed' | 'cancelled' | 'error' | 'printing' | 'in_progress' | 'server_exit' | 'klippy_shutdown' | 'klippy_disconnect'
+export type HistoryItemStatus = 'completed' | 'cancelled' | 'error' | 'printing' | 'in_progress' | 'server_exit' | 'klippy_shutdown' | 'klippy_disconnect' | 'interrupted'

From 30af3785b416a438908937e2dd69156bcacc95ab Mon Sep 17 00:00:00 2001
From: Pedro Lamas <pedrolamas@gmail.com>
Date: Fri, 5 Jan 2024 11:21:01 +0000
Subject: [PATCH 5/5] refactor: simplify containers and style

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>
---
 src/components/widgets/status/StatusTab.vue | 127 +++++++-------------
 1 file changed, 42 insertions(+), 85 deletions(-)

diff --git a/src/components/widgets/status/StatusTab.vue b/src/components/widgets/status/StatusTab.vue
index a3801f9062..e0c3f81ae5 100644
--- a/src/components/widgets/status/StatusTab.vue
+++ b/src/components/widgets/status/StatusTab.vue
@@ -18,38 +18,25 @@
           v-if="progressVisible && $vuetify.breakpoint.mdAndUp"
           cols="auto"
           align-self="center"
-          class="position-relative"
         >
           <v-row>
-            <div
-              class="progress-wrapper"
-              style="cursor: pointer"
+            <v-progress-circular
+              :rotate="-90"
+              :size="90"
+              :width="7"
+              :value="estimates.progress"
+              color="primary"
+              class="progress-circle mx-1"
               @click="handleViewThumbnail"
             >
-              <v-progress-circular
-                :rotate="-90"
-                :size="90"
-                :width="7"
-                :value="estimates.progress"
-                color="primary"
-                class="progress-circle"
-              />
-              <div class="thumbnail-background" />
-
-              <div class="fill-height print-thumb">
-                <img
-                  class="print-thumb"
-                  :src="thumbnail"
-                >
-              </div>
-            </div>
+              <img
+                class="print-thumb"
+                :src="thumbnail"
+              >
+            </v-progress-circular>
           </v-row>
-          <v-row
-            justify="center"
-          >
-            <div class="percentage-wrapper">
-              <span class="primary--text">{{ estimates.progress }}%</span>
-            </div>
+          <v-row justify="center">
+            <span class="primary--text">{{ estimates.progress }}%</span>
           </v-row>
         </v-col>
 
@@ -396,66 +383,36 @@ export default class StatusTab extends Mixins(StateMixin, FilesMixin, ToolheadMi
 </script>
 
 <style lang="scss" scoped>
-.print-thumb {
-  display: block;
-  max-height: 110px;
-}
-
-.filename {
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  // width: 200px;
-  direction: rtl;
-  text-align: left;
-}
-
-.position-relative {
-  position: relative;
-}
-
-.progress-wrapper {
-  position: relative;
-  width: 90px;
-  /* Set the width and height to match progress circle size */
-  height: 90px;
-  /* Set the width and height to match progress circle size */
-  overflow: hidden;
-  border-radius: 50%;
-}
+  @import 'vuetify/src/styles/styles.sass';
+
+  .filename {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    // width: 200px;
+    direction: rtl;
+    text-align: left;
+  }
 
-.progress-circle {
-  position: absolute;
-  z-index: 4;
-}
+  .progress-circle {
+    cursor: pointer;
 
-.thumbnail-background {
-  position: absolute;
-  width: 85px;
-  /* 10% less than the size of the progress circle */
-  height: 85px;
-  /* 10% less than the size of the progress circle */
-  border-radius: 50%;
-  background-color: rgba(0, 0, 0, 0.5);
-  /* Adjust transparency here */
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 0;
-}
+    :deep(.v-progress-circular__underlay) {
+      fill: rgba(0, 0, 0, 0.5);
+    }
 
-.print-thumb {
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
-  z-index: 0;
-  max-height: 73px;
-  max-width: 73px;
-  /* Adjust as needed */
-  border-radius: 50%;
-  opacity: 0.8;
-  /* Adjust opacity as needed */
-}
+    &:hover :deep(.v-progress-circular__underlay) {
+      fill: rgba(0, 0, 0, 0.2);
+      transition-duration: 0.28s;
+      transition-property: fill;
+      transition-timing-function: map-get($transition, 'fast-out-slow-in');
+    }
+  }
 
+  .print-thumb {
+    max-height: 73px;
+    max-width: 73px;
+    border-radius: 50%;
+    opacity: 0.8;
+  }
 </style>