From 2c55109cb5fbfb1e5981a01774e90906b1d47d07 Mon Sep 17 00:00:00 2001
From: Leo dev <klesti.selimay@icloud.com>
Date: Wed, 22 Oct 2025 11:55:32 +0200
Subject: [PATCH] Small sidebar fix

---
 src/components/app/AppLayout.tsx  | 32 +++++++++++++++++++++++--------
 src/components/app/SidebarDMs.tsx | 13 +------------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/components/app/AppLayout.tsx b/src/components/app/AppLayout.tsx
index ec5797b..abed679 100644
--- a/src/components/app/AppLayout.tsx
+++ b/src/components/app/AppLayout.tsx
@@ -12,6 +12,7 @@ import { Server, Message } from "@/types/types";
 import SidebarServers from "./SidebarServers";
 import SidebarDMs from "./SidebarDMs";
 import SidebarChannels from "./SidebarChannels";
+import DMItem from "./DMItem";
 
 export default function AppLayout({
   children,
@@ -70,15 +71,30 @@ export default function AppLayout({
           app.sidebarOpen && isMobile ? "w-5xl md:w-md" : "w-0 md:w-md"
         )}
       >
-        {/* Left column — servers */}
-        <SidebarServers app={app} />
+        <div className="flex-shrink-0">
+          <SidebarServers app={app} />
+        </div>
 
-        {/* Right column — DMs or server channels */}
-        {server ? (
-          <SidebarChannels server={server} />
-        ) : (
-          <SidebarDMs app={app} />
-        )}
+        <div className="flex-1 min-w-0 flex flex-col bg-sidebar">
+          <div className="flex-1 min-h-0">
+            {server ? (
+              <SidebarChannels server={server} />
+            ) : (
+              <SidebarDMs app={app} />
+            )}
+          </div>
+
+          <footer className="mt-auto pb-3 px-3">
+            <DMItem
+              name={app.profile?.display_name || "Loading.."}
+              id={app.profile?.id || "me"}
+              avatar={app.profile?.avatar_url || ""}
+              status="online"
+              app={app}
+              settings
+            />
+          </footer>
+        </div>
       </div>
 
       {app.sidebarOpen && isMobile ? (
diff --git a/src/components/app/SidebarDMs.tsx b/src/components/app/SidebarDMs.tsx
index 9e88f46..c1be647 100644
--- a/src/components/app/SidebarDMs.tsx
+++ b/src/components/app/SidebarDMs.tsx
@@ -76,7 +76,7 @@ export default function SidebarDMs({ app }: { app: App }) {
             <div className="px-3 py-2">
               <Button
                 variant="ghost"
-                className="w-full justify-start gap-2 text-sm"
+                className="w-full justify-start gap-2 text-sm truncate"
                 onClick={async () => {
                   const res = await axios.get("/api/profile", {
                     params: { username: query },
@@ -92,17 +92,6 @@ export default function SidebarDMs({ app }: { app: App }) {
           )}
         </div>
       </ScrollArea>
-
-      <footer className="mt-auto pb-3 px-3">
-        <DMItem
-          name={app.profile?.display_name || "Loading.."}
-          id={app.profile?.id || "me"}
-          avatar={app.profile?.avatar_url || ""}
-          status="online"
-          app={app}
-          settings
-        />
-      </footer>
     </div>
   );
 }