@@ -1,5 +1,5 @@
11 import { useEffect, useRef, useState } from "react";
2-import { Hash, LogOut, Moon, Settings, Sun, Users } from "lucide-react";
2+import { Hash, Menu, Settings } from "lucide-react";
33 import { Button } from "@/components/ui/button";
44 import { api } from "../lib/api";
55 import { useSettings } from "../lib/settings";
@@ -9,9 +9,6 @@ import type { Channel, Message, User, UserSummary, WSEvent } from "../lib/types"
99 import ChatPane from "../components/ChatPane";
1010 import SettingsPanel from "../components/SettingsPanel";
1111 import Sidebar from "../components/Sidebar";
12-import UserList from "../components/UserList";
13-
14-type Panel = "users" | "settings" | null;
1512
1613 export default function Chat({ user, onLogout }: { user: User; onLogout: () => void }) {
1714 const [channels, setChannels] = useState<Channel[]>([]);
@@ -19,7 +16,9 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
1916 const [users, setUsers] = useState<UserSummary[]>([]);
2017 const [online, setOnline] = useState<Set<string>>(new Set());
2118 const [messages, setMessages] = useState<Message[]>([]);
22- const [panel, setPanel] = useState<Panel>("users");
19+ const [settingsOpen, setSettingsOpen] = useState(false);
20+ const desktop = useRef(window.matchMedia("(min-width: 768px)").matches);
21+ const [sidebarOpen, setSidebarOpen] = useState(desktop.current);
2322 const selectedId = useRef<number | null>(null);
2423 const { settings, update } = useSettings();
2524 const voice = useVoice(settings);
@@ -66,60 +65,76 @@ export default function Chat({ user, onLogout }: { user: User; onLogout: () => v
6665 .catch(() => {});
6766 }, [selected]);
6867
68+ function selectChannel(c: Channel) {
69+ setSelected(c);
70+ setSettingsOpen(false);
71+ if (!desktop.current) setSidebarOpen(false);
72+ }
73+
74+ function toggleSettings() {
75+ setSettingsOpen((v) => !v);
76+ if (!desktop.current) setSidebarOpen(false);
77+ }
78+
6979 async function logout() {
7080 await api("/logout", { method: "POST" }).catch(() => {});
7181 onLogout();
7282 }
7383
7484 return (
75- <div className="flex h-full">
76- <Sidebar
77- channels={channels}
78- selected={selected}
79- onSelect={setSelected}
80- voice={voice}
81- username={user.username}
82- />
85+ <div className="relative flex h-full">
86+ {sidebarOpen && (
87+ <div
88+ className="fixed inset-0 z-10 bg-black/30 md:hidden"
89+ onClick={() => setSidebarOpen(false)}
90+ />
91+ )}
92+ {sidebarOpen && (
93+ <Sidebar
94+ channels={channels}
95+ selected={selected}
96+ onSelect={selectChannel}
97+ voice={voice}
98+ username={user.username}
99+ users={users}
100+ online={online}
101+ theme={theme}
102+ onToggleTheme={toggle}
103+ settingsOpen={settingsOpen}
104+ onToggleSettings={toggleSettings}
105+ onLogout={logout}
106+ />
107+ )}
83108 <main className="flex min-w-0 flex-1 flex-col">
84- <header className="flex items-center justify-between border-b border-sepia/15 px-4 py-2">
109+ <header className="flex items-center gap-1 border-b border-sepia/15 px-2 py-2">
110+ <Button
111+ variant="ghost"
112+ size="icon-sm"
113+ onClick={() => setSidebarOpen((v) => !v)}
114+ title="toggle sidebar"
115+ >
116+ <Menu />
117+ </Button>
85118 <span className="flex items-center gap-1.5 text-sm text-sepia/70">
86- {selected && <Hash size={14} />}
87- {selected?.name}
119+ {settingsOpen ? (
120+ <>
121+ <Settings size={14} />
122+ Settings
123+ </>
124+ ) : (
125+ <>
126+ {selected && <Hash size={14} />}
127+ {selected?.name}
128+ </>
129+ )}
88130 </span>
89- <div className="flex items-center gap-1">
90- <Button
91- variant="ghost"
92- size="icon-sm"
93- onClick={toggle}
94- title={theme === "dark" ? "light mode" : "dark mode"}
95- >
96- {theme === "dark" ? <Sun /> : <Moon />}
97- </Button>
98- <Button
99- variant="ghost"
100- size="icon-sm"
101- onClick={() => setPanel((p) => (p === "settings" ? null : "settings"))}
102- title="settings"
103- >
104- <Settings />
105- </Button>
106- <Button
107- variant="ghost"
108- size="icon-sm"
109- onClick={() => setPanel((p) => (p === "users" ? null : "users"))}
110- title="toggle users"
111- >
112- <Users />
113- </Button>
114- <Button variant="ghost" size="icon-sm" onClick={logout} title="log out">
115- <LogOut />
116- </Button>
117- </div>
118131 </header>
119- <ChatPane channel={selected} messages={messages} />
132+ {settingsOpen ? (
133+ <SettingsPanel settings={settings} update={update} voice={voice} />
134+ ) : (
135+ <ChatPane channel={selected} messages={messages} />
136+ )}
120137 </main>
121- {panel === "settings" && <SettingsPanel settings={settings} update={update} voice={voice} />}
122- {panel === "users" && <UserList users={users} online={online} />}
123138 </div>
124139 );
125140 }