Merge branch 'develop' into chore/add-locale-sort-prettier

mainsail-crew · Aug 27, 2024 · c5fe340 · c5fe340
2 parents dbab47a + 85c5774
commit c5fe340
Show file tree

Hide file tree

Showing 12 changed files with 169 additions and 128 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
         "@lezer/highlight": "^1.0.0",
         "@sindarius/gcodeviewer": "^3.7.11",
         "@uiw/codemirror-theme-vscode": "^4.19.11",
-        "axios": "^1.6.0",
+        "axios": "^1.7.4",
         "codemirror": "^6.0.1",
         "core-js": "^3.16.0",
         "detect-browser": "^5.3.0",
@@ -93,7 +93,7 @@
         "prettier": "^3.3.3",
         "prettier-plugin-sort-json": "^4.0.0",
         "sass": "~1.32",
-        "start-server-and-test": "^2.0.0",
+        "start-server-and-test": "^2.0.5",
         "typescript": "^4.5.5",
         "unplugin-vue-components": "^0.22.12",
         "vite": "^4.5.3",

diff --git a/src/components/console/ConsoleTableEntry.vue b/src/components/console/ConsoleTableEntry.vue
@@ -19,7 +19,7 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) {
     get entryStyle() {
         const classes = ['ma-0', 'flex-nowrap']
         classes.push(this.$store.state.gui.console.entryStyle ?? 'default')
-        if (this.event.type === 'action') classes.push('text--disabled')
+        if (['action', 'debug'].includes(this.event.type)) classes.push('text--disabled')
 
         return classes
     }
@@ -31,7 +31,7 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) {
     get messageClass() {
         const classes = ['console-message']
 
-        if (this.event.type === 'action') classes.push('text--disabled')
+        if (['action', 'debug'].includes(this.event.type)) classes.push('text--disabled')
         else if (this.event.message.startsWith('!! ')) classes.push('error--text')
         else classes.push('text--primary')
 

diff --git a/src/components/panels/WebcamPanel.vue b/src/components/panels/WebcamPanel.vue
@@ -42,7 +42,7 @@
         <v-card-text v-if="webcams.length" class="px-0 py-0 content d-inline-block">
             <v-row>
                 <v-col class="pb-0" style="position: relative">
-                    <webcam-wrapper :webcam="currentCam" />
+                    <webcam-wrapper :webcam="currentCam" :page="currentPage" />
                 </v-col>
             </v-row>
         </v-card-text>

diff --git a/src/components/settings/Webcams/WebcamForm.vue b/src/components/settings/Webcams/WebcamForm.vue
@@ -145,7 +145,7 @@
                     </v-row>
                 </v-col>
                 <v-col class="col-12 col-sm-6 text-center" align-self="center">
-                    <webcam-wrapper :webcam="webcam" />
+                    <webcam-wrapper :webcam="webcam" page="settings" />
                 </v-col>
             </v-row>
         </v-card-text>

diff --git a/src/components/webcams/WebcamWrapper.vue b/src/components/webcams/WebcamWrapper.vue
@@ -4,13 +4,17 @@
             <v-container v-if="webcams" fluid class="pb-4">
                 <v-row dense>
                     <v-col v-for="gridWebcam in webcams" :key="gridWebcam.name" cols="6">
-                        <webcam-wrapper-item :webcam="gridWebcam" :printer-url="printerUrl" :show-fps="showFps" />
+                        <webcam-wrapper-item
+                            :webcam="gridWebcam"
+                            :printer-url="printerUrl"
+                            :show-fps="showFps"
+                            :page="page" />
                     </v-col>
                 </v-row>
             </v-container>
         </template>
         <template v-else>
-            <webcam-wrapper-item :webcam="webcam" :printer-url="printerUrl" :show-fps="showFps" />
+            <webcam-wrapper-item :webcam="webcam" :printer-url="printerUrl" :show-fps="showFps" :page="page" />
         </template>
     </div>
 </template>
@@ -31,6 +35,7 @@ export default class WebcamWrapper extends Mixins(BaseMixin) {
     @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam
     @Prop({ type: Boolean, default: true }) showFps!: Boolean
     @Prop({ type: String, default: null }) printerUrl!: string | null
+    @Prop({ type: String, default: null }) page!: string | null
 
     get webcams(): GuiWebcamStateWebcam[] {
         return this.$store.getters['gui/webcams/getWebcams']

diff --git a/src/components/webcams/WebcamWrapperItem.vue b/src/components/webcams/WebcamWrapperItem.vue
@@ -25,7 +25,7 @@
             <janus-streamer-async :cam-settings="webcam" :printer-url="printerUrl" />
         </template>
         <template v-else-if="service === 'webrtc-mediamtx'">
-            <webrtc-media-m-t-x-async :cam-settings="webcam" :printer-url="printerUrl" />
+            <webrtc-media-m-t-x-async :cam-settings="webcam" :printer-url="printerUrl" :page="page" />
         </template>
         <template v-else-if="service === 'webrtc-go2rtc'">
             <webrtc-go2rtc-async :cam-settings="webcam" :printer-url="printerUrl" />
@@ -61,6 +61,7 @@ export default class WebcamWrapperItem extends Mixins(BaseMixin) {
     @Prop({ type: Object, required: true }) webcam!: GuiWebcamStateWebcam
     @Prop({ type: Boolean, default: true }) showFps!: Boolean
     @Prop({ default: null }) printerUrl!: string | null
+    @Prop({ type: String, default: null }) page!: string | null
 
     get service() {
         return this.webcam?.service ?? 'unknown'