Fetch and display actual username in sidebar profile section

backend/src/db.rs

@@ -59,15 +59,23 @@ impl Db {
         Ok(())
     }
 
-    pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
+        pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
-        let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
+            let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
-            .bind(username)
+                .bind(username)
-            .fetch_optional(&self.pool)
+                .fetch_optional(&self.pool)
-            .await?;
+                .await?;
 
-        Ok(row.map(|r| (r.get(0), r.get(1))))
+            Ok(row.map(|r| (r.get(0), r.get(1))))
-    }
+        }
 
+        pub async fn get_username_by_id(&self, id: i64) -> Result<Option<String>> {
+            let row = sqlx::query("SELECT username FROM users WHERE id = ?")
+                .bind(id)
+                .fetch_optional(&self.pool)
+                .await?;
+
+            Ok(row.map(|r| r.get(0)))
+        }
     pub async fn has_users(&self) -> Result<bool> {
         let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
             .fetch_one(&self.pool)

backend/src/handlers/auth.rs

@@ -15,7 +15,6 @@ pub struct LoginRequest {
     password: String,
 }
 
-#[allow(dead_code)]
 #[derive(Serialize, ToSchema)]
 pub struct UserResponse {
     username: String,
@@ -79,7 +78,7 @@ pub async fn login_handler(
                 .build();
 
             tracing::info!("Session created and cookie set for user: {}", payload.username);
-            (StatusCode::OK, jar.add(cookie), "Login successful").into_response()
+            (StatusCode::OK, jar.add(cookie), Json(UserResponse { username: payload.username })).into_response()
         }
         Ok(false) => {
             tracing::warn!("Login failed: Invalid password for {}", payload.username);
@@ -120,7 +119,7 @@ pub async fn logout_handler(
     get,
     path = "/api/auth/check",
     responses(
-        (status = 200, description = "Authenticated"),
+        (status = 200, description = "Authenticated", body = UserResponse),
         (status = 401, description = "Not authenticated")
     )
 )]
@@ -130,7 +129,15 @@ pub async fn check_auth_handler(
 ) -> impl IntoResponse {
     if let Some(token) = jar.get("auth_token") {
         match state.db.get_session_user(token.value()).await {
-            Ok(Some(_)) => return StatusCode::OK.into_response(),
+            Ok(Some(user_id)) => {
+                // Fetch username
+                // We need a helper in db.rs to get username by id, or we can use a direct query here if we don't want to change db.rs interface yet.
+                // But better to add `get_username_by_id` to db.rs
+                // For now let's query directly or via a new db method.
+                if let Ok(Some(username)) = state.db.get_username_by_id(user_id).await {
+                     return (StatusCode::OK, Json(UserResponse { username })).into_response();
+                }
+            },
             _ => {} // Invalid session
         }
     }

frontend/src/app.rs

@@ -12,6 +12,11 @@ struct SetupStatus {
     completed: bool,
 }
 
+#[derive(Deserialize)]
+struct UserResponse {
+    username: String,
+}
+
 #[component]
 pub fn App() -> impl IntoView {
     crate::store::provide_torrent_store();
@@ -55,6 +60,14 @@ pub fn App() -> impl IntoView {
                 Ok(resp) => {
                     if resp.status() == 200 {
                         logging::log!("Authenticated!");
+
+                        // Parse user info
+                        if let Ok(user_info) = resp.json::<UserResponse>().await {
+                            if let Some(store) = use_context::<crate::store::TorrentStore>() {
+                                store.user.set(Some(user_info.username));
+                            }
+                        }
+
                         set_is_authenticated.set(true);
                     } else {
                         logging::log!("Not authenticated, redirecting to /login");
@@ -71,7 +84,6 @@ pub fn App() -> impl IntoView {
             set_is_loading.set(false);
         });
     });
-
     // Initialize push notifications (Only if authenticated)
     create_effect(move |_| {
         if is_authenticated.get() {

frontend/src/components/layout/sidebar.rs

@@ -86,88 +86,190 @@ pub fn Sidebar() -> impl IntoView {
         });
     };
 
-            view! {
+                let username = move || {
-                <div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
+
-                    <div class="p-2 flex-1 overflow-y-auto">                    <ul class="menu w-full rounded-box gap-1">
+                    store.user.get().unwrap_or_else(|| "User".to_string())
-                        <li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
+
-                        <li>
+                };
-                            <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
+
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
+
-                                </svg>
+                let first_letter = move || {
-                                "All"
+
-                                <span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
+                    username().chars().next().unwrap_or('?').to_uppercase().to_string()
-                            </button>
+
-                        </li>
+                };
-                        <li>
+
-                            <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
+
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
+                view! {
-                                </svg>
+
-                                "Downloading"
+                    <div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
-                                <span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
+
-                            </button>
+                        <div class="p-2 flex-1 overflow-y-auto">
-                        </li>
+
-                        <li>
+                            <ul class="menu w-full rounded-box gap-1">
-                            <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
+
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                <li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
+
-                                </svg>
+                                <li>
-                                "Seeding"
+
-                                <span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
+                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
-                            </button>
+
-                        </li>
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-                        <li>
+
-                            <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+                                        </svg>
-                                </svg>
+
-                                "Completed"
+                                        "All"
-                                <span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
+
-                            </button>
+                                        <span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
-                        </li>
+
-                        <li>
+                                    </button>
-                            <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
+
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                </li>
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
+
-                                </svg>
+                                <li>
-                                "Paused"
+
-                                <span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
+                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
-                            </button>
+
-                        </li>
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-                        <li>
+
-                            <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
+                                        </svg>
-                                </svg>
+
-                                "Inactive"
+                                        "Downloading"
-                                 <span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
+
-                            </button>
+                                        <span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
-                        </li>
+
-                    </ul>
+                                    </button>
-                </div>
+
+                                </li>
+
+                                <li>
+
+                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
+
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
+
+                                        </svg>
+
+                                        "Seeding"
+
+                                        <span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
+
+                                    </button>
+
+                                </li>
+
+                                <li>
+
+                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
+
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
+
+                                        </svg>
+
+                                        "Completed"
+
+                                        <span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
+
+                                    </button>
+
+                                </li>
+
+                                <li>
+
+                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
+
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
+
+                                        </svg>
+
+                                        "Paused"
+
+                                        <span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
+
+                                    </button>
+
+                                </li>
+
+                                <li>
+
+                                    <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
+
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
+
+                                        </svg>
+
+                                        "Inactive"
+
+                                         <span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
+
+                                    </button>
+
+                                </li>
+
+                            </ul>
+
+                        </div>
+
+
+
+                        <div class="p-4 border-t border-base-300 bg-base-200/50">
+
+                            <div class="flex items-center gap-3">
+
+                                <div class="avatar">
+
+                                    <div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
+
+                                        <span class="text-sm font-bold flex items-center justify-center h-full">{first_letter}</span>
+
+                                    </div>
+
+                                </div>
+
+                                <div class="flex-1 overflow-hidden">
+
+                                    <div class="font-bold text-sm truncate">{username}</div>
+
+                                    <div class="text-[10px] text-base-content/60 truncate">"Online"</div>
+
+                                </div>
+
+                                <button
+
+                                    class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
+
+                                    title="Logout"
+
+                                    on:click=handle_logout
+
+                                >
+
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
+
+                                        <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
+
+                                    </svg>
+
+                                </button>
 
-                <div class="p-4 border-t border-base-300 bg-base-200/50">
-                    <div class="flex items-center gap-3">
-                        <div class="avatar">
-                            <div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
-                                <span class="text-sm font-bold flex items-center justify-center h-full">"A"</span>
                             </div>
+
                         </div>
-                        <div class="flex-1 overflow-hidden">
+
-                            <div class="font-bold text-sm truncate">"Admin User"</div>
-                            <div class="text-[10px] text-base-content/60 truncate">"Online"</div>
-                        </div>
-                        <button
-                            class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
-                            title="Logout"
-                            on:click=handle_logout
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
-                            </svg>
-                        </button>
                     </div>
-                </div>
+
-            </div>
+                }}
-        }}

frontend/src/store.rs

@@ -120,6 +120,7 @@ pub struct TorrentStore {
     pub search_query: RwSignal<String>,
     pub global_stats: RwSignal<GlobalStats>,
     pub notifications: RwSignal<Vec<NotificationItem>>,
+    pub user: RwSignal<Option<String>>,
 }
 
 pub fn provide_torrent_store() {
@@ -128,6 +129,7 @@ pub fn provide_torrent_store() {
     let search_query = create_rw_signal(String::new());
     let global_stats = create_rw_signal(GlobalStats::default());
     let notifications = create_rw_signal(Vec::<NotificationItem>::new());
+    let user = create_rw_signal(Option::<String>::None);
 
     let store = TorrentStore {
         torrents,
@@ -135,6 +137,7 @@ pub fn provide_torrent_store() {
         search_query,
         global_stats,
         notifications,
+        user,
     };
     provide_context(store);