From d982ce66a8ac23a745240cf8124b61ec230aa138 Mon Sep 17 00:00:00 2001
From: Elijah <elijah.kuntz@gmail.com>
Date: Mon, 25 May 2026 19:09:02 -0700
Subject: [PATCH] Fix: sidebar drive button resets to root, and use query
 parameter for downloads to bypass Next.js API rewrite bug with parenthesis in
 paths

---
 backend/main.go                          | 1 +
 frontend/src/components/FileExplorer.tsx | 2 +-
 frontend/src/lib/api.ts                  | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/backend/main.go b/backend/main.go
index d1c15b3..9de8655 100644
--- a/backend/main.go
+++ b/backend/main.go
@@ -205,6 +205,7 @@ func main() {
 	files.Get("/thumbnail/:checksum", fsHandler.ServeThumbnail)
 	files.Get("/download-folder", fsHandler.DownloadFolder)
 	files.Post("/download-bulk", fsHandler.DownloadBulk)
+	files.Get("/download", fsHandler.Download)
 	files.Get("/download/*", fsHandler.Download)
 	files.Post("/zip", archiveHandler.Zip)
 	files.Post("/unzip", archiveHandler.Unzip)
diff --git a/frontend/src/components/FileExplorer.tsx b/frontend/src/components/FileExplorer.tsx
index 5276fee..d6ce06c 100644
--- a/frontend/src/components/FileExplorer.tsx
+++ b/frontend/src/components/FileExplorer.tsx
@@ -1433,7 +1433,7 @@ export default function FileExplorer({ onLogout }: FileExplorerProps) {
       >
         <div className="flex flex-col gap-1 px-3 py-4 border-b" style={{ borderColor: 'var(--color-border-subtle)' }}>
           <button
-            onClick={() => { setAppMode('drive'); setEditingFile(null); setActiveSection('files'); }}
+            onClick={() => { setAppMode('drive'); setEditingFile(null); setActiveSection('files'); navigateTo('.'); }}
             className="w-full flex items-center gap-3 px-3 py-2.5 rounded-xl text-sm font-bold transition-all duration-150"
             style={{
               backgroundColor: appMode === 'drive' ? 'var(--color-accent-subtle)' : 'transparent',
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index db5b4d5..b5c1192 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -234,7 +234,7 @@ class ApiClient {
 
   async deleteFile(path: string, permanent: boolean = false) {
     const query = permanent ? `?permanent=true&path=${encodeURIComponent(path)}` : `?path=${encodeURIComponent(path)}`;
-    const res = await this.request(`/api/files/${encodeURIComponent(path)}${query}`, {
+    const res = await this.request(`/api/files/${query}`, {
       method: 'DELETE',
     });
     return res.json();
@@ -295,7 +295,7 @@ class ApiClient {
   }
 
   getDownloadUrl(path: string, token: string) {
-    return `${API_BASE}/api/files/download/${encodeURIComponent(path)}?token=${token}`;
+    return `${API_BASE}/api/files/download?path=${encodeURIComponent(path)}&token=${token}`;
   }
 
   getDownloadFolderUrl(path: string, token: string) {