From e75ce8afaf37f90331727f4742474501fb7bc4a2 Mon Sep 17 00:00:00 2001
From: Alex Blank <alexblank@fastmail.com>
Date: Thu, 16 Jan 2025 12:11:14 +0100
Subject: [PATCH] improvements

---
 .gitignore                            | 2 ++
 config.json => config.sample.json     | 0
 src/app/components/BusControlTabs.tsx | 4 +---
 src/app/layout.tsx                    | 4 ++--
 src/app/page.tsx                      | 6 ++++--
 src/app/utils/fetchConfig.ts          | 6 +++++-
 6 files changed, 14 insertions(+), 8 deletions(-)
 rename config.json => config.sample.json (100%)

diff --git a/.gitignore b/.gitignore
index 3c6ff67..5945f1c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 .idea/
 
+config.json
+
 # dependencies
 /node_modules
 /.pnp
diff --git a/config.json b/config.sample.json
similarity index 100%
rename from config.json
rename to config.sample.json
diff --git a/src/app/components/BusControlTabs.tsx b/src/app/components/BusControlTabs.tsx
index 85e33ec..a9277dd 100644
--- a/src/app/components/BusControlTabs.tsx
+++ b/src/app/components/BusControlTabs.tsx
@@ -19,8 +19,6 @@ const BusControlTabs = () => {
                             content: <BusControl busControlConfig={busControl} mainConfig={config}/>
                         };
                     });
-                    // setTabComponents(components);
-
                     // set the active tab to the first tab
                     if (components.length > 0) {
                         setActiveTab(components[0].id);
@@ -55,7 +53,7 @@ const BusControlTabs = () => {
                 {tabComponents.map((tab) => (
                     <button
                         key={tab.id}
-                        className={`px-4 py-2 ${
+                        className={`px-4 py-2 text-sm ${
                             activeTab === tab.id
                                 ? "border-b-2 border-blue-500 text-blue-500"
                                 : "text-gray-500"
diff --git a/src/app/layout.tsx b/src/app/layout.tsx
index f7fa87e..cc311d5 100644
--- a/src/app/layout.tsx
+++ b/src/app/layout.tsx
@@ -13,8 +13,8 @@ const geistMono = Geist_Mono({
 });
 
 export const metadata: Metadata = {
-  title: "Create Next App",
-  description: "Generated by create next app",
+  title: "Jam-Session Web",
+  description: "A web interface for jamming the session",
 };
 
 export default function RootLayout({
diff --git a/src/app/page.tsx b/src/app/page.tsx
index 3b0269d..8b3c2fc 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -40,7 +40,8 @@ const Page = () => {
     useEffect(() => {
         fetchConfig().then((config: Config) => {
             setAppConfig(config);
-            initConnection(`ws://${window.location.hostname}:${config.webserver.port}`);
+            const webserverIP = config.webserver.ip || window.location.hostname;
+            initConnection(`ws://${webserverIP}:${config.webserver.port}`);
         });
     }, []);
 
@@ -55,7 +56,8 @@ const Page = () => {
             setWebSocketConnected(isConnected);
             if (!isConnected) {
                 console.log("Reconnecting to WebSocket");
-                initConnection(`ws://${window.location.hostname}:${appConfig.webserver.port}`);
+                const webserverIP = appConfig.webserver.ip || window.location.hostname;
+                initConnection(`ws://${webserverIP}:${appConfig.webserver.port}`);
             } else {
                 // check if mixer is connected
                 withTimeout(fetchValue("/info"), 1500)
diff --git a/src/app/utils/fetchConfig.ts b/src/app/utils/fetchConfig.ts
index 87ff661..b0da0d3 100644
--- a/src/app/utils/fetchConfig.ts
+++ b/src/app/utils/fetchConfig.ts
@@ -5,7 +5,11 @@ export const fetchConfig = async <T>(): Promise<T | null> => {
             console.error(`Failed to fetch config:`, response.statusText);
             return null;
         }
-        return await response.json();
+        const config = await response.json();
+        // apply defaults
+        config.polling_interval = config.polling_interval || 1000;
+
+        return config
     } catch (error) {
         console.error(`Error fetching config from:`, error);
         return null;