From 646f722ce168ec98b33d69eee0646dd19dd1695a Mon Sep 17 00:00:00 2001
From: angel <sillyangel3@gmail.com>
Date: Wed, 2 Jul 2025 16:33:14 +0000
Subject: [PATCH] feat: enhance Ihateserverside component with client-side
 hydration and sidebar functionality

---
 .env.local                         |  2 +-
 app/components/ihateserverside.tsx | 60 ++++++++++++++++++++++++----
 app/components/menu.tsx            | 63 +++++++++++++++++++-----------
 3 files changed, 94 insertions(+), 31 deletions(-)

diff --git a/.env.local b/.env.local
index 079945a..093b263 100644
--- a/.env.local
+++ b/.env.local
@@ -1 +1 @@
-NEXT_PUBLIC_COMMIT_SHA=dd1a5b1
+NEXT_PUBLIC_COMMIT_SHA=1c60db5
diff --git a/app/components/ihateserverside.tsx b/app/components/ihateserverside.tsx
index a44733f..073fd66 100644
--- a/app/components/ihateserverside.tsx
+++ b/app/components/ihateserverside.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Menu } from "@/app/components/menu";
 import { Sidebar } from "@/app/components/sidebar";
 import { useNavidrome } from "@/app/components/NavidromeContext";
@@ -15,14 +15,17 @@ const Ihateserverside: React.FC<IhateserversideProps> = ({ children }) => {
   const [isSidebarVisible, setIsSidebarVisible] = useState(true);
   const [isStatusBarVisible, setIsStatusBarVisible] = useState(true);
   const [isSidebarHidden, setIsSidebarHidden] = useState(false);
-  const [isSidebarCollapsed, setIsSidebarCollapsed] = useState(() => {
-    if (typeof window !== 'undefined') {
-      return localStorage.getItem('sidebar-collapsed') === 'true';
-    }
-    return false;
-  });
+  const [isSidebarCollapsed, setIsSidebarCollapsed] = useState(false);
+  const [isClient, setIsClient] = useState(false);
   const { playlists } = useNavidrome();
 
+  // Handle client-side hydration
+  useEffect(() => {
+    setIsClient(true);
+    const savedCollapsed = localStorage.getItem('sidebar-collapsed') === 'true';
+    setIsSidebarCollapsed(savedCollapsed);
+  }, []);
+
   const toggleSidebarCollapse = () => {
     const newCollapsed = !isSidebarCollapsed;
     setIsSidebarCollapsed(newCollapsed);
@@ -36,6 +39,49 @@ const Ihateserverside: React.FC<IhateserversideProps> = ({ children }) => {
       setIsSidebarHidden(true); // This will fully hide the sidebar after transition
     }
   };
+
+  if (!isClient) {
+    // Return a basic layout during SSR to match initial client render
+    return (
+      <div className="hidden md:flex md:flex-col md:h-screen">
+        {/* Top Menu */}
+        <div
+          className="sticky z-10 bg-background border-b"
+          style={{
+            left: 'env(titlebar-area-x, 0)',
+            top: 'env(titlebar-area-y, 0)',
+          }}
+        >
+          <Menu
+            toggleSidebar={() => setIsSidebarVisible(!isSidebarVisible)}
+            isSidebarVisible={isSidebarVisible}
+            toggleStatusBar={() => setIsStatusBarVisible(!isStatusBarVisible)}
+            isStatusBarVisible={isStatusBarVisible}
+          />
+        </div>
+
+        {/* Main Content Area */}
+        <div className="flex-1 flex overflow-hidden">
+          <div className="w-64 flex-shrink-0 border-r transition-all duration-200">
+            <Sidebar
+              playlists={playlists}
+              className="h-full overflow-y-auto"
+              collapsed={false}
+              onToggle={toggleSidebarCollapse}
+              onTransitionEnd={handleTransitionEnd}
+            />
+          </div>
+          <div className="flex-1 overflow-y-auto">
+            <div>{children}</div>
+          </div>
+        </div>
+
+        {/* Floating Audio Player */}
+        <AudioPlayer />
+        <Toaster />
+      </div>
+    );
+  }
   return (
     <div className="hidden md:flex md:flex-col md:h-screen">
       {/* Top Menu */}
diff --git a/app/components/menu.tsx b/app/components/menu.tsx
index 958d37a..d747fd1 100644
--- a/app/components/menu.tsx
+++ b/app/components/menu.tsx
@@ -44,6 +44,8 @@ export function Menu({ toggleSidebar, isSidebarVisible, toggleStatusBar, isStatu
     const router = useRouter();
     const [open, setOpen] = useState(false);
     const { isConnected } = useNavidrome();
+    const [isClient, setIsClient] = useState(false);
+    const [navidromeUrl, setNavidromeUrl] = useState<string | null>(null);
 
     // For this demo, we'll show connection status instead of user auth
     const connectionStatus = isConnected ? "Connected to Navidrome" : "Not connected";
@@ -57,6 +59,29 @@ export function Menu({ toggleSidebar, isSidebarVisible, toggleStatusBar, isStatu
       setIsFullScreen(!isFullScreen)
     }, [isFullScreen])
 
+    useEffect(() => {
+        setIsClient(true);
+        
+        // Get Navidrome URL from localStorage
+        const config = localStorage.getItem("navidrome-config");
+        if (config) {
+            try {
+                const { serverUrl } = JSON.parse(config);
+                if (serverUrl) {
+                    // Remove protocol (http:// or https://) and trailing slash
+                    const prettyUrl = serverUrl.replace(/^https?:\/\//, "").replace(/\/$/, "");
+                    setNavidromeUrl(prettyUrl);
+                } else {
+                    setNavidromeUrl(null);
+                }
+            } catch {
+                setNavidromeUrl(null);
+            }
+        } else {
+            setNavidromeUrl(null);
+        }
+    }, []);
+
     useEffect(() => {
         const handleKeyDown = (event: KeyboardEvent) => {
             if ((event.metaKey || event.ctrlKey) && event.key === ',') {
@@ -73,12 +98,16 @@ export function Menu({ toggleSidebar, isSidebarVisible, toggleStatusBar, isStatu
             }
         };
       
-        window.addEventListener('keydown', handleKeyDown);
+        if (isClient) {
+            window.addEventListener('keydown', handleKeyDown);
+        }
 
         return () => {
-            window.removeEventListener('keydown', handleKeyDown);
+            if (isClient) {
+                window.removeEventListener('keydown', handleKeyDown);
+            }
         };
-    }, [router, toggleSidebar, handleFullScreen]);
+    }, [router, toggleSidebar, handleFullScreen, isClient]);
 
     return (
       <>
@@ -100,7 +129,7 @@ export function Menu({ toggleSidebar, isSidebarVisible, toggleStatusBar, isStatu
             Preferences <MenubarShortcut>⌘,</MenubarShortcut>
           </MenubarItem>
           <MenubarSeparator />
-          <MenubarItem onClick={() => window.close()}>
+          <MenubarItem onClick={() => isClient && window.close()}>
             Quit Music <MenubarShortcut>⌘Q</MenubarShortcut>
           </MenubarItem>
         </MenubarContent>
@@ -281,25 +310,13 @@ export function Menu({ toggleSidebar, isSidebarVisible, toggleStatusBar, isStatu
           <div className="flex items-center justify-between">
             <span className="text-xs text-muted-foreground">Navidrome URL</span>
             <span className="text-xs truncate max-w-[160px] text-right">
-            {typeof window !== "undefined"
-              ? (() => {
-                  const config = localStorage.getItem("navidrome-config");
-                  if (config) {
-                    try {
-                      const { serverUrl } = JSON.parse(config);
-                      if (serverUrl) {
-                        // Remove protocol (http:// or https://) and trailing slash
-                        const prettyUrl = serverUrl.replace(/^https?:\/\//, "").replace(/\/$/, "");
-                        return prettyUrl;
-                      }
-                      return <span className="italic text-gray-400">Not set</span>;
-                    } catch {
-                      return <span className="italic text-gray-400">Invalid config</span>;
-                    }
-                  }
-                  return <span className="italic text-gray-400">Not set</span>;
-                })()
-              : <span className="italic text-gray-400">Not available</span>}
+              {!isClient ? (
+                <span className="italic text-gray-400">Loading...</span>
+              ) : navidromeUrl ? (
+                navidromeUrl
+              ) : (
+                <span className="italic text-gray-400">Not set</span>
+              )}
             </span>
           </div>
         </div>