Merge pull request #30 from bradenn/patch

Patch 2.14.2
bradenn · Jul 18, 2022 · 1e1b81a · 1e1b81a
2 parents 8a7429b + 4b0e9a0
commit 1e1b81a
Show file tree

Hide file tree

Showing 53 changed files with 1,932 additions and 1,123 deletions.
diff --git a/app/main.ts b/app/main.ts
@@ -15,7 +15,7 @@ function createWindow() {
         backgroundColor: '#000000',
         autoHideMenuBar: true,
         show: true,
-        kiosk: true,
+        kiosk: false,
         fullscreen: true,
         removeMenu: true,
         frame: false,

diff --git a/client/public/custom/textures/map.hdr b/client/public/custom/textures/map.hdr
diff --git a/client/src/components/Deck.vue b/client/src/components/Deck.vue
diff --git a/client/src/components/Diagnostics.vue b/client/src/components/Diagnostics.vue
diff --git a/client/src/components/Dock.vue b/client/src/components/Dock.vue
diff --git a/client/src/components/Progress.vue b/client/src/components/Progress.vue
diff --git a/client/src/components/Shortcut.vue b/client/src/components/Shortcut.vue
diff --git a/client/src/components/WidgetDeck.vue b/client/src/components/WidgetDeck.vue
diff --git a/client/src/components/widgets/Fractal.vue b/client/src/components/widgets/Fractal.vue
diff --git a/client/src/components/widgets/Light.vue b/client/src/components/widgets/Light.vue
@@ -40,7 +40,6 @@ let props = defineProps<{
 
 // Inject the remote manifest
 let remote = inject('remote') as Remote
-let context: any = inject('context')
 
 // When the view loads, force the local state to update
 onMounted(() => {

diff --git a/client/src/components/zone/ZonePreview.vue b/client/src/components/zone/ZonePreview.vue
@@ -5,6 +5,7 @@
 import Plot from "@/components/plot/Plot.vue";
 import {inject} from "vue";
 import type {Remote, Zone} from "@/types";
+import axios from "axios";
 
 interface ZoneProps {
   zone: Zone
@@ -15,10 +16,14 @@ let props = defineProps<ZoneProps>()
 let remote = inject('remote') as Remote
 
 function restoreZone(id: string) {
+  axios.post(`http://localhost:3020/zones/${id}/restore`).then(res => {
+  }).catch(err => console.log(err))
   // remote.nexus.requestId("zone", "restore", "", id)
 }
 
 function deleteZone(id: string) {
+  axios.post(`http://localhost:3020/zones/${id}/delete`).then(res => {
+  }).catch(err => console.log(err))
   // remote.nexus.requestId("zone", "delete", "", id)
 }
 
@@ -32,8 +37,7 @@ function deleteZone(id: string) {
     </div>
     <div class="d-flex label-sm label-o4 subplot justify-content-end px-1 subplot-inline"
          @click="props.zone.deleted?restoreZone(props.zone.id):deleteZone(props.zone.id)">
-      <div
-      >
+      <div>
         {{ props.zone.deleted ? 'Restore' : 'Delete' }}
       </div>
 

diff --git a/client/src/router/index.ts b/client/src/router/index.ts
@@ -45,7 +45,7 @@ import Summary from "../views/terminal/weather/Summary.vue";
 import Whiteboard from "@/views/terminal/whiteboard/Whiteboard.vue";
 
 // Calculator Routes
-import Calculator from "@/views/screensaver/Screensaver.vue";
+import Calculator from "@/views/screensaver/Bounce.vue";
 
 // Atlas Routes
 import Atlas from "@/views/terminal/atlas/Atlas.vue";