feat(torrent): add date sorting and display

- Sort torrents by added date (newest first) by default
- Add Date column to desktop table (after ETA)
- Add Date to mobile card view
- Add Date option to mobile sort dropdown
- Display dates in DD/MM/YYYY HH:mm format

.gitea/workflows/build-mips.yml

@@ -26,22 +26,23 @@ jobs:
       run: |
         cd frontend
         npm install
-        npx @tailwindcss/cli -i input.css -o public/tailwind.css --minify --content './src/**/*.rs'
-        # Trunk'ın optimizasyonunu kapalı (0) tutuyoruz çünkü Cargo.toml'daki opt-level='z' zaten o işi yapıyor.
+        # Run Tailwind manually first
+        npx @tailwindcss/cli -i input.css -o public/tailwind.css
         trunk build --release
 
     - name: Build Backend (MIPS)
       env:
-        # -s ve -w ile binary içindeki gereksiz tüm yükleri siliyoruz.
-        RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float -C link-arg=-s -C link-arg=-w"
+        # Ensure we are building a fully static binary
+        # -C link-self-contained=no: Let Zig (the linker) handle CRT objects (crt1.o, etc.)
+        RUSTFLAGS: "-C target-feature=+crt-static -C link-self-contained=no -C link-arg=-msoft-float"
         CFLAGS_mips_unknown_linux_musl: "-msoft-float"
       run: |
-        # Sadece gerekli özellikleri derliyoruz (Boyut tasarrufu için swagger kapalı)
-        cargo zigbuild -p backend --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort --no-default-features --features push-notifications
+        cd backend
+        cargo zigbuild --target mips-unknown-linux-musl --release -Z build-std=std,panic_abort
+        file target/mips-unknown-linux-musl/release/backend
 
-    - name: Create Release Assets
-      run: |
-        mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
+    - name: Rename Binary
+      run: mv target/mips-unknown-linux-musl/release/backend target/mips-unknown-linux-musl/release/vibetorrent-mips
 
     - name: Generate Release Tag
       id: tag
@@ -55,10 +56,8 @@ jobs:
         REPO="admin/vibetorrent"
         API_URL="${{ gitea.server_url }}/api/v1"
 
-        RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases" \
-          -H "Authorization: token ${RELEASE_TOKEN}" \
-          -H "Content-Type: application/json" \
-          -d "{
+        # Create release
+        RELEASE_RESPONSE=$(curl -s -X POST "${API_URL}/repos/${REPO}/releases"           -H "Authorization: token ${RELEASE_TOKEN}"           -H "Content-Type: application/json"           -d "{
             \"tag_name\": \"${TAG}\",
             \"name\": \"Release ${TAG}\",
             \"body\": \"Automated build from commit ${{ gitea.sha }}\",
@@ -67,9 +66,15 @@ jobs:
           }")
 
         RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
-        if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then exit 1; fi
+        echo "Release ID: $RELEASE_ID"
 
-        curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips" \
-          -H "Authorization: token ${RELEASE_TOKEN}" \
-          -H "Content-Type: application/octet-stream" \
-          --data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
+        if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
+          echo "Failed to create release:"
+          echo "$RELEASE_RESPONSE"
+          exit 1
+        fi
+
+        # Upload binary as release asset
+        curl -s -X POST "${API_URL}/repos/${REPO}/releases/${RELEASE_ID}/assets?name=vibetorrent-mips"           -H "Authorization: token ${RELEASE_TOKEN}"           -H "Content-Type: application/octet-stream"           --data-binary @target/mips-unknown-linux-musl/release/vibetorrent-mips
+
+        echo "Release ${TAG} created with binary attached."

.gitignore

@@ -6,5 +6,3 @@ result.xml
 frontend/dist
 backend.log
 .runner
-.env
-backend/.env

Cargo.toml

@@ -2,20 +2,13 @@
 members = ["backend", "frontend", "shared"]
 resolver = "2"
 
+# Optimize for size (aggressive)
 [profile.release]
-# En küçük binary boyutu
 opt-level = "z"
-# En derin kod temizliği (dead code elimination)
-lto = "fat"
-# En iyi optimizasyon için tek birim derleme
+lto = true
 codegen-units = 1
-# Hata izleme kodlarını atarak yer kazan
 panic = "abort"
-# Sembolleri ve hata ayıklama bilgilerini kesin sil
 strip = true
-# Artık (incremental) build'i kapat ki optimizasyon tam olsun
-incremental = false
 
 [patch.crates-io]
-coarsetime = { path = "patches/coarsetime" }
-
+coarsetime = { path = "third_party/coarsetime" }

backend/.env.example

@@ -3,12 +3,3 @@ RTORRENT_SOCKET=/tmp/rtorrent.sock
 
 # Backend Listen Port
 PORT=3000
-
-# Database URL
-DATABASE_URL=sqlite:vibetorrent.db
-
-# VAPID Keys for Push Notifications
-# Generate new keys for production using: npx web-push generate-vapid-keys
-VAPID_PUBLIC_KEY=YOUR_PUBLIC_VAPID_KEY
-VAPID_PRIVATE_KEY=YOUR_PRIVATE_VAPID_KEY
-VAPID_EMAIL=mailto:your-email@example.com

backend/Cargo.toml

@@ -4,46 +4,38 @@ version = "0.1.0"
 edition = "2021"
 
 [features]
-default = ["swagger"] # push-notifications kaldırıldı
+default = ["push-notifications"]
 push-notifications = ["web-push", "openssl"]
-swagger = ["utoipa-swagger-ui"]
 
 [dependencies]
 axum = { version = "0.8", features = ["macros", "ws"] }
 tokio = { version = "1", features = ["full"] }
-tower = { version = "0.5", features = ["util", "timeout"] }
-tower-http = { version = "0.6", features = ["fs", "trace", "cors", "compression-full"] }
+tower = { version = "0.4", features = ["util", "timeout"] }
+tower-http = { version = "0.5", features = ["fs", "trace", "cors", "compression-full"] }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-rmp-serde = "1.3"
-struct-patch = "0.5"
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tokio-stream = "0.1"
 bytes = "1"
 futures = "0.3"
 quick-xml = { version = "0.31", features = ["serde", "serialize"] }
+# We might need `tokio-util` for codecs if we implement SCGI manually
 tokio-util = { version = "0.7", features = ["codec", "io"] }
 clap = { version = "4.4", features = ["derive", "env"] }
 rust-embed = "8.2"
 mime_guess = "2.0"
-shared = { path = "../shared", features = ["ssr"] }
+shared = { path = "../shared" }
 thiserror = "2.0.18"
 dotenvy = "0.15.7"
 utoipa = { version = "5.4.0", features = ["axum_extras"] }
-utoipa-swagger-ui = { version = "9.0", features = ["axum"], optional = true }
+utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
 web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
 base64 = "0.22"
 openssl = { version = "0.10", features = ["vendored"], optional = true }
+sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
 bcrypt = "0.17.0"
 axum-extra = { version = "0.10", features = ["cookie"] }
 rand = "0.8"
 anyhow = "1.0.101"
 time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
-tower_governor = "0.8.0"
-governor = "0.10.4"
-
-# Leptos
-leptos = { version = "0.8.15", features = ["nightly"] }
-leptos_axum = { version = "0.8.7" }
-jsonwebtoken = "9"

backend/src/db.rs

@@ -1,7 +1,6 @@
-use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite, Row, sqlite::SqliteConnectOptions};
+use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite, Row};
 use std::time::Duration;
 use anyhow::Result;
-use std::str::FromStr;
 
 #[derive(Clone)]
 pub struct Db {
@@ -10,25 +9,42 @@ pub struct Db {
 
 impl Db {
     pub async fn new(db_url: &str) -> Result<Self> {
-        let options = SqliteConnectOptions::from_str(db_url)?
-            .create_if_missing(true)
-            .busy_timeout(Duration::from_secs(10)) // Bekleme süresini 10 saniyeye çıkardık
-            .journal_mode(sqlx::sqlite::SqliteJournalMode::Wal)
-            .synchronous(sqlx::sqlite::SqliteSynchronous::Normal);
-
         let pool = SqlitePoolOptions::new()
             .max_connections(5)
-            .acquire_timeout(Duration::from_secs(10))
-            .connect_with(options)
+            .acquire_timeout(Duration::from_secs(3))
+            .connect(db_url)
             .await?;
 
         let db = Self { pool };
-        db.run_migrations().await?;
+        db.init().await?;
         Ok(db)
     }
 
-    async fn run_migrations(&self) -> Result<()> {
-        sqlx::migrate!("./migrations").run(&self.pool).await?;
+    async fn init(&self) -> Result<()> {
+        // Create users table
+        sqlx::query(
+            "CREATE TABLE IF NOT EXISTS users (
+                id INTEGER PRIMARY KEY,
+                username TEXT NOT NULL UNIQUE,
+                password_hash TEXT NOT NULL,
+                created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+            )",
+        )
+        .execute(&self.pool)
+        .await?;
+
+        // Create sessions table
+        sqlx::query(
+            "CREATE TABLE IF NOT EXISTS sessions (
+                token TEXT PRIMARY KEY,
+                user_id INTEGER NOT NULL,
+                expires_at DATETIME NOT NULL,
+                FOREIGN KEY(user_id) REFERENCES users(id)
+            )",
+        )
+        .execute(&self.pool)
+        .await?;
+
         Ok(())
     }
 
@@ -43,24 +59,23 @@ impl Db {
         Ok(())
     }
 
-    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 = ?")
-            .bind(username)
-            .fetch_optional(&self.pool)
-            .await?;
+        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 = ?")
+                .bind(username)
+                .fetch_optional(&self.pool)
+                .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 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)
@@ -113,36 +128,4 @@ impl Db {
             .await?;
         Ok(())
     }
-
-    // --- Push Subscription Operations ---
-
-    pub async fn save_push_subscription(&self, endpoint: &str, p256dh: &str, auth: &str) -> Result<()> {
-        sqlx::query(
-            "INSERT INTO push_subscriptions (endpoint, p256dh, auth) VALUES (?, ?, ?)
-             ON CONFLICT(endpoint) DO UPDATE SET p256dh = EXCLUDED.p256dh, auth = EXCLUDED.auth"
-        )
-        .bind(endpoint)
-        .bind(p256dh)
-        .bind(auth)
-        .execute(&self.pool)
-        .await?;
-        Ok(())
-    }
-
-    pub async fn remove_push_subscription(&self, endpoint: &str) -> Result<()> {
-        sqlx::query("DELETE FROM push_subscriptions WHERE endpoint = ?")
-            .bind(endpoint)
-            .execute(&self.pool)
-            .await?;
-        Ok(())
-    }
-
-    pub async fn get_all_push_subscriptions(&self) -> Result<Vec<(String, String, String)>> {
-        let rows = sqlx::query_as::<_, (String, String, String)>(
-            "SELECT endpoint, p256dh, auth FROM push_subscriptions"
-        )
-        .fetch_all(&self.pool)
-        .await?;
-        Ok(rows)
-    }
 }

backend/src/diff.rs

@@ -1,4 +1,3 @@
-use std::collections::HashMap;
 use shared::{AppEvent, NotificationLevel, SystemNotification, Torrent, TorrentUpdate};
 
 #[derive(Debug)]
@@ -9,54 +8,99 @@ pub enum DiffResult {
 }
 
 pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
+    // 1. Structural Check (Length or Order changed)
     if old.len() != new.len() {
         return DiffResult::FullUpdate;
     }
 
-    let old_map: HashMap<&str, &Torrent> = old.iter().map(|t| (t.hash.as_str(), t)).collect();
-    
-    for new_t in new {
-        if !old_map.contains_key(new_t.hash.as_str()) {
+    for (i, t) in new.iter().enumerate() {
+        if old[i].hash != t.hash {
             return DiffResult::FullUpdate;
         }
     }
 
+    // 2. Field Updates
     let mut events = Vec::new();
 
-    for new_t in new {
-        let old_t = old_map.get(new_t.hash.as_str()).unwrap();
+    for (i, new_t) in new.iter().enumerate() {
+        let old_t = &old[i];
+
+        // Initialize with all None
+        let mut update = TorrentUpdate {
+            hash: new_t.hash.clone(),
+            name: None,
+            size: None,
+            down_rate: None,
+            up_rate: None,
+            percent_complete: None,
+            completed: None,
+            eta: None,
+            status: None,
+            error_message: None,
+            label: None,
+        };
 
-        // Manuel diff creating TorrentUpdate (which is the Patch struct)
-        let mut patch = TorrentUpdate::default();
         let mut has_changes = false;
 
-        if old_t.name != new_t.name { patch.name = Some(new_t.name.clone()); has_changes = true; }
-        if old_t.size != new_t.size { patch.size = Some(new_t.size); has_changes = true; }
-        if old_t.down_rate != new_t.down_rate { patch.down_rate = Some(new_t.down_rate); has_changes = true; }
-        if old_t.up_rate != new_t.up_rate { patch.up_rate = Some(new_t.up_rate); has_changes = true; }
-        if old_t.completed != new_t.completed { patch.completed = Some(new_t.completed); has_changes = true; }
-        if old_t.eta != new_t.eta { patch.eta = Some(new_t.eta); has_changes = true; }
-        if (old_t.percent_complete - new_t.percent_complete).abs() > 0.01 { 
-            patch.percent_complete = Some(new_t.percent_complete); 
-            has_changes = true; 
-            
+        // Compare fields
+        if old_t.name != new_t.name {
+            update.name = Some(new_t.name.clone());
+            has_changes = true;
+        }
+        if old_t.size != new_t.size {
+            update.size = Some(new_t.size);
+            has_changes = true;
+        }
+        if old_t.down_rate != new_t.down_rate {
+            update.down_rate = Some(new_t.down_rate);
+            has_changes = true;
+        }
+        if old_t.up_rate != new_t.up_rate {
+            update.up_rate = Some(new_t.up_rate);
+            has_changes = true;
+        }
+        if (old_t.percent_complete - new_t.percent_complete).abs() > 0.01 {
+            update.percent_complete = Some(new_t.percent_complete);
+            has_changes = true;
+
+            // Check for torrent completion: reached 100%
             if old_t.percent_complete < 100.0 && new_t.percent_complete >= 100.0 {
+                tracing::info!("Torrent completed: {} ({})", new_t.name, new_t.hash);
                 events.push(AppEvent::Notification(SystemNotification {
                     level: NotificationLevel::Success,
                     message: format!("Torrent tamamlandı: {}", new_t.name),
                 }));
             }
         }
-        if old_t.status != new_t.status { patch.status = Some(new_t.status.clone()); has_changes = true; }
-        if old_t.error_message != new_t.error_message { patch.error_message = Some(new_t.error_message.clone()); has_changes = true; }
-        if old_t.label != new_t.label { patch.label = Some(new_t.label.clone()); has_changes = true; }
+        if old_t.completed != new_t.completed {
+            update.completed = Some(new_t.completed);
+            has_changes = true;
+        }
+        if old_t.eta != new_t.eta {
+            update.eta = Some(new_t.eta);
+            has_changes = true;
+        }
+        if old_t.status != new_t.status {
+            update.status = Some(new_t.status.clone());
+            has_changes = true;
+
+            // Log status changes for debugging
+            tracing::debug!(
+                "Torrent status changed: {} ({}) {:?} -> {:?}",
+                new_t.name, new_t.hash, old_t.status, new_t.status
+            );
+        }
+        if old_t.error_message != new_t.error_message {
+            update.error_message = Some(new_t.error_message.clone());
+            has_changes = true;
+        }
+        if old_t.label != new_t.label {
+            update.label = new_t.label.clone();
+            has_changes = true;
+        }
 
         if has_changes {
-            // Set the hash (not an Option in Patch usually, but check shared/src/lib.rs)
-            // Wait, TorrentUpdate is a Patch, does it have 'hash' field?
-            // Yes, because Torrent has 'hash' field.
-            patch.hash = Some(new_t.hash.clone()); 
-            events.push(AppEvent::Update(patch));
+            events.push(AppEvent::Update(update));
         }
     }
 
@@ -66,4 +110,4 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
         tracing::debug!("Generated {} partial updates", events.len());
         DiffResult::Partial(events)
     }
-}
+}

backend/src/handlers/mod.rs

@@ -1,9 +1,22 @@
+use crate::{
+    xmlrpc::{self, RpcParam},
+    AppState,
+};
+#[cfg(feature = "push-notifications")]
+use crate::push;
 use axum::{
+    extract::{Json, Path, State},
     http::{header, StatusCode, Uri},
     response::IntoResponse,
     BoxError,
 };
 use rust_embed::RustEmbed;
+use serde::Deserialize;
+use shared::{
+    GlobalLimitRequest, SetFilePriorityRequest, SetLabelRequest, TorrentActionRequest, TorrentFile,
+    TorrentPeer, TorrentTracker,
+};
+use utoipa::ToSchema;
 
 pub mod auth;
 pub mod setup;
@@ -12,6 +25,13 @@ pub mod setup;
 #[folder = "../frontend/dist"]
 pub struct Asset;
 
+#[derive(Deserialize, ToSchema)]
+pub struct AddTorrentRequest {
+    /// Magnet link or Torrent file URL
+    #[schema(example = "magnet:?xt=urn:btih:...")]
+    uri: String,
+}
+
 pub async fn static_handler(uri: Uri) -> impl IntoResponse {
     let mut path = uri.path().trim_start_matches('/').to_string();
 
@@ -28,6 +48,7 @@ pub async fn static_handler(uri: Uri) -> impl IntoResponse {
             if path.contains('.') {
                 return StatusCode::NOT_FOUND.into_response();
             }
+            // Fallback to index.html for SPA routing
             match Asset::get("index.html") {
                 Some(content) => {
                     let mime = mime_guess::from_path("index.html").first_or_octet_stream();
@@ -39,6 +60,614 @@ pub async fn static_handler(uri: Uri) -> impl IntoResponse {
     }
 }
 
+// --- TORRENT ACTIONS ---
+
+/// Add a new torrent via magnet link or URL
+#[utoipa::path(
+    post,
+    path = "/api/torrents/add",
+    request_body = AddTorrentRequest,
+    responses(
+        (status = 200, description = "Torrent added successfully"),
+        (status = 500, description = "Internal server error or rTorrent fault")
+    )
+)]
+pub async fn add_torrent_handler(
+    State(state): State<AppState>,
+    Json(payload): Json<AddTorrentRequest>,
+) -> StatusCode {
+    tracing::info!(
+        "Received add_torrent request. URI length: {}",
+        payload.uri.len()
+    );
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    let params = vec![RpcParam::from(""), RpcParam::from(payload.uri.as_str())];
+
+    match client.call("load.start", &params).await {
+        Ok(response) => {
+            tracing::debug!("rTorrent response to load.start: {}", response);
+            if response.contains("faultCode") {
+                tracing::error!("rTorrent returned fault: {}", response);
+                return StatusCode::INTERNAL_SERVER_ERROR;
+            }
+            // Note: Frontend shows its own toast, no SSE notification needed
+            StatusCode::OK
+        }
+        Err(e) => {
+            tracing::error!("Failed to add torrent: {}", e);
+            // Note: Frontend shows its own toast, no SSE notification needed
+            StatusCode::INTERNAL_SERVER_ERROR
+        }
+    }
+}
+
+/// Perform an action on a torrent (start, stop, delete)
+#[utoipa::path(
+    post,
+    path = "/api/torrents/action",
+    request_body = TorrentActionRequest,
+    responses(
+        (status = 200, description = "Action executed successfully"),
+        (status = 400, description = "Invalid action or request"),
+        (status = 403, description = "Forbidden: Security risk detected"),
+        (status = 500, description = "Internal server error")
+    )
+)]
+pub async fn handle_torrent_action(
+    State(state): State<AppState>,
+    Json(payload): Json<TorrentActionRequest>,
+) -> impl IntoResponse {
+    tracing::info!(
+        "Received action: {} for hash: {}",
+        payload.action,
+        payload.hash
+    );
+
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+
+    // Special handling for delete_with_data
+    if payload.action == "delete_with_data" {
+        return match delete_torrent_with_data(&client, &payload.hash).await {
+            Ok(msg) => {
+                // Note: Frontend shows its own toast
+                (StatusCode::OK, msg).into_response()
+            }
+            Err((status, msg)) => (status, msg).into_response(),
+        };
+    }
+
+    let method = match payload.action.as_str() {
+        "start" => "d.start",
+        "stop" => "d.stop",
+        "delete" => "d.erase",
+        _ => return (StatusCode::BAD_REQUEST, "Invalid action").into_response(),
+    };
+
+    let params = vec![RpcParam::from(payload.hash.as_str())];
+
+    match client.call(method, &params).await {
+        Ok(_) => {
+            // Note: Frontend shows its own toast, no SSE notification needed
+            (StatusCode::OK, "Action executed").into_response()
+        }
+        Err(e) => {
+            tracing::error!("RPC error: {}", e);
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                "Failed to execute action",
+            )
+                .into_response()
+        }
+    }
+}
+
+/// Helper function to handle secure deletion of torrent data
+async fn delete_torrent_with_data(
+    client: &xmlrpc::RtorrentClient,
+    hash: &str,
+) -> Result<&'static str, (StatusCode, String)> {
+    let params_hash = vec![RpcParam::from(hash)];
+
+    // 1. Get Base Path
+    let path_xml = client
+        .call("d.base_path", &params_hash)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Failed to call rTorrent: {}", e),
+            )
+        })?;
+
+    let path = xmlrpc::parse_string_response(&path_xml).map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Failed to parse path: {}", e),
+        )
+    })?;
+
+    // 1.5 Get Default Download Directory (Sandbox Root)
+    let root_xml = client.call("directory.default", &[]).await.map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Failed to get valid download root: {}", e),
+        )
+    })?;
+
+    let root_path_str = xmlrpc::parse_string_response(&root_xml).map_err(|e| {
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Failed to parse root path: {}", e),
+        )
+    })?;
+
+    // Resolve Paths (Canonicalize) to prevent .. traversal and symlink attacks
+    let root_path = tokio::fs::canonicalize(std::path::Path::new(&root_path_str))
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Invalid download root configuration (on server): {}", e),
+            )
+        })?;
+
+    // Check if target path exists before trying to resolve it
+    let target_path_raw = std::path::Path::new(&path);
+    if !tokio::fs::try_exists(target_path_raw)
+        .await
+        .unwrap_or(false)
+    {
+        tracing::warn!(
+            "Data path not found: {:?}. Removing torrent only.",
+            target_path_raw
+        );
+        // If file doesn't exist, we just remove the torrent entry
+        client.call("d.erase", &params_hash).await.map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Failed to erase torrent: {}", e),
+            )
+        })?;
+
+        return Ok("Torrent removed (Data not found)");
+    }
+
+    let target_path = tokio::fs::canonicalize(target_path_raw)
+        .await
+        .map_err(|e| {
+            (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Invalid data path: {}", e),
+            )
+        })?;
+
+    tracing::info!(
+        "Delete request: Target='{:?}', Root='{:?}'",
+        target_path,
+        root_path
+    );
+
+    // SECURITY CHECK: Ensure path is inside root_path
+    if !target_path.starts_with(&root_path) {
+        tracing::error!(
+            "Security Risk: Attempted to delete path outside download directory: {:?}",
+            target_path
+        );
+        return Err((
+            StatusCode::FORBIDDEN,
+            "Security Error: Cannot delete files outside default download directory".to_string(),
+        ));
+    }
+
+    // SECURITY CHECK: Ensure we are not deleting the root itself
+    if target_path == root_path {
+        return Err((
+            StatusCode::BAD_REQUEST,
+            "Security Error: Cannot delete the download root directory itself".to_string(),
+        ));
+    }
+
+    // 2. Erase Torrent first
+    client.call("d.erase", &params_hash).await.map_err(|e| {
+        tracing::warn!("Failed to erase torrent entry: {}", e);
+        (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("Failed to erase torrent: {}", e),
+        )
+    })?;
+
+    // 3. Delete Files via Native FS
+    let delete_result = if target_path.is_dir() {
+        tokio::fs::remove_dir_all(&target_path).await
+    } else {
+        tokio::fs::remove_file(&target_path).await
+    };
+
+    match delete_result {
+        Ok(_) => Ok("Torrent and data deleted"),
+        Err(e) => {
+            tracing::error!("Failed to delete data at {:?}: {}", target_path, e);
+            Err((
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Failed to delete data: {}", e),
+            ))
+        }
+    }
+}
+
+// --- NEW HANDLERS ---
+
+/// Get rTorrent version
+#[utoipa::path(
+    get,
+    path = "/api/system/version",
+    responses(
+        (status = 200, description = "rTorrent version", body = String),
+        (status = 500, description = "Internal server error")
+    )
+)]
+pub async fn get_version_handler(State(state): State<AppState>) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    match client.call("system.client_version", &[]).await {
+        Ok(xml) => {
+            let version = xmlrpc::parse_string_response(&xml).unwrap_or(xml);
+            (StatusCode::OK, version).into_response()
+        }
+        Err(e) => {
+            tracing::error!("Failed to get version: {}", e);
+            (StatusCode::INTERNAL_SERVER_ERROR, "Failed to get version").into_response()
+        }
+    }
+}
+
+/// Get files for a torrent
+#[utoipa::path(
+    get,
+    path = "/api/torrents/{hash}/files",
+    responses(
+        (status = 200, description = "Files list", body = Vec<TorrentFile>),
+        (status = 500, description = "Internal server error")
+    ),
+    params(
+        ("hash" = String, Path, description = "Torrent Hash")
+    )
+)]
+pub async fn get_files_handler(
+    State(state): State<AppState>,
+    Path(hash): Path<String>,
+) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(hash.as_str()),
+        RpcParam::from(""),
+        RpcParam::from("f.path="),
+        RpcParam::from("f.size_bytes="),
+        RpcParam::from("f.completed_chunks="),
+        RpcParam::from("f.priority="),
+    ];
+
+    match client.call("f.multicall", &params).await {
+        Ok(xml) => match xmlrpc::parse_multicall_response(&xml) {
+            Ok(rows) => {
+                let files: Vec<TorrentFile> = rows
+                    .into_iter()
+                    .enumerate()
+                    .map(|(idx, row)| TorrentFile {
+                        index: idx as u32,
+                        path: row.get(0).cloned().unwrap_or_default(),
+                        size: row.get(1).and_then(|s| s.parse().ok()).unwrap_or(0),
+                        completed_chunks: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
+                        priority: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
+                    })
+                    .collect();
+                (StatusCode::OK, Json(files)).into_response()
+            }
+            Err(e) => (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Parse error: {}", e),
+            )
+                .into_response(),
+        },
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("RPC error: {}", e),
+        )
+            .into_response(),
+    }
+}
+
+/// Get peers for a torrent
+#[utoipa::path(
+    get,
+    path = "/api/torrents/{hash}/peers",
+    responses(
+        (status = 200, description = "Peers list", body = Vec<TorrentPeer>),
+        (status = 500, description = "Internal server error")
+    ),
+    params(
+        ("hash" = String, Path, description = "Torrent Hash")
+    )
+)]
+pub async fn get_peers_handler(
+    State(state): State<AppState>,
+    Path(hash): Path<String>,
+) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(hash.as_str()),
+        RpcParam::from(""),
+        RpcParam::from("p.address="),
+        RpcParam::from("p.client_version="),
+        RpcParam::from("p.down_rate="),
+        RpcParam::from("p.up_rate="),
+        RpcParam::from("p.completed_percent="),
+    ];
+
+    match client.call("p.multicall", &params).await {
+        Ok(xml) => match xmlrpc::parse_multicall_response(&xml) {
+            Ok(rows) => {
+                let peers: Vec<TorrentPeer> = rows
+                    .into_iter()
+                    .map(|row| TorrentPeer {
+                        ip: row.get(0).cloned().unwrap_or_default(),
+                        client: row.get(1).cloned().unwrap_or_default(),
+                        down_rate: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
+                        up_rate: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
+                        progress: row.get(4).and_then(|s| s.parse().ok()).unwrap_or(0.0),
+                    })
+                    .collect();
+                (StatusCode::OK, Json(peers)).into_response()
+            }
+            Err(e) => (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Parse error: {}", e),
+            )
+                .into_response(),
+        },
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("RPC error: {}", e),
+        )
+            .into_response(),
+    }
+}
+
+/// Get trackers for a torrent
+#[utoipa::path(
+    get,
+    path = "/api/torrents/{hash}/trackers",
+    responses(
+        (status = 200, description = "Trackers list", body = Vec<TorrentTracker>),
+        (status = 500, description = "Internal server error")
+    ),
+    params(
+        ("hash" = String, Path, description = "Torrent Hash")
+    )
+)]
+pub async fn get_trackers_handler(
+    State(state): State<AppState>,
+    Path(hash): Path<String>,
+) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(hash.as_str()),
+        RpcParam::from(""),
+        RpcParam::from("t.url="),
+        RpcParam::from("t.activity_date_last="),
+        RpcParam::from("t.message="),
+    ];
+
+    match client.call("t.multicall", &params).await {
+        Ok(xml) => {
+            match xmlrpc::parse_multicall_response(&xml) {
+                Ok(rows) => {
+                    let trackers: Vec<TorrentTracker> = rows
+                        .into_iter()
+                        .map(|row| {
+                            TorrentTracker {
+                                url: row.get(0).cloned().unwrap_or_default(),
+                                status: "Unknown".to_string(), // Derive from type/activity?
+                                message: row.get(2).cloned().unwrap_or_default(),
+                            }
+                        })
+                        .collect();
+                    (StatusCode::OK, Json(trackers)).into_response()
+                }
+                Err(e) => (
+                    StatusCode::INTERNAL_SERVER_ERROR,
+                    format!("Parse error: {}", e),
+                )
+                    .into_response(),
+            }
+        }
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("RPC error: {}", e),
+        )
+            .into_response(),
+    }
+}
+
+/// Set file priority
+#[utoipa::path(
+    post,
+    path = "/api/torrents/files/priority",
+    request_body = SetFilePriorityRequest,
+    responses(
+        (status = 200, description = "Priority updated"),
+        (status = 500, description = "Internal server error")
+    )
+)]
+pub async fn set_file_priority_handler(
+    State(state): State<AppState>,
+    Json(payload): Json<SetFilePriorityRequest>,
+) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+
+    // f.set_priority takes "hash", index, priority
+    // Priority: 0 (off), 1 (normal), 2 (high)
+    // f.set_priority is tricky. Let's send as string first as before, or int if we knew.
+    // Usually priorities are small integers.
+    // But since we are updating everything to RpcParam, let's use Int if possible or String.
+    // The previous implementation used string. Let's stick to string for now or try Int.
+    // Actually, f.set_priority likely takes an integer.
+
+    let target = format!("{}:f{}", payload.hash, payload.file_index);
+    let params = vec![
+        RpcParam::from(target.as_str()),
+        RpcParam::from(payload.priority as i64),
+    ];
+
+    match client.call("f.set_priority", &params).await {
+        Ok(_) => {
+            let _ = client
+                .call(
+                    "d.update_priorities",
+                    &[RpcParam::from(payload.hash.as_str())],
+                )
+                .await;
+            (StatusCode::OK, "Priority updated").into_response()
+        }
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("RPC error: {}", e),
+        )
+            .into_response(),
+    }
+}
+
+/// Set torrent label
+#[utoipa::path(
+    post,
+    path = "/api/torrents/label",
+    request_body = SetLabelRequest,
+    responses(
+        (status = 200, description = "Label updated"),
+        (status = 500, description = "Internal server error")
+    )
+)]
+pub async fn set_label_handler(
+    State(state): State<AppState>,
+    Json(payload): Json<SetLabelRequest>,
+) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    let params = vec![
+        RpcParam::from(payload.hash.as_str()),
+        RpcParam::from(payload.label),
+    ];
+
+    match client.call("d.custom1.set", &params).await {
+        Ok(_) => (StatusCode::OK, "Label updated").into_response(),
+        Err(e) => (
+            StatusCode::INTERNAL_SERVER_ERROR,
+            format!("RPC error: {}", e),
+        )
+            .into_response(),
+    }
+}
+
+/// Get global speed limits
+#[utoipa::path(
+    get,
+    path = "/api/settings/global-limits",
+    responses(
+        (status = 200, description = "Current limits", body = GlobalLimitRequest),
+        (status = 500, description = "Internal server error")
+    )
+)]
+pub async fn get_global_limit_handler(State(state): State<AppState>) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+    // throttle.global_down.max_rate, throttle.global_up.max_rate
+    let down_fut = client.call("throttle.global_down.max_rate", &[]);
+    let up_fut = client.call("throttle.global_up.max_rate", &[]);
+
+    let down = match down_fut.await {
+        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
+        Err(_) => -1,
+    };
+
+    let up = match up_fut.await {
+        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
+        Err(_) => -1,
+    };
+
+    let resp = GlobalLimitRequest {
+        max_download_rate: Some(down),
+        max_upload_rate: Some(up),
+    };
+
+    (StatusCode::OK, Json(resp)).into_response()
+}
+
+/// Set global speed limits
+#[utoipa::path(
+    post,
+    path = "/api/settings/global-limits",
+    request_body = GlobalLimitRequest,
+    responses(
+        (status = 200, description = "Limits updated"),
+        (status = 500, description = "Internal server error")
+    )
+)]
+pub async fn set_global_limit_handler(
+    State(state): State<AppState>,
+    Json(payload): Json<GlobalLimitRequest>,
+) -> impl IntoResponse {
+    let client = xmlrpc::RtorrentClient::new(&state.scgi_socket_path);
+
+    // Use throttle.global_*.max_rate.set_kb which is more reliable than .set (which is buggy)
+    // The .set_kb method expects KB/s, so we convert bytes to KB
+
+    if let Some(down) = payload.max_download_rate {
+        // Convert bytes/s to KB/s (divide by 1024)
+        let down_kb = down / 1024;
+        tracing::info!(
+            "Setting download limit: {} bytes/s = {} KB/s",
+            down,
+            down_kb
+        );
+
+        // Use set_kb with empty string as first param (throttle name), then value
+        if let Err(e) = client
+            .call(
+                "throttle.global_down.max_rate.set_kb",
+                &[RpcParam::from(""), RpcParam::Int(down_kb)],
+            )
+            .await
+        {
+            tracing::error!("Failed to set download limit: {}", e);
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Failed to set down limit: {}", e),
+            )
+                .into_response();
+        }
+    }
+
+    if let Some(up) = payload.max_upload_rate {
+        // Convert bytes/s to KB/s
+        let up_kb = up / 1024;
+        tracing::info!("Setting upload limit: {} bytes/s = {} KB/s", up, up_kb);
+
+        if let Err(e) = client
+            .call(
+                "throttle.global_up.max_rate.set_kb",
+                &[RpcParam::from(""), RpcParam::Int(up_kb)],
+            )
+            .await
+        {
+            tracing::error!("Failed to set upload limit: {}", e);
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                format!("Failed to set up limit: {}", e),
+            )
+                .into_response();
+        }
+    }
+
+    (StatusCode::OK, "Limits updated").into_response()
+}
+
 pub async fn handle_timeout_error(err: BoxError) -> (StatusCode, &'static str) {
     if err.is::<tower::timeout::error::Elapsed>() {
         (StatusCode::REQUEST_TIMEOUT, "Request timed out")
@@ -49,3 +678,42 @@ pub async fn handle_timeout_error(err: BoxError) -> (StatusCode, &'static str) {
         )
     }
 }
+
+// --- PUSH NOTIFICATION HANDLERS ---
+
+#[cfg(feature = "push-notifications")]
+/// Get VAPID public key for push subscription
+#[utoipa::path(
+    get,
+    path = "/api/push/public-key",
+    responses(
+        (status = 200, description = "VAPID public key", body = String)
+    )
+)]
+pub async fn get_push_public_key_handler() -> impl IntoResponse {
+    let public_key = push::get_vapid_public_key();
+    (StatusCode::OK, Json(serde_json::json!({ "publicKey": public_key }))).into_response()
+}
+
+
+#[cfg(feature = "push-notifications")]
+/// Subscribe to push notifications
+#[utoipa::path(
+    post,
+    path = "/api/push/subscribe",
+    request_body = push::PushSubscription,
+    responses(
+        (status = 200, description = "Subscription saved"),
+        (status = 400, description = "Invalid subscription data")
+    )
+)]
+pub async fn subscribe_push_handler(
+    State(state): State<AppState>,
+    Json(subscription): Json<push::PushSubscription>,
+) -> impl IntoResponse {
+    tracing::info!("Received push subscription: {:?}", subscription);
+
+    state.push_store.add_subscription(subscription).await;
+
+    (StatusCode::OK, "Subscription saved").into_response()
+}

backend/src/main.rs

@@ -1,11 +1,11 @@
+mod db;
 mod diff;
 mod handlers;
 #[cfg(feature = "push-notifications")]
 mod push;
-mod rate_limit;
+mod scgi;
 mod sse;
-
-use shared::xmlrpc;
+mod xmlrpc;
 
 use axum::error_handling::HandleErrorLayer;
 use axum::{
@@ -25,15 +25,12 @@ use std::sync::Arc;
 use std::time::Duration;
 use tokio::sync::{broadcast, watch};
 use tower::ServiceBuilder;
-use tower_governor::GovernorLayer;
 use tower_http::{
     compression::{CompressionLayer, CompressionLevel},
     cors::CorsLayer,
     trace::TraceLayer,
 };
-#[cfg(feature = "swagger")]
 use utoipa::OpenApi;
-#[cfg(feature = "swagger")]
 use utoipa_swagger_ui::SwaggerUi;
 
 #[derive(Clone)]
@@ -41,10 +38,9 @@ pub struct AppState {
     pub tx: Arc<watch::Sender<Vec<Torrent>>>,
     pub event_bus: broadcast::Sender<AppEvent>,
     pub scgi_socket_path: String,
-    pub db: shared::db::Db,
+    pub db: db::Db,
     #[cfg(feature = "push-notifications")]
     pub push_store: push::PushSubscriptionStore,
-    pub notify_poll: Arc<tokio::sync::Notify>,
 }
 
 async fn auth_middleware(
@@ -55,9 +51,9 @@ async fn auth_middleware(
 ) -> Result<Response, StatusCode> {
     // Skip auth for public paths
     let path = request.uri().path();
-    if path.starts_with("/api/server_fns/Login") // Login server fn
-       || path.starts_with("/api/server_fns/GetSetupStatus")
-       || path.starts_with("/api/server_fns/Setup")
+    if path.starts_with("/api/auth/login")
+       || path.starts_with("/api/auth/check") // Used by frontend to decide where to go
+       || path.starts_with("/api/setup")
        || path.starts_with("/swagger-ui")
        || path.starts_with("/api-docs")
        || !path.starts_with("/api/") // Allow static files (frontend)
@@ -67,19 +63,9 @@ async fn auth_middleware(
 
     // Check token
     if let Some(token) = jar.get("auth_token") {
-        use jsonwebtoken::{decode, Validation, DecodingKey};
-        use shared::server_fns::auth::Claims;
-
-        let secret = std::env::var("JWT_SECRET").unwrap_or_else(|_| "secret".to_string());
-        let validation = Validation::default();
-        
-        match decode::<Claims>(
-            token.value(),
-            &DecodingKey::from_secret(secret.as_bytes()),
-            &validation,
-        ) {
-            Ok(_) => return Ok(next.run(request).await),
-            Err(_) => {} // Invalid token
+        match state.db.get_session_user(token.value()).await {
+            Ok(Some(_)) => return Ok(next.run(request).await),
+            _ => {} // Invalid
         }
     }
 
@@ -110,10 +96,22 @@ struct Args {
     reset_password: Option<String>,
 }
 
-#[cfg(feature = "swagger")]
+#[cfg(feature = "push-notifications")]
 #[derive(OpenApi)]
 #[openapi(
     paths(
+        handlers::add_torrent_handler,
+        handlers::handle_torrent_action,
+        handlers::get_version_handler,
+        handlers::get_files_handler,
+        handlers::get_peers_handler,
+        handlers::get_trackers_handler,
+        handlers::set_file_priority_handler,
+        handlers::set_label_handler,
+        handlers::get_global_limit_handler,
+        handlers::set_global_limit_handler,
+        handlers::get_push_public_key_handler,
+        handlers::subscribe_push_handler,
         handlers::auth::login_handler,
         handlers::auth::logout_handler,
         handlers::auth::check_auth_handler,
@@ -122,7 +120,53 @@ struct Args {
     ),
     components(
         schemas(
-            shared::AddTorrentRequest,
+            handlers::AddTorrentRequest,
+            shared::TorrentActionRequest,
+            shared::Torrent,
+            shared::TorrentStatus,
+            shared::TorrentFile,
+            shared::TorrentPeer,
+            shared::TorrentTracker,
+            shared::SetFilePriorityRequest,
+            shared::SetLabelRequest,
+            shared::GlobalLimitRequest,
+            push::PushSubscription,
+            push::PushKeys,
+            handlers::auth::LoginRequest,
+            handlers::setup::SetupRequest,
+            handlers::setup::SetupStatusResponse,
+            handlers::auth::UserResponse
+        )
+    ),
+    tags(
+        (name = "vibetorrent", description = "VibeTorrent API")
+    )
+)]
+struct ApiDoc;
+
+#[cfg(not(feature = "push-notifications"))]
+#[derive(OpenApi)]
+#[openapi(
+    paths(
+        handlers::add_torrent_handler,
+        handlers::handle_torrent_action,
+        handlers::get_version_handler,
+        handlers::get_files_handler,
+        handlers::get_peers_handler,
+        handlers::get_trackers_handler,
+        handlers::set_file_priority_handler,
+        handlers::set_label_handler,
+        handlers::get_global_limit_handler,
+        handlers::set_global_limit_handler,
+        handlers::auth::login_handler,
+        handlers::auth::logout_handler,
+        handlers::auth::check_auth_handler,
+        handlers::setup::setup_handler,
+        handlers::setup::get_setup_status_handler
+    ),
+    components(
+        schemas(
+            handlers::AddTorrentRequest,
             shared::TorrentActionRequest,
             shared::Torrent,
             shared::TorrentStatus,
@@ -162,9 +206,19 @@ async fn main() {
 
     // Initialize Database
     tracing::info!("Connecting to database: {}", args.db_url);
-    // Redundant manual creation removed, shared::db handles it
+    // Ensure the db file exists if it's sqlite
+    if args.db_url.starts_with("sqlite:") {
+        let path = args.db_url.trim_start_matches("sqlite:");
+        if !std::path::Path::new(path).exists() {
+            tracing::info!("Database file not found, creating: {}", path);
+            match std::fs::File::create(path) {
+                Ok(_) => tracing::info!("Created empty database file"),
+                Err(e) => tracing::error!("Failed to create database file: {}", e),
+            }
+        }
+    }
 
-    let db: shared::db::Db = match shared::db::Db::new(&args.db_url).await {
+    let db: db::Db = match db::Db::new(&args.db_url).await {
         Ok(db) => db,
         Err(e) => {
             tracing::error!("Failed to connect to database: {}", e);
@@ -199,7 +253,9 @@ async fn main() {
                     }
                 };
 
-                // Update in DB
+                // Update in DB (using a direct query since db.rs doesn't have update_password yet)
+                // We should add `update_password` to db.rs for cleaner code, but for now direct query is fine or we can extend Db.
+                // Let's extend Db.rs first to be clean.
                 if let Err(e) = db.update_password(user_id, &password_hash).await {
                      tracing::error!("Failed to update password in DB: {}", e);
                      std::process::exit(1);
@@ -264,28 +320,13 @@ async fn main() {
     // Channel for Events (Diffs)
     let (event_bus, _) = broadcast::channel::<AppEvent>(1024);
 
-    #[cfg(feature = "push-notifications")]
-    let push_store = match push::PushSubscriptionStore::with_db(&db).await {
-        Ok(store) => store,
-        Err(e) => {
-            tracing::error!("Failed to initialize push store: {}", e);
-            push::PushSubscriptionStore::new()
-        }
-    };
-
-    #[cfg(not(feature = "push-notifications"))]
-    let _push_store = ();
-
-    let notify_poll = Arc::new(tokio::sync::Notify::new());
-
     let app_state = AppState {
         tx: tx.clone(),
         event_bus: event_bus.clone(),
         scgi_socket_path: args.socket.clone(),
         db: db.clone(),
         #[cfg(feature = "push-notifications")]
-        push_store,
-        notify_poll: notify_poll.clone(),
+        push_store: push::PushSubscriptionStore::new(),
     };
 
     // Spawn background task to poll rTorrent
@@ -294,7 +335,6 @@ async fn main() {
     let socket_path = args.socket.clone(); // Clone for background task
     #[cfg(feature = "push-notifications")]
     let push_store_clone = app_state.push_store.clone();
-    let notify_poll_clone = notify_poll.clone();
 
     tokio::spawn(async move {
         let client = xmlrpc::RtorrentClient::new(&socket_path);
@@ -303,14 +343,6 @@ async fn main() {
         let mut backoff_duration = Duration::from_secs(1);
 
         loop {
-            // Determine polling interval based on active clients
-            let active_clients = event_bus_tx.receiver_count();
-            let loop_interval = if active_clients > 0 {
-                Duration::from_secs(1)
-            } else {
-                Duration::from_secs(30)
-            };
-
             // 1. Fetch Torrents
             let torrents_result = sse::fetch_torrents(&client).await;
 
@@ -346,7 +378,10 @@ async fn main() {
 
                     match diff::diff_torrents(&previous_torrents, &new_torrents) {
                         diff::DiffResult::FullUpdate => {
-                            let _ = event_bus_tx.send(AppEvent::FullList(new_torrents.clone(), now));
+                            let _ = event_bus_tx.send(AppEvent::FullList {
+                                torrents: new_torrents.clone(),
+                                timestamp: now,
+                            });
                         }
                         diff::DiffResult::Partial(updates) => {
                             for update in updates {
@@ -378,14 +413,6 @@ async fn main() {
                     }
 
                     previous_torrents = new_torrents;
-
-                    // Success case: wait for the determined interval OR a wakeup notification
-                    tokio::select! {
-                        _ = tokio::time::sleep(loop_interval) => {},
-                        _ = notify_poll_clone.notified() => {
-                            tracing::debug!("Background loop awakened by new client connection");
-                        }
-                    }
                 }
                 Err(e) => {
                     tracing::error!("Error fetching torrents in background: {}", e);
@@ -406,48 +433,66 @@ async fn main() {
                         "Backoff: Sleeping for {:?} due to rTorrent error.",
                         backoff_duration
                     );
-                    
-                    tokio::time::sleep(backoff_duration).await;
                 }
             }
 
             // Handle Stats
-            if let Ok(stats) = stats_result {
-                let _ = event_bus_tx.send(AppEvent::Stats(stats));
+            match stats_result {
+                Ok(stats) => {
+                    let _ = event_bus_tx.send(AppEvent::Stats(stats));
+                }
+                Err(e) => {
+                    tracing::warn!("Error fetching global stats: {}", e);
+                }
             }
+
+            tokio::time::sleep(backoff_duration).await;
         }
     });
 
-    let app = Router::new();
-
-    #[cfg(feature = "swagger")]
-    let app = app.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()));
-
-    // Setup & Auth Routes (cookie-based, stay as REST)
-    let scgi_path_for_ctx = args.socket.clone();
-    let db_for_ctx = db.clone();
-    let app = app
+    let app = Router::new()
+        .merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
+        // Setup & Auth Routes
+        .route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
+        .route("/api/setup", post(handlers::setup::setup_handler))
+        .route("/api/auth/login", post(handlers::auth::login_handler))
+        .route("/api/auth/logout", post(handlers::auth::logout_handler))
+        .route("/api/auth/check", get(handlers::auth::check_auth_handler))
+        // App Routes
         .route("/api/events", get(sse::sse_handler))
-        .route("/api/server_fns/{*fn_name}", post({
-            let scgi_path = scgi_path_for_ctx.clone();
-            let db = db_for_ctx.clone();
-            move |req: Request<Body>| {
-                let scgi_path = scgi_path.clone();
-                let db = db.clone();
-                leptos_axum::handle_server_fns_with_context(
-                    move || {
-                        leptos::context::provide_context(shared::ServerContext {
-                            scgi_socket_path: scgi_path.clone(),
-                        });
-                        leptos::context::provide_context(shared::DbContext {
-                            db: db.clone(),
-                        });
-                    },
-                    req,
-                )
-            }
-        }))
-        .fallback(handlers::static_handler);
+        .route("/api/torrents/add", post(handlers::add_torrent_handler))
+        .route(
+            "/api/torrents/action",
+            post(handlers::handle_torrent_action),
+        )
+        .route("/api/system/version", get(handlers::get_version_handler))
+        .route(
+            "/api/torrents/{hash}/files",
+            get(handlers::get_files_handler),
+        )
+        .route(
+            "/api/torrents/{hash}/peers",
+            get(handlers::get_peers_handler),
+        )
+        .route(
+            "/api/torrents/{hash}/trackers",
+            get(handlers::get_trackers_handler),
+        )
+        .route(
+            "/api/torrents/files/priority",
+            post(handlers::set_file_priority_handler),
+        )
+        .route("/api/torrents/label", post(handlers::set_label_handler))
+        .route(
+            "/api/settings/global-limits",
+            get(handlers::get_global_limit_handler).post(handlers::set_global_limit_handler),
+        )
+        .fallback(handlers::static_handler); // Serve static files for everything else
+
+    #[cfg(feature = "push-notifications")]
+    let app = app
+        .route("/api/push/public-key", get(handlers::get_push_public_key_handler))
+        .route("/api/push/subscribe", post(handlers::subscribe_push_handler));
 
     let app = app
         .layer(middleware::from_fn_with_state(app_state.clone(), auth_middleware))
@@ -479,12 +524,7 @@ async fn main() {
         }
     };
     tracing::info!("Backend listening on {}", addr);
-    if let Err(e) = axum::serve(
-        listener,
-        app.into_make_service_with_connect_info::<SocketAddr>(),
-    )
-    .await
-    {
+    if let Err(e) = axum::serve(listener, app).await {
         tracing::error!("Server error: {}", e);
         std::process::exit(1);
     }

backend/src/push.rs

@@ -5,9 +5,11 @@ use utoipa::ToSchema;
 use web_push::{
     HyperWebPushClient, SubscriptionInfo, VapidSignatureBuilder, WebPushClient, WebPushMessageBuilder,
 };
-use futures::StreamExt;
 
-use shared::db::Db;
+// VAPID keys - PRODUCTION'DA ENVIRONMENT VARIABLE'DAN ALINMALI!
+const VAPID_PUBLIC_KEY: &str = "BEdPj6XQR7MGzM28Nev9wokF5upHoydNDahouJbQ9ZdBJpEFAN1iNfANSEvY0ItasNY5zcvvqN_tjUt64Rfd0gU";
+const VAPID_PRIVATE_KEY: &str = "aUcCYJ7kUd9UClCaWwad0IVgbYJ6svwl19MjSX7GH10";
+const VAPID_EMAIL: &str = "mailto:admin@vibetorrent.app";
 
 #[derive(Debug, Clone, Serialize, Deserialize, ToSchema)]
 pub struct PushSubscription {
@@ -21,107 +23,39 @@ pub struct PushKeys {
     pub auth: String,
 }
 
-#[derive(Clone)]
-pub struct VapidConfig {
-    pub private_key: String,
-    pub public_key: String,
-    pub email: String,
-}
-
-#[derive(Clone)]
+/// In-memory store for push subscriptions
+/// TODO: Replace with database in production
+#[derive(Default, Clone)]
 pub struct PushSubscriptionStore {
-    db: Option<Db>,
     subscriptions: Arc<RwLock<Vec<PushSubscription>>>,
-    vapid_config: VapidConfig,
 }
 
 impl PushSubscriptionStore {
     pub fn new() -> Self {
-        let private_key = std::env::var("VAPID_PRIVATE_KEY").expect("VAPID_PRIVATE_KEY must be set in .env");
-        let public_key = std::env::var("VAPID_PUBLIC_KEY").expect("VAPID_PUBLIC_KEY must be set in .env");
-        let email = std::env::var("VAPID_EMAIL").expect("VAPID_EMAIL must be set in .env");
-
         Self {
-            db: None,
             subscriptions: Arc::new(RwLock::new(Vec::new())),
-            vapid_config: VapidConfig {
-                private_key,
-                public_key,
-                email,
-            },
         }
     }
 
-    pub async fn with_db(db: &Db) -> Result<Self, Box<dyn std::error::Error>> {
-        let mut subscriptions_vec: Vec<PushSubscription> = Vec::new();
-
-        // Load existing subscriptions from DB
-        let subs = db.get_all_push_subscriptions().await?;
-        for (endpoint, p256dh, auth) in subs {
-            subscriptions_vec.push(PushSubscription {
-                endpoint,
-                keys: PushKeys { p256dh, auth },
-            });
-        }
-        tracing::info!("Loaded {} push subscriptions from database", subscriptions_vec.len());
-
-        let private_key = std::env::var("VAPID_PRIVATE_KEY").expect("VAPID_PRIVATE_KEY must be set in .env");
-        let public_key = std::env::var("VAPID_PUBLIC_KEY").expect("VAPID_PUBLIC_KEY must be set in .env");
-        let email = std::env::var("VAPID_EMAIL").expect("VAPID_EMAIL must be set in .env");
-
-        Ok(Self {
-            db: Some(db.clone()),
-            subscriptions: Arc::new(RwLock::new(subscriptions_vec)),
-            vapid_config: VapidConfig {
-                private_key,
-                public_key,
-                email,
-            },
-        })
-    }
-
     pub async fn add_subscription(&self, subscription: PushSubscription) {
-        // Add to memory
         let mut subs = self.subscriptions.write().await;
-
+        
         // Remove duplicate endpoint if exists
         subs.retain(|s| s.endpoint != subscription.endpoint);
-        subs.push(subscription.clone());
+        
+        subs.push(subscription);
         tracing::info!("Added push subscription. Total: {}", subs.len());
-
-        // Save to DB if available
-        if let Some(db) = &self.db {
-            if let Err(e) = db.save_push_subscription(
-                &subscription.endpoint,
-                &subscription.keys.p256dh,
-                &subscription.keys.auth,
-            ).await {
-                tracing::error!("Failed to save push subscription to DB: {}", e);
-            }
-        }
     }
 
     pub async fn remove_subscription(&self, endpoint: &str) {
-        // Remove from memory
         let mut subs = self.subscriptions.write().await;
         subs.retain(|s| s.endpoint != endpoint);
         tracing::info!("Removed push subscription. Total: {}", subs.len());
-
-        // Remove from DB if available
-        if let Some(db) = &self.db {
-            if let Err(e) = db.remove_push_subscription(endpoint).await {
-                tracing::error!("Failed to remove push subscription from DB: {}", e);
-            }
-        }
     }
 
     pub async fn get_all_subscriptions(&self) -> Vec<PushSubscription> {
         self.subscriptions.read().await.clone()
     }
-
-    pub fn get_public_key(&self) -> &str {
-        &self.vapid_config.public_key
-    }
 }
 
 /// Send push notification to all subscribed clients
@@ -131,7 +65,7 @@ pub async fn send_push_notification(
     body: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let subscriptions = store.get_all_subscriptions().await;
-
+    
     if subscriptions.is_empty() {
         tracing::debug!("No push subscriptions to send to");
         return Ok(());
@@ -147,68 +81,47 @@ pub async fn send_push_notification(
         "tag": "vibetorrent"
     });
 
-    let client = Arc::new(HyperWebPushClient::new());
-    let vapid_config = store.vapid_config.clone();
-    let payload_str = payload.to_string();
+    let client = HyperWebPushClient::new();
 
-    // Send notifications concurrently
-    futures::stream::iter(subscriptions)
-        .for_each_concurrent(10, |subscription| {
-            let client = client.clone();
-            let vapid_config = vapid_config.clone();
-            let payload_str = payload_str.clone();
+    for subscription in subscriptions {
+        let subscription_info = SubscriptionInfo {
+            endpoint: subscription.endpoint.clone(),
+            keys: web_push::SubscriptionKeys {
+                p256dh: subscription.keys.p256dh.clone(),
+                auth: subscription.keys.auth.clone(),
+            },
+        };
 
-            async move {
-                let subscription_info = SubscriptionInfo {
-                    endpoint: subscription.endpoint.clone(),
-                    keys: web_push::SubscriptionKeys {
-                        p256dh: subscription.keys.p256dh.clone(),
-                        auth: subscription.keys.auth.clone(),
-                    },
-                };
+        let mut sig_builder = VapidSignatureBuilder::from_base64(
+            VAPID_PRIVATE_KEY,
+            web_push::URL_SAFE_NO_PAD,
+            &subscription_info,
+        )?;
+        
+        sig_builder.add_claim("sub", VAPID_EMAIL);
+        sig_builder.add_claim("aud", subscription.endpoint.clone());
+        let signature = sig_builder.build()?;
 
-                let sig_res = VapidSignatureBuilder::from_base64(
-                    &vapid_config.private_key,
-                    web_push::URL_SAFE_NO_PAD,
-                    &subscription_info,
-                );
+        let mut builder = WebPushMessageBuilder::new(&subscription_info);
+        builder.set_vapid_signature(signature);
+        
+        let payload_str = payload.to_string();
+        builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload_str.as_bytes());
 
-                match sig_res {
-                    Ok(mut sig_builder) => {
-                        sig_builder.add_claim("sub", vapid_config.email.as_str());
-                        sig_builder.add_claim("aud", subscription.endpoint.as_str());
-                        
-                        match sig_builder.build() {
-                            Ok(signature) => {
-                                let mut builder = WebPushMessageBuilder::new(&subscription_info);
-                                builder.set_vapid_signature(signature);
-                                builder.set_payload(web_push::ContentEncoding::Aes128Gcm, payload_str.as_bytes());
-
-                                match builder.build() {
-                                    Ok(msg) => {
-                                        match client.send(msg).await {
-                                            Ok(_) => {
-                                                tracing::debug!("Push notification sent to: {}", subscription.endpoint);
-                                            }
-                                            Err(e) => {
-                                                tracing::error!("Failed to send push notification to {}: {}", subscription.endpoint, e);
-                                            }
-                                        }
-                                    }
-                                    Err(e) => tracing::error!("Failed to build push message: {}", e),
-                                }
-                            }
-                            Err(e) => tracing::error!("Failed to build VAPID signature: {}", e),
-                        }
-                    }
-                    Err(e) => tracing::error!("Failed to create VAPID signature builder: {}", e),
-                }
+        match client.send(builder.build()?).await {
+            Ok(_) => {
+                tracing::debug!("Push notification sent to: {}", subscription.endpoint);
             }
-        })
-        .await;
-
-        Ok(())
-
+            Err(e) => {
+                tracing::error!("Failed to send push notification: {}", e);
+                // TODO: Remove invalid subscriptions
+            }
+        }
     }
 
-    
+    Ok(())
+}
+
+pub fn get_vapid_public_key() -> &'static str {
+    VAPID_PUBLIC_KEY
+}

backend/src/rate_limit.rs

@@ -1,16 +0,0 @@
-use governor::clock::QuantaInstant;
-use governor::middleware::NoOpMiddleware;
-use tower_governor::governor::GovernorConfig;
-use tower_governor::governor::GovernorConfigBuilder;
-use tower_governor::key_extractor::SmartIpKeyExtractor;
-
-pub fn get_login_rate_limit_config() -> GovernorConfig<SmartIpKeyExtractor, NoOpMiddleware<QuantaInstant>> {
-    // 5 yanlış denemeden sonra bloklanır.
-    // Her yeni hak için 60 saniye (1 dakika) bekleme süresi.
-    GovernorConfigBuilder::default()
-        .key_extractor(SmartIpKeyExtractor)
-        .per_second(60) 
-        .burst_size(5)
-        .finish()
-        .unwrap()
-}

backend/src/scgi.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "ssr")]
-
 use bytes::Bytes;
 use std::collections::HashMap;
 use thiserror::Error;
@@ -13,8 +11,6 @@ pub enum ScgiError {
     #[allow(dead_code)]
     #[error("Protocol Error: {0}")]
     Protocol(String),
-    #[error("Timeout: SCGI request took too long")]
-    Timeout,
 }
 
 pub struct ScgiRequest {
@@ -82,48 +78,20 @@ impl ScgiRequest {
 }
 
 pub async fn send_request(socket_path: &str, request: ScgiRequest) -> Result<Bytes, ScgiError> {
-    let perform_request = async {
-        let mut stream = UnixStream::connect(socket_path).await?;
-        let data = request.encode();
-        stream.write_all(&data).await?;
+    let mut stream = UnixStream::connect(socket_path).await?;
+    let data = request.encode();
+    stream.write_all(&data).await?;
 
-        let mut response = Vec::new();
-        stream.read_to_end(&mut response).await?;
-        Ok::<Vec<u8>, std::io::Error>(response)
-    };
+    let mut response = Vec::new();
+    stream.read_to_end(&mut response).await?;
 
-    let response = tokio::time::timeout(std::time::Duration::from_secs(10), perform_request)
-        .await
-        .map_err(|_| ScgiError::Timeout)??;
-
-    let mut response_vec = response;
-    
-    // Improved header stripping: find the first occurrence of "<?xml" OR double newline
-    let patterns = [
-        &b"\r\n\r\n"[..],
-        &b"\n\n"[..],
-        &b"<?xml"[..] // If headers are missing or weird, find start of XML
-    ];
-
-    let mut found_pos = None;
-    for (i, pattern) in patterns.iter().enumerate() {
-        if let Some(pos) = response_vec
-            .windows(pattern.len())
-            .position(|window| window == *pattern)
-        {
-            // For XML pattern, we keep it. For newlines, we skip them.
-            if i == 2 {
-                found_pos = Some(pos);
-            } else {
-                found_pos = Some(pos + pattern.len());
-            }
-            break;
-        }
-    }
-
-    if let Some(pos) = found_pos {
-        Ok(Bytes::from(response_vec.split_off(pos)))
+    let double_newline = b"\r\n\r\n";
+    if let Some(pos) = response
+        .windows(double_newline.len())
+        .position(|window| window == double_newline)
+    {
+        Ok(Bytes::from(response.split_off(pos + double_newline.len())))
     } else {
-        Ok(Bytes::from(response_vec))
+        Ok(Bytes::from(response))
     }
-}
+}

backend/src/sse.rs

@@ -1,4 +1,4 @@
-use shared::xmlrpc::{
+use crate::xmlrpc::{
     parse_i64_response, parse_multicall_response, RpcParam, RtorrentClient, XmlRpcError,
 };
 use crate::AppState;
@@ -8,8 +8,6 @@ use futures::stream::{self, Stream};
 use shared::{AppEvent, GlobalStats, Torrent, TorrentStatus};
 use std::convert::Infallible;
 use tokio_stream::StreamExt;
-use axum::response::IntoResponse;
-use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
 
 // Field definitions to keep query and parser in sync
 mod fields {
@@ -196,10 +194,7 @@ pub async fn fetch_global_stats(client: &RtorrentClient) -> Result<GlobalStats,
 
 pub async fn sse_handler(
     State(state): State<AppState>,
-) -> impl IntoResponse {
-    // Notify background worker to wake up and poll immediately
-    state.notify_poll.notify_one();
-
+) -> Sse<impl Stream<Item = Result<Event, Infallible>>> {
     // Get initial value synchronously (from the watch channel's current state)
     let initial_rx = state.tx.subscribe();
     let initial_torrents = initial_rx.borrow().clone();
@@ -210,10 +205,13 @@ pub async fn sse_handler(
             .unwrap()
             .as_secs();
 
-        let event_data = AppEvent::FullList(initial_torrents, timestamp);
+        let event_data = AppEvent::FullList {
+            torrents: initial_torrents,
+            timestamp,
+        };
 
-        match rmp_serde::to_vec(&event_data) {
-            Ok(bytes) => Event::default().data(BASE64.encode(bytes)),
+        match serde_json::to_string(&event_data) {
+            Ok(json) => Event::default().data(json),
             Err(_) => Event::default().comment("init_error"),
         }
     };
@@ -225,10 +223,10 @@ pub async fn sse_handler(
     let rx = state.event_bus.subscribe();
     let update_stream = stream::unfold(rx, |mut rx| async move {
         match rx.recv().await {
-            Ok(event) => match rmp_serde::to_vec(&event) {
-                Ok(bytes) => Some((Ok::<Event, Infallible>(Event::default().data(BASE64.encode(bytes))), rx)),
+            Ok(event) => match serde_json::to_string(&event) {
+                Ok(json) => Some((Ok::<Event, Infallible>(Event::default().data(json)), rx)),
                 Err(e) => {
-                    tracing::warn!("Failed to serialize SSE event (MessagePack): {}", e);
+                    tracing::warn!("Failed to serialize SSE event: {}", e);
                     Some((
                         Ok::<Event, Infallible>(Event::default().comment("error")),
                         rx,
@@ -243,11 +241,6 @@ pub async fn sse_handler(
         }
     });
 
-    let sse = Sse::new(initial_stream.chain(update_stream))
-        .keep_alive(axum::response::sse::KeepAlive::default());
-
-    (
-        [("content-type", "text/event-stream")],
-        sse
-    )
-}
+    Sse::new(initial_stream.chain(update_stream))
+        .keep_alive(axum::response::sse::KeepAlive::default())
+}

backend/src/xmlrpc.rs

@@ -1,5 +1,3 @@
-#![cfg(feature = "ssr")]
-
 use crate::scgi::{send_request, ScgiError, ScgiRequest};
 use quick_xml::de::from_str;
 use quick_xml::se::to_string;

docker/runner/Dockerfile

@@ -20,8 +20,6 @@ RUN apt-get update && apt-get install -y \
     jq \
     # Needed for some crate compilations
     protobuf-compiler \
-    # Install binaryen to have wasm-opt available system-wide
-    binaryen \
     && rm -rf /var/lib/apt/lists/*
 
 # 2. Install Node.js v20 (Manual install to support multi-arch cleanly)
@@ -72,7 +70,7 @@ RUN . "$HOME/.cargo/env" && \
     ARCH=$(dpkg --print-architecture) && \
     if [ "$ARCH" = "amd64" ]; then TRUNK_ARCH="x86_64-unknown-linux-gnu"; \
     elif [ "$ARCH" = "arm64" ]; then TRUNK_ARCH="aarch64-unknown-linux-gnu"; fi && \
-    wget -qO- "https://github.com/trunk-rs/trunk/releases/download/v0.21.14/trunk-$TRUNK_ARCH.tar.gz" | tar -xzf - -C /root/.cargo/bin/ && \
+    wget -qO- "https://github.com/trunk-rs/trunk/releases/download/v0.21.5/trunk-$TRUNK_ARCH.tar.gz" | tar -xzf - -C /root/.cargo/bin/ && \
     chmod +x /root/.cargo/bin/trunk && \
     # Install wasm-bindgen-cli (Compiling from source to avoid glibc issues, doing it ONCE here)
     cargo install wasm-bindgen-cli --version 0.2.108

frontend/Cargo.toml

@@ -7,48 +7,48 @@ edition = "2021"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-leptos = { version = "0.8.15", features = ["csr"] }
-leptos_router = { version = "0.8.11" }
+leptos = { version = "0.6", features = ["csr"] }
+leptos_router = { version = "0.6", features = ["csr"] }
 
 console_error_panic_hook = "0.1"
 console_log = "1"
 log = "0.4"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
-gloo-net = "0.6"
+gloo-net = "0.5"
 gloo-timers = { version = "0.3", features = ["futures"] }
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 uuid = { version = "1", features = ["v4", "js"] }
 futures = "0.3"
 chrono = { version = "0.4", features = ["serde", "wasm-bindgen"] }
-web-sys = { version = "0.3", features = ["HtmlDivElement", "HtmlUListElement", "HtmlLiElement", "HtmlAnchorElement", "MouseEvent", "Event", "Window", "Document", "Element", "DomTokenList", "CssStyleDeclaration", "Storage", "TouchEvent", "TouchList", "Touch", "Navigator", "Notification", "NotificationOptions", "NotificationPermission", "ServiceWorkerContainer", "ServiceWorkerRegistration", "PushManager", "PushSubscription", "PushSubscriptionOptions", "PushSubscriptionOptionsInit", "HtmlDetailsElement", "HtmlInputElement", "HtmlFormElement", "HtmlDialogElement", "ProgressEvent"] }
-shared = { path = "../shared", features = ["hydrate"] }
+web-sys = { version = "0.3", features = [
+    "HtmlDivElement",
+    "HtmlUListElement",
+    "HtmlLiElement",
+    "HtmlAnchorElement",
+    "MouseEvent",
+    "Event",
+    "Window",
+    "Document",
+    "Element",
+    "DomTokenList",
+    "CssStyleDeclaration",
+    "Storage",
+    "TouchEvent",
+    "TouchList",
+    "Touch",
+    "Navigator",
+    "Notification",
+    "NotificationOptions",
+    "NotificationPermission",
+    "ServiceWorkerContainer",
+    "ServiceWorkerRegistration",
+    "PushManager",
+    "PushSubscription",
+    "PushSubscriptionOptions",
+    "PushSubscriptionOptionsInit"
+] }
+shared = { path = "../shared" }
 tailwind_fuse = "0.3.2"
 js-sys = "0.3.85"
-base64 = "0.22.1"
-serde-wasm-bindgen = "0.6.5"
-leptos-use = { version = "0.16", features = ["storage"] }
-codee = "0.3"
-thiserror = "2.0"
-rmp-serde = "1.3"
-struct-patch = "0.5"
-
-# ShadCN UI Components (Individual)
-leptos-shadcn-button = "0.8"
-leptos-shadcn-input = "0.8"
-leptos-shadcn-card = "0.8"
-leptos-shadcn-badge = "0.8"
-leptos-shadcn-context-menu = "0.8"
-leptos-shadcn-separator = "0.8"
-leptos-shadcn-progress = "0.8"
-leptos-shadcn-avatar = "0.8"
-leptos-shadcn-sheet = "0.8"
-leptos-shadcn-tabs = "0.8"
-leptos-shadcn-scroll-area = "0.8"
-leptos-shadcn-dialog = "0.8"
-leptos-shadcn-label = "0.8"
-leptos-shadcn-alert = "0.8"
-leptos-shadcn-toast = "0.8"
-leptos-shadcn-dropdown-menu = "0.8"
-leptos-shadcn-tooltip = "0.8"

frontend/index.html

@@ -4,7 +4,7 @@
         <meta charset="utf-8" />
         <meta
             name="viewport"
-            content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no, viewport-fit=cover"
+            content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, viewport-fit=cover"
         />
         <title>VibeTorrent</title>
 
@@ -81,20 +81,17 @@
         </script>
     </head>
 
-    <body style="cursor: pointer;">
+    <body>
         <div
             id="app-loading"
             style="
                 display: flex;
-                flex-direction: column;
                 justify-content: center;
                 align-items: center;
                 height: 100vh;
-                font-family: sans-serif;
             "
         >
             <div
-                id="app-loading-spinner"
                 style="
                     width: 40px;
                     height: 40px;
@@ -105,32 +102,6 @@
                     opacity: 0.5;
                 "
             ></div>
-            <div
-                id="app-loading-error"
-                style="display: none; text-align: center; margin-top: 20px; padding: 0 20px"
-            >
-                <p style="color: #ef4444; font-weight: bold; margin-bottom: 8px">
-                    Uygulama yüklenemedi
-                </p>
-                <p style="font-size: 14px; opacity: 0.7">
-                    Bağlantınız yavaş olabilir veya bir sistem hatası oluşmuş olabilir.
-                </p>
-                <button
-                    onclick="location.reload()"
-                    style="
-                        margin-top: 16px;
-                        padding: 8px 16px;
-                        background: #3b82f6;
-                        color: white;
-                        border: none;
-                        border-radius: 6px;
-                        cursor: pointer;
-                        font-weight: 500;
-                    "
-                >
-                    Sayfayı Yenile
-                </button>
-            </div>
         </div>
         <style>
             @keyframes spin {
@@ -142,62 +113,10 @@
             body.app-loaded #app-loading {
                 display: none !important;
             }
-
-            /* iOS Safari Click Fixes */
-            body {
-                cursor: pointer;
-                -webkit-tap-highlight-color: transparent;
-            }
-
-            summary {
-                list-style: none;
-            }
-            summary::-webkit-details-marker {
-                display: none;
-            }
         </style>
-
-        <script>
-            // App loading timeout handler
-            (function () {
-                var timeout = setTimeout(function () {
-                    if (!document.body.classList.contains("app-loaded")) {
-                        var spinner = document.getElementById("app-loading-spinner");
-                        var error = document.getElementById("app-loading-error");
-                        if (spinner) spinner.style.display = "none";
-                        if (error) error.style.display = "block";
-                    }
-                }, 15000); // 15 seconds timeout
-
-                // Clean up timeout if app loads
-                var observer = new MutationObserver(function (mutations) {
-                    mutations.forEach(function (mutation) {
-                        if (
-                            mutation.attributeName === "class" &&
-                            document.body.classList.contains("app-loaded")
-                        ) {
-                            clearTimeout(timeout);
-                            observer.disconnect();
-                        }
-                    });
-                });
-                observer.observe(document.body, { attributes: true });
-            })();
-        </script>
         
         <!-- Service Worker Registration & PWA Setup -->
         <script>
-            // Global Dropdown Closer for iOS/Mobile
-            document.addEventListener('click', function(event) {
-                const details = document.querySelectorAll('details[open]');
-                details.forEach(detail => {
-                    // Eğer tıklanan yer bu details'in içinde değilse kapat
-                    if (!detail.contains(event.target)) {
-                        detail.removeAttribute('open');
-                    }
-                });
-            }, true); // Use capture phase for better mobile support
-
             if ("serviceWorker" in navigator) {
                 window.addEventListener("load", () => {
                     navigator.serviceWorker

frontend/input.css

@@ -1,139 +1,17 @@
 @import "tailwindcss";
 @config "./tailwind.config.js";
 
-@theme {
-    /* Shadcn Colors */
-    --color-border: hsl(var(--border));
-    --color-input: hsl(var(--input));
-    --color-ring: hsl(var(--ring));
-    --color-background: hsl(var(--background));
-    --color-foreground: hsl(var(--foreground));
-
-    --color-primary: hsl(var(--primary));
-    --color-primary-foreground: hsl(var(--primary-foreground));
-
-    --color-secondary: hsl(var(--secondary));
-    --color-secondary-foreground: hsl(var(--secondary-foreground));
-
-    --color-destructive: hsl(var(--destructive));
-    --color-destructive-foreground: hsl(var(--destructive-foreground));
-
-    --color-muted: hsl(var(--muted));
-    --color-muted-foreground: hsl(var(--muted-foreground));
-
-    --color-accent: hsl(var(--accent));
-    --color-accent-foreground: hsl(var(--accent-foreground));
-
-    --color-popover: hsl(var(--popover));
-    --color-popover-foreground: hsl(var(--popover-foreground));
-
-    --color-card: hsl(var(--card));
-    --color-card-foreground: hsl(var(--card-foreground));
-
-    --radius-lg: var(--radius);
-    --radius-md: calc(var(--radius) - 2px);
-    --radius-sm: calc(var(--radius) - 4px);
-
-    --animate-accordion-down: accordion-down 0.2s ease-out;
-    --animate-accordion-up: accordion-up 0.2s ease-out;
-
-    @keyframes accordion-down {
-        from {
-            height: 0;
-        }
-        to {
-            height: var(--radix-accordion-content-height);
-        }
-    }
-    @keyframes accordion-up {
-        from {
-            height: var(--radix-accordion-content-height);
-        }
-        to {
-            height: 0;
-        }
-    }
+@plugin "daisyui" {
+    themes:
+        light, dark, dim, nord, cupcake, dracula, cyberpunk, emerald, sunset,
+        abyss;
 }
 
 @layer base {
-    :root {
-        --background: 0 0% 100%;
-        --foreground: 222.2 84% 4.9%;
-
-        --card: 0 0% 100%;
-        --card-foreground: 222.2 84% 4.9%;
-
-        --popover: 0 0% 100%;
-        --popover-foreground: 222.2 84% 4.9%;
-
-        --primary: 222.2 47.4% 11.2%;
-        --primary-foreground: 210 40% 98%;
-
-        --secondary: 210 40% 96.1%;
-        --secondary-foreground: 222.2 47.4% 11.2%;
-
-        --muted: 210 40% 96.1%;
-        --muted-foreground: 215.4 16.3% 46.9%;
-
-        --accent: 210 40% 96.1%;
-        --accent-foreground: 222.2 47.4% 11.2%;
-
-        --destructive: 0 84.2% 60.2%;
-        --destructive-foreground: 210 40% 98%;
-
-        --border: 214.3 31.8% 91.4%;
-        --input: 214.3 31.8% 91.4%;
-        --ring: 222.2 84% 4.9%;
-
-        --radius: 0.5rem;
-    }
-
-    .dark {
-        --background: 222.2 84% 4.9%;
-        --foreground: 210 40% 98%;
-
-        --card: 222.2 84% 4.9%;
-        --card-foreground: 210 40% 98%;
-
-        --popover: 222.2 84% 4.9%;
-        --popover-foreground: 210 40% 98%;
-
-        --primary: 210 40% 98%;
-        --primary-foreground: 222.2 47.4% 11.2%;
-
-        --secondary: 217.2 32.6% 17.5%;
-        --secondary-foreground: 210 40% 98%;
-
-        --muted: 217.2 32.6% 17.5%;
-        --muted-foreground: 215 20.2% 65.1%;
-
-        --accent: 217.2 32.6% 17.5%;
-        --accent-foreground: 210 40% 98%;
-
-        --destructive: 0 62.8% 30.6%;
-        --destructive-foreground: 210 40% 98%;
-
-        --border: 217.2 32.6% 17.5%;
-        --input: 217.2 32.6% 17.5%;
-        --ring: 212.7 26.8% 83.9%;
-    }
-}
-
-@layer base {
-    * {
-        @apply border-border;
-    }
+    html,
     body {
-        @apply bg-background text-foreground;
+        @apply min-h-dvh w-full overflow-hidden bg-base-100 text-base-content overscroll-y-none;
     }
-    
-    /* Ensure Shadcn Utilities are always available */
-    .bg-popover { background-color: hsl(var(--popover)); }
-    .text-popover-foreground { color: hsl(var(--popover-foreground)); }
-    .border-border { border-color: hsl(var(--border)); }
-    .shadow-md { box-shadow: 0 4px 6px -1px rgb(0 0 0 / 0.1), 0 2px 4px -2px rgb(0 0 0 / 0.1); }
-    .z-50 { z-index: 50; }
-    .z-100 { z-index: 100; }
 }
 
 /* Fix for iOS click/blur events */

frontend/package.json

@@ -11,6 +11,7 @@
   "license": "ISC",
   "devDependencies": {
     "autoprefixer": "^10.4.23",
+    "daisyui": "^5.5.1-beta.2",
     "postcss": "^8.5.6",
     "tailwindcss": "^4.1.18"
   },

frontend/src/api/mod.rs

@@ -1,210 +0,0 @@
-use gloo_net::http::Request;
-use thiserror::Error;
-
-#[derive(Debug, Error)]
-pub enum ApiError {
-    #[error("Network error")]
-    Network,
-    #[error("Server error: {status}")]
-    Server { status: u16 },
-    #[error("Login failed")]
-    LoginFailed,
-    #[error("Unauthorized")]
-    Unauthorized,
-    #[error("Too many requests")]
-    RateLimited,
-    #[error("Server function error: {0}")]
-    ServerFn(String),
-}
-
-fn base_url() -> String {
-    "/api".to_string()
-}
-
-pub mod auth {
-    use super::*;
-
-    #[derive(serde::Serialize)]
-    pub struct LoginRequest {
-        pub username: String,
-        pub password: String,
-        pub remember_me: bool,
-    }
-
-    pub async fn login(
-        username: &str,
-        password: &str,
-        remember_me: bool,
-    ) -> Result<(), ApiError> {
-        let req = LoginRequest {
-            username: username.to_string(),
-            password: password.to_string(),
-            remember_me,
-        };
-        let resp = Request::post(&format!("{}/auth/login", base_url()))
-            .json(&req)
-            .map_err(|_| ApiError::Network)?
-            .send()
-            .await
-            .map_err(|_| ApiError::Network)?;
-
-        if resp.ok() {
-            Ok(())
-        } else if resp.status() == 429 {
-            Err(ApiError::RateLimited)
-        } else {
-            Err(ApiError::LoginFailed)
-        }
-    }
-
-    pub async fn logout() -> Result<(), ApiError> {
-        Request::post(&format!("{}/auth/logout", base_url()))
-            .send()
-            .await
-            .map_err(|_| ApiError::Network)?;
-        Ok(())
-    }
-
-    pub async fn check_auth() -> Result<bool, ApiError> {
-        let resp = Request::get(&format!("{}/auth/check", base_url()))
-            .send()
-            .await
-            .map_err(|_| ApiError::Network)?;
-        Ok(resp.ok())
-    }
-
-    #[derive(serde::Deserialize)]
-    pub struct UserResponse {
-        pub username: String,
-    }
-
-    pub async fn get_user() -> Result<UserResponse, ApiError> {
-        let resp = Request::get(&format!("{}/auth/check", base_url()))
-            .send()
-            .await
-            .map_err(|_| ApiError::Network)?;
-        let user = resp.json().await.map_err(|_| ApiError::Network)?;
-        Ok(user)
-    }
-}
-
-pub mod setup {
-    use super::*;
-
-    #[derive(serde::Serialize)]
-    pub struct SetupRequest {
-        pub username: String,
-        pub password: String,
-    }
-
-    #[derive(serde::Deserialize)]
-    pub struct SetupStatusResponse {
-        pub completed: bool,
-    }
-
-    pub async fn get_status() -> Result<SetupStatusResponse, ApiError> {
-        let resp = Request::get(&format!("{}/setup/status", base_url()))
-            .send()
-            .await
-            .map_err(|_| ApiError::Network)?;
-        let status = resp.json().await.map_err(|_| ApiError::Network)?;
-        Ok(status)
-    }
-
-    pub async fn setup(username: &str, password: &str) -> Result<(), ApiError> {
-        let req = SetupRequest {
-            username: username.to_string(),
-            password: password.to_string(),
-        };
-        Request::post(&format!("{}/setup", base_url()))
-            .json(&req)
-            .map_err(|_| ApiError::Network)?
-            .send()
-            .await
-            .map_err(|_| ApiError::Network)?;
-        Ok(())
-    }
-}
-
-pub mod settings {
-    use super::*;
-    use shared::GlobalLimitRequest;
-
-    pub async fn set_global_limits(req: &GlobalLimitRequest) -> Result<(), ApiError> {
-        shared::server_fns::settings::set_global_limits(
-            req.max_download_rate,
-            req.max_upload_rate,
-        )
-        .await
-        .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-}
-
-pub mod push {
-    use super::*;
-
-    pub async fn get_public_key() -> Result<String, ApiError> {
-        shared::server_fns::push::get_public_key()
-            .await
-            .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-
-    pub async fn subscribe(endpoint: &str, p256dh: &str, auth: &str) -> Result<(), ApiError> {
-        shared::server_fns::push::subscribe_push(
-            endpoint.to_string(),
-            p256dh.to_string(),
-            auth.to_string(),
-        )
-        .await
-        .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-}
-
-pub mod torrent {
-    use super::*;
-
-    pub async fn add(uri: &str) -> Result<(), ApiError> {
-        shared::server_fns::torrent::add_torrent(uri.to_string())
-            .await
-            .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-
-    pub async fn action(hash: &str, action: &str) -> Result<(), ApiError> {
-        shared::server_fns::torrent::torrent_action(hash.to_string(), action.to_string())
-            .await
-            .map(|_| ())
-            .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-
-    pub async fn delete(hash: &str) -> Result<(), ApiError> {
-        action(hash, "delete").await
-    }
-
-    pub async fn delete_with_data(hash: &str) -> Result<(), ApiError> {
-        action(hash, "delete_with_data").await
-    }
-
-    pub async fn start(hash: &str) -> Result<(), ApiError> {
-        action(hash, "start").await
-    }
-
-    pub async fn stop(hash: &str) -> Result<(), ApiError> {
-        action(hash, "stop").await
-    }
-
-    pub async fn set_label(hash: &str, label: &str) -> Result<(), ApiError> {
-        shared::server_fns::torrent::set_label(hash.to_string(), label.to_string())
-            .await
-            .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-
-    pub async fn set_priority(hash: &str, file_index: u32, priority: u8) -> Result<(), ApiError> {
-        shared::server_fns::torrent::set_file_priority(
-            hash.to_string(),
-            file_index,
-            priority,
-        )
-        .await
-        .map_err(|e| ApiError::ServerFn(e.to_string()))
-    }
-}

frontend/src/app.rs

@@ -1,64 +1,102 @@
 use crate::components::layout::protected::Protected;
 use crate::components::toast::ToastContainer;
 use crate::components::torrent::table::TorrentTable;
-use crate::components::torrent::detail::TorrentDetail;
 use crate::components::auth::login::Login;
 use crate::components::auth::setup::Setup;
-use leptos::prelude::*;
-use leptos::task::spawn_local;
-use leptos_router::components::{Router, Routes, Route};
-use leptos_router::hooks::use_navigate;
+use leptos::*;
+use leptos_router::*;
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+struct SetupStatus {
+    completed: bool,
+}
+
+#[derive(Deserialize)]
+struct UserResponse {
+    username: String,
+}
 
 #[component]
 pub fn App() -> impl IntoView {
     crate::store::provide_torrent_store();
-    let store = use_context::<crate::store::TorrentStore>();
 
-    let is_loading = signal(true);
-    let is_authenticated = signal(false);
-    let needs_setup = signal(false);
+    // Auth State
+    let (is_loading, set_is_loading) = create_signal(true);
+    let (is_authenticated, set_is_authenticated) = create_signal(false);
 
-    Effect::new(move |_| {
+    // Check Auth & Setup Status on load
+    create_effect(move |_| {
         spawn_local(async move {
-            log::info!("App initialization started...");
+            logging::log!("App initialization started...");
 
-            // Check if setup is needed via Server Function
-            match shared::server_fns::auth::get_setup_status().await {
-                Ok(status) => {
-                    if !status.completed {
-                        log::info!("Setup not completed");
-                        needs_setup.1.set(true);
-                        is_loading.1.set(false);
-                        return;
+            // 1. Check Setup Status
+            let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
+
+            match setup_res {
+                Ok(resp) => {
+                    if resp.ok() {
+                        match resp.json::<SetupStatus>().await {
+                            Ok(status) => {
+                                if !status.completed {
+                                    logging::log!("Setup not completed, redirecting to /setup");
+                                    let navigate = use_navigate();
+                                    navigate("/setup", Default::default());
+                                    set_is_loading.set(false);
+                                    return;
+                                }
+                            }
+                            Err(e) => logging::error!("Failed to parse setup status: {}", e),
+                        }
                     }
                 }
-                Err(e) => log::error!("Failed to get setup status: {:?}", e),
+                Err(e) => logging::error!("Network error checking setup status: {}", e),
             }
 
-            // Check authentication via GetUser Server Function
-            match shared::server_fns::auth::get_user().await {
-                Ok(Some(user_info)) => {
-                    log::info!("Authenticated as {}", user_info.username);
-                    if let Some(s) = store {
-                        s.user.set(Some(user_info.username));
-                    }
-                    is_authenticated.1.set(true);
-                }
-                Ok(None) => {
-                    log::info!("Not authenticated");
-                }
-                Err(e) => {
-                    log::error!("Auth check failed: {:?}", e);
-                }
-            }
+            // 2. Check Auth Status
+            let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
 
-            is_loading.1.set(false);
+                        match auth_res {
+                            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);
+
+                                    // If user is already authenticated but on login/setup page, redirect to home
+                                    let pathname = window().location().pathname().unwrap_or_default();
+                                    if pathname == "/login" || pathname == "/setup" {
+                                        logging::log!("Already authenticated, redirecting to home");
+                                        let navigate = use_navigate();
+                                        navigate("/", Default::default());
+                                    }
+                                } else {
+                                    logging::log!("Not authenticated, redirecting to /login");
+                                    let navigate = use_navigate();
+                                    let pathname = window().location().pathname().unwrap_or_default();
+                                    if pathname != "/login" && pathname != "/setup" {
+                                         navigate("/login", Default::default());
+                                    }
+                                }
+                            }
+                            Err(e) => logging::error!("Network error checking auth status: {}", e),
+                        }
+            set_is_loading.set(false);
         });
     });
-
-    Effect::new(move |_| {
-        if is_authenticated.0.get() {
+    // Initialize push notifications (Only if authenticated)
+    create_effect(move |_| {
+        if is_authenticated.get() {
             spawn_local(async {
+                // ... (Push notification logic kept same, shortened for brevity in this replace)
+                // Wait a bit for service worker to be ready
                 gloo_timers::future::TimeoutFuture::new(2000).await;
 
                 if crate::utils::platform::supports_push_notifications() && !crate::utils::platform::is_safari() {
@@ -71,83 +109,30 @@ pub fn App() -> impl IntoView {
     view! {
         <div class="relative w-full h-screen" style="height: 100dvh;">
             <Router>
-                <Routes fallback=|| view! { <div class="p-4">"404 Not Found"</div> }>
-                    <Route path=leptos_router::path!("/login") view=move || {
-                        let authenticated = is_authenticated.0.get();
-                        let setup_needed = needs_setup.0.get();
-                        
-                        Effect::new(move |_| {
-                            if setup_needed {
-                                let navigate = use_navigate();
-                                navigate("/setup", Default::default());
-                            } else if authenticated {
-                                log::info!("Already authenticated, redirecting to home");
-                                let navigate = use_navigate();
-                                navigate("/", Default::default());
-                            }
-                        });
-                        
-                        view! { <Login /> }
-                    } />
-                    <Route path=leptos_router::path!("/setup") view=move || {
-                        Effect::new(move |_| {
-                            if is_authenticated.0.get() {
-                                let navigate = use_navigate();
-                                navigate("/", Default::default());
-                            }
-                        });
-                        
-                        view! { <Setup /> }
-                    } />
+                <Routes>
+                    <Route path="/login" view=move || view! { <Login /> } />
+                    <Route path="/setup" view=move || view! { <Setup /> } />
 
-                    <Route path=leptos_router::path!("/") view=move || {
-                        let navigate = use_navigate();
-                        Effect::new(move |_| {
-                            if !is_loading.0.get() {
-                                if needs_setup.0.get() {
-                                    log::info!("Setup not completed, redirecting to setup");
-                                    navigate("/setup", Default::default());
-                                } else if !is_authenticated.0.get() {
-                                    log::info!("Not authenticated, redirecting to login");
-                                    navigate("/login", Default::default());
-                                }
-                            }
-                        });
-                        
+                    <Route path="/" view=move || {
                         view! {
-                            <Show when=move || !is_loading.0.get() fallback=|| view! {
-                                <div class="flex items-center justify-center h-screen bg-background">
-                                    <div class="flex flex-col items-center gap-4">
-                                        <div class="animate-spin h-8 w-8 border-4 border-primary border-t-transparent rounded-full"></div>
-                                        <p class="text-sm text-muted-foreground">"Yükleniyor..."</p>
-                                    </div>
+                            <Show when=move || !is_loading.get() fallback=|| view! {
+                                <div class="flex items-center justify-center h-screen bg-base-100">
+                                    <span class="loading loading-spinner loading-lg"></span>
                                 </div>
-                            }.into_any()>
-                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
+                            }>
+                                <Show when=move || is_authenticated.get() fallback=|| ()>
                                     <Protected>
-                                        <div class="flex flex-col h-full overflow-hidden">
-                                            <div class="flex-1 overflow-hidden">
-                                                <TorrentTable />
-                                            </div>
-                                            <TorrentDetail />
-                                        </div>
+                                        <TorrentTable />
                                     </Protected>
                                 </Show>
                             </Show>
-                        }.into_any()
+                        }
                     }/>
 
-                    <Route path=leptos_router::path!("/settings") view=move || {
-                        Effect::new(move |_| {
-                            if !is_authenticated.0.get() {
-                                let navigate = use_navigate();
-                                navigate("/login", Default::default());
-                            }
-                        });
-                        
+                    <Route path="/settings" view=move || {
                         view! {
-                            <Show when=move || !is_loading.0.get() fallback=|| ()>
-                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
+                            <Show when=move || !is_loading.get() fallback=|| ()>
+                                <Show when=move || is_authenticated.get() fallback=|| ()>
                                     <Protected>
                                         <div class="p-4">"Settings Page (Coming Soon)"</div>
                                     </Protected>

frontend/src/components/auth/login.rs

@@ -1,99 +1,131 @@
-use leptos::prelude::*;
-use leptos::task::spawn_local;
-use leptos_shadcn_card::{Card, CardHeader, CardContent};
-use leptos_shadcn_input::Input;
-use leptos_shadcn_button::Button;
-use leptos_shadcn_label::Label;
-use leptos_shadcn_alert::{Alert, AlertDescription, AlertVariant};
+use leptos::*;
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct LoginRequest {
+    username: String,
+    password: String,
+    remember_me: bool,
+}
 
 #[component]
 pub fn Login() -> impl IntoView {
-    let username = signal(String::new());
-    let password = signal(String::new());
-    let error = signal(Option::<String>::None);
-    let loading = signal(false);
+    let (username, set_username) = create_signal(String::new());
+    let (password, set_password) = create_signal(String::new());
+    let (remember_me, set_remember_me) = create_signal(false);
+    let (error, set_error) = create_signal(Option::<String>::None);
+    let (loading, set_loading) = create_signal(false);
 
     let handle_login = move |ev: web_sys::SubmitEvent| {
         ev.prevent_default();
-        loading.1.set(true);
-        error.1.set(None);
+        set_loading.set(true);
+        set_error.set(None);
 
-        let user = username.0.get();
-        let pass = password.0.get();
+        logging::log!("Attempting login for user: {}", username.get());
 
         spawn_local(async move {
-            match shared::server_fns::auth::login(user, pass).await {
-                Ok(_) => {
-                    let window = web_sys::window().expect("window should exist");
-                    let _ = window.location().set_href("/");
+            let req = LoginRequest {
+                username: username.get(),
+                password: password.get(),
+                remember_me: remember_me.get(),
+            };
+
+            let client = gloo_net::http::Request::post("/api/auth/login")
+                .json(&req)
+                .expect("Failed to create request");
+
+            match client.send().await {
+                Ok(resp) => {
+                    logging::log!("Login response status: {}", resp.status());
+                    if resp.ok() {
+                        logging::log!("Login successful, redirecting...");
+                        // Force a full reload to re-run auth checks in App.rs
+                        let _ = window().location().set_href("/");
+                    } else {
+                        let text = resp.text().await.unwrap_or_default();
+                        logging::error!("Login failed: {}", text);
+                        set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
+                    }
                 }
-                Err(_) => {
-                    error.1.set(Some("Geçersiz kullanıcı adı veya şifre".to_string()));
-                    loading.1.set(false);
+                Err(e) => {
+                    logging::error!("Network error: {}", e);
+                    set_error.set(Some("Bağlantı hatası".to_string()));
                 }
             }
+            set_loading.set(false);
         });
     };
 
     view! {
-        <div class="flex items-center justify-center min-h-screen bg-muted/40 px-4">
-            <Card class="w-full max-w-sm shadow-lg">
-                <CardHeader class="pb-2 items-center">
-                    <div class="w-12 h-12 bg-primary rounded-xl flex items-center justify-center text-primary-foreground shadow-sm mb-4">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.25 0 003 2.48z" />
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 18a3.75 3.75 0 00.495-7.467 5.99 5.99 0 00-1.925 3.546 5.974 5.974 0 01-2.133-1A3.75 3.75 0 0012 18z" />
-                        </svg>
-                    </div>
-                    <h3 class="font-semibold tracking-tight text-2xl">"VibeTorrent"</h3>
-                    <p class="text-sm text-muted-foreground">"Hesabınıza giriş yapın"</p>
-                </CardHeader>
-                
-                <CardContent class="pt-4">
-                    <form on:submit=handle_login class="space-y-4">
-                        <div class="space-y-2">
-                            <Label>"Kullanıcı Adı"</Label>
-                            <Input
-                                input_type="text"
+        <div class="flex items-center justify-center min-h-screen bg-base-200">
+            <div class="card w-full max-w-sm shadow-xl bg-base-100">
+                <div class="card-body">
+                    <h2 class="card-title justify-center mb-4">"VibeTorrent Giriş"</h2>
+
+                    <form on:submit=handle_login>
+                        <div class="form-control w-full">
+                            <label class="label">
+                                <span class="label-text">"Kullanıcı Adı"</span>
+                            </label>
+                            <input
+                                type="text"
                                 placeholder="Kullanıcı adınız"
-                                value=MaybeProp::derive(move || Some(username.0.get()))
-                                on_change=Callback::new(move |val: String| username.1.set(val))
-                                disabled=Signal::derive(move || loading.0.get())
-                            />
-                        </div>
-                        <div class="space-y-2">
-                            <Label>"Şifre"</Label>
-                            <Input
-                                input_type="password"
-                                placeholder="******"
-                                value=MaybeProp::derive(move || Some(password.0.get()))
-                                on_change=Callback::new(move |val: String| password.1.set(val))
-                                disabled=Signal::derive(move || loading.0.get())
+                                class="input input-bordered w-full"
+                                prop:value=username
+                                on:input=move |ev| set_username.set(event_target_value(&ev))
+                                disabled=move || loading.get()
                             />
                         </div>
 
-                        <Show when=move || error.0.get().is_some()>
-                            <Alert variant=AlertVariant::Destructive>
-                                <AlertDescription>
-                                    {move || error.0.get().unwrap_or_default()}
-                                </AlertDescription>
-                            </Alert>
+                        <div class="form-control w-full mt-4">
+                            <label class="label">
+                                <span class="label-text">"Şifre"</span>
+                            </label>
+                            <input
+                                type="password"
+                                placeholder="******"
+                                class="input input-bordered w-full"
+                                prop:value=password
+                                on:input=move |ev| set_password.set(event_target_value(&ev))
+                                disabled=move || loading.get()
+                            />
+                        </div>
+
+                        <div class="form-control mt-4">
+                            <label class="label cursor-pointer justify-start gap-3">
+                                <input
+                                    type="checkbox"
+                                    class="checkbox checkbox-primary checkbox-sm"
+                                    prop:checked=remember_me
+                                    on:change=move |ev| set_remember_me.set(event_target_checked(&ev))
+                                    disabled=move || loading.get()
+                                />
+                                <span class="label-text">"Beni Hatırla"</span>
+                            </label>
+                        </div>
+
+                        <Show when=move || error.get().is_some()>
+                            <div class="alert alert-error mt-4 text-sm py-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                                <span>{move || error.get()}</span>
+                            </div>
                         </Show>
 
-                        <div class="pt-2">
-                            <Button
-                                class="w-full"
-                                disabled=Signal::derive(move || loading.0.get())
+                        <div class="card-actions justify-end mt-6">
+                            <button
+                                class="btn btn-primary w-full"
+                                type="submit"
+                                disabled=move || loading.get()
                             >
-                                <Show when=move || loading.0.get() fallback=|| "Giriş Yap">
-                                    <span class="animate-spin mr-2 h-4 w-4 border-2 border-current border-t-transparent rounded-full"></span>
+                                <Show when=move || loading.get() fallback=|| "Giriş Yap">
+                                    <span class="loading loading-spinner"></span>
                                     "Giriş Yapılıyor..."
                                 </Show>
-                            </Button>
+                            </button>
                         </div>
                     </form>
-                </CardContent>
-            </Card>
+                </div>
+            </div>
         </div>
     }
-}
+}

frontend/src/components/auth/setup.rs

@@ -1,124 +1,144 @@
-use leptos::prelude::*;
-use leptos::task::spawn_local;
-use leptos_shadcn_card::{Card, CardHeader, CardContent};
-use leptos_shadcn_input::Input;
-use leptos_shadcn_button::Button;
-use leptos_shadcn_label::Label;
-use leptos_shadcn_alert::{Alert, AlertDescription, AlertVariant};
+use leptos::*;
+use serde::Serialize;
+
+#[derive(Serialize)]
+struct SetupRequest {
+    username: String,
+    password: String,
+}
 
 #[component]
 pub fn Setup() -> impl IntoView {
-    let username = signal(String::new());
-    let password = signal(String::new());
-    let confirm_password = signal(String::new());
-    let error = signal(Option::<String>::None);
-    let loading = signal(false);
+    let (username, set_username) = create_signal(String::new());
+    let (password, set_password) = create_signal(String::new());
+    let (confirm_password, set_confirm_password) = create_signal(String::new());
+    let (error, set_error) = create_signal(Option::<String>::None);
+    let (loading, set_loading) = create_signal(false);
 
     let handle_setup = move |ev: web_sys::SubmitEvent| {
         ev.prevent_default();
-        
-        let pass = password.0.get();
-        let confirm = confirm_password.0.get();
-        
+        set_loading.set(true);
+        set_error.set(None);
+
+        let pass = password.get();
+        let confirm = confirm_password.get();
+
         if pass != confirm {
-            error.1.set(Some("Şifreler eşleşmiyor".to_string()));
+            set_error.set(Some("Şifreler eşleşmiyor".to_string()));
+            set_loading.set(false);
             return;
         }
 
         if pass.len() < 6 {
-            error.1.set(Some("Şifre en az 6 karakter olmalıdır".to_string()));
+            set_error.set(Some("Şifre en az 6 karakter olmalıdır".to_string()));
+            set_loading.set(false);
             return;
         }
 
-        loading.1.set(true);
-        error.1.set(None);
-
-        let user = username.0.get();
-
         spawn_local(async move {
-            match shared::server_fns::auth::setup(user, pass).await {
-                Ok(_) => {
-                    log::info!("Setup completed successfully, redirecting...");
-                    let window = web_sys::window().expect("window should exist");
-                    let _ = window.location().set_href("/");
+            let req = SetupRequest {
+                username: username.get(),
+                password: pass,
+            };
+
+            let client = gloo_net::http::Request::post("/api/setup")
+                .json(&req)
+                .expect("Failed to create request");
+
+            match client.send().await {
+                Ok(resp) => {
+                    if resp.ok() {
+                        // Redirect to home after setup (auto-login handled by backend)
+                        // Full reload to ensure auth state is refreshed
+                        let _ = window().location().set_href("/");
+                    } else {
+                        let text = resp.text().await.unwrap_or_default();
+                        set_error.set(Some(format!("Hata: {}", text)));
+                    }
                 }
-                Err(e) => {
-                    log::error!("Setup failed: {:?}", e);
-                    error.1.set(Some("Kurulum sırasında bir hata oluştu".to_string()));
-                    loading.1.set(false);
+                Err(_) => {
+                    set_error.set(Some("Bağlantı hatası".to_string()));
                 }
             }
+            set_loading.set(false);
         });
     };
 
     view! {
-        <div class="flex items-center justify-center min-h-screen bg-muted/40 px-4">
-            <Card class="w-full max-w-md shadow-lg overflow-hidden">
-                <CardHeader class="pb-2 items-center text-center">
-                    <div class="w-12 h-12 bg-primary rounded-xl flex items-center justify-center text-primary-foreground shadow-sm mb-4">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M11.42 15.17L17.25 21A2.652 2.652 0 0021 17.25l-5.877-5.877M11.42 15.17l2.496-3.03c.317-.384.74-.626 1.208-.766M11.42 15.17l-4.655 5.653a2.548 2.548 0 11-3.586-3.586l6.837-5.63m5.108-3.497a2.548 2.548 0 113.586 3.586l-6.837 5.63m-5.108 3.497l2.496-3.03c.317-.384.74-.626 1.208-.766M15.75 9.25a2.548 2.548 0 11-5.096 0 2.548 2.548 0 015.096 0z" />
-                        </svg>
-                    </div>
-                    <h3 class="font-semibold tracking-tight text-2xl">"VibeTorrent Kurulumu"</h3>
-                    <p class="text-sm text-muted-foreground">"Yönetici hesabınızı oluşturun"</p>
-                </CardHeader>
+        <div class="flex items-center justify-center min-h-screen bg-base-200">
+            <div class="card w-full max-w-md shadow-xl bg-base-100">
+                <div class="card-body">
+                    <h2 class="card-title justify-center mb-2">"VibeTorrent Kurulumu"</h2>
+                    <p class="text-center text-sm opacity-70 mb-4">"Yönetici hesabınızı oluşturun"</p>
 
-                <CardContent class="pt-4">
-                    <form on:submit=handle_setup class="space-y-4">
-                        <div class="space-y-2">
-                            <Label>"Yönetici Kullanıcı Adı"</Label>
-                            <Input
-                                input_type="text"
+                    <form on:submit=handle_setup>
+                        <div class="form-control w-full">
+                            <label class="label">
+                                <span class="label-text">"Kullanıcı Adı"</span>
+                            </label>
+                            <input
+                                type="text"
                                 placeholder="admin"
-                                value=MaybeProp::derive(move || Some(username.0.get()))
-                                on_change=Callback::new(move |val: String| username.1.set(val))
-                                disabled=Signal::derive(move || loading.0.get())
-                            />
-                        </div>
-                        <div class="space-y-2">
-                            <Label>"Şifre"</Label>
-                            <Input
-                                input_type="password"
-                                placeholder="******"
-                                value=MaybeProp::derive(move || Some(password.0.get()))
-                                on_change=Callback::new(move |val: String| password.1.set(val))
-                                disabled=Signal::derive(move || loading.0.get())
-                            />
-                        </div>
-                        <div class="space-y-2">
-                            <Label>"Şifre Onay"</Label>
-                            <Input
-                                input_type="password"
-                                placeholder="******"
-                                value=MaybeProp::derive(move || Some(confirm_password.0.get()))
-                                on_change=Callback::new(move |val: String| confirm_password.1.set(val))
-                                disabled=Signal::derive(move || loading.0.get())
+                                class="input input-bordered w-full"
+                                prop:value=username
+                                on:input=move |ev| set_username.set(event_target_value(&ev))
+                                disabled=move || loading.get()
+                                required
                             />
                         </div>
 
-                        <Show when=move || error.0.get().is_some() fallback=|| ()>
-                            <Alert variant=AlertVariant::Destructive>
-                                <AlertDescription>
-                                    <span>{move || error.0.get().unwrap_or_default()}</span>
-                                </AlertDescription>
-                            </Alert>
+                        <div class="form-control w-full mt-4">
+                            <label class="label">
+                                <span class="label-text">"Şifre"</span>
+                            </label>
+                            <input
+                                type="password"
+                                placeholder="******"
+                                class="input input-bordered w-full"
+                                prop:value=password
+                                on:input=move |ev| set_password.set(event_target_value(&ev))
+                                disabled=move || loading.get()
+                                required
+                            />
+                        </div>
+
+                        <div class="form-control w-full mt-4">
+                            <label class="label">
+                                <span class="label-text">"Şifre Tekrar"</span>
+                            </label>
+                            <input
+                                type="password"
+                                placeholder="******"
+                                class="input input-bordered w-full"
+                                prop:value=confirm_password
+                                on:input=move |ev| set_confirm_password.set(event_target_value(&ev))
+                                disabled=move || loading.get()
+                                required
+                            />
+                        </div>
+
+                        <Show when=move || error.get().is_some()>
+                            <div class="alert alert-error mt-4 text-sm py-2">
+                                <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                                <span>{move || error.get()}</span>
+                            </div>
                         </Show>
 
-                        <div class="pt-2">
-                            <Button
-                                class="w-full"
-                                disabled=Signal::derive(move || loading.0.get())
+                        <div class="card-actions justify-end mt-6">
+                            <button
+                                class="btn btn-primary w-full"
+                                type="submit"
+                                disabled=move || loading.get()
                             >
-                                <Show when=move || loading.0.get() fallback=|| "Kurulumu Tamamla">
-                                    <span class="animate-spin mr-2 h-4 w-4 border-2 border-current border-t-transparent rounded-full"></span>
-                                    "Kuruluyor..."
+                                <Show when=move || loading.get() fallback=|| "Kurulumu Tamamla">
+                                    <span class="loading loading-spinner"></span>
+                                    "İşleniyor..."
                                 </Show>
-                            </Button>
+                            </button>
                         </div>
                     </form>
-                </CardContent>
-            </Card>
+                </div>
+            </div>
         </div>
     }
 }

frontend/src/components/context_menu.rs

@@ -1,158 +1,98 @@
-use leptos::prelude::*;
-use web_sys::MouseEvent;
-use wasm_bindgen::prelude::*;
-use wasm_bindgen::JsCast;
-
-// ── Kendi reaktif Context Menu implementasyonumuz ──
-// leptos-shadcn-context-menu v0.8.1'de ContextMenuContent'te
-// `if open.get()` statik kontrolü reaktif değil. Aşağıda
-// `Show` bileşeni ile düzgün reaktif versiyon yer alıyor.
+use leptos::*;
 
 #[component]
-pub fn TorrentContextMenu(
-    children: Children,
+pub fn ContextMenu(
+    position: (i32, i32),
+    visible: bool,
     torrent_hash: String,
-    on_action: Callback<(String, String)>,
+    on_close: Callback<()>,
+    on_action: Callback<(String, String)>, // (Action, Hash)
 ) -> impl IntoView {
-    let hash = StoredValue::new(torrent_hash);
-    let on_action = StoredValue::new(on_action);
-
-    let open = RwSignal::new(false);
-    let position = RwSignal::new((0i32, 0i32));
-
-    // Sağ tıklama handler
-    let on_contextmenu = move |e: MouseEvent| {
-        e.prevent_default();
-        e.stop_propagation();
-        position.set((e.client_x(), e.client_y()));
-        open.set(true);
+    let handle_action = move |action: &str| {
+        let hash = torrent_hash.clone();
+        let action_str = action.to_string();
+        
+        logging::log!("ContextMenu: Action '{}' for hash '{}'", action_str, hash);
+        on_action.call((action_str, hash)); // Delegate FIRST
+        on_close.call(()); // Close menu AFTER
     };
 
-    // Menü dışına tıklandığında kapanma
-    Effect::new(move |_| {
-        if open.get() {
-            let cb = Closure::wrap(Box::new(move |_: MouseEvent| {
-                open.set(false);
-            }) as Box<dyn Fn(MouseEvent)>);
-
-            let window = web_sys::window().unwrap();
-            let document = window.document().unwrap();
-            let _ = document.add_event_listener_with_callback(
-                "click",
-                cb.as_ref().unchecked_ref(),
-            );
-
-            // Cleanup: tek sefer dinleyici — click yakalandığında otomatik kapanıp listener kalıyor
-            // ama open=false olduğunda effect tekrar çalışmaz, böylece sorun yok.
-            cb.forget();
-        }
-    });
-
-    let menu_action = move |action: &'static str| {
-        open.set(false);
-        on_action.get_value().run((action.to_string(), hash.get_value()));
-    };
+    if !visible {
+        return view! {}.into_view();
+    }
 
     view! {
-        <div
-            class="w-full"
-            on:contextmenu=on_contextmenu
+        // Backdrop to catch clicks outside
+        <div 
+            class="fixed inset-0 z-[99] cursor-default" 
+            role="button"
+            tabindex="-1"
+            on:click=move |_| on_close.call(())
+            on:contextmenu=move |e| e.prevent_default()
+        ></div>
+
+        <div 
+            class="fixed z-[100] min-w-[200px] animate-in fade-in zoom-in-95 duration-100"
+            style=format!("left: {}px; top: {}px", position.0, position.1)
+            on:contextmenu=move |e| e.prevent_default()
         >
-            {children()}
-        </div>
+            <ul class="menu bg-base-200 text-base-content rounded-box shadow-xl border border-white/5 p-2 gap-1">
 
-        <Show when=move || open.get()>
-            {
-                    let (x, y) = position.get();
-                    // Menü yaklaşık boyutları
-                    let menu_width = 200;
-                    let menu_height = 220;
-                    let window = web_sys::window().unwrap();
-                    let vw = window.inner_width().unwrap().as_f64().unwrap() as i32;
-                    let vh = window.inner_height().unwrap().as_f64().unwrap() as i32;
-                    // Sağa taşarsa sola aç, alta taşarsa yukarı aç
-                    let final_x = if x + menu_width > vw { x - menu_width } else { x };
-                    let final_y = if y + menu_height > vh { y - menu_height } else { y };
-                    let final_x = final_x.max(0);
-                    let final_y = final_y.max(0);
-                    view! {
-                        <div
-                            class="fixed inset-0 z-[99]"
-                            on:click=move |e: MouseEvent| {
-                                e.stop_propagation();
-                                open.set(false);
-                            }
-                            on:contextmenu=move |e: MouseEvent| {
-                                e.prevent_default();
-                                e.stop_propagation();
-                                open.set(false);
-                            }
-                        />
-                        <div
-                            class="fixed z-[100] min-w-[12rem] overflow-hidden rounded-md border bg-popover p-1 text-popover-foreground shadow-md animate-in fade-in-0 zoom-in-95"
-                            style=format!("left: {}px; top: {}px;", final_x, final_y)
-                            on:click=move |e: MouseEvent| e.stop_propagation()
+                
+                <li>
+                    <button 
+                        class="gap-3 active:bg-primary active:text-primary-content"
+                        on:click={
+                            let handle_action = handle_action.clone();
+                            move |_| handle_action("start")
+                        }
                     >
-                        // Start
-                        <div
-                            class="relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground"
-                            on:click=move |_| menu_action("start")
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
-                            </svg>
-                            "Start"
-                        </div>
+                        <svg class="w-4 h-4 text-success" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14.752 11.168l-3.197-2.132A1 1 0 0010 9.87v4.263a1 1 0 001.555.832l3.197-2.132a1 1 0 000-1.664z" /><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M21 12a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                        "Resume"
+                    </button>
+                </li>
 
-                        // Stop
-                        <div
-                            class="relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground"
-                            on:click=move |_| menu_action("stop")
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
-                            </svg>
-                            "Stop"
-                        </div>
-
-                        // Recheck
-                        <div
-                            class="relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors hover:bg-accent hover:text-accent-foreground"
-                            on:click=move |_| menu_action("recheck")
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0l3.181 3.183a8.25 8.25 0 0013.803-3.7M4.031 9.865a8.25 8.25 0 0113.803-3.7l3.181 3.182m0-4.991v4.99" />
-                            </svg>
-                            "Recheck"
-                        </div>
-
-                        // Separator
-                        <div class="-mx-1 my-1 h-px bg-border" />
-
-                        // Remove
-                        <div
-                            class="relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors text-destructive hover:bg-destructive hover:text-destructive-foreground"
-                            on:click=move |_| menu_action("delete")
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.164h-2.34c-1.18 0-2.09.984-2.09 2.164v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
-                            </svg>
-                            "Remove"
-                        </div>
-
-                        // Remove with Data
-                        <div
-                            class="relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors text-destructive hover:bg-destructive hover:text-destructive-foreground"
-                            on:click=move |_| menu_action("delete_with_data")
-                        >
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 7.5l-.625 10.632a2.25 2.25 0 01-2.247 2.118H6.622a2.25 2.25 0 01-2.247-2.118L3.75 7.5m6 4.125l2.25 2.25m0 0l2.25 2.25M12 13.875l2.25-2.25M12 13.875l-2.25-2.25M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125z" />
-                            </svg>
-                            "Remove with Data"
-                        </div>
-                    </div>
-                }
-            }
-        </Show>
-    }
-}
+                <li>    
+                    <button 
+                        class="gap-3 active:bg-primary active:text-primary-content"
+                        on:click={
+                            let handle_action = handle_action.clone();
+                            move |_| handle_action("stop")
+                        }
+                    >
+                        <svg class="w-4 h-4 text-warning" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 9v6m4-6v6m7-3a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
+                        "Pause"
+                    </button>
+                </li>
+                
+                <div class="divider my-0 h-px p-0 opacity-10"></div>
+                
+                <li>
+                    <button 
+                        class="gap-3 text-error hover:bg-error/10 active:bg-error active:text-error-content"
+                        on:click={
+                            let handle_action = handle_action.clone();
+                            move |_| handle_action("delete")
+                        }
+                    >
+                        <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 7l-.867 12.142A2 2 0 0116.138 21H7.862a2 2 0 01-1.995-1.858L5 7m5 4v6m4-6v6m1-10V4a1 1 0 00-1-1h-4a1 1 0 00-1 1v3M4 7h16" /></svg>
+                        "Delete"
+                    </button>
+                </li>
+                
+                <li>
+                    <button 
+                        class="gap-3 text-error hover:bg-error/10 active:bg-error active:text-error-content text-xs"
+                        on:click={
+                            let handle_action = handle_action.clone();
+                            move |_| handle_action("delete_with_data")
+                        }
+                    >
+                        <svg class="w-4 h-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 10V3L4 14h7v7l9-11h-7z" /></svg>
+                        <span>"Delete with Data"</span>
+                    </button>
+                </li>
+            </ul>
+        </div>
+    }.into_view()
+}

frontend/src/components/layout/protected.rs

@@ -1,52 +1,30 @@
-use leptos::prelude::*;
+use leptos::*;
 use crate::components::layout::sidebar::Sidebar;
-use crate::components::layout::toolbar::Toolbar;
 use crate::components::layout::statusbar::StatusBar;
+use crate::components::layout::toolbar::Toolbar;
 
 #[component]
 pub fn Protected(children: Children) -> impl IntoView {
-    // Mobil menü durumu için bir sinyal oluşturuyoruz (RwSignal for easier passing)
-    let is_mobile_menu_open = RwSignal::new(false);
-    
-    // Sinyali context olarak sağlıyoruz ki Toolbar ve Sidebar buna erişebilsin
-    provide_context(is_mobile_menu_open);
-
     view! {
-        <div class="flex h-screen w-full overflow-hidden bg-background">
-            
-            // --- SIDEBAR (Desktop: Sabit, Mobil: Overlay) ---
-            <aside class=move || {
-                let base = "fixed inset-y-0 left-0 z-50 w-64 transform transition-transform duration-300 ease-in-out border-r border-border bg-card lg:relative lg:translate-x-0";
-                if is_mobile_menu_open.get() {
-                    format!("{} translate-x-0", base)
-                } else {
-                    format!("{} -translate-x-full", base)
-                }
-            }>
-                <Sidebar />
-            </aside>
+        <div class="drawer lg:drawer-open h-full w-full">
+            <input id="my-drawer" type="checkbox" class="drawer-toggle" />
 
-            // Mobil arka plan karartma (Overlay)
-            <Show when=move || is_mobile_menu_open.get()>
-                <div 
-                    class="fixed inset-0 z-40 bg-background/80 backdrop-blur-sm lg:hidden"
-                    on:click=move |_| is_mobile_menu_open.set(false)
-                ></div>
-            </Show>
-            
-            // --- MAIN CONTENT AREA ---
-            <div class="flex flex-1 flex-col overflow-hidden">
-                // --- TOOLBAR (TOP) ---
+            <div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
                 <Toolbar />
-                
-                // --- MAIN CONTENT ---
-                <main class="flex-1 overflow-hidden relative bg-background">
+
+                <main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
                     {children()}
                 </main>
 
-                // --- STATUS BAR (BOTTOM) ---
                 <StatusBar />
             </div>
+
+            <div class="drawer-side z-40 transition-none duration-0">
+                <label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
+                <div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
+                    <Sidebar />
+                </div>
+            </div>
         </div>
     }
-}
+}

frontend/src/components/layout/sidebar.rs

@@ -1,193 +1,275 @@
-use leptos::prelude::*;
-use leptos::task::spawn_local;
-use leptos_shadcn_button::{Button, ButtonVariant, ButtonSize};
-use leptos_shadcn_avatar::{Avatar, AvatarFallback};
-use leptos_shadcn_separator::Separator;
+use leptos::wasm_bindgen::JsCast;
+use leptos::*;
 
 #[component]
 pub fn Sidebar() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-    let is_mobile_menu_open = use_context::<RwSignal<bool>>().expect("mobile menu state not provided");
 
-    let total_count = move || store.torrents.with(|map| map.len());
+    let total_count = move || store.torrents.get().len();
     let downloading_count = move || {
-        store.torrents.with(|map| {
-            map.values()
-                .filter(|t| t.status == shared::TorrentStatus::Downloading)
-                .count()
-        })
+        store
+            .torrents
+            .get()
+            .iter()
+            .filter(|t| t.status == shared::TorrentStatus::Downloading)
+            .count()
     };
     let seeding_count = move || {
-        store.torrents.with(|map| {
-            map.values()
-                .filter(|t| t.status == shared::TorrentStatus::Seeding)
-                .count()
-        })
+        store
+            .torrents
+            .get()
+            .iter()
+            .filter(|t| t.status == shared::TorrentStatus::Seeding)
+            .count()
     };
     let completed_count = move || {
-        store.torrents.with(|map| {
-            map.values()
-                .filter(|t| {
-                    t.status == shared::TorrentStatus::Seeding
-                        || (t.status == shared::TorrentStatus::Paused && t.percent_complete >= 100.0)
-                })
-                .count()
-        })
+        store
+            .torrents
+            .get()
+            .iter()
+            .filter(|t| {
+                t.status == shared::TorrentStatus::Seeding
+                    || (t.status == shared::TorrentStatus::Paused && t.percent_complete >= 100.0)
+            })
+            .count()
     };
     let paused_count = move || {
-        store.torrents.with(|map| {
-            map.values()
-                .filter(|t| t.status == shared::TorrentStatus::Paused)
-                .count()
-        })
+        store
+            .torrents
+            .get()
+            .iter()
+            .filter(|t| t.status == shared::TorrentStatus::Paused)
+            .count()
     };
     let inactive_count = move || {
-        store.torrents.with(|map| {
-            map.values()
-                .filter(|t| {
-                    t.status == shared::TorrentStatus::Paused
-                        || t.status == shared::TorrentStatus::Error
-                })
-                .count()
-        })
+        store
+            .torrents
+            .get()
+            .iter()
+            .filter(|t| {
+                t.status == shared::TorrentStatus::Paused
+                    || t.status == shared::TorrentStatus::Error
+            })
+            .count()
+    };
+
+    let close_drawer = move || {
+        if let Some(element) = document().get_element_by_id("my-drawer") {
+            if let Ok(input) = element.dyn_into::<web_sys::HtmlInputElement>() {
+                input.set_checked(false);
+            }
+        }
     };
 
     let set_filter = move |f: crate::store::FilterStatus| {
         store.filter.set(f);
-        is_mobile_menu_open.set(false);
+        close_drawer();
     };
 
-    let is_active = move |f: crate::store::FilterStatus| store.filter.get() == f;
-
-    let username = move || {
-        store.user.get().unwrap_or_else(|| "User".to_string())
+    let filter_class = move |f: crate::store::FilterStatus| {
+        if store.filter.get() == f {
+            "active"
+        } else {
+            ""
+        }
     };
 
-    let first_letter = move || {
-        username().chars().next().unwrap_or('?').to_uppercase().to_string()
+    let handle_logout = move |_| {
+        spawn_local(async move {
+            let client = gloo_net::http::Request::post("/api/auth/logout");
+            if let Ok(resp) = client.send().await {
+                if resp.ok() {
+                    // Force full reload to clear state
+                    let _ = window().location().set_href("/login");
+                }
+            }
+        });
     };
 
-    view! {
-        <div class="w-full h-full flex flex-col bg-card" style="padding-top: env(safe-area-inset-top);">
-            <div class="p-4 flex-1 overflow-y-auto">
-                <div class="mb-4 px-2 text-lg font-semibold tracking-tight text-foreground">
-                    "VibeTorrent"
-                </div>
-                <div class="space-y-1">
-                    <h4 class="mb-1 rounded-md px-2 py-1 text-sm font-semibold text-muted-foreground">"Filters"</h4>
-                    
-                    <Button 
-                        variant=MaybeProp::derive(move || Some(if is_active(crate::store::FilterStatus::All) { ButtonVariant::Secondary } else { ButtonVariant::Ghost }))
-                        size=ButtonSize::Sm
-                        class="w-full justify-start gap-2"
-                        on_click=Callback::new(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-4 h-4">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
-                        </svg>
-                        "All"
-                        <span class="ml-auto text-xs font-mono opacity-70">{total_count}</span>
-                    </Button>
+                let username = move || {
 
-                    <Button 
-                        variant=MaybeProp::derive(move || Some(if is_active(crate::store::FilterStatus::Downloading) { ButtonVariant::Secondary } else { ButtonVariant::Ghost }))
-                        size=ButtonSize::Sm
-                        class="w-full justify-start gap-2"
-                        on_click=Callback::new(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-4 h-4">
-                            <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>
-                        "Downloading"
-                        <span class="ml-auto text-xs font-mono opacity-70">{downloading_count}</span>
-                    </Button>
+                    store.user.get().unwrap_or_else(|| "User".to_string())
 
-                    <Button 
-                        variant=MaybeProp::derive(move || Some(if is_active(crate::store::FilterStatus::Seeding) { ButtonVariant::Secondary } else { ButtonVariant::Ghost }))
-                        size=ButtonSize::Sm
-                        class="w-full justify-start gap-2"
-                        on_click=Callback::new(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-4 h-4">
-                            <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="ml-auto text-xs font-mono opacity-70">{seeding_count}</span>
-                    </Button>
+                };
 
-                    <Button 
-                        variant=MaybeProp::derive(move || Some(if is_active(crate::store::FilterStatus::Completed) { ButtonVariant::Secondary } else { ButtonVariant::Ghost }))
-                        size=ButtonSize::Sm
-                        class="w-full justify-start gap-2"
-                        on_click=Callback::new(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-4 h-4">
-                            <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="ml-auto text-xs font-mono opacity-70">{completed_count}</span>
-                    </Button>
 
-                    <Button 
-                        variant=MaybeProp::derive(move || Some(if is_active(crate::store::FilterStatus::Paused) { ButtonVariant::Secondary } else { ButtonVariant::Ghost }))
-                        size=ButtonSize::Sm
-                        class="w-full justify-start gap-2"
-                        on_click=Callback::new(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-4 h-4">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
-                        </svg>
-                        "Paused"
-                        <span class="ml-auto text-xs font-mono opacity-70">{paused_count}</span>
-                    </Button>
 
-                    <Button 
-                        variant=MaybeProp::derive(move || Some(if is_active(crate::store::FilterStatus::Inactive) { ButtonVariant::Secondary } else { ButtonVariant::Ghost }))
-                        size=ButtonSize::Sm
-                        class="w-full justify-start gap-2"
-                        on_click=Callback::new(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-4 h-4">
-                            <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="ml-auto text-xs font-mono opacity-70">{inactive_count}</span>
-                    </Button>
-                </div>
-            </div>
+                let first_letter = move || {
 
-            <Separator />
+                    username().chars().next().unwrap_or('?').to_uppercase().to_string()
+
+                };
+
+
+
+                view! {
+
+                    <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">
+
+                                <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>
+
+                                        "All"
+
+                                        <span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
+
+                                    </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" />
+
+                                        </svg>
+
+                                        "Downloading"
+
+                                        <span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
+
+                                    </button>
+
+                                </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>
+
+                        </div>
 
-            <div class="p-4 bg-card">
-                <div class="flex items-center gap-3">
-                    <Avatar class="h-8 w-8">
-                        <AvatarFallback class="bg-primary text-primary-foreground text-xs font-medium">
-                            {first_letter}
-                        </AvatarFallback>
-                    </Avatar>
-                    <div class="flex-1 overflow-hidden">
-                        <div class="font-medium text-sm truncate text-foreground">{username}</div>
-                        <div class="text-[10px] text-muted-foreground truncate">"Online"</div>
                     </div>
-                    <Button
-                        variant=ButtonVariant::Ghost
-                        size=ButtonSize::Icon
-                        class="text-destructive h-8 w-8"
-                        on_click=Callback::new(move |()| {
-                            spawn_local(async move {
-                                if shared::server_fns::auth::logout().await.is_ok() {
-                                    let window = web_sys::window().expect("window should exist");
-                                    let _ = window.location().set_href("/login");
-                                }
-                            });
-                        })
-                    >
-                        <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/components/layout/statusbar.rs

@@ -1,9 +1,5 @@
-use leptos::prelude::*;
-use leptos::html;
-use leptos_use::storage::use_local_storage;
-use ::codee::string::FromToStringCodec;
+use leptos::*;
 use shared::GlobalLimitRequest;
-use crate::api;
 
 fn format_bytes(bytes: i64) -> String {
     const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
@@ -30,30 +26,39 @@ pub fn StatusBar() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
     let stats = store.global_stats;
 
-    let (current_theme, set_current_theme, _) = use_local_storage::<String, FromToStringCodec>("vibetorrent_theme");
+    let initial_theme = if let Some(win) = web_sys::window() {
+        if let Some(doc) = win.document() {
+            doc.document_element()
+                .and_then(|el| el.get_attribute("data-theme"))
+                .unwrap_or_else(|| "dark".to_string())
+        } else {
+            "dark".to_string()
+        }
+    } else {
+        "dark".to_string()
+    };
 
-    // Initialize with default if empty
-    let current_theme_val = current_theme.get();
-    if current_theme_val.is_empty() {
-        set_current_theme.set("dark".to_string());
-    }
+    let (current_theme, set_current_theme) = create_signal(initial_theme);
 
-    // Automatically sync theme to document attribute
-    Effect::new(move |_| {
-        let theme = current_theme.get().to_lowercase();
-        if let Some(doc) = document().document_element() {
-            let _ = doc.set_attribute("data-theme", &theme);
-            // Also set class for Shadcn dark mode support
-            if theme == "dark" || theme == "dracula" || theme == "dim" || theme == "abyss" {
-                let _ = doc.class_list().add_1("dark");
-            } else {
-                let _ = doc.class_list().remove_1("dark");
+    create_effect(move |_| {
+        if let Some(win) = web_sys::window() {
+            if let Some(storage) = win.local_storage().ok().flatten() {
+                if let Ok(Some(stored_theme)) = storage.get_item("vibetorrent_theme") {
+                    let theme = stored_theme.to_lowercase();
+                    set_current_theme.set(theme.clone());
+                    if let Some(doc) = win.document() {
+                        let _ = doc
+                            .document_element()
+                            .unwrap()
+                            .set_attribute("data-theme", &theme);
+                    }
+                }
             }
         }
     });
 
     // Preset limits in bytes/s
-    let limits: Vec<(i64, &str)> = vec!(
+    let limits: Vec<(i64, &str)> = vec![
         (0, "Unlimited"),
         (100 * 1024, "100 KB/s"),
         (500 * 1024, "500 KB/s"),
@@ -62,49 +67,87 @@ pub fn StatusBar() -> impl IntoView {
         (5 * 1024 * 1024, "5 MB/s"),
         (10 * 1024 * 1024, "10 MB/s"),
         (20 * 1024 * 1024, "20 MB/s"),
-    );
+    ];
 
     let set_limit = move |limit_type: &str, val: i64| {
         let limit_type = limit_type.to_string();
-        log::info!("Setting {} limit to {}", limit_type, val);
+        logging::log!("Setting {} limit to {}", limit_type, val);
 
-        let req = if limit_type == "down" {
-            GlobalLimitRequest {
-                max_download_rate: Some(val),
-                max_upload_rate: None,
-            }
-        } else {
-            GlobalLimitRequest {
-                max_download_rate: None,
-                max_upload_rate: Some(val),
-            }
-        };
-
-        leptos::task::spawn_local(async move {
-            if let Err(e) = api::settings::set_global_limits(&req).await {
-                log::error!("Failed to set limit: {:?}", e);
+        spawn_local(async move {
+            let req_body = if limit_type == "down" {
+                GlobalLimitRequest {
+                    max_download_rate: Some(val),
+                    max_upload_rate: None,
+                }
             } else {
-                log::info!("Limit set successfully");
+                GlobalLimitRequest {
+                    max_download_rate: None,
+                    max_upload_rate: Some(val),
+                }
+            };
+
+            let client =
+                gloo_net::http::Request::post("/api/settings/global-limits").json(&req_body);
+
+            match client {
+                Ok(req) => match req.send().await {
+                    Ok(resp) => {
+                        if !resp.ok() {
+                            logging::error!(
+                                "Failed to set limit: {} {}",
+                                resp.status(),
+                                resp.status_text()
+                            );
+                        } else {
+                            logging::log!("Limit set successfully");
+                        }
+                    }
+                    Err(e) => logging::error!("Network error setting limit: {}", e),
+                },
+                Err(e) => logging::error!("Failed to create request: {}", e),
             }
         });
     };
 
-        let down_details_ref = NodeRef::<html::Details>::new();
-        let up_details_ref = NodeRef::<html::Details>::new();
-        let theme_details_ref = NodeRef::<html::Details>::new();
+        // Signal-based dropdown state: 0=none, 1=download, 2=upload, 3=theme
+        let (active_dropdown, set_active_dropdown) = create_signal(0u8);
 
-        let close_details = move |node_ref: NodeRef<html::Details>| {
-            if let Some(el) = node_ref.get_untracked() {
-                el.set_open(false);
+        // Toggle a specific dropdown
+        let toggle = move |id: u8| {
+            let current = active_dropdown.get_untracked();
+            if current == id {
+                set_active_dropdown.set(0);
+            } else {
+                set_active_dropdown.set(id);
             }
         };
 
+        // Close all dropdowns
+        let close_all = move || {
+            set_active_dropdown.set(0);
+        };
+
         view! {
-            <div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-muted border-t border-border flex items-center px-4 text-xs gap-4 text-muted-foreground z-[99] cursor-pointer">
+            // Transparent overlay to close dropdowns when clicking outside
+            <Show when=move || active_dropdown.get() != 0>
+                <div
+                    class="fixed inset-0 z-[98] cursor-default"
+                    on:pointerdown=move |_| close_all()
+                ></div>
+            </Show>
+
+            <div class="fixed bottom-0 left-0 right-0 h-8 min-h-8 bg-base-200 border-t border-base-300 flex items-center px-4 text-xs gap-4 text-base-content/70 z-[99]">
 
                 // --- DOWNLOAD SPEED DROPDOWN ---
-                <details class="group relative" node_ref=down_details_ref>
-                    <summary class="flex items-center gap-2 cursor-pointer hover:text-foreground transition-colors select-none list-none [&::-webkit-details-marker]:hidden outline-none">
+                <div class="relative">
+                    <div
+                        class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
+                        title="Global Download Speed - Click to Set Limit"
+                        on:pointerdown=move |e| {
+                            e.stop_propagation();
+                            toggle(1);
+                        }
+                    >
                         <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="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
                         </svg>
@@ -114,46 +157,50 @@ pub fn StatusBar() -> impl IntoView {
                                 {move || format!("(Limit: {})", format_speed(stats.get().down_limit.unwrap_or(0)))}
                             </span>
                         </Show>
-                    </summary>
-
-                    <div class="absolute bottom-full left-0 mb-2 z-[100] min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md hidden group-open:block animate-in fade-in-0 zoom-in-95 slide-in-from-bottom-2">
-                        <ul class="w-full">
-                            {
-                                limits.clone().into_iter().map(|(val, label)| {
-                                    let is_active = move || {
-                                        let current = stats.get().down_limit.unwrap_or(0);
-                                        (current - val).abs() < 1024
-                                    };
-                                    view! {
-                                        <li>
-                                            <button
-                                                class=move || {
-                                                    let base = "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-xs outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-accent hover:text-accent-foreground";
-                                                    if is_active() { format!("{} bg-accent text-accent-foreground font-medium", base) } else { base.to_string() }
-                                                }
-                                                on:click=move |_| {
-                                                    set_limit("down", val);
-                                                    close_details(down_details_ref);
-                                                }
-                                            >
-                                                <span class="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-                                                    <Show when=is_active fallback=|| ()>
-                                                        <span>"✓"</span>
-                                                    </Show>
-                                                </span>
-                                                {label}
-                                            </button>
-                                        </li>
-                                    }
-                                }).collect::<Vec<_>>()
-                            }
-                        </ul>
                     </div>
-                </details>
+
+                    <ul
+                        class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
+                        style=move || if active_dropdown.get() == 1 { "display: block" } else { "display: none" }
+                    >
+                        {
+                            limits.clone().into_iter().map(|(val, label)| {
+                                let is_active = move || {
+                                    let current = stats.get().down_limit.unwrap_or(0);
+                                    (current - val).abs() < 1024
+                                };
+                                view! {
+                                    <li>
+                                        <button
+                                            class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
+                                            on:pointerdown=move |e| {
+                                                e.stop_propagation();
+                                                set_limit("down", val);
+                                                close_all();
+                                            }
+                                        >
+                                            {label}
+                                            <Show when=is_active fallback=|| ()>
+                                                <span>"✓"</span>
+                                            </Show>
+                                        </button>
+                                    </li>
+                                }
+                            }).collect::<Vec<_>>()
+                        }
+                    </ul>
+                </div>
 
                 // --- UPLOAD SPEED DROPDOWN ---
-                <details class="group relative" node_ref=up_details_ref>
-                    <summary class="flex items-center gap-2 cursor-pointer hover:text-foreground transition-colors select-none list-none [&::-webkit-details-marker]:hidden outline-none">
+                <div class="relative">
+                    <div
+                        class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
+                        title="Global Upload Speed - Click to Set Limit"
+                        on:pointerdown=move |e| {
+                            e.stop_propagation();
+                            toggle(2);
+                        }
+                    >
                         <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="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
                         </svg>
@@ -163,34 +210,83 @@ pub fn StatusBar() -> impl IntoView {
                                 {move || format!("(Limit: {})", format_speed(stats.get().up_limit.unwrap_or(0)))}
                             </span>
                         </Show>
-                    </summary>
+                    </div>
 
-                    <div class="absolute bottom-full left-0 mb-2 z-[100] min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md hidden group-open:block animate-in fade-in-0 zoom-in-95 slide-in-from-bottom-2">
-                        <ul class="w-full">
+                    <ul
+                        class="absolute bottom-full left-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-40 mb-2 border border-base-300"
+                        style=move || if active_dropdown.get() == 2 { "display: block" } else { "display: none" }
+                    >
+                        {
+                            limits.clone().into_iter().map(|(val, label)| {
+                                let is_active = move || {
+                                    let current = stats.get().up_limit.unwrap_or(0);
+                                    (current - val).abs() < 1024
+                                };
+                                view! {
+                                    <li>
+                                        <button
+                                            class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
+                                            on:pointerdown=move |e| {
+                                                e.stop_propagation();
+                                                set_limit("up", val);
+                                                close_all();
+                                            }
+                                        >
+                                            {label}
+                                            <Show when=is_active fallback=|| ()>
+                                                <span>"✓"</span>
+                                            </Show>
+                                        </button>
+                                    </li>
+                                }
+                            }).collect::<Vec<_>>()
+                        }
+                    </ul>
+                </div>
+
+                <div class="ml-auto flex items-center gap-4">
+                    <div class="relative">
+                        <div
+                            class="btn btn-ghost btn-xs btn-square"
+                            title="Change Theme"
+                            on:pointerdown=move |e| {
+                                e.stop_propagation();
+                                toggle(3);
+                            }
+                        >
+                            <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="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
+                            </svg>
+                        </div>
+
+                        <ul
+                            class="absolute bottom-full right-0 z-[100] menu p-2 shadow bg-base-200 rounded-box w-52 mb-2 border border-base-300 max-h-96 overflow-y-auto"
+                            style=move || if active_dropdown.get() == 3 { "display: block" } else { "display: none" }
+                        >
                             {
-                                limits.clone().into_iter().map(|(val, label)| {
-                                    let is_active = move || {
-                                        let current = stats.get().up_limit.unwrap_or(0);
-                                        (current - val).abs() < 1024
-                                    };
+                                let themes = vec![
+                                    "light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
+                                ];
+                                themes.into_iter().map(|theme| {
                                     view! {
                                         <li>
                                             <button
-                                                class=move || {
-                                                    let base = "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-xs outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-accent hover:text-accent-foreground";
-                                                    if is_active() { format!("{} bg-accent text-accent-foreground font-medium", base) } else { base.to_string() }
-                                                }
-                                                on:click=move |_| {
-                                                    set_limit("up", val);
-                                                    close_details(up_details_ref);
+                                                class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
+                                                on:pointerdown=move |e| {
+                                                    e.stop_propagation();
+                                                    set_current_theme.set(theme.to_string());
+                                                    if let Some(win) = web_sys::window() {
+                                                        if let Some(doc) = win.document() {
+                                                            let _ = doc.document_element().unwrap().set_attribute("data-theme", theme);
+                                                        }
+                                                        if let Some(storage) = win.local_storage().ok().flatten() {
+                                                            let _ = storage.set_item("vibetorrent_theme", theme);
+                                                        }
+                                                    }
+                                                    close_all();
                                                 }
                                             >
-                                                <span class="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-                                                    <Show when=is_active fallback=|| ()>
-                                                        <span>"✓"</span>
-                                                    </Show>
-                                                </span>
-                                                {label}
+                                                {theme}
                                             </button>
                                         </li>
                                     }
@@ -198,70 +294,61 @@ pub fn StatusBar() -> impl IntoView {
                             }
                         </ul>
                     </div>
-                </details>
-
-                <div class="ml-auto flex items-center gap-4">
-                    <details class="group relative" node_ref=theme_details_ref>
-                        <summary class="inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:bg-accent hover:text-accent-foreground h-7 w-7 cursor-pointer outline-none list-none [&::-webkit-details-marker]:hidden">
-                            <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="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
-                            </svg>
-                        </summary>
-
-                        <div class="absolute bottom-full right-0 mb-2 z-[100] min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover p-1 text-popover-foreground shadow-md hidden group-open:block animate-in fade-in-0 zoom-in-95 slide-in-from-bottom-2 max-h-96 overflow-y-auto">
-                            <ul class="w-full">
-                                {
-                                    let themes = vec![
-                                        "light", "dark", "dim", "nord", "cupcake", "dracula", "cyberpunk", "emerald", "sunset", "abyss"
-                                    ];
-                                    themes.into_iter().map(|theme| {
-                                        let theme_name = theme.to_string();
-                                        let theme_name_for_class = theme_name.clone();
-                                        let theme_name_for_onclick = theme_name.clone();
-                                        let is_active = move || current_theme.get() == theme_name_for_class;
-                                        view! {
-                                            <li>
-                                                <button
-                                                    class=move || {
-                                                        let base = "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-xs outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50 hover:bg-accent hover:text-accent-foreground capitalize";
-                                                        if is_active() { format!("{} bg-accent text-accent-foreground font-medium", base) } else { base.to_string() }
-                                                    }
-                                                                                                    on:click=move |_| {
-                                                                                                        set_current_theme.set(theme_name_for_onclick.clone());
-                                                                                                        close_details(theme_details_ref);
-                                                                                                    }
-                                                                                                >
-                                                                                                    <span class="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
-                                                                                                        <Show when=is_active.clone() fallback=|| ()>
-                                                                                                            <span>"✓"</span>
-                                                                                                        </Show>
-                                                                                                    </span>
-                                                                                                    {theme_name}
-                                                                                                </button>                                            </li>
-                                        }
-                                    }).collect::<Vec<_>>()
-                                }
-                            </ul>
-                        </div>
-                    </details>
                 <button
-                    class="inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 hover:bg-accent hover:text-accent-foreground h-7 w-7"
+                    class="btn btn-ghost btn-xs btn-square"
                     title="Settings & Notification Permissions"
                     on:click=move |_| {
-                        // Request push notification permission
-                        leptos::task::spawn_local(async {
-                            // ... existing logic ...
+                        // Request push notification permission when settings button is clicked
+                        spawn_local(async {
+                            log::info!("Settings button clicked - requesting push notification permission");
+
+                            // Check current permission state before requesting
+                            let window = web_sys::window().expect("window should exist");
+                            let _current_perm = js_sys::Reflect::get(&window, &"Notification".into())
+                                .ok()
+                                .and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
+                                .and_then(|p| p.as_string())
+                                .unwrap_or_default();
+
                             crate::store::subscribe_to_push_notifications().await;
-                            // ... existing logic ...
+
+                            // Check permission after request
+                            let new_perm = js_sys::Reflect::get(&window, &"Notification".into())
+                                .ok()
+                                .and_then(|n| js_sys::Reflect::get(&n, &"permission".into()).ok())
+                                .and_then(|p| p.as_string())
+                                .unwrap_or_default();
+
+                            if let Some(store) = use_context::<crate::store::TorrentStore>() {
+                                if new_perm == "granted" {
+                                    crate::store::show_toast_with_signal(
+                                        store.notifications,
+                                        shared::NotificationLevel::Success,
+                                        "Bildirimler etkinleştirildi! Torrent tamamlandığında bildirim alacaksınız.".to_string(),
+                                    );
+                                } else if new_perm == "denied" {
+                                    crate::store::show_toast_with_signal(
+                                        store.notifications,
+                                        shared::NotificationLevel::Error,
+                                        "Bildirim izni reddedildi. Tarayıcı ayarlarından izin verebilirsiniz.".to_string(),
+                                    );
+                                } else {
+                                    crate::store::show_toast_with_signal(
+                                        store.notifications,
+                                        shared::NotificationLevel::Warning,
+                                        "Bildirim izni verilemedi. Açılan izin penceresinde 'İzin Ver' seçeneğini seçin.".to_string(),
+                                    );
+                                }
+                            }
                         });
                     }
                 >
                      <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="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.212 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 012.6-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
+                        <path stroke-linecap="round" stroke-linejoin="round" d="M9.594 3.94c.09-.542.56-.94 1.11-.94h2.593c.55 0 1.02.398 1.11.94l.213 1.281c.063.374.313.686.645.87.074.04.147.083.22.127.324.196.72.257 1.075.124l1.217-.456a1.125 1.125 0 011.37.49l1.296 2.247a1.125 1.125 0 01-.26 1.431l-1.003.827c-.293.24-.438.613-.431.992a6.759 6.759 0 010 .255c-.007.378.138.75.43.99l1.005.828c.424.35.534.954.26 1.43l-1.298 2.247a1.125 1.125 0 01-1.369.491l-1.217-.456c-.355-.133-.75-.072-1.076.124a6.57 6.57 0 01-.22.128c-.331.183-.581.495-.644.869l-.212 1.28c-.09.543-.56.941-1.11.941h-2.594c-.55 0-1.02-.398-1.11-.94l-.213-1.281c-.062-.374-.312-.686-.644-.87a6.52 6.52 0 01-.22-.127c-.325-.196-.72-.257-1.076-.124l-1.217.456a1.125 1.125 0 01-1.369-.49l-1.297-2.247a1.125 1.125 0 01.26-1.431l1.004-.827c.292-.24.437-.613.43-.992a6.932 6.932 0 010-.255c.007-.378-.138-.75-.43-.99l-1.004-.828a1.125 1.125 0 01-.26-1.43l1.297-2.247a1.125 1.125 0 011.37-.491l1.216.456c.356.133.751.072 1.076-.124.072-.044.146-.087.22-.128.332-.183.582-.495.644-.869l.214-1.281z" />
                         <path stroke-linecap="round" stroke-linejoin="round" d="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
                     </svg>
                 </button>
             </div>
         </div>
     }
-}
+}

frontend/src/components/layout/toolbar.rs

@@ -1,61 +1,64 @@
-use leptos::prelude::*;
-use leptos_shadcn_input::Input;
-use leptos_shadcn_button::{Button, ButtonVariant, ButtonSize};
-use crate::components::torrent::add_torrent::AddTorrentDialog;
+use leptos::*;
 
 #[component]
 pub fn Toolbar() -> impl IntoView {
-    let show_add_modal = signal(false);
+    let (show_add_modal, set_show_add_modal) = create_signal(false);
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-    let is_mobile_menu_open = use_context::<RwSignal<bool>>().expect("mobile menu state not provided");
 
     view! {
-        <div class="flex min-h-14 h-auto items-center border-b border-border bg-background px-4" style="padding-top: env(safe-area-inset-top);">
-            // Sol kısım: Menü butonu + Add Torrent
-            <div class="flex items-center gap-3">
-                // Mobile Menu Trigger
-                <Button
-                    variant=ButtonVariant::Ghost
-                    size=ButtonSize::Icon
-                    class="lg:hidden"
-                    on_click=Callback::new(move |()| is_mobile_menu_open.update(|v| *v = !*v))
-                >
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="w-5 h-5 stroke-current"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
-                </Button>
-                
-                <Button
-                    class="gap-2 shadow"
-                    on_click=Callback::new(move |()| show_add_modal.1.set(true))
-                >
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4 md:w-5 md:h-5">
-                        <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
-                    </svg>
-                    <span class="hidden sm:inline">"Add Torrent"</span>
-                    <span class="sm:hidden">"Add"</span>
-                </Button>
-            </div>
+        <div class="navbar min-h-14 h-auto bg-base-100 p-0" style="padding-top: env(safe-area-inset-top);">
+            <div class="navbar-start gap-4 px-4">
+                <label for="my-drawer" class="btn btn-square btn-ghost lg:hidden drawer-button">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="inline-block w-5 h-5 stroke-current"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M4 6h16M4 12h16M4 18h16"></path></svg>
+                </label>
 
-            // Sağ kısım: Search kutusu
-            <div class="flex flex-1 items-center justify-end gap-2">
-                <div class="hidden md:flex items-center gap-2 w-full max-w-xs">
-                    <div class="relative flex-1">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="absolute left-2.5 top-1/2 -translate-y-1/2 w-4 h-4 text-muted-foreground pointer-events-none">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+                <div class="flex gap-2">
+                    <button
+                        class="btn btn-sm btn-primary gap-2 font-normal"
+                        title="Add Magnet Link"
+                        on:click=move |_| set_show_add_modal.set(true)
+                    >
+                        <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="M12 4.5v15m7.5-7.5h-15" />
                         </svg>
-                        <Input
-                            input_type="search"
-                            placeholder="Search..."
-                            value=MaybeProp::derive(move || Some(store.search_query.get()))
-                            on_change=Callback::new(move |val: String| store.search_query.set(val))
-                            class="pl-8 h-9"
-                        />
-                    </div>
+                         "Add Torrent"
+                    </button>
                 </div>
+
+
             </div>
 
-            <Show when=move || show_add_modal.0.get()>
-                <AddTorrentDialog on_close=Callback::new(move |()| show_add_modal.1.set(false)) />
+            <div class="navbar-end gap-2 px-4">
+                 <div class="join">
+                    <input
+                        type="text"
+                        placeholder="Search..."
+                        class="input input-sm input-bordered join-item w-full max-w-xs focus:outline-none"
+                        prop:value=move || store.search_query.get()
+                        on:input=move |ev| store.search_query.set(event_target_value(&ev))
+                        on:keydown=move |ev: web_sys::KeyboardEvent| {
+                            if ev.key() == "Escape" {
+                                store.search_query.set(String::new());
+                            }
+                        }
+                    />
+                    <Show when=move || !store.search_query.get().is_empty()>
+                        <button
+                            class="btn btn-sm btn-ghost join-item border-base-content/20 border-l-0 px-2"
+                            title="Clear Search"
+                            on:click=move |_| store.search_query.set(String::new())
+                        >
+                            <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 opacity-70">
+                                <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
+                            </svg>
+                        </button>
+                    </Show>
+                 </div>
+            </div>
+
+            <Show when=move || show_add_modal.get()>
+                <crate::components::torrent::add_torrent::AddTorrentModal on_close=move |_| set_show_add_modal.set(false) />
             </Show>
         </div>
     }
-}
+}

frontend/src/components/mod.rs

@@ -1,5 +1,6 @@
 pub mod context_menu;
 pub mod layout;
+pub mod modal;
 pub mod toast;
 pub mod torrent;
 pub mod auth;

frontend/src/components/modal.rs

@@ -0,0 +1,56 @@
+use leptos::*;
+
+#[component]
+pub fn Modal(
+    #[prop(into)] title: String,
+    children: Children,
+    #[prop(into)] on_confirm: Callback<()>,
+    #[prop(into)] on_cancel: Callback<()>,
+    #[prop(into)] visible: Signal<bool>,
+    #[prop(into, default = "Confirm".to_string())] confirm_text: String,
+    #[prop(into, default = "Cancel".to_string())] cancel_text: String,
+    #[prop(into, default = false)] is_danger: bool,
+) -> impl IntoView {
+    let title = store_value(title);
+    // Eagerly render children to a Fragment, which is Clone
+    let child_view = store_value(children());
+    let on_confirm = store_value(on_confirm);
+    let on_cancel = store_value(on_cancel);
+    let confirm_text = store_value(confirm_text);
+    let cancel_text = store_value(cancel_text);
+    
+    view! {
+        <Show when=move || visible.get() fallback=|| ()>
+            <div class="fixed inset-0 bg-background/80 backdrop-blur-sm flex items-end md:items-center justify-center z-[200] animate-in fade-in duration-200 sm:p-4">
+                <div class="bg-card p-6 rounded-t-2xl md:rounded-lg w-full max-w-sm shadow-xl border border-border ring-0 transform transition-all animate-in slide-in-from-bottom-10 md:slide-in-from-bottom-0 md:zoom-in-95">
+                    <h3 class="text-lg font-semibold text-card-foreground mb-4">{title.get_value()}</h3>
+                    
+                    <div class="text-muted-foreground mb-6 text-sm">
+                        {child_view.with_value(|c| c.clone())}
+                    </div>
+                    
+                    <div class="flex justify-end gap-3">
+                        <button 
+                            class="inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background hover:bg-accent hover:text-accent-foreground h-10 px-4 py-2"
+                            on:click=move |_| on_cancel.with_value(|cb| cb.call(()))
+                        >
+                            {cancel_text.get_value()}
+                        </button>
+                        <button 
+                            class=move || crate::utils::cn(format!("inline-flex items-center justify-center rounded-md text-sm font-medium ring-offset-background transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 h-10 px-4 py-2 {}", 
+                                if is_danger { "bg-destructive text-destructive-foreground hover:bg-destructive/90" } 
+                                else { "bg-primary text-primary-foreground hover:bg-primary/90" }
+                            ))
+                            on:click=move |_| {
+                                logging::log!("Modal: Confirm clicked");
+                                on_confirm.with_value(|cb| cb.call(()))
+                            }
+                        >
+                            {confirm_text.get_value()}
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </Show>
+    }
+}

frontend/src/components/toast.rs

@@ -1,42 +1,17 @@
-use leptos::prelude::*;
+use leptos::*;
 use shared::NotificationLevel;
-use leptos_shadcn_alert::{Alert, AlertVariant};
 
 // ============================================================================
-// Toast Components - Using ShadCN Alert
+// Toast Components - DaisyUI Alert Style
 // ============================================================================
 
-fn level_to_variant(level: &NotificationLevel) -> AlertVariant {
+/// Returns the DaisyUI alert class for the notification level
+fn get_alert_class(level: &NotificationLevel) -> &'static str {
     match level {
-        NotificationLevel::Info => AlertVariant::Default,
-        NotificationLevel::Success => AlertVariant::Success,
-        NotificationLevel::Warning => AlertVariant::Warning,
-        NotificationLevel::Error => AlertVariant::Destructive,
-    }
-}
-
-fn level_icon(level: &NotificationLevel) -> impl IntoView {
-    match level {
-        NotificationLevel::Info => view! {
-            <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 opacity-90">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M11.25 11.25l.041-.02a.75.75 0 011.063.852l-.708 2.836a.75.75 0 001.063.853l.041-.021M21 12a9 9 0 11-18 0 9 9 0 0118 0zm-9-3.75h.008v.008H12V8.25z" />
-            </svg>
-        }.into_any(),
-        NotificationLevel::Success => view! {
-            <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 opacity-90">
-                <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>
-        }.into_any(),
-        NotificationLevel::Warning => view! {
-            <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 opacity-90">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
-            </svg>
-        }.into_any(),
-        NotificationLevel::Error => view! {
-            <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 opacity-90">
-                <path stroke-linecap="round" stroke-linejoin="round" d="M12 9v3.75m9-.75a9 9 0 11-18 0 9 9 0 0118 0zm-9 3.75h.008v.008H12v-.008z" />
-            </svg>
-        }.into_any(),
+        NotificationLevel::Info => "alert alert-info",
+        NotificationLevel::Success => "alert alert-success",
+        NotificationLevel::Warning => "alert alert-warning",
+        NotificationLevel::Error => "alert alert-error",
     }
 }
 
@@ -46,16 +21,37 @@ fn ToastItem(
     level: NotificationLevel,
     message: String,
 ) -> impl IntoView {
-    let variant = level_to_variant(&level);
-    let icon = level_icon(&level);
+    let alert_class = get_alert_class(&level);
+    
+    // DaisyUI SVG icons
+    let icon_svg = match level {
+        NotificationLevel::Info => view! {
+            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" class="stroke-current shrink-0 w-6 h-6">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M13 16h-1v-4h-1m1-4h.01M21 12a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+            </svg>
+        }.into_view(),
+        NotificationLevel::Success => view! {
+            <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M9 12l2 2 4-4m6 2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+            </svg>
+        }.into_view(),
+        NotificationLevel::Warning => view! {
+            <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 9v2m0 4h.01m-6.938 4h13.856c1.54 0 2.502-1.667 1.732-3L13.732 4c-.77-1.333-2.694-1.333-3.464 0L3.34 16c-.77 1.333.192 3 1.732 3z"></path>
+            </svg>
+        }.into_view(),
+        NotificationLevel::Error => view! {
+            <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24">
+                <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z"></path>
+            </svg>
+        }.into_view(),
+    };
     
     view! {
-        <Alert variant=variant class="pointer-events-auto shadow-lg">
-            <div class="flex items-center gap-3">
-                {icon}
-                <div class="text-sm font-medium">{message}</div>
-            </div>
-        </Alert>
+        <div class=alert_class>
+            {icon_svg}
+            <span>{message}</span>
+        </div>
     }
 }
 
@@ -67,7 +63,8 @@ pub fn ToastContainer() -> impl IntoView {
 
     view! {
         <div 
-            class="fixed bottom-0 right-0 z-[100] flex max-h-screen w-full flex-col-reverse p-4 sm:bottom-0 sm:right-0 sm:top-auto sm:flex-col md:max-w-[420px] gap-2"
+            class="toast toast-end toast-bottom"
+            style="position: fixed; bottom: 20px; right: 20px; z-index: 99999;"
         >
             <For
                 each=move || notifications.get()

frontend/src/components/torrent/add_torrent.rs

@@ -1,110 +1,128 @@
-use leptos::prelude::*;
-use leptos::task::spawn_local;
-use leptos_shadcn_dialog::{Dialog, DialogContent, DialogHeader, DialogTitle, DialogDescription, DialogFooter};
-use leptos_shadcn_input::Input;
-use leptos_shadcn_button::{Button, ButtonVariant};
-use leptos_shadcn_alert::{Alert, AlertDescription, AlertVariant};
-use crate::store::TorrentStore;
-use crate::api;
+use leptos::*;
+use leptos::html::Dialog;
+use crate::store::{show_toast_with_signal, TorrentStore};
+use shared::NotificationLevel;
+
 
 #[component]
-pub fn AddTorrentDialog(
+pub fn AddTorrentModal(
+    #[prop(into)]
     on_close: Callback<()>,
 ) -> impl IntoView {
     let store = use_context::<TorrentStore>().expect("TorrentStore not provided");
     let notifications = store.notifications;
+    
+    let dialog_ref = create_node_ref::<Dialog>();
+    let (uri, set_uri) = create_signal(String::new());
+    let (is_loading, set_loading) = create_signal(false);
+    let (error_msg, set_error_msg) = create_signal(Option::<String>::None);
 
-    let uri = signal(String::new());
-    let is_loading = signal(false);
-    let error_msg = signal(Option::<String>::None);
-    let is_open = signal(true);
+    // Effect to open the dialog when the component mounts/renders
+    create_effect(move |_| {
+        if let Some(dialog) = dialog_ref.get() {
+            let _ = dialog.show_modal();
+        }
+    });
 
-    let handle_submit = move |ev: web_sys::SubmitEvent| {
-        ev.prevent_default();
-        let uri_val = uri.0.get();
-        
+    let handle_submit = move |_| {
+        let uri_val = uri.get();
         if uri_val.is_empty() {
-            error_msg.1.set(Some("Please enter a Magnet URI or URL".to_string()));
+            show_toast_with_signal(notifications, NotificationLevel::Warning, "Lütfen bir Magnet URI veya URL girin");
+            set_error_msg.set(Some("Please enter a Magnet URI or URL".to_string()));
             return;
         }
 
-        is_loading.1.set(true);
-        error_msg.1.set(None);
+        set_loading.set(true);
+        set_error_msg.set(None);
 
-        let on_close = on_close.clone();
         spawn_local(async move {
-            match api::torrent::add(&uri_val).await {
-                Ok(_) => {
-                    log::info!("Torrent added successfully");
-                    crate::store::show_toast_with_signal(
-                        notifications, 
-                        shared::NotificationLevel::Success, 
-                        "Torrent başarıyla eklendi"
-                    );
-                    is_open.1.set(false);
-                    on_close.run(());
+            let req_body = serde_json::json!({
+                "uri": uri_val
+            });
+
+            match gloo_net::http::Request::post("/api/torrents/add")
+                .json(&req_body)
+            {
+                Ok(req) => {
+                    match req.send().await {
+                        Ok(resp) => {
+                            if resp.ok() {
+                                logging::log!("Torrent added successfully");
+                                show_toast_with_signal(notifications, NotificationLevel::Success, "Torrent eklendi");
+                                set_loading.set(false);
+                                if let Some(dialog) = dialog_ref.get() {
+                                    dialog.close();
+                                }
+                                on_close.call(());
+                            } else {
+                                let status = resp.status();
+                                let text = resp.text().await.unwrap_or_default();
+                                logging::error!("Failed to add torrent: {} - {}", status, text);
+                                show_toast_with_signal(notifications, NotificationLevel::Error, "Torrent eklenemedi");
+                                set_error_msg.set(Some(format!("Error {}: {}", status, text)));
+                                set_loading.set(false);
+                            }
+                        }
+                        Err(e) => {
+                            logging::error!("Network error: {}", e);
+                            show_toast_with_signal(notifications, NotificationLevel::Error, "Bağlantı hatası");
+                            set_error_msg.set(Some(format!("Network Error: {}", e)));
+                            set_loading.set(false);
+                        }
+                    }
                 }
                 Err(e) => {
-                    log::error!("Failed to add torrent: {:?}", e);
-                    error_msg.1.set(Some(format!("Hata: {:?}", e)));
-                    is_loading.1.set(false);
+                    logging::error!("Serialization error: {}", e);
+                    show_toast_with_signal(notifications, NotificationLevel::Error, "İstek hatası");
+                    set_error_msg.set(Some(format!("Request Error: {}", e)));
+                    set_loading.set(false);
                 }
             }
         });
     };
 
+    let handle_close = move |_| {
+        if let Some(dialog) = dialog_ref.get() {
+            dialog.close();
+        }
+        on_close.call(());
+    };
 
     view! {
-        <Dialog
-            open=Signal::derive(move || is_open.0.get())
-            on_open_change=Callback::new(move |open: bool| {
-                is_open.1.set(open);
-                if !open {
-                    on_close.run(());
-                }
-            })
-        >
-            <DialogContent class="sm:max-w-[425px]">
-                <DialogHeader>
-                    <DialogTitle>"Add Torrent"</DialogTitle>
-                    <DialogDescription>"Enter a Magnet link or a .torrent file URL."</DialogDescription>
-                </DialogHeader>
+        <dialog node_ref=dialog_ref class="modal modal-bottom sm:modal-middle">
+            <div class="modal-box">
+                <h3 class="font-bold text-lg">"Add Torrent"</h3>
+                <p class="py-4">"Enter a Magnet URI or direct URL to a .torrent file."</p>
                 
-                <form on:submit=handle_submit class="space-y-4">
-                    <Input
-                        input_type="text"
-                        placeholder="magnet:?xt=urn:btih:..."
-                        value=MaybeProp::derive(move || Some(uri.0.get()))
-                        on_change=Callback::new(move |val: String| uri.1.set(val))
-                        disabled=Signal::derive(move || is_loading.0.get())
+                <div class="form-control w-full">
+                    <input 
+                        type="text" 
+                        placeholder="magnet:?xt=urn:btih:..." 
+                        class="input input-bordered w-full" 
+                        prop:value=uri
+                        on:input=move |ev| set_uri.set(event_target_value(&ev))
+                        disabled=is_loading
                     />
-                    
-                    {move || error_msg.0.get().map(|msg| view! {
-                        <Alert variant=AlertVariant::Destructive>
-                            <AlertDescription>{msg}</AlertDescription>
-                        </Alert>
-                    })}
+                </div>
 
-                    <DialogFooter>
-                        <Button
-                            variant=ButtonVariant::Ghost
-                            on_click=Callback::new(move |()| {
-                                is_open.1.set(false);
-                                on_close.run(());
-                            })
-                        >
-                            "Cancel"
-                        </Button>
-                        <Button disabled=Signal::derive(move || is_loading.0.get())>
-                            {move || if is_loading.0.get() {
-                                leptos::either::Either::Left(view! { <span class="loading loading-spinner"></span> "Adding..." })
-                            } else {
-                                leptos::either::Either::Right(view! { "Add" })
-                            }}
-                        </Button>
-                    </DialogFooter>
-                </form>
-            </DialogContent>
-        </Dialog>
+                <div class="modal-action">
+                    <button class="btn" on:click=handle_close disabled=is_loading>"Cancel"</button>
+                    <button class="btn btn-primary" on:click=handle_submit disabled=is_loading>
+                        {move || if is_loading.get() {
+                            view! { <span class="loading loading-spinner"></span> "Adding..." }.into_view()
+                        } else {
+                            view! { "Add" }.into_view()
+                        }}
+                    </button>
+                </div>
+                
+                {move || error_msg.get().map(|msg| view! {
+                    <div class="text-error text-sm mt-2">{msg}</div>
+                })}
+            </div>
+            <form method="dialog" class="modal-backdrop">
+                <button type="button" on:click=handle_close>"close"</button>
+            </form>
+        </dialog>
     }
-}
+}

frontend/src/components/torrent/detail.rs

@@ -1,156 +0,0 @@
-use leptos::prelude::*;
-use leptos_shadcn_tabs::{Tabs, TabsList, TabsTrigger, TabsContent};
-
-fn format_bytes(bytes: i64) -> String {
-    const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
-    if bytes < 1024 { return format!("{} B", bytes); }
-    let i = (bytes as f64).log2().div_euclid(10.0) as usize;
-    format!("{:.1} {}", (bytes as f64) / 1024_f64.powi(i as i32), UNITS[i])
-}
-
-fn format_speed(bytes_per_sec: i64) -> String {
-    if bytes_per_sec == 0 { return "0 B/s".to_string(); }
-    format!("{}/s", format_bytes(bytes_per_sec))
-}
-
-fn format_date(timestamp: i64) -> String {
-    if timestamp <= 0 { return "N/A".to_string(); }
-    let dt = chrono::DateTime::from_timestamp(timestamp, 0);
-    match dt { Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(), None => "N/A".to_string() }
-}
-
-fn format_duration(seconds: i64) -> String {
-    if seconds <= 0 { return "∞".to_string(); }
-    let days = seconds / 86400;
-    let hours = (seconds % 86400) / 3600;
-    let minutes = (seconds % 3600) / 60;
-    let secs = seconds % 60;
-    if days > 0 { format!("{}d {}h", days, hours) }
-    else if hours > 0 { format!("{}h {}m", hours, minutes) }
-    else if minutes > 0 { format!("{}m {}s", minutes, secs) }
-    else { format!("{}s", secs) }
-}
-
-#[component]
-pub fn TorrentDetail() -> impl IntoView {
-    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-
-    let torrent = Memo::new(move |_| {
-        let hash = store.selected_torrent.get()?;
-        store.torrents.with(|map| map.get(&hash).cloned())
-    });
-
-    let close = move |_| {
-        store.selected_torrent.set(None);
-    };
-
-    view! {
-        <Show when=move || torrent.get().is_some()>
-            {move || {
-                let t = torrent.get().unwrap();
-                let name = t.name.clone();
-                let status_color = match t.status {
-                    shared::TorrentStatus::Seeding => "text-green-500",
-                    shared::TorrentStatus::Downloading => "text-blue-500",
-                    shared::TorrentStatus::Paused => "text-yellow-500",
-                    shared::TorrentStatus::Error => "text-red-500",
-                    _ => "text-muted-foreground",
-                };
-                let status_text = format!("{:?}", t.status);
-
-                view! {
-                    <div class="border-t border-border bg-card flex flex-col" style="height: 280px; min-height: 200px;">
-                        // Header
-                        <div class="flex items-center justify-between px-4 py-2 border-b border-border bg-muted/30">
-                            <div class="flex items-center gap-3 min-w-0 flex-1">
-                                <h3 class="text-sm font-semibold truncate">{name}</h3>
-                                <span class={format!("text-xs font-medium {}", status_color)}>{status_text}</span>
-                            </div>
-                            <button
-                                class="inline-flex items-center justify-center rounded-md text-sm font-medium hover:bg-accent hover:text-accent-foreground h-7 w-7 text-muted-foreground shrink-0"
-                                on:click=close
-                                title="Close"
-                            >
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18L18 6M6 6l12 12" />
-                                </svg>
-                            </button>
-                        </div>
-
-                        // Tabs
-                        <Tabs default_value="general" class="flex-1 flex flex-col overflow-hidden">
-                            <div class="px-4 pt-2">
-                                <TabsList class="w-full">
-                                    <TabsTrigger value="general">"General"</TabsTrigger>
-                                    <TabsTrigger value="transfer">"Transfer"</TabsTrigger>
-                                    <TabsTrigger value="files">"Files"</TabsTrigger>
-                                    <TabsTrigger value="peers">"Peers"</TabsTrigger>
-                                </TabsList>
-                            </div>
-
-                            <TabsContent value="general" class="flex-1 overflow-y-auto px-4 pb-3">
-                                <div class="grid grid-cols-2 md:grid-cols-4 gap-x-6 gap-y-2 text-sm">
-                                    <DetailItem label="Size" value=format_bytes(t.size) />
-                                    <DetailItem label="Downloaded" value=format_bytes(t.completed) />
-                                    <DetailItem label="Progress" value=format!("{:.1}%", t.percent_complete) />
-                                    <DetailItem label="Added" value=format_date(t.added_date) />
-                                    <DetailItem label="Hash" value={
-                                        let hash = store.selected_torrent.get().unwrap_or_default();
-                                        format!("{}…", &hash[..std::cmp::min(16, hash.len())])
-                                    } />
-                                    <DetailItem label="Label" value=t.label.clone().unwrap_or_else(|| "—".to_string()) />
-                                    <DetailItem label="Error" value={
-                                        if t.error_message.is_empty() { "None".to_string() } else { t.error_message.clone() }
-                                    } />
-                                </div>
-                            </TabsContent>
-
-                            <TabsContent value="transfer" class="flex-1 overflow-y-auto px-4 pb-3">
-                                <div class="grid grid-cols-2 md:grid-cols-4 gap-x-6 gap-y-2 text-sm">
-                                    <DetailItem label="Download Speed" value=format_speed(t.down_rate) />
-                                    <DetailItem label="Upload Speed" value=format_speed(t.up_rate) />
-                                    <DetailItem label="ETA" value=format_duration(t.eta) />
-                                    <DetailItem label="Downloaded" value=format_bytes(t.completed) />
-                                    <DetailItem label="Total Size" value=format_bytes(t.size) />
-                                    <DetailItem label="Remaining" value=format_bytes(t.size - t.completed) />
-                                </div>
-                            </TabsContent>
-
-                            <TabsContent value="files" class="flex-1 overflow-y-auto px-4 pb-3">
-                                <div class="text-sm text-muted-foreground flex items-center gap-2 py-4">
-                                    <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="M2.25 12.75V12A2.25 2.25 0 014.5 9.75h15A2.25 2.25 0 0121.75 12v.75m-8.69-6.44l-2.12-2.12a1.5 1.5 0 00-1.061-.44H4.5A2.25 2.25 0 002.25 6v12a2.25 2.25 0 002.25 2.25h15A2.25 2.25 0 0021.75 18V9a2.25 2.25 0 00-2.25-2.25h-5.379a1.5 1.5 0 01-1.06-.44z" />
-                                    </svg>
-                                    "File list will be available when file API is connected."
-                                </div>
-                            </TabsContent>
-
-                            <TabsContent value="peers" class="flex-1 overflow-y-auto px-4 pb-3">
-                                <div class="text-sm text-muted-foreground flex items-center gap-2 py-4">
-                                    <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 18.72a9.094 9.094 0 003.741-.479 3 3 0 00-4.682-2.72m.94 3.198l.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0112 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 016 18.719m12 0a5.971 5.971 0 00-.941-3.197m0 0A5.995 5.995 0 0012 12.75a5.995 5.995 0 00-5.058 2.772m0 0a3 3 0 00-4.681 2.72 8.986 8.986 0 003.74.477m.94-3.197a5.971 5.971 0 00-.94 3.197M15 6.75a3 3 0 11-6 0 3 3 0 016 0zm6 3a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0zm-13.5 0a2.25 2.25 0 11-4.5 0 2.25 2.25 0 014.5 0z" />
-                                    </svg>
-                                    "Peer list will be available when peer API is connected."
-                                </div>
-                            </TabsContent>
-                        </Tabs>
-                    </div>
-                }
-            }}
-        </Show>
-    }
-}
-
-#[component]
-fn DetailItem(
-    #[prop(into)] label: String,
-    #[prop(into)] value: String,
-) -> impl IntoView {
-    let title = value.clone();
-    view! {
-        <div class="flex flex-col gap-0.5 py-1">
-            <span class="text-[10px] uppercase tracking-wider text-muted-foreground font-medium">{label}</span>
-            <span class="text-foreground font-mono text-xs truncate" title=title>{value}</span>
-        </div>
-    }
-}

frontend/src/components/torrent/mod.rs

@@ -1,3 +1,2 @@
 pub mod table;
 pub mod add_torrent;
-pub mod detail;

frontend/src/components/torrent/table.rs

@@ -1,82 +1,133 @@
-use leptos::prelude::*;
-use leptos::task::spawn_local;
+use leptos::*;
+use wasm_bindgen::closure::Closure;
+use wasm_bindgen::JsCast;
 use crate::store::{get_action_messages, show_toast_with_signal};
-use crate::api;
 use shared::NotificationLevel;
-use crate::components::context_menu::TorrentContextMenu;
-use leptos_shadcn_card::{Card, CardHeader, CardTitle, CardContent};
 
 fn format_bytes(bytes: i64) -> String {
     const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
-    if bytes < 1024 { return format!("{} B", bytes); }
+    if bytes < 1024 {
+        return format!("{} B", bytes);
+    }
     let i = (bytes as f64).log2().div_euclid(10.0) as usize;
-    format!("{:.1} {}", (bytes as f64) / 1024_f64.powi(i as i32), UNITS[i])
+    format!(
+        "{:.1} {}",
+        (bytes as f64) / 1024_f64.powi(i as i32),
+        UNITS[i]
+    )
 }
 
 fn format_speed(bytes_per_sec: i64) -> String {
-    if bytes_per_sec == 0 { return "0 B/s".to_string(); }
+    if bytes_per_sec == 0 {
+        return "0 B/s".to_string();
+    }
     format!("{}/s", format_bytes(bytes_per_sec))
 }
 
 fn format_duration(seconds: i64) -> String {
-    if seconds <= 0 { return "∞".to_string(); }
+    if seconds <= 0 {
+        return "∞".to_string();
+    }
+
     let days = seconds / 86400;
     let hours = (seconds % 86400) / 3600;
     let minutes = (seconds % 3600) / 60;
     let secs = seconds % 60;
-    if days > 0 { format!("{}d {}h", days, hours) }
-    else if hours > 0 { format!("{}h {}m", hours, minutes) }
-    else if minutes > 0 { format!("{}m {}s", minutes, secs) }
-    else { format!("{}s", secs) }
+
+    if days > 0 {
+        format!("{}d {}h", days, hours)
+    } else if hours > 0 {
+        format!("{}h {}m", hours, minutes)
+    } else if minutes > 0 {
+        format!("{}m {}s", minutes, secs)
+    } else {
+        format!("{}s", secs)
+    }
 }
 
 fn format_date(timestamp: i64) -> String {
-    if timestamp <= 0 { return "N/A".to_string(); }
     let dt = chrono::DateTime::from_timestamp(timestamp, 0);
-    match dt { Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(), None => "N/A".to_string() }
+    match dt {
+        Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(),
+        None => "N/A".to_string(),
+    }
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 enum SortColumn {
-    Name, Size, Progress, Status, DownSpeed, UpSpeed, ETA, AddedDate,
+    Name,
+    Size,
+    Progress,
+    Status,
+    DownSpeed,
+    UpSpeed,
+    ETA,
+    AddedDate,
 }
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
-enum SortDirection { Ascending, Descending }
+enum SortDirection {
+    Ascending,
+    Descending,
+}
 
 #[component]
 pub fn TorrentTable() -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-    let sort_col = signal(SortColumn::AddedDate);
-    let sort_dir = signal(SortDirection::Descending);
 
-    let filtered_hashes = Memo::new(move |_| {
-        let torrents_map = store.torrents.get();
-        let filter = store.filter.get();
-        let search = store.search_query.get();
-        let search_lower = search.to_lowercase();
-        
-        let mut torrents: Vec<shared::Torrent> = torrents_map.values().filter(|t| {
-            let matches_filter = match filter {
-                crate::store::FilterStatus::All => true,
-                crate::store::FilterStatus::Downloading => t.status == shared::TorrentStatus::Downloading,
-                crate::store::FilterStatus::Seeding => t.status == shared::TorrentStatus::Seeding,
-                crate::store::FilterStatus::Completed => t.status == shared::TorrentStatus::Seeding || (t.status == shared::TorrentStatus::Paused && t.percent_complete >= 100.0),
-                crate::store::FilterStatus::Paused => t.status == shared::TorrentStatus::Paused,
-                crate::store::FilterStatus::Inactive => t.status == shared::TorrentStatus::Paused || t.status == shared::TorrentStatus::Error,
-                _ => true,
-            };
-            let matches_search = if search_lower.is_empty() { true } else { t.name.to_lowercase().contains(&search_lower) };
-            matches_filter && matches_search
-        }).cloned().collect();
+    let sort_col = create_rw_signal(SortColumn::AddedDate);
+    let sort_dir = create_rw_signal(SortDirection::Descending);
+
+    let filtered_torrents = move || {
+        let mut torrents = store
+            .torrents
+            .get()
+            .into_iter()
+            .filter(|t| {
+                let filter = store.filter.get();
+                let search = store.search_query.get().to_lowercase();
+
+                let matches_filter = match filter {
+                    crate::store::FilterStatus::All => true,
+                    crate::store::FilterStatus::Downloading => {
+                        t.status == shared::TorrentStatus::Downloading
+                    }
+                    crate::store::FilterStatus::Seeding => {
+                        t.status == shared::TorrentStatus::Seeding
+                    }
+                    crate::store::FilterStatus::Completed => {
+                        t.status == shared::TorrentStatus::Seeding
+                            || (t.status == shared::TorrentStatus::Paused
+                                && t.percent_complete >= 100.0)
+                    } // Approximate
+                    crate::store::FilterStatus::Paused => t.status == shared::TorrentStatus::Paused,
+                    crate::store::FilterStatus::Inactive => {
+                        t.status == shared::TorrentStatus::Paused
+                            || t.status == shared::TorrentStatus::Error
+                    }
+                    _ => true,
+                };
+
+                let matches_search = if search.is_empty() {
+                    true
+                } else {
+                    t.name.to_lowercase().contains(&search)
+                };
+
+                matches_filter && matches_search
+            })
+            .collect::<Vec<_>>();
 
         torrents.sort_by(|a, b| {
-            let col = sort_col.0.get();
-            let dir = sort_dir.0.get();
+            let col = sort_col.get();
+            let dir = sort_dir.get();
             let cmp = match col {
                 SortColumn::Name => a.name.to_lowercase().cmp(&b.name.to_lowercase()),
                 SortColumn::Size => a.size.cmp(&b.size),
-                SortColumn::Progress => a.percent_complete.partial_cmp(&b.percent_complete).unwrap_or(std::cmp::Ordering::Equal),
+                SortColumn::Progress => a
+                    .percent_complete
+                    .partial_cmp(&b.percent_complete)
+                    .unwrap_or(std::cmp::Ordering::Equal),
                 SortColumn::Status => format!("{:?}", a.status).cmp(&format!("{:?}", b.status)),
                 SortColumn::DownSpeed => a.down_rate.cmp(&b.down_rate),
                 SortColumn::UpSpeed => a.up_rate.cmp(&b.up_rate),
@@ -87,235 +138,417 @@ pub fn TorrentTable() -> impl IntoView {
                 }
                 SortColumn::AddedDate => a.added_date.cmp(&b.added_date),
             };
-            if dir == SortDirection::Descending { cmp.reverse() } else { cmp }
+            if dir == SortDirection::Descending {
+                cmp.reverse()
+            } else {
+                cmp
+            }
         });
-        torrents.into_iter().map(|t| t.hash.clone()).collect::<Vec<String>>()
-    });
+
+        torrents
+    };
 
     let handle_sort = move |col: SortColumn| {
-        if sort_col.0.get() == col {
-            sort_dir.1.update(|d| {
-                *d = match d { SortDirection::Ascending => SortDirection::Descending, SortDirection::Descending => SortDirection::Ascending };
+        if sort_col.get() == col {
+            sort_dir.update(|d| {
+                *d = match d {
+                    SortDirection::Ascending => SortDirection::Descending,
+                    SortDirection::Descending => SortDirection::Ascending,
+                }
             });
         } else {
-            sort_col.1.set(col);
-            sort_dir.1.set(SortDirection::Ascending);
+            sort_col.set(col);
+            sort_dir.set(SortDirection::Ascending);
         }
     };
 
+    // Signal-based sort dropdown for mobile
+    let (sort_open, set_sort_open) = create_signal(false);
+
     let sort_arrow = move |col: SortColumn| {
-        if sort_col.0.get() == col {
-            match sort_dir.0.get() {
-                SortDirection::Ascending => view! { <span class="ml-1 text-xs">"▲"</span> }.into_any(),
-                SortDirection::Descending => view! { <span class="ml-1 text-xs">"▼"</span> }.into_any(),
-            }
-        } else { view! { <span class="ml-1 text-xs opacity-0 group-hover:opacity-50">"▲"</span> }.into_any() }
-    };
-
-    let on_action = Callback::new(move |(action, hash): (String, String)| {
-        let (success_msg_str, error_msg_str): (&'static str, &'static str) = get_action_messages(&action);
-        let success_msg = success_msg_str.to_string();
-        let error_msg = error_msg_str.to_string();
-        let notifications = store.notifications;
-        spawn_local(async move {
-            let result = match action.as_str() {
-                "delete" => api::torrent::delete(&hash).await,
-                "delete_with_data" => api::torrent::delete_with_data(&hash).await,
-                "start" => api::torrent::start(&hash).await,
-                "stop" => api::torrent::stop(&hash).await,
-                _ => api::torrent::action(&hash, &action).await,
-            };
-            match result {
-                Ok(_) => show_toast_with_signal(notifications, NotificationLevel::Success, success_msg),
-                Err(e) => show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: {:?}", error_msg, e)),
-            }
-        });
-    });
-
-    view! {
-        <div class="h-full bg-background relative flex flex-col overflow-hidden">
-            // --- DESKTOP VIEW ---
-            <div class="hidden md:flex flex-col h-full overflow-hidden">
-                // Header
-                <div class="flex items-center text-xs uppercase text-muted-foreground border-b border-border bg-muted/50 h-9 shrink-0 px-2 font-medium">
-                    <div class="flex-1 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::Name)>
-                        "Name" {move || sort_arrow(SortColumn::Name)}
-                    </div>
-                    <div class="w-24 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::Size)>
-                        "Size" {move || sort_arrow(SortColumn::Size)}
-                    </div>
-                    <div class="w-48 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::Progress)>
-                        "Progress" {move || sort_arrow(SortColumn::Progress)}
-                    </div>
-                    <div class="w-24 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::Status)>
-                        "Status" {move || sort_arrow(SortColumn::Status)}
-                    </div>
-                    <div class="w-24 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::DownSpeed)>
-                        "DL Speed" {move || sort_arrow(SortColumn::DownSpeed)}
-                    </div>
-                    <div class="w-24 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::UpSpeed)>
-                        "Up Speed" {move || sort_arrow(SortColumn::UpSpeed)}
-                    </div>
-                    <div class="w-24 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::ETA)>
-                        "ETA" {move || sort_arrow(SortColumn::ETA)}
-                    </div>
-                    <div class="w-32 px-2 cursor-pointer hover:text-foreground group select-none flex items-center" on:click=move |_| handle_sort(SortColumn::AddedDate)>
-                        "Date" {move || sort_arrow(SortColumn::AddedDate)}
-                    </div>
-                </div>
-
-                // Regular List
-                <div class="flex-1 overflow-y-auto min-h-0">
-                    <For each=move || filtered_hashes.get() key=|hash| hash.clone() children={
-                        let on_action = on_action.clone();
-                        move |hash| {
-                            let h = hash.clone();
-                            view! { 
-                                <TorrentContextMenu torrent_hash=h on_action=on_action.clone()>
-                                    <TorrentRow hash=hash.clone() /> 
-                                </TorrentContextMenu>
-                            }
-                        }
-                    } />
-                </div>
-            </div>
-
-            // --- MOBILE VIEW ---
-            <div class="md:hidden flex flex-col h-full bg-muted/10 relative overflow-hidden">
-                <div class="flex-1 overflow-y-auto p-3 min-h-0">
-                    <For each=move || filtered_hashes.get() key=|hash| hash.clone() children={
-                        let on_action = on_action.clone();
-                        move |hash| {
-                            let h = hash.clone();
-                            view! { 
-                                 <div class="pb-3">
-                                    <TorrentContextMenu torrent_hash=h on_action=on_action.clone()>
-                                        <TorrentCard hash=hash.clone() /> 
-                                    </TorrentContextMenu>
-                                </div>
-                            }
-                        }
-                    } />
-                </div>
-            </div>
-        </div>
-    }
-}
-
-#[component]
-fn TorrentRow(
-    hash: String,
-) -> impl IntoView {
-    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-    let h = hash.clone();
-    let torrent = Memo::new(move |_| store.torrents.with(|map| map.get(&h).cloned()));
-
-    let stored_hash = StoredValue::new(hash.clone());
-
-    view! {
-        <Show when=move || torrent.get().is_some() fallback=|| ()>
-            {
-                move || {
-                    let t = torrent.get().unwrap();
-                    let t_name = t.name.clone();
-                    let status_color = match t.status { shared::TorrentStatus::Seeding => "text-green-500", shared::TorrentStatus::Downloading => "text-blue-500", shared::TorrentStatus::Paused => "text-yellow-500", shared::TorrentStatus::Error => "text-red-500", _ => "text-muted-foreground" };
-                    
-                    view! {
-                        <div 
-                            class=move || {
-                                let selected = store.selected_torrent.get();
-                                let is_selected = selected.as_deref() == Some(stored_hash.get_value().as_str());
-                                if is_selected {
-                                    "flex items-center text-sm bg-primary/10 border-b border-border h-[48px] px-2 select-none cursor-pointer transition-colors w-full"
-                                } else {
-                                    "flex items-center text-sm hover:bg-muted/50 border-b border-border h-[48px] px-2 select-none cursor-pointer transition-colors w-full"
-                                }
-                            }
-                            on:click=move |_| store.selected_torrent.set(Some(stored_hash.get_value()))
-                        >
-                            <div class="flex-1 min-w-0 px-2 font-medium truncate" title=t_name.clone()>{t_name.clone()}</div>
-                            <div class="w-24 px-2 font-mono text-xs text-muted-foreground">{format_bytes(t.size)}</div>
-                            <div class="w-48 px-2">
-                                <div class="flex items-center gap-2">
-                                    <div class="h-2 w-full bg-secondary rounded-full overflow-hidden">
-                                        <div class="h-full bg-primary transition-all duration-500" style=format!("width: {}%", t.percent_complete)></div>
-                                    </div>
-                                    <span class="text-[10px] text-muted-foreground w-10 text-right">{format!("{:.1}%", t.percent_complete)}</span>
-                                </div>
-                            </div>
-                            <div class={format!("w-24 px-2 text-xs font-medium {}", status_color)}>{format!("{:?}", t.status)}</div>
-                            <div class="w-24 px-2 text-right font-mono text-xs text-green-600 dark:text-green-500">{format_speed(t.down_rate)}</div>
-                            <div class="w-24 px-2 text-right font-mono text-xs text-blue-600 dark:text-blue-500">{format_speed(t.up_rate)}</div>
-                            <div class="w-24 px-2 text-right font-mono text-xs text-muted-foreground">{format_duration(t.eta)}</div>
-                            <div class="w-32 px-2 text-right font-mono text-xs text-muted-foreground">{format_date(t.added_date)}</div>
-                        </div>
-                    }
+        if sort_col.get() == col {
+            match sort_dir.get() {
+                SortDirection::Ascending => {
+                    view! { <span class="ml-1 text-xs">"▲"</span> }.into_view()
+                }
+                SortDirection::Descending => {
+                    view! { <span class="ml-1 text-xs">"▼"</span> }.into_view()
                 }
             }
-        </Show>
-    }
-}
+        } else {
+            view! { <span class="ml-1 text-xs opacity-0 group-hover:opacity-50">"▲"</span> }
+                .into_view()
+        }
+    };
 
-#[component]
-fn TorrentCard(
-    hash: String,
-) -> impl IntoView {
-    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-    let h = hash.clone();
-    let torrent = Memo::new(move |_| store.torrents.with(|map| map.get(&h).cloned()));
+    let (selected_hash, set_selected_hash) = create_signal(Option::<String>::None);
+    let (menu_visible, set_menu_visible) = create_signal(false);
+    let (menu_position, set_menu_position) = create_signal((0, 0));
 
-    let stored_hash = StoredValue::new(hash.clone());
+    let handle_context_menu = move |e: web_sys::MouseEvent, hash: String| {
+        e.prevent_default();
+        set_menu_position.set((e.client_x(), e.client_y()));
+        set_selected_hash.set(Some(hash)); // Select on right click too
+        set_menu_visible.set(true);
+    };
+
+    let on_action = move |(action, hash): (String, String)| {
+        logging::log!("TorrentTable Action: {} on {}", action, hash);
+        // Note: Don't close menu here - ContextMenu's on_close handles it
+        // Closing here would dispose ContextMenu while still in callback chain
+
+        // Get action messages for toast (Clean Code: DRY)
+        let (success_msg, error_msg) = get_action_messages(&action);
+        let success_msg = success_msg.to_string();
+        let error_msg = error_msg.to_string();
+
+        // Capture notifications signal before async (use_context unavailable in spawn_local)
+        let notifications = store.notifications;
+
+        spawn_local(async move {
+            let action_req = if action == "delete_with_data" {
+                "delete_with_data"
+            } else {
+                &action
+            };
+
+            let req_body = shared::TorrentActionRequest {
+                hash: hash.clone(),
+                action: action_req.to_string(),
+            };
+
+            let client = gloo_net::http::Request::post("/api/torrents/action").json(&req_body);
+
+            match client {
+                Ok(req) => match req.send().await {
+                    Ok(resp) => {
+                        if !resp.ok() {
+                            logging::error!(
+                                "Failed to execute action: {} {}",
+                                resp.status(),
+                                resp.status_text()
+                            );
+                            show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
+                        } else {
+                            logging::log!("Action {} executed successfully", action);
+                            show_toast_with_signal(notifications, NotificationLevel::Success, success_msg);
+                        }
+                    }
+                    Err(e) => {
+                        logging::error!("Network error executing action: {}", e);
+                        show_toast_with_signal(notifications, NotificationLevel::Error, format!("{}: Bağlantı hatası", error_msg));
+                    }
+                },
+                Err(e) => {
+                    logging::error!("Failed to serialize request: {}", e);
+                    show_toast_with_signal(notifications, NotificationLevel::Error, error_msg);
+                }
+            }
+        });
+    };
 
     view! {
-        <Show when=move || torrent.get().is_some() fallback=|| ()>
-            {
-                move || {
-                    let t = torrent.get().unwrap();
-                    let t_name = t.name.clone();
-                    let status_badge_class = match t.status { shared::TorrentStatus::Seeding => "bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400 border-green-200 dark:border-green-800", shared::TorrentStatus::Downloading => "bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400 border-blue-200 dark:border-blue-800", shared::TorrentStatus::Paused => "bg-yellow-100 text-yellow-700 dark:bg-yellow-900/30 dark:text-yellow-400 border-yellow-200 dark:border-yellow-800", shared::TorrentStatus::Error => "bg-red-100 text-red-700 dark:bg-red-900/30 dark:text-red-400 border-red-200 dark:border-red-800", _ => "bg-muted text-muted-foreground" };
+        <div class="overflow-x-auto h-full bg-base-100 relative">
+            <div class="hidden md:block h-full overflow-x-auto">
+                <table class="table table-sm table-pin-rows w-full max-w-full whitespace-nowrap">
+                    <thead>
+                        <tr class="text-xs uppercase text-base-content/60 border-b border-base-200">
+                            <th class="cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Name)>
+                                <div class="flex items-center">"Name" {move || sort_arrow(SortColumn::Name)}</div>
+                            </th>
+                            <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Size)>
+                                 <div class="flex items-center">"Size" {move || sort_arrow(SortColumn::Size)}</div>
+                            </th>
+                            <th class="w-48 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Progress)>
+                                 <div class="flex items-center">"Progress" {move || sort_arrow(SortColumn::Progress)}</div>
+                            </th>
+                            <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Status)>
+                                 <div class="flex items-center">"Status" {move || sort_arrow(SortColumn::Status)}</div>
+                            </th>
+                            <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::DownSpeed)>
+                                 <div class="flex items-center">"Down Speed" {move || sort_arrow(SortColumn::DownSpeed)}</div>
+                            </th>
+                            <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::UpSpeed)>
+                                 <div class="flex items-center">"Up Speed" {move || sort_arrow(SortColumn::UpSpeed)}</div>
+                            </th>
+                            <th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
+                                 <div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
+                            </th>
+                            <th class="w-32 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::AddedDate)>
+                                 <div class="flex items-center">"Date" {move || sort_arrow(SortColumn::AddedDate)}</div>
+                            </th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        {move || filtered_torrents().into_iter().map(|t| {
+                            let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
+                            let status_str = format!("{:?}", t.status);
+                            let status_class = match t.status {
+                                shared::TorrentStatus::Seeding => "text-success",
+                                shared::TorrentStatus::Downloading => "text-primary",
+                                shared::TorrentStatus::Paused => "text-warning",
+                                shared::TorrentStatus::Error => "text-error",
+                                _ => "text-base-content/50"
+                            };
+                            let t_hash = t.hash.clone();
+                            let t_hash_click = t.hash.clone();
+
+                            let is_selected_fn = move || {
+                                selected_hash.get() == Some(t_hash.clone())
+                            };
+
+                            view! {
+                                <tr
+                                    class=move || {
+                                        let base = "hover border-b border-base-200 select-none";
+                                        if is_selected_fn() {
+                                            format!("{} bg-primary/10", base)
+                                        } else {
+                                            base.to_string()
+                                        }
+                                    }
+                                    on:contextmenu={
+                                        let t_hash = t_hash_click.clone();
+                                        move |e: web_sys::MouseEvent| handle_context_menu(e, t_hash.clone())
+                                    }
+                                    on:click={
+                                        let t_hash = t_hash_click.clone();
+                                        move |_| set_selected_hash.set(Some(t_hash.clone()))
+                                    }
+                                >
+                                    <td class="font-medium truncate max-w-xs" title={t.name.clone()}>
+                                        {t.name}
+                                    </td>
+                                    <td class="opacity-80 font-mono text-[11px]">{format_bytes(t.size)}</td>
+                                    <td>
+                                        <div class="flex items-center gap-2">
+                                            <progress class={format!("progress w-24 {}", progress_class)} value={t.percent_complete} max="100"></progress>
+                                            <span class="text-[10px] opacity-70">{format!("{:.1}%", t.percent_complete)}</span>
+                                        </div>
+                                    </td>
+                                    <td class={format!("text-[11px] font-medium {}", status_class)}>{status_str}</td>
+                                    <td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
+                                    <td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
+                                    <td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
+                                    <td class="text-right font-mono text-[11px] opacity-80 whitespace-nowrap">{format_date(t.added_date)}</td>
+                                </tr>
+                            }
+                        }).collect::<Vec<_>>()}
+                    </tbody>
+                </table>
+            </div>
+
+                        <div class="md:hidden flex flex-col h-full bg-base-200 relative">
+                            // Transparent overlay to close sort dropdown
+                            <Show when=move || sort_open.get()>
+                                <div
+                                    class="fixed inset-0 z-[98] cursor-default"
+                                    on:pointerdown=move |_| set_sort_open.set(false)
+                                ></div>
+                            </Show>
+
+                            <div class="px-3 py-2 border-b border-base-200 flex justify-between items-center bg-base-100/95 backdrop-blur z-10 shrink-0">
+                                <span class="text-xs font-bold opacity-50 uppercase tracking-wider">"Torrents"</span>
+
+                                <div class="relative">
+                                    <div
+                                        role="button"
+                                        class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
+                                        on:pointerdown=move |e| {
+                                            e.stop_propagation();
+                                            let cur = sort_open.get_untracked();
+                                            set_sort_open.set(!cur);
+                                        }
+                                    >
+                                        <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="M3 7.5L7.5 3m0 0L12 7.5M7.5 3v13.5m13.5 0L16.5 21m0 0L12 16.5m4.5 4.5V7.5" />
+                                        </svg>
+                                        "Sort"
+                                    </div>
+                                    <ul
+                                        class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
+                                        style=move || if sort_open.get() { "display: block" } else { "display: none" }
+                                        on:pointerdown=move |e| e.stop_propagation()
+                                    >
+                                         <li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
+                                         {
+                                              let columns = vec![
+                                                  (SortColumn::Name, "Name"),
+                                                  (SortColumn::Size, "Size"),
+                                                  (SortColumn::Progress, "Progress"),
+                                                  (SortColumn::Status, "Status"),
+                                                  (SortColumn::DownSpeed, "Down Speed"),
+                                                  (SortColumn::UpSpeed, "Up Speed"),
+                                                  (SortColumn::ETA, "ETA"),
+                                                  (SortColumn::AddedDate, "Date"),
+                                              ];
+
+                                             columns.into_iter().map(|(col, label)| {
+                                                 let is_active = move || sort_col.get() == col;
+                                                 let current_dir = move || sort_dir.get();
+
+                                                 view! {
+                                                     <li>
+                                                         <button
+                                                             class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
+                                                             on:pointerdown=move |e| {
+                                                                 e.stop_propagation();
+                                                                 handle_sort(col);
+                                                                 set_sort_open.set(false);
+                                                             }
+                                                         >
+                                                             {label}
+                                                             <Show when=is_active fallback=|| ()>
+                                                                 <span class="opacity-70 text-[10px]">
+                                                                     {move || match current_dir() {
+                                                                         SortDirection::Ascending => "▲",
+                                                                         SortDirection::Descending => "▼",
+                                                                     }}
+                                                                 </span>
+                                                             </Show>
+                                                         </button>
+                                                     </li>
+                                                 }
+                                             }).collect::<Vec<_>>()
+                                         }
+                                    </ul>
+                                </div>
+                            </div>
+
+                            <div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3">                {move || filtered_torrents().into_iter().map(|t| {
+                    let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
+                    let status_str = format!("{:?}", t.status);
+                    let status_badge_class = match t.status {
+                        shared::TorrentStatus::Seeding => "badge-success badge-soft",
+                        shared::TorrentStatus::Downloading => "badge-primary badge-soft",
+                        shared::TorrentStatus::Paused => "badge-warning badge-soft",
+                        shared::TorrentStatus::Error => "badge-error badge-soft",
+                        _ => "badge-ghost"
+                    };
+                    let _t_hash = t.hash.clone();
+                    let t_hash_click = t.hash.clone();
+
+                    let (timer_id, set_timer_id) = create_signal(Option::<i32>::None);
+                    let t_hash_long = t.hash.clone();
+
+                    let clear_timer = move || {
+                        if let Some(id) = timer_id.get_untracked() {
+                            window().clear_timeout_with_handle(id);
+                            set_timer_id.set(None);
+                        }
+                    };
+
+                    let handle_touchstart = {
+                         let t_hash = t_hash_long.clone();
+                         move |e: web_sys::TouchEvent| {
+                            clear_timer();
+                            if let Some(touch) = e.touches().get(0) {
+                                let x = touch.client_x();
+                                let y = touch.client_y();
+                                let hash = t_hash.clone();
+
+                                let closure = Closure::wrap(Box::new(move || {
+                                    set_menu_position.set((x, y));
+                                    set_selected_hash.set(Some(hash.clone()));
+                                    set_menu_visible.set(true);
+
+                                    // Haptic feedback (iOS Safari doesn't support vibrate)
+                                    let navigator = window().navigator();
+                                    if js_sys::Reflect::has(&navigator, &wasm_bindgen::JsValue::from_str("vibrate")).unwrap_or(false) {
+                                        let _ = navigator.vibrate_with_duration(50);
+                                    }
+                                }) as Box<dyn Fn()>);
+
+                                let id = window()
+                                    .set_timeout_with_callback_and_timeout_and_arguments_0(
+                                        closure.as_ref().unchecked_ref(),
+                                        600
+                                    )
+                                    .unwrap_or(0);
+
+                                closure.forget();
+                                set_timer_id.set(Some(id));
+                            }
+                        }
+                    };
+
+                    let handle_touchmove = move |_| {
+                        clear_timer();
+                    };
+
+                    let handle_touchend = move |_| {
+                        clear_timer();
+                    };
 
                     view! {
                         <div
                             class=move || {
-                                let selected = store.selected_torrent.get();
-                                let is_selected = selected.as_deref() == Some(stored_hash.get_value().as_str());
-                                if is_selected {
-                                    "ring-2 ring-primary rounded-lg transition-all"
-                                } else {
-                                    "transition-all"
-                                }
+                                "card card-compact bg-base-100 shadow-sm border border-base-200 transition-transform active:scale-[0.99] select-none"
                             }
-                            on:click=move |_| store.selected_torrent.set(Some(stored_hash.get_value()))
+                            style="user-select: none; -webkit-user-select: none; -webkit-touch-callout: none;"
+                            on:contextmenu={
+                                let t_hash = t.hash.clone();
+                                move |e: web_sys::MouseEvent| handle_context_menu(e, t_hash.clone())
+                            }
+                            on:click={
+                                let t_hash = t_hash_click.clone();
+                                move |_| set_selected_hash.set(Some(t_hash.clone()))
+                            }
+                            on:touchstart=handle_touchstart
+                            on:touchmove=handle_touchmove
+                            on:touchend=handle_touchend
+                            on:touchcancel=handle_touchend
                         >
-                        <Card class="h-full select-none cursor-pointer hover:border-primary transition-colors">
-                            <CardHeader class="p-3 pb-0">
+                            <div class="card-body gap-3">
                                 <div class="flex justify-between items-start gap-2">
-                                    <CardTitle class="text-sm font-medium leading-tight line-clamp-2">{t_name.clone()}</CardTitle>
-                                    <div class={format!("inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 {}", status_badge_class)}>{format!("{:?}", t.status)}</div>
+                                    <h3 class="font-medium text-sm line-clamp-2 leading-tight">{t.name}</h3>
+                                    <div class={format!("badge badge-xs text-[10px] whitespace-nowrap {}", status_badge_class)}>
+                                        {status_str}
+                                    </div>
                                 </div>
-                            </CardHeader>
-                            <CardContent class="p-3 pt-2 gap-3 flex flex-col">
+
                                 <div class="flex flex-col gap-1">
-                                    <div class="flex justify-between text-[10px] text-muted-foreground">
+                                    <div class="flex justify-between text-[10px] opacity-70">
                                         <span>{format_bytes(t.size)}</span>
                                         <span>{format!("{:.1}%", t.percent_complete)}</span>
                                     </div>
-                                    <div class="h-1.5 w-full bg-secondary rounded-full overflow-hidden">
-                                        <div class="h-full bg-primary transition-all duration-500" style=format!("width: {}%", t.percent_complete)></div>
+                                    <progress class={format!("progress w-full h-1.5 {}", progress_class)} value={t.percent_complete} max="100"></progress>
+                                </div>
+
+                                <div class="grid grid-cols-4 gap-2 text-[10px] font-mono opacity-80 pt-1 border-t border-base-200/50">
+                                    <div class="flex flex-col">
+                                        <span class="text-[9px] opacity-60 uppercase">"Down"</span>
+                                        <span class="text-success">{format_speed(t.down_rate)}</span>
+                                    </div>
+                                    <div class="flex flex-col text-center border-l border-r border-base-200/50">
+                                        <span class="text-[9px] opacity-60 uppercase">"Up"</span>
+                                        <span class="text-primary">{format_speed(t.up_rate)}</span>
+                                    </div>
+                                    <div class="flex flex-col text-center border-r border-base-200/50">
+                                        <span class="text-[9px] opacity-60 uppercase">"ETA"</span>
+                                        <span>{format_duration(t.eta)}</span>
+                                    </div>
+                                    <div class="flex flex-col text-right">
+                                        <span class="text-[9px] opacity-60 uppercase">"Date"</span>
+                                        <span>{format_date(t.added_date)}</span>
                                     </div>
                                 </div>
-                                <div class="grid grid-cols-4 gap-2 text-[10px] font-mono text-muted-foreground pt-1 border-t border-border/50">
-                                    <div class="flex flex-col text-blue-600 dark:text-blue-500"><span>"DL"</span><span>{format_speed(t.down_rate)}</span></div>
-                                    <div class="flex flex-col text-green-600 dark:text-green-500"><span>"UP"</span><span>{format_speed(t.up_rate)}</span></div>
-                                    <div class="flex flex-col"><span>"ETA"</span><span>{format_duration(t.eta)}</span></div>
-                                    <div class="flex flex-col text-right"><span>"DATE"</span><span>{format_date(t.added_date)}</span></div>
-                                </div>
-                            </CardContent>
-                        </Card>
+                            </div>
                         </div>
                     }
-                }
-            }
-        </Show>
+                }).collect::<Vec<_>>()}
+                </div>
+            </div>
+
+            <Show when=move || menu_visible.get() fallback=|| ()>
+                <crate::components::context_menu::ContextMenu
+                    visible=true
+                    position=menu_position.get()
+                    torrent_hash=selected_hash.get().unwrap_or_default()
+                    on_close=Callback::from(move |_| set_menu_visible.set(false))
+                    on_action=Callback::from(on_action)
+                />
+            </Show>
+        </div>
     }
 }

frontend/src/lib.rs

@@ -1,27 +1,21 @@
-#![recursion_limit = "256"]
 mod app;
+// mod models; // Removed
 mod components;
 pub mod utils;
 pub mod store;
-pub mod api;
 
-use leptos::prelude::*;
-use leptos::mount::mount_to_body;
+use leptos::*;
 use wasm_bindgen::prelude::*;
 use app::App;
 
 #[wasm_bindgen(start)]
 pub fn main() {
     console_error_panic_hook::set_once();
-    console_log::init_with_level(log::Level::Debug)
-        .expect("Failed to initialize logging");
+    console_log::init_with_level(log::Level::Debug).unwrap();
 
-    let window = web_sys::window()
-        .expect("Failed to access window - browser may not be fully loaded");
-    let document = window.document()
-        .expect("Failed to access document");
-    let body = document.body()
-        .expect("Failed to access document body");
+    let window = web_sys::window().unwrap();
+    let document = window.document().unwrap();
+    let body = document.body().unwrap();
     
     // Add app-loaded class to body to hide spinner via CSS
     let _ = body.class_list().add_1("app-loaded");

frontend/src/store.rs

@@ -1,11 +1,7 @@
 use futures::StreamExt;
 use gloo_net::eventsource::futures::EventSource;
-use leptos::prelude::*;
-use leptos::task::spawn_local;
+use leptos::*;
 use shared::{AppEvent, GlobalStats, NotificationLevel, SystemNotification, Torrent};
-use std::collections::HashMap;
-use struct_patch::traits::Patch;
-use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct NotificationItem {
@@ -13,6 +9,13 @@ pub struct NotificationItem {
     pub notification: SystemNotification,
 }
 
+// ============================================================================
+// Toast Helper Functions (Clean Code: Single Responsibility)
+// ============================================================================
+
+/// Shows a toast notification using a direct signal reference.
+/// Use this version inside async blocks (spawn_local) where use_context is unavailable.
+/// Auto-removes after 5 seconds.
 pub fn show_toast_with_signal(
     notifications: RwSignal<Vec<NotificationItem>>,
     level: NotificationLevel,
@@ -27,7 +30,8 @@ pub fn show_toast_with_signal(
 
     notifications.update(|list| list.push(item));
 
-    leptos::prelude::set_timeout(
+    // Auto-remove after 5 seconds
+    let _ = set_timeout(
         move || {
             notifications.update(|list| list.retain(|i| i.id != id));
         },
@@ -35,15 +39,41 @@ pub fn show_toast_with_signal(
     );
 }
 
+/// Shows a toast notification with the given level and message.
+/// Only works within reactive scope (components, effects). For async, use show_toast_with_signal.
+/// Auto-removes after 5 seconds.
 pub fn show_toast(level: NotificationLevel, message: impl Into<String>) {
     if let Some(store) = use_context::<TorrentStore>() {
         show_toast_with_signal(store.notifications, level, message);
     }
 }
 
-pub fn toast_success(message: impl Into<String>) { show_toast(NotificationLevel::Success, message); }
-pub fn toast_error(message: impl Into<String>) { show_toast(NotificationLevel::Error, message); }
+/// Convenience function for success toasts (reactive scope only)
+pub fn toast_success(message: impl Into<String>) {
+    show_toast(NotificationLevel::Success, message);
+}
 
+/// Convenience function for error toasts (reactive scope only)
+pub fn toast_error(message: impl Into<String>) {
+    show_toast(NotificationLevel::Error, message);
+}
+
+/// Convenience function for info toasts (reactive scope only)
+pub fn toast_info(message: impl Into<String>) {
+    show_toast(NotificationLevel::Info, message);
+}
+
+/// Convenience function for warning toasts (reactive scope only)
+pub fn toast_warning(message: impl Into<String>) {
+    show_toast(NotificationLevel::Warning, message);
+}
+
+// ============================================================================
+// Action Message Mapping (Clean Code: DRY Principle)
+// ============================================================================
+
+/// Maps torrent action strings to user-friendly Turkish messages.
+/// Returns (success_message, error_message)
 pub fn get_action_messages(action: &str) -> (&'static str, &'static str) {
     match action {
         "start" => ("Torrent başlatıldı", "Torrent başlatılamadı"),
@@ -58,131 +88,523 @@ pub fn get_action_messages(action: &str) -> (&'static str, &'static str) {
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum FilterStatus {
-    All, Downloading, Seeding, Completed, Paused, Inactive, Active, Error,
+    All,
+    Downloading,
+    Seeding,
+    Completed,
+    Paused,
+    Inactive,
+    Active,
+    Error,
+}
+
+impl FilterStatus {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            FilterStatus::All => "All",
+            FilterStatus::Downloading => "Downloading",
+            FilterStatus::Seeding => "Seeding",
+            FilterStatus::Completed => "Completed",
+            FilterStatus::Paused => "Paused",
+            FilterStatus::Inactive => "Inactive",
+            FilterStatus::Active => "Active",
+            FilterStatus::Error => "Error",
+        }
+    }
 }
 
 #[derive(Clone, Copy, Debug)]
 pub struct TorrentStore {
-    pub torrents: RwSignal<HashMap<String, Torrent>>,
+    pub torrents: RwSignal<Vec<Torrent>>,
     pub filter: RwSignal<FilterStatus>,
     pub search_query: RwSignal<String>,
     pub global_stats: RwSignal<GlobalStats>,
     pub notifications: RwSignal<Vec<NotificationItem>>,
     pub user: RwSignal<Option<String>>,
-    pub selected_torrent: RwSignal<Option<String>>,
 }
 
 pub fn provide_torrent_store() {
-    let torrents = RwSignal::new(HashMap::new());
-    let filter = RwSignal::new(FilterStatus::All);
-    let search_query = RwSignal::new(String::new());
-    let global_stats = RwSignal::new(GlobalStats::default());
-    let notifications = RwSignal::new(Vec::<NotificationItem>::new());
-    let user = RwSignal::new(Option::<String>::None);
-    let selected_torrent = RwSignal::new(Option::<String>::None);
+    let torrents = create_rw_signal(Vec::<Torrent>::new());
+    let filter = create_rw_signal(FilterStatus::All);
+    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 show_browser_notification = crate::utils::notification::use_app_notification();
-
-    let store = TorrentStore { torrents, filter, search_query, global_stats, notifications, user, selected_torrent };
+    let store = TorrentStore {
+        torrents,
+        filter,
+        search_query,
+        global_stats,
+        notifications,
+        user,
+    };
     provide_context(store);
 
-    let notifications_for_sse = notifications;
-    let global_stats_for_sse = global_stats;
-    let torrents_for_sse = torrents;
-    let show_browser_notification = show_browser_notification.clone();
+    // Initialize SSE connection with auto-reconnect
+    create_effect(move |_| {
+        spawn_local(async move {
+            let mut backoff_ms: u32 = 1000; // Start with 1 second
+            let max_backoff_ms: u32 = 30000; // Max 30 seconds
+            let mut was_connected = false;
+            let mut disconnect_notified = false; // Track if we already showed disconnect toast
+            let mut got_first_message; // Only count as "connected" after receiving data
 
-    spawn_local(async move {
-        let mut backoff_ms: u32 = 1000;
-        let mut was_connected = false;
-        let mut disconnect_notified = false;
+            loop {
+                let es_result = EventSource::new("/api/events");
 
-        loop {
+                match es_result {
+                    Ok(mut es) => {
+                        match es.subscribe("message") {
+                            Ok(mut stream) => {
+                                // Don't show "connected" toast yet - wait for first real message
+                                got_first_message = false;
 
-            log::debug!("SSE: Creating EventSource...");
-            let es_result = EventSource::new("/api/events");
-            match es_result {
-                Ok(mut es) => {
-                    log::debug!("SSE: EventSource created, subscribing...");
-                    if let Ok(mut stream) = es.subscribe("message") {
-                        log::debug!("SSE: Subscribed to message channel");
-                        let mut got_first_message = false;
-                        while let Some(Ok((_, msg))) = stream.next().await {
-                            log::debug!("SSE: Received message");
-                            if !got_first_message {
-                                got_first_message = true;
-                                backoff_ms = 1000;
-                                if was_connected && disconnect_notified {
-                                    show_toast_with_signal(notifications_for_sse, NotificationLevel::Success, "Sunucu bağlantısı yeniden kuruldu");
-                                    disconnect_notified = false;
-                                }
-                                was_connected = true;
-                            }
+                                // Process messages
+                                while let Some(Ok((_, msg))) = stream.next().await {
+                                    // First successful message = truly connected
+                                    if !got_first_message {
+                                        got_first_message = true;
+                                        backoff_ms = 1000; // Reset backoff on real data
 
-                            if let Some(data_str) = msg.data().as_string() {
-                                // Decode Base64
-                                match BASE64.decode(&data_str) {
-                                    Ok(bytes) => {
-                                        // Deserialize MessagePack
-                                        match rmp_serde::from_slice::<AppEvent>(&bytes) {
-                                            Ok(event) => {
-                                                match event {
-                                                    AppEvent::FullList(list, _) => {
-                                                        log::info!("SSE: Received FullList with {} torrents", list.len());
-                                                        torrents_for_sse.update(|map| {
-                                                            let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
-                                                            map.retain(|hash, _| new_hashes.contains(hash));
-                                                            for new_torrent in list {
-                                                                map.insert(new_torrent.hash.clone(), new_torrent);
+                                        if was_connected && disconnect_notified {
+                                            // We were previously connected, lost connection, and now truly reconnected
+                                            show_toast_with_signal(
+                                                notifications,
+                                                NotificationLevel::Success,
+                                                "Sunucu bağlantısı yeniden kuruldu",
+                                            );
+                                            disconnect_notified = false;
+                                        }
+                                        was_connected = true;
+                                    }
+
+                                    if let Some(data_str) = msg.data().as_string() {
+                                        if let Ok(event) = serde_json::from_str::<AppEvent>(&data_str) {
+                                            match event {
+                                                AppEvent::FullList { torrents: list, .. } => {
+                                                    torrents.set(list);
+                                                }
+                                                AppEvent::Update(update) => {
+                                                    torrents.update(|list| {
+                                                        if let Some(t) = list.iter_mut().find(|t| t.hash == update.hash)
+                                                        {
+                                                            if let Some(name) = update.name {
+                                                                t.name = name;
+                                                            }
+                                                            if let Some(size) = update.size {
+                                                                t.size = size;
+                                                            }
+                                                            if let Some(down_rate) = update.down_rate {
+                                                                t.down_rate = down_rate;
+                                                            }
+                                                            if let Some(up_rate) = update.up_rate {
+                                                                t.up_rate = up_rate;
+                                                            }
+                                                            if let Some(percent_complete) = update.percent_complete {
+                                                                t.percent_complete = percent_complete;
+                                                            }
+                                                            if let Some(completed) = update.completed {
+                                                                t.completed = completed;
+                                                            }
+                                                            if let Some(eta) = update.eta {
+                                                                t.eta = eta;
+                                                            }
+                                                            if let Some(status) = update.status {
+                                                                t.status = status;
+                                                            }
+                                                            if let Some(error_message) = update.error_message {
+                                                                t.error_message = error_message;
+                                                            }
+                                                            if let Some(label) = update.label {
+                                                                t.label = Some(label);
                                                             }
-                                                        });
-                                                        log::debug!("SSE: torrents map now has {} entries", torrents_for_sse.with(|m| m.len()));
-                                                    }
-                                                    AppEvent::Update(patch) => {
-                                                        let hash_opt = patch.hash.clone();
-                                                        if let Some(hash) = hash_opt {
-                                                            torrents_for_sse.update(|map| {
-                                                                if let Some(t) = map.get_mut(&hash) {
-                                                                    t.apply(patch);
-                                                                }
-                                                            });
-                                                        }
-                                                    }
-                                                    AppEvent::Stats(stats) => { global_stats_for_sse.set(stats); }
-                                                    AppEvent::Notification(n) => {
-                                                        show_toast_with_signal(notifications_for_sse, n.level.clone(), n.message.clone());
-                                                        if n.message.contains("tamamlandı") || n.level == shared::NotificationLevel::Error {
-                                                            show_browser_notification("VibeTorrent", &n.message);
                                                         }
+                                                    });
+                                                }
+                                                AppEvent::Stats(stats) => {
+                                                    global_stats.set(stats);
+                                                }
+                                                AppEvent::Notification(n) => {
+                                                    // Show toast notification
+                                                    show_toast_with_signal(notifications, n.level.clone(), n.message.clone());
+
+                                                    // Show browser notification for critical events
+                                                    let is_critical = n.message.contains("tamamlandı")
+                                                        || n.level == shared::NotificationLevel::Error;
+
+                                                    if is_critical {
+                                                        let title = match n.level {
+                                                            shared::NotificationLevel::Success => "✅ VibeTorrent",
+                                                            shared::NotificationLevel::Error => "❌ VibeTorrent",
+                                                            shared::NotificationLevel::Warning => "⚠️ VibeTorrent",
+                                                            shared::NotificationLevel::Info => "ℹ️ VibeTorrent",
+                                                        };
+
+                                                        crate::utils::notification::show_notification_if_enabled(
+                                                            title,
+                                                            &n.message
+                                                        );
                                                     }
                                                 }
                                             }
-                                            Err(e) => log::error!("SSE: Failed to deserialize MessagePack: {}", e),
                                         }
                                     }
-                                    Err(e) => log::error!("SSE: Failed to decode Base64: {}", e),
+                                }
+
+                                // Stream ended - connection lost
+                                if was_connected && !disconnect_notified {
+                                    show_toast_with_signal(
+                                        notifications,
+                                        NotificationLevel::Warning,
+                                        "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...",
+                                    );
+                                    disconnect_notified = true;
+                                }
+                            }
+                            Err(_) => {
+                                // Failed to subscribe - only notify once
+                                if was_connected && !disconnect_notified {
+                                    show_toast_with_signal(
+                                        notifications,
+                                        NotificationLevel::Warning,
+                                        "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...",
+                                    );
+                                    disconnect_notified = true;
                                 }
                             }
                         }
+                    }
+                    Err(_) => {
+                        // Failed to create EventSource - only notify once
                         if was_connected && !disconnect_notified {
-                            show_toast_with_signal(notifications_for_sse, NotificationLevel::Warning, "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...");
+                            show_toast_with_signal(
+                                notifications,
+                                NotificationLevel::Warning,
+                                "Sunucu bağlantısı kesildi, yeniden bağlanılıyor...",
+                            );
                             disconnect_notified = true;
                         }
                     }
                 }
-                Err(_) => {
-                    if was_connected && !disconnect_notified {
-                        show_toast_with_signal(notifications_for_sse, NotificationLevel::Warning, "Sunucu bağlantısı kurulamıyor...");
-                        disconnect_notified = true;
-                    }
-                }
+
+                // Wait before reconnecting (exponential backoff)
+                gloo_timers::future::TimeoutFuture::new(backoff_ms).await;
+                backoff_ms = std::cmp::min(backoff_ms * 2, max_backoff_ms);
             }
-            log::debug!("SSE: Reconnecting in {}ms...", backoff_ms);
-            gloo_timers::future::TimeoutFuture::new(backoff_ms).await;
-            backoff_ms = std::cmp::min(backoff_ms * 2, 30000);
-        }
+        });
     });
 }
 
-pub async fn subscribe_to_push_notifications() {
-    // ...
+// ============================================================================
+// Push Notification Subscription
+// ============================================================================
+
+use serde::{Deserialize, Serialize};
+use wasm_bindgen::prelude::*;
+
+#[derive(Serialize, Deserialize, Debug)]
+struct PushSubscriptionData {
+    endpoint: String,
+    keys: PushKeys,
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+struct PushKeys {
+    p256dh: String,
+    auth: String,
+}
+
+/// Subscribe user to push notifications
+/// Requests notification permission if needed, then subscribes to push
+pub async fn subscribe_to_push_notifications() {
+    use gloo_net::http::Request;
+
+    // First, request notification permission if not already granted
+    let window = web_sys::window().expect("window should exist");
+    let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
+        if notification_class.is_undefined() {
+            log::error!("Notification API not available");
+            return;
+        }
+
+        // Check current permission
+        let current_permission = js_sys::Reflect::get(&notification_class, &"permission".into())
+            .ok()
+            .and_then(|p| p.as_string())
+            .unwrap_or_default();
+
+        if current_permission == "granted" {
+            log::info!("Notification permission already granted");
+            true
+        } else if current_permission == "denied" {
+            log::warn!("Notification permission was denied");
+            return;
+        } else {
+            // Permission is "default" - need to request
+            log::info!("Requesting notification permission...");
+            if let Ok(request_fn) = js_sys::Reflect::get(&notification_class, &"requestPermission".into()) {
+                if request_fn.is_function() {
+                    let request_fn_typed = js_sys::Function::from(request_fn);
+                    match request_fn_typed.call0(&notification_class) {
+                        Ok(promise_val) => {
+                            let request_future = wasm_bindgen_futures::JsFuture::from(
+                                js_sys::Promise::from(promise_val)
+                            );
+                            match request_future.await {
+                                Ok(result) => {
+                                    let result_str = result.as_string().unwrap_or_default();
+                                    log::info!("Permission request result: {}", result_str);
+                                    result_str == "granted"
+                                }
+                                Err(e) => {
+                                    log::error!("Failed to request notification permission: {:?}", e);
+                                    false
+                                }
+                            }
+                        }
+                        Err(e) => {
+                            log::error!("Failed to call requestPermission: {:?}", e);
+                            false
+                        }
+                    }
+                } else {
+                    false
+                }
+            } else {
+                false
+            }
+        }
+    } else {
+        log::error!("Cannot access Notification class");
+        return;
+    };
+
+    if !permission_granted {
+        log::warn!("Notification permission not granted, cannot subscribe to push");
+        return;
+    }
+
+    log::info!("Notification permission granted! Proceeding with push subscription...");
+
+    // Get VAPID public key from backend
+    let public_key_response = match Request::get("/api/push/public-key").send().await {
+        Ok(resp) => resp,
+        Err(e) => {
+            log::error!("Failed to get VAPID public key: {:?}", e);
+            return;
+        }
+    };
+
+    let public_key_data: serde_json::Value = match public_key_response.json().await {
+        Ok(data) => data,
+        Err(e) => {
+            log::error!("Failed to parse VAPID public key: {:?}", e);
+            return;
+        }
+    };
+
+    let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) {
+        Some(key) => key,
+        None => {
+            log::error!("Missing publicKey in response");
+            return;
+        }
+    };
+
+    log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len());
+
+    // Convert VAPID public key to Uint8Array
+    let public_key_array = match url_base64_to_uint8array(public_key) {
+        Ok(arr) => {
+            log::info!("VAPID key converted to Uint8Array (length: {})", arr.length());
+            arr
+        }
+        Err(e) => {
+            log::error!("Failed to convert VAPID key: {:?}", e);
+            return;
+        }
+    };
+
+    // Get service worker registration
+    let window = web_sys::window().expect("window should exist");
+    let navigator = window.navigator();
+    let service_worker = navigator.service_worker();
+
+    let registration_promise = match service_worker.ready() {
+        Ok(promise) => promise,
+        Err(e) => {
+            log::error!("Failed to get ready promise: {:?}", e);
+            return;
+        }
+    };
+
+    let registration_future = wasm_bindgen_futures::JsFuture::from(registration_promise);
+
+    let registration = match registration_future.await {
+        Ok(reg) => reg,
+        Err(e) => {
+            log::error!("Failed to get service worker registration: {:?}", e);
+            return;
+        }
+    };
+
+    let service_worker_registration = registration
+        .dyn_into::<web_sys::ServiceWorkerRegistration>()
+        .expect("should be ServiceWorkerRegistration");
+
+    // Subscribe to push
+    let push_manager = match service_worker_registration.push_manager() {
+        Ok(pm) => pm,
+        Err(e) => {
+            log::error!("Failed to get push manager: {:?}", e);
+            return;
+        }
+    };
+
+    let subscribe_options = web_sys::PushSubscriptionOptionsInit::new();
+    subscribe_options.set_user_visible_only(true);
+    subscribe_options.set_application_server_key(&public_key_array);
+
+    let subscribe_promise = match push_manager.subscribe_with_options(&subscribe_options) {
+        Ok(promise) => promise,
+        Err(e) => {
+            log::error!("Failed to subscribe to push: {:?}", e);
+            return;
+        }
+    };
+
+    let subscription_future = wasm_bindgen_futures::JsFuture::from(subscribe_promise);
+
+    let subscription = match subscription_future.await {
+        Ok(sub) => sub,
+        Err(e) => {
+            log::error!("Failed to get push subscription: {:?}", e);
+            return;
+        }
+    };
+
+    let push_subscription = subscription
+        .dyn_into::<web_sys::PushSubscription>()
+        .expect("should be PushSubscription");
+
+    // Get subscription JSON using toJSON() method
+    let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
+        Ok(func) if func.is_function() => {
+            let json_func = js_sys::Function::from(func);
+            match json_func.call0(&push_subscription) {
+                Ok(result) => result,
+                Err(e) => {
+                    log::error!("Failed to call toJSON: {:?}", e);
+                    return;
+                }
+            }
+        }
+        _ => {
+            log::error!("toJSON method not found on PushSubscription");
+            return;
+        }
+    };
+
+    let json_value = match js_sys::JSON::stringify(&json_result) {
+        Ok(val) => val,
+        Err(e) => {
+            log::error!("Failed to stringify subscription: {:?}", e);
+            return;
+        }
+    };
+
+    let subscription_json_str = json_value.as_string().expect("should be string");
+
+    log::info!("Push subscription: {}", subscription_json_str);
+
+    // Parse and send to backend
+    let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
+        Ok(data) => data,
+        Err(e) => {
+            log::error!("Failed to parse subscription JSON: {:?}", e);
+            return;
+        }
+    };
+
+    // Extract endpoint and keys
+    let endpoint = subscription_data
+        .get("endpoint")
+        .and_then(|v| v.as_str())
+        .expect("endpoint should exist")
+        .to_string();
+
+    let keys_obj = subscription_data
+        .get("keys")
+        .expect("keys should exist");
+
+    let p256dh = keys_obj
+        .get("p256dh")
+        .and_then(|v| v.as_str())
+        .expect("p256dh should exist")
+        .to_string();
+
+    let auth = keys_obj
+        .get("auth")
+        .and_then(|v| v.as_str())
+        .expect("auth should exist")
+        .to_string();
+
+    let push_data = PushSubscriptionData {
+        endpoint,
+        keys: PushKeys { p256dh, auth },
+    };
+
+    // Send to backend
+    let response = match Request::post("/api/push/subscribe")
+        .json(&push_data)
+        .expect("serialization should succeed")
+        .send()
+        .await
+    {
+        Ok(resp) => resp,
+        Err(e) => {
+            log::error!("Failed to send subscription to backend: {:?}", e);
+            return;
+        }
+    };
+
+    if response.ok() {
+        log::info!("Successfully subscribed to push notifications");
+    } else {
+        log::error!("Backend rejected push subscription: {:?}", response.status());
+    }
+}
+
+/// Helper to convert URL-safe base64 string to Uint8Array
+/// Uses JavaScript to properly decode binary data (avoids UTF-8 encoding issues)
+fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, JsValue> {
+    // Add padding
+    let padding = (4 - (base64_string.len() % 4)) % 4;
+    let mut padded = base64_string.to_string();
+    padded.push_str(&"=".repeat(padding));
+
+    // Replace URL-safe characters
+    let standard_base64 = padded.replace('-', "+").replace('_', "/");
+
+    // Decode using JavaScript to avoid UTF-8 encoding issues
+    // Create a JavaScript function to decode the base64 and convert to Uint8Array
+    let js_code = format!(
+        r#"
+        (function() {{
+            const binaryString = atob('{}');
+            const bytes = new Uint8Array(binaryString.length);
+            for (let i = 0; i < binaryString.length; i++) {{
+                bytes[i] = binaryString.charCodeAt(i);
+            }}
+            return bytes;
+        }})()
+        "#,
+        standard_base64
+    );
+
+    let result = js_sys::eval(&js_code)?;
+    let array = result.dyn_into::<js_sys::Uint8Array>()?;
+
+    Ok(array)
 }

frontend/src/utils/notification.rs

@@ -1,19 +1,37 @@
 use wasm_bindgen::prelude::*;
 use web_sys::{Notification, NotificationOptions};
-use leptos::prelude::*;
-use leptos_use::{use_web_notification, UseWebNotificationReturn, NotificationPermission};
 
 /// Request browser notification permission from user
 pub async fn request_notification_permission() -> bool {
-    if let Ok(promise) = Notification::request_permission() {
-        if let Ok(result) = wasm_bindgen_futures::JsFuture::from(promise).await {
-            return result.as_string().unwrap_or_default() == "granted";
+    let window = web_sys::window().expect("no global window");
+    
+    // Check if Notification API is available
+    if js_sys::Reflect::has(&window, &JsValue::from_str("Notification")).unwrap_or(false) {
+        let notification = js_sys::Reflect::get(&window, &JsValue::from_str("Notification"))
+            .expect("Notification should exist");
+        
+        // Request permission
+        let promise = js_sys::Reflect::get(&notification, &JsValue::from_str("requestPermission"))
+            .expect("requestPermission should exist");
+        
+        if let Ok(function) = promise.dyn_into::<js_sys::Function>() {
+            if let Ok(promise) = function.call0(&notification) {
+                if let Ok(promise) = promise.dyn_into::<js_sys::Promise>() {
+                    let result = wasm_bindgen_futures::JsFuture::from(promise).await;
+                    
+                    if let Ok(permission) = result {
+                        let permission_str = permission.as_string().unwrap_or_default();
+                        return permission_str == "granted";
+                    }
+                }
+            }
         }
     }
+    
     false
 }
 
-/// Check if browser notifications are supported
+/// Check if browser notifications are supported and permitted
 pub fn is_notification_supported() -> bool {
     let window = web_sys::window().expect("no global window");
     js_sys::Reflect::has(&window, &JsValue::from_str("Notification")).unwrap_or(false)
@@ -21,61 +39,67 @@ pub fn is_notification_supported() -> bool {
 
 /// Get current notification permission status
 pub fn get_notification_permission() -> String {
-    match Notification::permission() {
-        web_sys::NotificationPermission::Granted => "granted".to_string(),
-        web_sys::NotificationPermission::Denied => "denied".to_string(),
-        web_sys::NotificationPermission::Default => "default".to_string(),
-        _ => "default".to_string(),
+    if !is_notification_supported() {
+        return "unsupported".to_string();
     }
+    
+    let window = web_sys::window().expect("no global window");
+    let notification = js_sys::Reflect::get(&window, &JsValue::from_str("Notification"))
+        .expect("Notification should exist");
+    
+    let permission = js_sys::Reflect::get(&notification, &JsValue::from_str("permission"))
+        .unwrap_or(JsValue::from_str("default"));
+    
+    permission.as_string().unwrap_or("default".to_string())
 }
 
-/// Hook for using browser notifications within Leptos components or effects.
-/// This uses leptos-use for reactive permission tracking.
-pub fn use_app_notification() -> impl Fn(&str, &str) + Clone {
-    let UseWebNotificationReturn { permission, .. } = use_web_notification();
+/// Show a browser notification
+/// Returns true if notification was shown successfully
+pub fn show_browser_notification(title: &str, body: &str, icon: Option<&str>) -> bool {
+    // Check permission first
+    let permission = get_notification_permission();
+    if permission != "granted" {
+        log::warn!("Notification permission not granted: {}", permission);
+        return false;
+    }
     
-    move |title: &str, body: &str| {
-        // Check user preference from localStorage
-        let window = web_sys::window().expect("no global window");
-        let storage = window.local_storage().ok().flatten();
-        let enabled = storage
-            .and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
-            .unwrap_or_else(|| "true".to_string());
-
-        // Use the reactive permission signal from leptos-use
-        if enabled == "true" && permission.get() == NotificationPermission::Granted {
-            show_browser_notification(title, body);
+    // Create notification options
+    let opts = NotificationOptions::new();
+    opts.set_body(body);
+    opts.set_icon(icon.unwrap_or("/icon-192.png"));
+    opts.set_badge("/icon-192.png");
+    opts.set_tag("vibetorrent");
+    opts.set_require_interaction(false);
+    opts.set_silent(Some(false));
+    
+    // Create and show notification
+    match Notification::new_with_options(title, &opts) {
+        Ok(_notification) => {
+            true
+        }
+        Err(e) => {
+            log::error!("Failed to create notification: {:?}", e);
+            false
         }
     }
 }
 
-/// Show a browser notification (non-reactive version)
-pub fn show_browser_notification(title: &str, body: &str) -> bool {
-    if get_notification_permission() != "granted" {
-        return false;
-    }
-    
-    let opts = NotificationOptions::new();
-    opts.set_body(body);
-    opts.set_icon("/icon-192.png");
-    opts.set_tag("vibetorrent");
-    
-    match Notification::new_with_options(title, &opts) {
-        Ok(_) => true,
-        Err(_) => false,
-    }
-}
-
-/// Legacy helper for showing notification if enabled in settings
+/// Show notification only if enabled in settings and permission granted
 pub fn show_notification_if_enabled(title: &str, body: &str) -> bool {
+    // Check localStorage for user preference
     let window = web_sys::window().expect("no global window");
     let storage = window.local_storage().ok().flatten();
-    let enabled = storage
-        .and_then(|s| s.get_item("vibetorrent_browser_notifications").ok().flatten())
-        .unwrap_or_else(|| "true".to_string());
+    
+    if let Some(storage) = storage {
+        let enabled = storage
+            .get_item("vibetorrent_browser_notifications")
+            .ok()
+            .flatten()
+            .unwrap_or("true".to_string());
         
-    if enabled == "true" {
-        return show_browser_notification(title, body);
+        if enabled == "true" {
+            return show_browser_notification(title, body, None);
+        }
     }
     
     false

patches/coarsetime/Cargo.toml

@@ -1,30 +0,0 @@
-[package]
-edition = "2018"
-name = "coarsetime"
-version = "0.1.37"
-description = "Time and duration crate optimized for speed (patched for MIPS)"
-license = "BSD-2-Clause"
-
-[features]
-wasi-abi2 = ["dep:wasi-abi2"]
-
-[lib]
-name = "coarsetime"
-path = "src/lib.rs"
-
-[dependencies]
-portable-atomic = { version = "1", default-features = false, features = ["fallback"] }
-
-[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies.wasm-bindgen]
-version = "0.2"
-
-[target.'cfg(any(target_os = "wasix", target_os = "wasi"))'.dependencies.wasix]
-version = "0.13"
-
-[target.'cfg(not(any(target_os = "wasix", target_os = "wasi")))'.dependencies.libc]
-version = "0.2"
-
-[target.'cfg(target_os = "wasi")'.dependencies.wasi-abi2]
-version = "0.14.7"
-optional = true
-package = "wasi"

shared/Cargo.toml

@@ -1,50 +1,8 @@
 [package]
 name = "shared"
 version = "0.1.0"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
-serde = { version = "1.0", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
 utoipa = { version = "5.4.0", features = ["axum_extras"] }
-struct-patch = "0.5"
-rmp-serde = "1.3"
-
-# Leptos 0.8.7
-leptos = { version = "0.8.7", features = ["nightly"] }
-leptos_router = { version = "0.8.7", features = ["nightly"] }
-leptos_axum = { version = "0.8.7", optional = true }
-axum = { version = "0.8", features = ["macros"], optional = true }
-
-# SSR Dependencies (XML-RPC & SCGI)
-tokio = { version = "1", features = ["full"], optional = true }
-bytes = { version = "1", optional = true }
-thiserror = { version = "2", optional = true }
-quick-xml = { version = "0.31", features = ["serde", "serialize"], optional = true }
-
-# Database
-sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"], optional = true }
-anyhow = { version = "1.0", optional = true }
-
-# Auth (SSR)
-jsonwebtoken = { version = "9", optional = true }
-cookie = { version = "0.18", features = ["percent-encode"], optional = true }
-bcrypt = { version = "0.17", optional = true }
-
-[features]
-default = []
-ssr = [
-    "dep:tokio",
-    "dep:bytes",
-    "dep:thiserror",
-    "dep:quick-xml",
-    "dep:leptos_axum",
-    "dep:sqlx",
-    "dep:anyhow",
-    "dep:jsonwebtoken",
-    "dep:cookie",
-    "dep:bcrypt",
-    "dep:axum",
-    "leptos/ssr",
-    "leptos_router/ssr",
-]
-hydrate = ["leptos/hydrate"]

shared/migrations/001_init.sql

@@ -1,16 +0,0 @@
--- 001_init.sql
--- Initial schema for users and sessions
-
-CREATE TABLE IF NOT EXISTS users (
-    id INTEGER PRIMARY KEY,
-    username TEXT NOT NULL UNIQUE,
-    password_hash TEXT NOT NULL,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
-CREATE TABLE IF NOT EXISTS sessions (
-    token TEXT PRIMARY KEY,
-    user_id INTEGER NOT NULL,
-    expires_at DATETIME NOT NULL,
-    FOREIGN KEY(user_id) REFERENCES users(id)
-);

shared/migrations/002_push_subscriptions.sql

@@ -1,13 +0,0 @@
--- 002_push_subscriptions.sql
--- Push notification subscriptions storage
-
-CREATE TABLE IF NOT EXISTS push_subscriptions (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
-    endpoint TEXT NOT NULL UNIQUE,
-    p256dh TEXT NOT NULL,
-    auth TEXT NOT NULL,
-    created_at DATETIME DEFAULT CURRENT_TIMESTAMP
-);
-
--- Index for faster lookups by endpoint
-CREATE INDEX IF NOT EXISTS idx_push_subscriptions_endpoint ON push_subscriptions(endpoint);

shared/src/lib.rs

@@ -1,32 +1,7 @@
 use serde::{Deserialize, Serialize};
-use struct_patch::Patch;
 use utoipa::ToSchema;
 
-#[cfg(feature = "ssr")]
-pub mod scgi;
-
-#[cfg(feature = "ssr")]
-pub mod xmlrpc;
-
-#[cfg(feature = "ssr")]
-pub mod db;
-
-pub mod server_fns;
-
-#[derive(Clone, Debug)]
-pub struct ServerContext {
-    pub scgi_socket_path: String,
-}
-
-#[cfg(feature = "ssr")]
-#[derive(Clone)]
-pub struct DbContext {
-    pub db: db::Db,
-}
-
-#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, ToSchema, Patch)]
-#[patch_derive(Debug, Serialize, Deserialize, Clone, PartialEq, ToSchema, Default)]
-#[patch_name = "TorrentUpdate"]
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, ToSchema)]
 pub struct Torrent {
     pub hash: String,
     pub name: String,
@@ -53,8 +28,12 @@ pub enum TorrentStatus {
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
+#[serde(tag = "type", content = "data")]
 pub enum AppEvent {
-    FullList(Vec<Torrent>, u64),
+    FullList {
+        torrents: Vec<Torrent>,
+        timestamp: u64,
+    },
     Update(TorrentUpdate),
     Stats(GlobalStats),
     Notification(SystemNotification),
@@ -83,8 +62,20 @@ pub struct GlobalStats {
     pub free_space: Option<i64>,
 }
 
-// REMOVED: Manual TorrentUpdate struct definition as it's now generated by Patch macro
-
+#[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
+pub struct TorrentUpdate {
+    pub hash: String,
+    pub name: Option<String>,
+    pub size: Option<i64>,
+    pub down_rate: Option<i64>,
+    pub up_rate: Option<i64>,
+    pub percent_complete: Option<f64>,
+    pub completed: Option<i64>,
+    pub eta: Option<i64>,
+    pub status: Option<TorrentStatus>,
+    pub error_message: Option<String>,
+    pub label: Option<String>,
+}
 
 #[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
 pub struct TorrentActionRequest {
@@ -139,9 +130,3 @@ pub struct SetLabelRequest {
     pub hash: String,
     pub label: String,
 }
-
-#[derive(Debug, Serialize, Deserialize, Clone, ToSchema)]
-pub struct AddTorrentRequest {
-    #[schema(example = "magnet:?xt=urn:btih:...")]
-    pub uri: String,
-}

shared/src/server_fns/auth.rs

@@ -1,168 +0,0 @@
-use leptos::prelude::*;
-use serde::{Deserialize, Serialize};
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct UserResponse {
-    pub id: i64,
-    pub username: String,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct Claims {
-    pub sub: String, // username
-    pub uid: i64,    // user id
-    pub exp: usize,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct SetupStatus {
-    pub completed: bool,
-}
-
-#[server(GetSetupStatus, "/api/server_fns/GetSetupStatus")]
-pub async fn get_setup_status() -> Result<SetupStatus, ServerFnError> {
-    use crate::DbContext;
-
-    let db_context = use_context::<DbContext>().ok_or_else(|| ServerFnError::new("DB Context missing"))?;
-    let has_users = db_context.db.has_users().await
-        .map_err(|e| ServerFnError::new(format!("DB error: {}", e)))?;
-
-    Ok(SetupStatus {
-        completed: has_users,
-    })
-}
-
-#[server(Setup, "/api/server_fns/Setup")]
-pub async fn setup(username: String, password: String) -> Result<(), ServerFnError> {
-    use crate::DbContext;
-
-    let db_context = use_context::<DbContext>().ok_or_else(|| ServerFnError::new("DB Context missing"))?;
-    
-    // Check if setup is already done
-    let has_users = db_context.db.has_users().await.unwrap_or(false);
-    if has_users {
-        return Err(ServerFnError::new("Setup already completed"));
-    }
-
-    // Hash password (low cost for MIPS)
-    let password_hash = bcrypt::hash(&password, 6)
-        .map_err(|_| ServerFnError::new("Hashing error"))?;
-
-    db_context.db.create_user(&username, &password_hash).await
-        .map_err(|e| ServerFnError::new(format!("DB error: {}", e)))?;
-
-    Ok(())
-}
-
-#[server(Login, "/api/server_fns/Login")]
-pub async fn login(username: String, password: String) -> Result<UserResponse, ServerFnError> {
-    use crate::DbContext;
-    use leptos_axum::ResponseOptions;
-    use jsonwebtoken::{encode, Header, EncodingKey};
-    use cookie::{Cookie, SameSite};
-    use std::time::{SystemTime, UNIX_EPOCH};
-
-    let db_context = use_context::<DbContext>().ok_or_else(|| ServerFnError::new("DB Context missing"))?;
-    
-    let user_opt = db_context.db.get_user_by_username(&username).await
-        .map_err(|e| ServerFnError::new(format!("DB error: {}", e)))?;
-
-    if let Some((uid, password_hash)) = user_opt {
-        let valid = bcrypt::verify(&password, &password_hash).unwrap_or(false);
-        if !valid {
-             return Err(ServerFnError::new("Invalid credentials"));
-        }
-
-        let expiration = SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .unwrap()
-            .as_secs() as usize + 24 * 3600; // 24 hours
-
-        let claims = Claims {
-            sub: username.clone(),
-            uid,
-            exp: expiration,
-        };
-
-        let secret = std::env::var("JWT_SECRET").unwrap_or_else(|_| "secret".to_string());
-        let token = encode(&Header::default(), &claims, &EncodingKey::from_secret(secret.as_bytes()))
-            .map_err(|e| ServerFnError::new(format!("Token error: {}", e)))?;
-
-        let cookie = Cookie::build(("auth_token", token))
-            .path("/")
-            .http_only(true)
-            .same_site(SameSite::Strict)
-            .build();
-
-        if let Some(options) = use_context::<ResponseOptions>() {
-            options.insert_header(
-                axum::http::header::SET_COOKIE,
-                axum::http::HeaderValue::from_str(&cookie.to_string()).unwrap(),
-            );
-        }
-
-        Ok(UserResponse {
-            id: uid,
-            username,
-        })
-    } else {
-        Err(ServerFnError::new("Invalid credentials"))
-    }
-}
-
-#[server(Logout, "/api/server_fns/Logout")]
-pub async fn logout() -> Result<(), ServerFnError> {
-    use leptos_axum::ResponseOptions;
-    use cookie::{Cookie, SameSite};
-
-    let cookie = Cookie::build(("auth_token", ""))
-        .path("/")
-        .http_only(true)
-        .same_site(SameSite::Strict)
-        .max_age(cookie::time::Duration::seconds(0))
-        .build();
-
-    if let Some(options) = use_context::<ResponseOptions>() {
-        options.insert_header(
-            axum::http::header::SET_COOKIE,
-            axum::http::HeaderValue::from_str(&cookie.to_string()).unwrap(),
-        );
-    }
-    Ok(())
-}
-
-#[server(GetUser, "/api/server_fns/GetUser")]
-pub async fn get_user() -> Result<Option<UserResponse>, ServerFnError> {
-    use axum::http::HeaderMap;
-    use leptos_axum::extract;
-    use jsonwebtoken::{decode, Validation, DecodingKey};
-
-    let headers: HeaderMap = extract().await.map_err(|e| ServerFnError::new(format!("Extract error: {}", e)))?;
-    let cookie_header = headers.get(axum::http::header::COOKIE)
-        .and_then(|h| h.to_str().ok());
-
-    if let Some(cookie_str) = cookie_header {
-        for c_str in cookie_str.split(';') {
-            if let Ok(c) = cookie::Cookie::parse(c_str.trim()) {
-                if c.name() == "auth_token" {
-                    let token = c.value();
-                    let secret = std::env::var("JWT_SECRET").unwrap_or_else(|_| "secret".to_string());
-                    let token_data = decode::<Claims>(
-                        token,
-                        &DecodingKey::from_secret(secret.as_bytes()),
-                        &Validation::default(),
-                    );
-
-                    if let Ok(data) = token_data {
-                        return Ok(Some(UserResponse {
-                            id: data.claims.uid,
-                            username: data.claims.sub,
-                        }));
-                    }
-                }
-            }
-        }
-    }
-
-    Ok(None)
-}

shared/src/server_fns/mod.rs

@@ -1,4 +0,0 @@
-pub mod torrent;
-pub mod settings;
-pub mod push;
-pub mod auth;

shared/src/server_fns/push.rs

@@ -1,22 +0,0 @@
-use leptos::prelude::*;
-
-#[server(GetPushPublicKey, "/api/server_fns")]
-pub async fn get_public_key() -> Result<String, ServerFnError> {
-    let key = std::env::var("VAPID_PUBLIC_KEY")
-        .map_err(|_| ServerFnError::new("VAPID_PUBLIC_KEY not configured"))?;
-    Ok(key)
-}
-
-#[server(SubscribePush, "/api/server_fns")]
-pub async fn subscribe_push(
-    endpoint: String,
-    p256dh: String,
-    auth: String,
-) -> Result<(), ServerFnError> {
-    let db_ctx = expect_context::<crate::DbContext>();
-    db_ctx
-        .db
-        .save_push_subscription(&endpoint, &p256dh, &auth)
-        .await
-        .map_err(|e| ServerFnError::new(format!("Failed to save subscription: {}", e)))
-}

shared/src/server_fns/settings.rs

@@ -1,58 +0,0 @@
-use leptos::prelude::*;
-use crate::GlobalLimitRequest;
-
-#[server(GetGlobalLimits, "/api/server_fns")]
-pub async fn get_global_limits() -> Result<GlobalLimitRequest, ServerFnError> {
-    use crate::xmlrpc::{self, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-
-    let down = match client.call("throttle.global_down.max_rate", &[]).await {
-        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
-        Err(_) => -1,
-    };
-
-    let up = match client.call("throttle.global_up.max_rate", &[]).await {
-        Ok(xml) => xmlrpc::parse_i64_response(&xml).unwrap_or(0),
-        Err(_) => -1,
-    };
-
-    Ok(GlobalLimitRequest {
-        max_download_rate: Some(down),
-        max_upload_rate: Some(up),
-    })
-}
-
-#[server(SetGlobalLimits, "/api/server_fns")]
-pub async fn set_global_limits(
-    max_download_rate: Option<i64>,
-    max_upload_rate: Option<i64>,
-) -> Result<(), ServerFnError> {
-    use crate::xmlrpc::{RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-
-    if let Some(down) = max_download_rate {
-        let down_kb = down / 1024;
-        client
-            .call(
-                "throttle.global_down.max_rate.set_kb",
-                &[RpcParam::from(""), RpcParam::Int(down_kb)],
-            )
-            .await
-            .map_err(|e| ServerFnError::new(format!("Failed to set down limit: {}", e)))?;
-    }
-
-    if let Some(up) = max_upload_rate {
-        let up_kb = up / 1024;
-        client
-            .call(
-                "throttle.global_up.max_rate.set_kb",
-                &[RpcParam::from(""), RpcParam::Int(up_kb)],
-            )
-            .await
-            .map_err(|e| ServerFnError::new(format!("Failed to set up limit: {}", e)))?;
-    }
-
-    Ok(())
-}

shared/src/server_fns/torrent.rs

@@ -1,274 +0,0 @@
-use leptos::prelude::*;
-use crate::{TorrentFile, TorrentPeer, TorrentTracker};
-
-#[server(AddTorrent, "/api/server_fns")]
-pub async fn add_torrent(uri: String) -> Result<(), ServerFnError> {
-    use crate::xmlrpc::{RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-    let params = vec![RpcParam::from(""), RpcParam::from(uri.as_str())];
-
-    match client.call("load.start", &params).await {
-        Ok(response) => {
-            if response.contains("faultCode") {
-                return Err(ServerFnError::new("rTorrent returned fault"));
-            }
-            Ok(())
-        }
-        Err(e) => Err(ServerFnError::new(format!("Failed to add torrent: {}", e))),
-    }
-}
-
-#[server(TorrentAction, "/api/server_fns")]
-pub async fn torrent_action(hash: String, action: String) -> Result<String, ServerFnError> {
-    use crate::xmlrpc::{RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-
-    if action == "delete_with_data" {
-        return delete_torrent_with_data_inner(&client, &hash).await;
-    }
-
-    let method = match action.as_str() {
-        "start" => "d.start",
-        "stop" => "d.stop",
-        "delete" => "d.erase",
-        _ => return Err(ServerFnError::new("Invalid action")),
-    };
-
-    let params = vec![RpcParam::from(hash.as_str())];
-    match client.call(method, &params).await {
-        Ok(_) => Ok("Action executed".to_string()),
-        Err(e) => Err(ServerFnError::new(format!("RPC error: {}", e))),
-    }
-}
-
-#[cfg(feature = "ssr")]
-async fn delete_torrent_with_data_inner(
-    client: &crate::xmlrpc::RtorrentClient,
-    hash: &str,
-) -> Result<String, ServerFnError> {
-    use crate::xmlrpc::{parse_string_response, RpcParam};
-
-    let params_hash = vec![RpcParam::from(hash)];
-
-    let path_xml = client
-        .call("d.base_path", &params_hash)
-        .await
-        .map_err(|e| ServerFnError::new(format!("Failed to call rTorrent: {}", e)))?;
-
-    let path = parse_string_response(&path_xml)
-        .map_err(|e| ServerFnError::new(format!("Failed to parse path: {}", e)))?;
-
-    let root_xml = client
-        .call("directory.default", &[])
-        .await
-        .map_err(|e| ServerFnError::new(format!("Failed to get download root: {}", e)))?;
-
-    let root_path_str = parse_string_response(&root_xml)
-        .map_err(|e| ServerFnError::new(format!("Failed to parse root path: {}", e)))?;
-
-    let root_path = tokio::fs::canonicalize(std::path::Path::new(&root_path_str))
-        .await
-        .map_err(|e| ServerFnError::new(format!("Invalid download root: {}", e)))?;
-
-    let target_path_raw = std::path::Path::new(&path);
-    if !tokio::fs::try_exists(target_path_raw).await.unwrap_or(false) {
-        client
-            .call("d.erase", &params_hash)
-            .await
-            .map_err(|e| ServerFnError::new(format!("Failed to erase torrent: {}", e)))?;
-        return Ok("Torrent removed (Data not found)".to_string());
-    }
-
-    let target_path = tokio::fs::canonicalize(target_path_raw)
-        .await
-        .map_err(|e| ServerFnError::new(format!("Invalid data path: {}", e)))?;
-
-    if !target_path.starts_with(&root_path) {
-        return Err(ServerFnError::new(
-            "Security Error: Cannot delete files outside download directory",
-        ));
-    }
-
-    if target_path == root_path {
-        return Err(ServerFnError::new(
-            "Security Error: Cannot delete the download root directory",
-        ));
-    }
-
-    client
-        .call("d.erase", &params_hash)
-        .await
-        .map_err(|e| ServerFnError::new(format!("Failed to erase torrent: {}", e)))?;
-
-    let delete_result = if target_path.is_dir() {
-        tokio::fs::remove_dir_all(&target_path).await
-    } else {
-        tokio::fs::remove_file(&target_path).await
-    };
-
-    match delete_result {
-        Ok(_) => Ok("Torrent and data deleted".to_string()),
-        Err(e) => Err(ServerFnError::new(format!("Failed to delete data: {}", e))),
-    }
-}
-
-#[server(GetFiles, "/api/server_fns")]
-pub async fn get_files(hash: String) -> Result<Vec<TorrentFile>, ServerFnError> {
-    use crate::xmlrpc::{parse_multicall_response, RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(hash.as_str()),
-        RpcParam::from(""),
-        RpcParam::from("f.path="),
-        RpcParam::from("f.size_bytes="),
-        RpcParam::from("f.completed_chunks="),
-        RpcParam::from("f.priority="),
-    ];
-
-    let xml = client
-        .call("f.multicall", &params)
-        .await
-        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
-
-    let rows = parse_multicall_response(&xml)
-        .map_err(|e| ServerFnError::new(format!("Parse error: {}", e)))?;
-
-    Ok(rows
-        .into_iter()
-        .enumerate()
-        .map(|(idx, row)| TorrentFile {
-            index: idx as u32,
-            path: row.get(0).cloned().unwrap_or_default(),
-            size: row.get(1).and_then(|s| s.parse().ok()).unwrap_or(0),
-            completed_chunks: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
-            priority: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
-        })
-        .collect())
-}
-
-#[server(GetPeers, "/api/server_fns")]
-pub async fn get_peers(hash: String) -> Result<Vec<TorrentPeer>, ServerFnError> {
-    use crate::xmlrpc::{parse_multicall_response, RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(hash.as_str()),
-        RpcParam::from(""),
-        RpcParam::from("p.address="),
-        RpcParam::from("p.client_version="),
-        RpcParam::from("p.down_rate="),
-        RpcParam::from("p.up_rate="),
-        RpcParam::from("p.completed_percent="),
-    ];
-
-    let xml = client
-        .call("p.multicall", &params)
-        .await
-        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
-
-    let rows = parse_multicall_response(&xml)
-        .map_err(|e| ServerFnError::new(format!("Parse error: {}", e)))?;
-
-    Ok(rows
-        .into_iter()
-        .map(|row| TorrentPeer {
-            ip: row.get(0).cloned().unwrap_or_default(),
-            client: row.get(1).cloned().unwrap_or_default(),
-            down_rate: row.get(2).and_then(|s| s.parse().ok()).unwrap_or(0),
-            up_rate: row.get(3).and_then(|s| s.parse().ok()).unwrap_or(0),
-            progress: row.get(4).and_then(|s| s.parse().ok()).unwrap_or(0.0),
-        })
-        .collect())
-}
-
-#[server(GetTrackers, "/api/server_fns")]
-pub async fn get_trackers(hash: String) -> Result<Vec<TorrentTracker>, ServerFnError> {
-    use crate::xmlrpc::{parse_multicall_response, RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-    let params = vec![
-        RpcParam::from(hash.as_str()),
-        RpcParam::from(""),
-        RpcParam::from("t.url="),
-        RpcParam::from("t.activity_date_last="),
-        RpcParam::from("t.message="),
-    ];
-
-    let xml = client
-        .call("t.multicall", &params)
-        .await
-        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
-
-    let rows = parse_multicall_response(&xml)
-        .map_err(|e| ServerFnError::new(format!("Parse error: {}", e)))?;
-
-    Ok(rows
-        .into_iter()
-        .map(|row| TorrentTracker {
-            url: row.get(0).cloned().unwrap_or_default(),
-            status: "Unknown".to_string(),
-            message: row.get(2).cloned().unwrap_or_default(),
-        })
-        .collect())
-}
-
-#[server(SetFilePriority, "/api/server_fns")]
-pub async fn set_file_priority(
-    hash: String,
-    file_index: u32,
-    priority: u8,
-) -> Result<(), ServerFnError> {
-    use crate::xmlrpc::{RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-
-    let target = format!("{}:f{}", hash, file_index);
-    let params = vec![
-        RpcParam::from(target.as_str()),
-        RpcParam::from(priority as i64),
-    ];
-
-    client
-        .call("f.set_priority", &params)
-        .await
-        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
-
-    let _ = client
-        .call("d.update_priorities", &[RpcParam::from(hash.as_str())])
-        .await;
-
-    Ok(())
-}
-
-#[server(SetLabel, "/api/server_fns")]
-pub async fn set_label(hash: String, label: String) -> Result<(), ServerFnError> {
-    use crate::xmlrpc::{RpcParam, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-    let params = vec![RpcParam::from(hash.as_str()), RpcParam::from(label)];
-
-    client
-        .call("d.custom1.set", &params)
-        .await
-        .map_err(|e| ServerFnError::new(format!("RPC error: {}", e)))?;
-
-    Ok(())
-}
-
-#[server(GetVersion, "/api/server_fns")]
-pub async fn get_version() -> Result<String, ServerFnError> {
-    use crate::xmlrpc::{parse_string_response, RtorrentClient};
-    let ctx = expect_context::<crate::ServerContext>();
-    let client = RtorrentClient::new(&ctx.scgi_socket_path);
-
-    match client.call("system.client_version", &[]).await {
-        Ok(xml) => {
-            let version = parse_string_response(&xml).unwrap_or(xml);
-            Ok(version)
-        }
-        Err(e) => Err(ServerFnError::new(format!("Failed to get version: {}", e))),
-    }
-}

third_party/coarsetime/.cargo-ok

@@ -0,0 +1 @@
+{"v":1}

third_party/coarsetime/.cargo_vcs_info.json

@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "831c97016aa3d8f7851999aa1deea8407e7cbd42"
+  },
+  "path_in_vcs": ""
+}

third_party/coarsetime/.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+- package-ecosystem: cargo
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10

third_party/coarsetime/.github/workflows/issues.yml

@@ -0,0 +1,17 @@
+name: Close inactive issues
+on:
+  schedule:
+    - cron: "30 1 * * *"
+
+jobs:
+  close-issues:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - uses: actions/stale@v9
+        with:
+          stale-issue-message: "This issue is stale because it has been open for 30 days with no activity."
+          close-issue-message: "This issue was closed because it has been inactive for 14 days since being marked as stale."
+          repo-token: ${{ secrets.GITHUB_TOKEN }}

third_party/coarsetime/.gitignore

@@ -0,0 +1,4 @@
+target
+Cargo.lock
+.vscode
+zig-cache

third_party/coarsetime/Cargo.toml

@@ -0,0 +1,82 @@
+# THIS FILE IS AUTOMATICALLY GENERATED BY CARGO
+#
+# When uploading crates to the registry Cargo will automatically
+# "normalize" Cargo.toml files for maximal compatibility
+# with all versions of Cargo and also rewrite `path` dependencies
+# to registry (e.g., crates.io) dependencies.
+#
+# If you are reading this file be aware that the original Cargo.toml
+# will likely look very different (and much more reasonable).
+# See Cargo.toml.orig for the original contents.
+
+[package]
+edition = "2018"
+name = "coarsetime"
+version = "0.1.37"
+authors = ["Frank Denis <github@pureftpd.org>"]
+build = false
+autolib = false
+autobins = false
+autoexamples = false
+autotests = false
+autobenches = false
+description = "Time and duration crate optimized for speed"
+homepage = "https://github.com/jedisct1/rust-coarsetime"
+readme = "README.md"
+keywords = [
+    "time",
+    "date",
+    "duration",
+]
+categories = [
+    "concurrency",
+    "date-and-time",
+    "os",
+]
+license = "BSD-2-Clause"
+repository = "https://github.com/jedisct1/rust-coarsetime"
+
+[features]
+wasi-abi2 = ["dep:wasi-abi2"]
+
+[lib]
+name = "coarsetime"
+path = "src/lib.rs"
+
+[[bench]]
+name = "benchmark"
+path = "benches/benchmark.rs"
+harness = false
+
+[dev-dependencies.benchmark-simple]
+version = "0.1.10"
+
+[dependencies.portable-atomic]
+version = "1.6"
+
+[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies.wasm-bindgen]
+version = "0.2"
+
+[target.'cfg(any(target_os = "wasix", target_os = "wasi"))'.dependencies.wasix]
+version = "0.13"
+
+[target.'cfg(not(any(target_os = "wasix", target_os = "wasi")))'.dependencies.libc]
+version = "0.2"
+
+[target.'cfg(target_os = "wasi")'.dependencies.wasi-abi2]
+version = "0.14.7"
+optional = true
+package = "wasi"
+
+[profile.bench]
+codegen-units = 1
+
+[profile.dev]
+overflow-checks = true
+
+[profile.release]
+opt-level = 3
+lto = true
+codegen-units = 1
+panic = "abort"
+incremental = false

third_party/coarsetime/Cargo.toml.orig

@@ -0,0 +1,47 @@
+[package]
+name = "coarsetime"
+version = "0.1.37"
+description = "Time and duration crate optimized for speed"
+authors = ["Frank Denis <github@pureftpd.org>"]
+keywords = ["time", "date", "duration"]
+readme = "README.md"
+license = "BSD-2-Clause"
+homepage = "https://github.com/jedisct1/rust-coarsetime"
+repository = "https://github.com/jedisct1/rust-coarsetime"
+categories = ["concurrency", "date-and-time", "os"]
+edition = "2018"
+
+[features]
+wasi-abi2 = ["dep:wasi-abi2"]
+
+[target.'cfg(not(any(target_os = "wasix", target_os = "wasi")))'.dependencies]
+libc = "0.2"
+
+[target.'cfg(target_os = "wasi")'.dependencies]
+wasi-abi2 = { package = "wasi", version = "0.14.7", optional = true }
+
+[target.'cfg(any(target_os = "wasix", target_os = "wasi"))'.dependencies]
+wasix = "0.13"
+
+[target.'cfg(all(any(target_arch = "wasm32", target_arch = "wasm64"), target_os = "unknown"))'.dependencies]
+wasm-bindgen = "0.2"
+
+[dev-dependencies]
+benchmark-simple = "0.1.10"
+
+[profile.bench]
+codegen-units = 1
+
+[[bench]]
+name = "benchmark"
+harness = false
+
+[profile.release]
+lto = true
+panic = "abort"
+opt-level = 3
+codegen-units = 1
+incremental = false
+
+[profile.dev]
+overflow-checks=true

third_party/coarsetime/LICENSE

@@ -0,0 +1,25 @@
+BSD 2-Clause License
+
+Copyright (c) 2016-2026, Frank Denis
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

third_party/coarsetime/README.md

@@ -0,0 +1,90 @@
+[![Documentation](https://docs.rs/coarsetime/badge.svg)](https://docs.rs/coarsetime)
+[![Windows build status](https://ci.appveyor.com/api/projects/status/xlbhk9850dvl5ylh?svg=true)](https://ci.appveyor.com/project/jedisct1/rust-coarsetime)
+# coarsetime
+
+A Rust crate to make time measurements, that focuses on speed, API stability and portability.
+
+This crate is a partial replacement for the `Time` and `Duration` structures
+from the standard library, with the following differences:
+
+* Speed is privileged over accuracy. In particular, `CLOCK_MONOTONIC_COARSE` is
+used to retrieve the clock value on Linux systems, and transformations avoid
+operations that can be slow on non-Intel systems.
+* The number of system calls can be kept to a minimum. The "most recent
+timestamp" is always kept in memory. It can be read with just a load operation,
+and can be updated only as frequently as necessary.
+* The API is stable, and the same for all platforms. Unlike the standard library, it doesn't silently compile functions that do nothing but panic at runtime on some platforms.
+
+# Installation
+
+`coarsetime` is available on [crates.io](https://crates.io/crates/coarsetime)
+and works on Rust stable, beta, and nightly.
+
+Windows and Unix-like systems are supported.
+
+Available feature:
+
+* `wasi-abi2`: when targeting WASI, use the second preview of the ABI. Default is to use the regular WASI-core ABI.
+
+# Documentation
+
+[API documentation](https://docs.rs/coarsetime)
+
+# Example
+
+```rust
+extern crate coarsetime;
+
+use coarsetime::{Duration, Instant, Updater};
+
+// Get the current instant. This may require a system call, but it may also
+// be faster than the stdlib equivalent.
+let now = Instant::now();
+
+// Get the latest known instant. This operation is super fast.
+// In this case, the value will be identical to `now`, because we haven't
+// updated the latest known instant yet.
+let ts1 = Instant::recent();
+
+// Update the latest known instant. This may require a system call.
+// Note that a call to `Instant::now()` also updates the stored instant.
+Instant::update();
+
+// Now, we may get a different instant. This call is also super fast.
+let ts2 = Instant::recent();
+
+// Compute the time elapsed between ts2 and ts1.
+let elapsed_ts2_ts1 = ts2.duration_since(ts1);
+
+// Operations such as `+` and `-` between `Instant` and `Duration` are also
+// available.
+let elapsed_ts2_ts1 = ts2 - ts1;
+
+// Returns the time elapsed since ts1.
+// This retrieves the actual current time, and may require a system call.
+let elapsed_since_ts1 = ts1.elapsed();
+
+// Returns the approximate time elapsed since ts1.
+// This uses the latest known instant, and is super fast.
+let elapsed_since_recent = ts1.elapsed_since_recent();
+
+// Instant::update() should be called periodically, for example using an
+// event loop. Alternatively, the crate provides an easy way to spawn a
+// background task that will periodically update the latest known instant.
+// Here, the update will happen every 250ms.
+let updater = Updater::new(250).start().unwrap();
+
+// From now on, Instant::recent() will always return an approximation of the
+// current instant.
+let ts3 = Instant::recent();
+
+// Stop the task.
+updater.stop().unwrap();
+
+// Returns the elapsed time since the UNIX epoch
+let unix_timestamp = Clock::now_since_epoch();
+
+// Returns an approximation of the elapsed time since the UNIX epoch, based on
+// the latest time update
+let unix_timestamp_approx = Clock::recent_since_epoch();
+```

third_party/coarsetime/benches/benchmark.rs

@@ -0,0 +1,61 @@
+use benchmark_simple::*;
+use coarsetime::*;
+use std::time;
+
+fn main() {
+    let options = &Options {
+        iterations: 250_000,
+        warmup_iterations: 25_000,
+        min_samples: 5,
+        max_samples: 10,
+        max_rsd: 1.0,
+        ..Default::default()
+    };
+    bench_coarsetime_now(options);
+    bench_coarsetime_recent(options);
+    bench_coarsetime_elapsed(options);
+    bench_coarsetime_elapsed_since_recent(options);
+    bench_stdlib_now(options);
+    bench_stdlib_elapsed(options);
+}
+
+fn bench_coarsetime_now(options: &Options) {
+    let b = Bench::new();
+    Instant::update();
+    let res = b.run(options, Instant::now);
+    println!("coarsetime_now():          {}", res.throughput(1));
+}
+
+fn bench_coarsetime_recent(options: &Options) {
+    let b = Bench::new();
+    Instant::update();
+    let res = b.run(options, Instant::recent);
+    println!("coarsetime_recent():       {}", res.throughput(1));
+}
+
+fn bench_coarsetime_elapsed(options: &Options) {
+    let b = Bench::new();
+    let ts = Instant::now();
+    let res = b.run(options, || ts.elapsed());
+    println!("coarsetime_elapsed():      {}", res.throughput(1));
+}
+
+fn bench_coarsetime_elapsed_since_recent(options: &Options) {
+    let b = Bench::new();
+    let ts = Instant::now();
+    let res = b.run(options, || ts.elapsed_since_recent());
+    println!("coarsetime_since_recent(): {}", res.throughput(1));
+}
+
+fn bench_stdlib_now(options: &Options) {
+    let b = Bench::new();
+    let res = b.run(options, time::Instant::now);
+    println!("stdlib_now():              {}", res.throughput(1));
+}
+
+fn bench_stdlib_elapsed(options: &Options) {
+    let b = Bench::new();
+    let ts = time::Instant::now();
+    let res = b.run(options, || ts.elapsed());
+    println!("stdlib_elapsed():          {}", res.throughput(1));
+}

third_party/coarsetime/src/clock.rs

@@ -4,6 +4,9 @@
 )))]
 use std::time;
 
+#[cfg(target_has_atomic = "64")]
+use std::sync::atomic::{AtomicU64, Ordering};
+#[cfg(not(target_has_atomic = "64"))]
 use portable_atomic::{AtomicU64, Ordering};
 
 use super::Duration;

third_party/coarsetime/src/instant.rs

@@ -3,6 +3,9 @@ use std::mem::MaybeUninit;
 use std::ops::*;
 #[allow(unused_imports)]
 use std::ptr::*;
+#[cfg(target_has_atomic = "64")]
+use std::sync::atomic::{AtomicU64, Ordering};
+#[cfg(not(target_has_atomic = "64"))]
 use portable_atomic::{AtomicU64, Ordering};
 
 use super::duration::*;

third_party/coarsetime/src/tests.rs

@@ -0,0 +1,55 @@
+use std::thread::sleep;
+use std::time;
+
+#[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))]
+use super::Updater;
+use super::{Clock, Duration, Instant};
+
+#[test]
+fn tests() {
+    let ts = Instant::now();
+    let d = Duration::from_secs(2);
+    sleep(time::Duration::new(3, 0));
+    let elapsed = ts.elapsed().as_secs();
+    println!("Elapsed: {elapsed} secs");
+    assert!(elapsed >= 2);
+    assert!(elapsed < 100);
+    assert!(ts.elapsed_since_recent() > d);
+
+    let ts = Instant::now();
+    sleep(time::Duration::new(1, 0));
+    assert_eq!(Instant::recent(), ts);
+    Instant::update();
+    assert!(Instant::recent() > ts);
+
+    let clock_now = Clock::recent_since_epoch();
+    sleep(time::Duration::new(1, 0));
+    assert_eq!(Clock::recent_since_epoch(), clock_now);
+    assert!(Clock::now_since_epoch() > clock_now);
+
+    #[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))]
+    tests_updater();
+}
+
+#[cfg(not(any(target_arch = "wasm32", target_arch = "wasm64")))]
+#[test]
+fn tests_updater() {
+    let updater = Updater::new(250)
+        .start()
+        .expect("Unable to start a background updater");
+    let ts = Instant::recent();
+    let clock_recent = Clock::recent_since_epoch();
+    sleep(time::Duration::new(2, 0));
+    assert!(Clock::recent_since_epoch() > clock_recent);
+    assert!(Instant::recent() != ts);
+    updater.stop().unwrap();
+    let clock_recent = Clock::recent_since_epoch();
+    sleep(time::Duration::new(1, 0));
+    assert_eq!(Clock::recent_since_epoch(), clock_recent);
+}
+
+#[test]
+fn tests_duration() {
+    let duration = Duration::from_days(1000);
+    assert_eq!(duration.as_days(), 1000);
+}