Merge pull request #19 from 333fred/fms-url-settings

Allow changing the FMS url via settings
FIRST-Robotics-Competition · Sep 25, 2024 · c7beb4e · c7beb4e
2 parents 0c46dfd + 547e9f0
commit c7beb4e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git 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: `http://${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
@@ -96,6 +96,10 @@
 				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
@@ -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
@@ -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;