From 6b0b1832563b4fa9bebeb3427f3bc708a21ca815 Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <fred@silberberg.xyz>
Date: Tue, 24 Sep 2024 21:44:22 -0700
Subject: [PATCH 1/2] Allow changing the FMS url via settings

We don't yet refresh on change, so after setting, you'll need to manually refresh the page to connect.
---
 ui/src/fms/fms-signalr.ts                          | 2 +-
 ui/src/lib/components/dialogs/SettingsModal.svelte | 9 +++++++++
 ui/src/lib/settings-store.ts                       | 4 +++-
 ui/src/routes/+page.svelte                         | 3 ++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ui/src/fms/fms-signalr.ts b/ui/src/fms/fms-signalr.ts
index a7b9603..9e0e226 100644
--- a/ui/src/fms/fms-signalr.ts
+++ b/ui/src/fms/fms-signalr.ts
@@ -5,7 +5,7 @@ import type { components } from './fms-api';
 const fieldMonitorHubPostfix = 'fieldMonitorHub';
 
 export function connectFieldMonitor(
-	fmsUrl: `http://${string}`
+	fmsUrl: string
 ): signalR.HubConnection & FieldMonitorHub {
 	const connection = new signalR.HubConnectionBuilder()
 		.withUrl(`${fmsUrl}/${fieldMonitorHubPostfix}`)
diff --git a/ui/src/lib/components/dialogs/SettingsModal.svelte b/ui/src/lib/components/dialogs/SettingsModal.svelte
index 0a1f27d..a975899 100644
--- a/ui/src/lib/components/dialogs/SettingsModal.svelte
+++ b/ui/src/lib/components/dialogs/SettingsModal.svelte
@@ -96,6 +96,15 @@
 				API Key
 			</TextInput>
 
+			<TextInput 
+				bind:text={settings.fmsUrl}
+				placeholder="http://localhost"
+				onblur={updateSettings}
+				>
+				FMS URL
+			</TextInput>
+
+
 			<div class="grid gap-2 md:col-span-2 mt-2">
 				{#if installPrompt}
 					<Button
diff --git a/ui/src/lib/settings-store.ts b/ui/src/lib/settings-store.ts
index e072379..f722d11 100644
--- a/ui/src/lib/settings-store.ts
+++ b/ui/src/lib/settings-store.ts
@@ -7,6 +7,7 @@ export interface Settings {
 	darkMode: boolean;
 	username: string;
 	key: string;
+	fmsUrl: string;
 }
 
 let initialSettings = browser ? window.localStorage.getItem('settings') : null;
@@ -16,7 +17,8 @@ const defaultSettings: Settings = {
 	developerMode: false,
 	darkMode: true,
 	username: '',
-	key: ''
+	key: '',
+	fmsUrl: 'http://10.0.100.5',
 };
 
 if (!initialSettings) {
diff --git a/ui/src/routes/+page.svelte b/ui/src/routes/+page.svelte
index a9ce4ee..c242df9 100644
--- a/ui/src/routes/+page.svelte
+++ b/ui/src/routes/+page.svelte
@@ -10,6 +10,7 @@
 		Red2Default,
 		Red3Default
 	} from './defaults';
+	import { settingsStore } from '$lib/settings-store';
 
 	let blue1: FieldMonitorData = Blue1Default;
 	let blue2: FieldMonitorData = Blue2Default;
@@ -23,7 +24,7 @@
 
 	let detailView = () => {};
 
-	const signalrConnection = connectFieldMonitor('http://localhost:5000');
+	const signalrConnection = connectFieldMonitor($settingsStore.fmsUrl);
 	signalrConnection.onFieldMonitorDataChanged((data) => {
 		for (const team of data) {
 			if (!team) continue;

From 547e9f096b1db76c49ff8caa116e28247c5b9c7f Mon Sep 17 00:00:00 2001
From: Fredric Silberberg <fred@silberberg.xyz>
Date: Tue, 24 Sep 2024 21:46:11 -0700
Subject: [PATCH 2/2] Prettier

---
 ui/src/fms/fms-signalr.ts                          | 4 +---
 ui/src/lib/components/dialogs/SettingsModal.svelte | 7 +------
 ui/src/lib/settings-store.ts                       | 2 +-
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/ui/src/fms/fms-signalr.ts b/ui/src/fms/fms-signalr.ts
index 9e0e226..e8a46f8 100644
--- a/ui/src/fms/fms-signalr.ts
+++ b/ui/src/fms/fms-signalr.ts
@@ -4,9 +4,7 @@ import type { components } from './fms-api';
 
 const fieldMonitorHubPostfix = 'fieldMonitorHub';
 
-export function connectFieldMonitor(
-	fmsUrl: string
-): signalR.HubConnection & FieldMonitorHub {
+export function connectFieldMonitor(fmsUrl: string): signalR.HubConnection & FieldMonitorHub {
 	const connection = new signalR.HubConnectionBuilder()
 		.withUrl(`${fmsUrl}/${fieldMonitorHubPostfix}`)
 		.withHubProtocol(new MessagePackHubProtocol())
diff --git a/ui/src/lib/components/dialogs/SettingsModal.svelte b/ui/src/lib/components/dialogs/SettingsModal.svelte
index a975899..cfb11b7 100644
--- a/ui/src/lib/components/dialogs/SettingsModal.svelte
+++ b/ui/src/lib/components/dialogs/SettingsModal.svelte
@@ -96,15 +96,10 @@
 				API Key
 			</TextInput>
 
-			<TextInput 
-				bind:text={settings.fmsUrl}
-				placeholder="http://localhost"
-				onblur={updateSettings}
-				>
+			<TextInput bind:text={settings.fmsUrl} placeholder="http://localhost" onblur={updateSettings}>
 				FMS URL
 			</TextInput>
 
-
 			<div class="grid gap-2 md:col-span-2 mt-2">
 				{#if installPrompt}
 					<Button
diff --git a/ui/src/lib/settings-store.ts b/ui/src/lib/settings-store.ts
index f722d11..50aa642 100644
--- a/ui/src/lib/settings-store.ts
+++ b/ui/src/lib/settings-store.ts
@@ -18,7 +18,7 @@ const defaultSettings: Settings = {
 	darkMode: true,
 	username: '',
 	key: '',
-	fmsUrl: 'http://10.0.100.5',
+	fmsUrl: 'http://10.0.100.5'
 };
 
 if (!initialSettings) {