Resolve merge conflict, primarily due to added semi-colons

Author: JonAlexandra

index.html

@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width,initial-scale=1">
 
-    <title>***</title>
+    <title>&#65279;</title>
 
     <link rel="icon" type="image/png" href="/imgs/favicon.png" />
     <link rel="stylesheet" href="/global.css" />

src/__tests__/datafunctions.test.ts

@@ -0,0 +1,17 @@
+/**
+ * @jest-environment jsdom
+ */
+
+import fs from 'fs';
+import { determineFilter, Filters } from '../script/datafunctions';
+import { doesNotThrow } from 'assert';
+function enumKeys<O extends object, K extends keyof O = keyof O>(obj: O): K[] {
+  return Object.keys(obj).filter(k => Number.isNaN(+k)) as K[];
+}
+describe('Data functions architecture test', () => {
+  test('All filters should be implemented in determineFilter', () => {
+    for (const filter of enumKeys(Filters)) {
+      expect(() => determineFilter(Filters[filter])).not.toThrow();
+    }
+  });
+});

src/pages/DataPage.svelte

@@ -45,42 +45,41 @@
   };
 
   const onUploadGestures = () => {
-    filePicker.click()
+    filePicker.click();
   };
 
   const updateInspector = (newPoint: Vector3, newPosition: {x: number, y: number}) => {
-    inspectedDataPoint = newPoint
-    inspectorPosition = newPosition
-    isInspectorOpen = true
+    inspectedDataPoint = newPoint;
+    inspectorPosition = newPosition;
+    isInspectorOpen = true;
   }
 
   const closeInspector = () => {
-    isInspectorOpen = false
+    isInspectorOpen = false;
   }
 
 
-  let filePicker: HTMLInputElement
+  let filePicker: HTMLInputElement;
   onMount(() => {
-    filePicker = document.createElement('input')
-    filePicker.type = 'file'
-    filePicker.accept = 'application/JSON'
+    filePicker = document.createElement('input');
+    filePicker.type = 'file';
+    filePicker.accept = 'application/JSON';
     filePicker.onchange = () => {
-      if (filePicker.files == null || filePicker.files.length < 1){ 
-        return
+      if (filePicker.files == null || filePicker.files.length < 1) {
+        return;
       }
-      const f = filePicker.files[0]
-      loadDatasetFromFile(f)
-      filePicker.value = '' // To trick element to trigger onChange if same file selected
+      const f = filePicker.files[0];
+      loadDatasetFromFile(f);
+      filePicker.value = ''; // To trick element to trigger onChange if same file selected
     }
     return () => {
-      filePicker.remove()
-    }
-  })
-
+      filePicker.remove();
+    };
+  });
 </script>
 
 <!-- Main pane -->
-<main class="h-full flex flex-col">
+<main class="h-full inline-block min-w-full">
   <RecordingInspector 
     dataPoint={$graphInspectorState.dataPoint} 
     position={$graphInspectorState.inspectorPosition} 
@@ -96,7 +95,7 @@
       {onUploadGestures} />
   </div>
   {#if !hasSomeData() && !$state.isInputConnected}
-    <div class="flex flex-col flex-grow justify-center">
+    <div class="mt-4">
       <PleaseConnectFirst />
     </div>
   {:else}