Merge remote-tracking branch 'origin/dev' into dev

pulling connection status commits

src/render/components/connectionStatus.vue

@@ -0,0 +1,37 @@
+<template>
+    <div class="statusContainer">
+        <div>{{status}}</div>
+    </div>
+
+</template>
+
+
+<script lang="ts">
+
+import { defineComponent } from 'vue'
+import { status } from "@/render/shared/connectionStatus";
+
+export default defineComponent({
+    name: "ConnectionStatus",
+
+    setup() {
+        return {
+            status
+        }
+    }
+
+});
+
+</script>
+
+
+<style lang="scss">
+.statusContainer {
+    width: 100vw;
+    display: flex;
+    justify-content: center;
+    :first-child {
+        margin-right: 2px;
+    }
+}
+</style>

src/render/components/header.vue

@@ -9,6 +9,7 @@
         class="menuButton minimizeButton"
         @click.prevent="postNavBarMin"
       />
+      <connection-status />
     </span>
 </template>
 
@@ -18,8 +19,11 @@
     import { defineComponent } from "vue";
     import { postNavBar } from "@/render/ipc";
 
+    import ConnectionStatus from "./connectionStatus.vue";
+
     export default defineComponent({
         name: "Header",
+        components: { ConnectionStatus },
         setup() {
             const postNavBarExit = () => postNavBar('close');
             const postNavBarMin = () => postNavBar('min');