fix: make SidenavMenuButton class prop reactive to resolve compilation error

.gitea/workflows/build-mips.yml

@@ -22,12 +22,32 @@ jobs:
         git fetch --depth=1 origin ${{ gitea.sha }}
         git checkout FETCH_HEAD
 
+    - name: Cache Cargo
+      uses: actions/cache@v3
+      with:
+        path: |
+          ~/.cargo/bin/
+          ~/.cargo/registry/index/
+          ~/.cargo/registry/cache/
+          ~/.cargo/git/db/
+          target/
+        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-cargo-
+
+    - name: Cache Node Modules
+      uses: actions/cache@v3
+      with:
+        path: frontend/node_modules
+        key: ${{ runner.os }}-node-${{ hashFiles('frontend/package-lock.json') }}
+        restore-keys: |
+          ${{ runner.os }}-node-
+
     - name: Build Frontend
       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.
         trunk build --release
 
     - name: Build Backend (MIPS)

Cargo.lock

@@ -1259,6 +1259,7 @@ dependencies = [
  "gloo-console",
  "gloo-net",
  "gloo-timers",
+ "icons",
  "js-sys",
  "leptos",
  "leptos-use",
@@ -1271,7 +1272,7 @@ dependencies = [
  "serde_json",
  "shared",
  "struct-patch",
- "strum",
+ "strum 0.26.3",
  "tailwind_fuse",
  "thiserror 2.0.18",
  "tw_merge",
@@ -1864,6 +1865,17 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icons"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75da3d473e24e0b541bf28cf31e67b262c379a4cbc2149f4865b7d99406711dc"
+dependencies = [
+ "leptos",
+ "strum 0.27.2",
+ "tw_merge",
+]
+
 [[package]]
 name = "icu_collections"
 version = "2.1.1"
@@ -4137,7 +4149,16 @@ version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
- "strum_macros",
+ "strum_macros 0.26.4",
+]
+
+[[package]]
+name = "strum"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
+dependencies = [
+ "strum_macros 0.27.2",
 ]
 
 [[package]]
@@ -4153,6 +4174,18 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "strum_macros"
+version = "0.27.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "subtle"
 version = "2.6.1"

frontend/index.html

@@ -20,13 +20,12 @@
     <link rel="apple-touch-icon" sizes="512x512" href="icon-512.png" />
 
     <!-- Trunk Assets -->
-    <link data-trunk rel="rust" href="Cargo.toml" data-wasm-opt="0" />
+    <script data-trunk rel="rust" src="Cargo.toml" data-wasm-opt="0" data-preload="false"></script>
     <link data-trunk rel="css" href="public/tailwind.css" />
     <link data-trunk rel="copy-file" href="manifest.json" />
     <link data-trunk rel="copy-file" href="icon-192.png" />
     <link data-trunk rel="copy-file" href="icon-512.png" />
     <link data-trunk rel="copy-file" href="public/lock_scroll.js" />
-    <script src="/lock_scroll.js"></script>
     <link data-trunk rel="copy-file" href="sw.js" />
     <script>
         (function () {

frontend/input.css

@@ -1,177 +1,92 @@
 @import "tailwindcss";
-@config "./tailwind.config.js";
-@source "../src/**/*.rs";
-@source "/Users/bilal/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/leptos-shadcn-*/src/**/*.rs";
+@import "tw-animate-css";
 
-@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));
+:root {
+  --background: 0 0% 100%;
+  --foreground: 240 10% 3.9%;
+  --card: 0 0% 100%;
+  --card-foreground: 240 10% 3.9%;
+  --popover: 0 0% 100%;
+  --popover-foreground: 240 10% 3.9%;
+  --primary: 240 5.9% 10%;
+  --primary-foreground: 0 0% 98%;
+  --secondary: 240 4.8% 95.9%;
+  --secondary-foreground: 240 5.9% 10%;
+  --muted: 240 4.8% 95.9%;
+  --muted-foreground: 240 3.8% 46.1%;
+  --accent: 240 4.8% 95.9%;
+  --accent-foreground: 240 5.9% 10%;
+  --destructive: 0 84.2% 60.2%;
+  --destructive-foreground: 0 0% 98%;
+  --border: 240 5.9% 90%;
+  --input: 240 5.9% 90%;
+  --ring: 240 5.9% 10%;
+  --radius: 0.5rem;
+}
 
-    --color-secondary: hsl(var(--secondary));
-    --color-secondary-foreground: hsl(var(--secondary-foreground));
+.dark {
+  --background: 240 10% 3.9%;
+  --foreground: 0 0% 98%;
+  --card: 240 10% 3.9%;
+  --card-foreground: 0 0% 98%;
+  --popover: 240 10% 3.9%;
+  --popover-foreground: 0 0% 98%;
+  --primary: 0 0% 98%;
+  --primary-foreground: 240 5.9% 10%;
+  --secondary: 240 3.7% 15.9%;
+  --secondary-foreground: 0 0% 98%;
+  --muted: 240 3.7% 15.9%;
+  --muted-foreground: 240 5% 64.9%;
+  --accent: 240 3.7% 15.9%;
+  --accent-foreground: 0 0% 98%;
+  --destructive: 0 62.8% 30.6%;
+  --destructive-foreground: 0 0% 98%;
+  --border: 240 3.7% 15.9%;
+  --input: 240 3.7% 15.9%;
+  --ring: 240 4.9% 83.9%;
+}
 
-    --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;
-        }
-    }
+@theme inline {
+  --color-background: hsl(var(--background));
+  --color-foreground: hsl(var(--foreground));
+  --color-card: hsl(var(--card));
+  --color-card-foreground: hsl(var(--card-foreground));
+  --color-popover: hsl(var(--popover));
+  --color-popover-foreground: hsl(var(--popover-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-muted: hsl(var(--muted));
+  --color-muted-foreground: hsl(var(--muted-foreground));
+  --color-accent: hsl(var(--accent));
+  --color-accent-foreground: hsl(var(--accent-foreground));
+  --color-destructive: hsl(var(--destructive));
+  --color-destructive-foreground: hsl(var(--destructive-foreground));
+  --color-border: hsl(var(--border));
+  --color-input: hsl(var(--input));
+  --color-ring: hsl(var(--ring));
+  --radius-sm: calc(var(--radius) - 4px);
+  --radius-md: calc(var(--radius) - 2px);
+  --radius-lg: var(--radius);
+  --radius-xl: calc(var(--radius) + 4px);
 }
 
 @layer base {
-    :root {
-        --background: 0 0% 100%;
-        --foreground: 222.2 84% 4.9%;
+  * {
+    @apply border-border outline-ring/50;
+  }
+  body {
+    @apply bg-background text-foreground;
+  }
 
-        --card: 0 0% 100%;
-        --card-foreground: 222.2 84% 4.9%;
+  button:not(:disabled),
+  [role="button"]:not(:disabled) {
+    cursor: pointer;
+  }
 
-        --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%;
-    }
+  dialog {
+    margin: auto;
+  }
 }
-
-@layer base {
-    * {
-        @apply border-border;
-    }
-
-    body {
-        @apply bg-background text-foreground;
-    }
-
-    /* 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 */
-@media (hover: none) {
-    body {
-        cursor: pointer;
-    }
-}
-
-/* Remove default focus outline/tap highlight */
-* {
-    -webkit-tap-highlight-color: transparent;
-    outline: none !important;
-}
-
-:focus {
-    outline: none !important;
-}

frontend/src/app.rs

@@ -1,4 +1,5 @@
 use crate::components::layout::protected::Protected;
+use crate::components::ui::skeleton::Skeleton;
 use crate::components::torrent::table::TorrentTable;
 use crate::components::auth::login::Login;
 use crate::components::auth::setup::Setup;
@@ -30,7 +31,9 @@ pub fn App() -> impl IntoView {
 
     view! {
         <Toaster />
-        <InnerApp />
+        <Router>
+            <InnerApp />
+        </Router>
     }
 }
 
@@ -97,119 +100,121 @@ fn InnerApp() -> 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 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 /> }
+                } />
 
-                    <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=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());
                             }
-                        });
-                        
-                        view! {
-                            <Show when=move || !is_loading.0.get() fallback=|| view! {
-                                <div class="flex h-screen bg-background">
+                        }
+                    });
+                    
+                    view! {
+                        <Show when=move || !is_loading.0.get() fallback=|| {
+                            // Standard 1: Always show Dashboard Skeleton
+                            view! {
+                                <div class="flex h-screen bg-background text-foreground overflow-hidden">
                                     // Sidebar skeleton
                                     <div class="w-56 border-r border-border p-4 space-y-4">
-                                        <div class="h-8 w-3/4 animate-pulse rounded-md bg-muted" />
+                                        <Skeleton class="h-8 w-3/4" />
                                         <div class="space-y-2">
-                                            <div class="h-6 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-6 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-6 w-4/5 animate-pulse rounded-md bg-muted" />
-                                            <div class="h-6 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-6 w-3/5 animate-pulse rounded-md bg-muted" />
-                                            <div class="h-6 w-full animate-pulse rounded-md bg-muted" />
+                                            <Skeleton class="h-6 w-full" />
+                                            <Skeleton class="h-6 w-full" />
+                                            <Skeleton class="h-6 w-4/5" />
+                                            <Skeleton class="h-6 w-full" />
+                                            <Skeleton class="h-6 w-3/5" />
+                                            <Skeleton class="h-6 w-full" />
                                         </div>
                                     </div>
                                     // Main content skeleton
-                                    <div class="flex-1 flex flex-col">
+                                    <div class="flex-1 flex flex-col min-w-0">
                                         <div class="border-b border-border p-4 flex items-center gap-4">
-                                            <div class="h-8 w-48 animate-pulse rounded-md bg-muted" />
-                                            <div class="h-8 w-64 animate-pulse rounded-md bg-muted" />
-                                            <div class="ml-auto"><div class="h-8 w-24 animate-pulse rounded-md bg-muted" /></div>
+                                            <Skeleton class="h-8 w-48" />
+                                            <Skeleton class="h-8 w-64" />
+                                            <div class="ml-auto"><Skeleton class="h-8 w-24" /></div>
                                         </div>
                                         <div class="flex-1 p-4 space-y-3">
-                                            <div class="h-10 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-10 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-10 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-10 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-10 w-full animate-pulse rounded-md bg-muted" />
-                                            <div class="h-10 w-3/4 animate-pulse rounded-md bg-muted" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-full" />
+                                            <Skeleton class="h-10 w-3/4" />
                                         </div>
                                         <div class="border-t border-border p-3">
-                                            <div class="h-5 w-96 animate-pulse rounded-md bg-muted" />
+                                            <Skeleton class="h-5 w-96" />
                                         </div>
                                     </div>
                                 </div>
-                            }.into_any()>
-                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
-                                    <Protected>
-                                        <div class="flex flex-col h-full overflow-hidden">
-                                            <div class="flex-1 overflow-hidden">
-                                                <TorrentTable />
-                                            </div>
+                            }.into_any()
+                        }>
+                            <Show when=move || is_authenticated.0.get() fallback=|| ()>
+                                <Protected>
+                                    <div class="flex flex-col h-full overflow-hidden">
+                                        <div class="flex-1 overflow-hidden">
+                                            <TorrentTable />
                                         </div>
-                                    </Protected>
-                                </Show>
+                                    </div>
+                                </Protected>
                             </Show>
-                        }.into_any()
-                    }/>
+                        </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());
-                            }
-                        });
-                        
-                        view! {
-                            <Show when=move || !is_loading.0.get() fallback=|| ()>
-                                <Show when=move || is_authenticated.0.get() fallback=|| ()>
-                                    <Protected>
-                                        <div class="p-4">"Settings Page (Coming Soon)"</div>
-                                    </Protected>
-                                </Show>
-                            </Show>
+                <Route path=leptos_router::path!("/settings") view=move || {
+                    let authenticated = is_authenticated.0.get();
+                    Effect::new(move |_| {
+                        if !authenticated {
+                            let navigate = use_navigate();
+                            navigate("/login", Default::default());
                         }
-                    }/>
-                </Routes>
-            </Router>
+                    });
+                    
+                    view! {
+                        <Show when=move || !is_loading.0.get() fallback=|| ()>
+                            <Show when=move || authenticated fallback=|| ()>
+                                <Protected>
+                                    <div class="p-4">"Settings Page (Coming Soon)"</div>
+                                </Protected>
+                            </Show>
+                        </Show>
+                    }
+                }/>
+            </Routes>
         </div>
     }
 }

frontend/src/components/context_menu.rs

@@ -1,5 +1,7 @@
 use leptos::prelude::*;
-use crate::components::ui::context_menu::*;
+use crate::components::ui::context_menu::{
+    ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger,
+};
 
 #[component]
 pub fn TorrentContextMenu(
@@ -7,72 +9,37 @@ pub fn TorrentContextMenu(
     torrent_hash: String,
     on_action: Callback<(String, String)>,
 ) -> impl IntoView {
-    let hash = StoredValue::new(torrent_hash);
-    
-    let menu_action = move |action: &'static str| {
-        on_action.run((action.to_string(), hash.get_value()));
+    let hash = torrent_hash.clone();
+    let on_action_stored = StoredValue::new(on_action);
+
+    let on_click = move |action: &str| {
+        on_action_stored.get_value().run((action.to_string(), hash.clone()));
     };
 
+    let start_click = { let on_click = on_click.clone(); move |_| on_click("start") };
+    let stop_click = { let on_click = on_click.clone(); move |_| on_click("stop") };
+    let delete_click = { let on_click = on_click.clone(); move |_| on_click("delete") };
+    let delete_data_click = { let on_click = on_click.clone(); move |_| on_click("delete_with_data") };
+
     view! {
         <ContextMenu>
             <ContextMenuTrigger>
                 {children()}
             </ContextMenuTrigger>
-            
-            <ContextMenuContent class="w-56">
-                <ContextMenuAction 
-                    class="px-2 py-1.5 hover:bg-accent hover:text-accent-foreground rounded-sm"
-                    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"
-                </ContextMenuAction>
-
-                <ContextMenuAction 
-                    class="px-2 py-1.5 hover:bg-accent hover:text-accent-foreground rounded-sm"
-                    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"
-                </ContextMenuAction>
-
-                <ContextMenuAction 
-                    class="px-2 py-1.5 hover:bg-accent hover:text-accent-foreground rounded-sm"
-                    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"
-                </ContextMenuAction>
-
-                <div class="-mx-1 my-1 h-px bg-border" />
-
-                <ContextMenuAction 
-                    class="px-2 py-1.5 text-destructive hover:bg-destructive/10 hover:text-destructive rounded-sm"
-                    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"
-                </ContextMenuAction>
-
-                <ContextMenuHoldAction 
-                    class="text-destructive hover:bg-destructive/10 hover:text-destructive"
-                    on_hold_complete=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"
-                    <span class="ml-auto text-[10px] opacity-50">"Hold"</span>
-                </ContextMenuHoldAction>
+            <ContextMenuContent class="w-48">
+                <ContextMenuItem on:click=start_click>
+                    "Başlat"
+                </ContextMenuItem>
+                <ContextMenuItem on:click=stop_click>
+                    "Durdur"
+                </ContextMenuItem>
+                <ContextMenuItem class="text-destructive" on:click=delete_click>
+                    "Sil"
+                </ContextMenuItem>
+                <ContextMenuItem class="text-destructive font-bold" on:click=delete_data_click>
+                    "Verilerle Birlikte Sil"
+                </ContextMenuItem>
             </ContextMenuContent>
         </ContextMenu>
     }
-}
+}

frontend/src/components/hooks/use_random.rs

@@ -1,31 +1,3 @@
-use std::collections::hash_map::DefaultHasher;
-use std::hash::{Hash, Hasher};
-use std::sync::atomic::{AtomicUsize, Ordering};
-
-const PREFIX: &str = "rust_ui"; // Must NOT contain "/" or "-"
-
-pub fn use_random_id() -> String {
-    format!("_{PREFIX}_{}", generate_hash())
+pub fn use_random_id_for(prefix: &str) -> String {
+    format!("{}_{}", prefix, js_sys::Math::random().to_string().replace(".", ""))
 }
-
-pub fn use_random_id_for(element: &str) -> String {
-    format!("{}_{PREFIX}_{}", element, generate_hash())
-}
-
-pub fn use_random_transition_name() -> String {
-    let random_id = use_random_id();
-    format!("view-transition-name: {random_id}")
-}
-
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
-static COUNTER: AtomicUsize = AtomicUsize::new(1);
-
-fn generate_hash() -> u64 {
-    let mut hasher = DefaultHasher::new();
-    let counter = COUNTER.fetch_add(1, Ordering::SeqCst);
-    counter.hash(&mut hasher);
-    hasher.finish()
-}

frontend/src/components/hooks/use_theme_mode.rs

@@ -8,26 +8,15 @@ pub struct ThemeMode {
 
 const LOCALSTORAGE_KEY: &str = "darkmode";
 
-/// Hook to access the dark mode context
-///
-/// Returns the ThemeMode instance from context for easy access
 pub fn use_theme_mode() -> ThemeMode {
     expect_context::<ThemeMode>()
 }
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
 impl ThemeMode {
-    #[must_use]
-    /// Initializes a new ThemeMode instance.
     pub fn init() -> Self {
         let theme_mode = Self { state: RwSignal::new(false) };
-
         provide_context(theme_mode);
 
-        // Use Effect to handle browser-only initialization
         Effect::new(move |_| {
             let initial = Self::get_storage_state().unwrap_or(Self::prefers_dark_mode());
             theme_mode.state.set(initial);
@@ -43,45 +32,14 @@ impl ThemeMode {
         });
     }
 
-    pub fn set_dark(&self) {
-        self.set(true);
-    }
-
-    pub fn set_light(&self) {
-        self.set(false);
-    }
-
-    /// - `dark`: Set to `true` for dark mode, and `false` for light mode.
-    pub fn set(&self, dark: bool) {
-        self.state.set(dark);
-        Self::set_storage_state(dark);
-    }
-
-    #[must_use]
     pub fn get(&self) -> bool {
         self.state.get()
     }
 
-    #[must_use]
-    pub fn is_dark(&self) -> bool {
-        self.state.get()
-    }
-
-    #[must_use]
-    pub fn is_light(&self) -> bool {
-        !self.state.get()
-    }
-
-    /* ========================================================== */
-    /*                     ✨ FUNCTIONS ✨                        */
-    /* ========================================================== */
-
-    /// Retrieves the local storage object, if available.
     fn get_storage() -> Option<Storage> {
         window().local_storage().ok().flatten()
     }
 
-    /// Retrieves the dark mode state from local storage, if available.
     fn get_storage_state() -> Option<bool> {
         Self::get_storage()
             .and_then(|storage| storage.get(LOCALSTORAGE_KEY).ok())
@@ -89,7 +47,6 @@ impl ThemeMode {
             .and_then(|entry| entry.parse::<bool>().ok())
     }
 
-    /// Checks whether the user's system prefers dark mode based on media queries.
     fn prefers_dark_mode() -> bool {
         window()
             .match_media("(prefers-color-scheme: dark)")
@@ -99,10 +56,9 @@ impl ThemeMode {
             .unwrap_or_default()
     }
 
-    /// Stores the dark mode state in local storage.
     fn set_storage_state(state: bool) {
         if let Some(storage) = Self::get_storage() {
-            storage.set(LOCALSTORAGE_KEY, state.to_string().as_str()).ok();
+            let _ = storage.set(LOCALSTORAGE_KEY, state.to_string().as_str());
         }
     }
-}
+}

frontend/src/components/layout/footer.rs

@@ -0,0 +1,30 @@
+use leptos::prelude::*;
+use crate::components::ui::separator::Separator;
+
+#[component]
+pub fn Footer() -> impl IntoView {
+    let year = chrono::Local::now().format("%Y").to_string();
+    
+    view! {
+        <footer class="mt-auto px-4 py-6 md:px-8">
+            <Separator class="mb-6 opacity-50" />
+            <div class="flex flex-col items-center justify-between gap-4 md:flex-row">
+                <p class="text-center text-sm leading-loose text-muted-foreground md:text-left">
+                    {format!("© {} VibeTorrent. Tüm hakları saklıdır.", year)}
+                </p>
+                <div class="flex items-center gap-4 text-sm font-medium text-muted-foreground">
+                    <a 
+                        href="https://git.karatatar.com/admin/vibetorrent" 
+                        target="_blank" 
+                        rel="noreferrer" 
+                        class="underline underline-offset-4 hover:text-foreground transition-colors"
+                    >
+                        "Gitea"
+                    </a>
+                    <span class="size-1 rounded-full bg-muted-foreground/30" />
+                    <span class="text-[10px] tracking-widest uppercase opacity-70">"v3.0.0-beta"</span>
+                </div>
+            </div>
+        </footer>
+    }
+}

frontend/src/components/layout/mod.rs

@@ -1,4 +1,4 @@
 pub mod sidebar;
-pub mod statusbar;
 pub mod toolbar;
+pub mod footer;
 pub mod protected;

frontend/src/components/layout/protected.rs

@@ -1,7 +1,7 @@
 use leptos::prelude::*;
 use crate::components::layout::sidebar::Sidebar;
 use crate::components::layout::toolbar::Toolbar;
-use crate::components::layout::statusbar::StatusBar;
+use crate::components::layout::footer::Footer;
 use crate::components::ui::sidenav::{SidenavWrapper, Sidenav, SidenavInset};
 
 #[component]
@@ -19,12 +19,12 @@ pub fn Protected(children: Children) -> impl IntoView {
                 <Toolbar />
                 
                 // Ana İçerik
-                <main class="flex-1 overflow-hidden relative bg-background">
-                    {children()}
+                <main class="flex-1 overflow-y-auto relative bg-background flex flex-col">
+                    <div class="flex-1">
+                        {children()}
+                    </div>
+                    <Footer />
                 </main>
-
-                // Alt Bar
-                <StatusBar />
             </SidenavInset>
         </SidenavWrapper>
     }

frontend/src/components/layout/statusbar.rs

@@ -1,201 +0,0 @@
-use leptos::prelude::*;
-use leptos::html;
-use shared::GlobalLimitRequest;
-use crate::api;
-
-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))
-}
-
-#[component]
-pub fn StatusBar() -> impl IntoView {
-    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
-    let stats = store.global_stats;
-
-
-
-    // Preset limits in bytes/s
-    let limits: Vec<(i64, &str)> = vec!(
-        (0, "Unlimited"),
-        (100 * 1024, "100 KB/s"),
-        (500 * 1024, "500 KB/s"),
-        (1024 * 1024, "1 MB/s"),
-        (2 * 1024 * 1024, "2 MB/s"),
-        (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);
-
-        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);
-            } else {
-                log::info!("Limit set successfully");
-            }
-        });
-    };
-
-        let down_details_ref = NodeRef::<html::Details>::new();
-        let up_details_ref = NodeRef::<html::Details>::new();
-
-        let close_details = move |node_ref: NodeRef<html::Details>| {
-            if let Some(el) = node_ref.get_untracked() {
-                el.set_open(false);
-            }
-        };
-
-        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">
-
-                // --- 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">
-                        <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>
-                        <span class="font-mono">{move || format_speed(stats.get().down_rate)}</span>
-                        <Show when=move || { stats.get().down_limit.unwrap_or(0) > 0 } fallback=|| ()>
-                            <span class="text-[10px] opacity-60">
-                                {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>
-
-                // --- 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">
-                        <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>
-                        <span class="font-mono">{move || format_speed(stats.get().up_rate)}</span>
-                        <Show when=move || { stats.get().up_limit.unwrap_or(0) > 0 } fallback=|| ()>
-                            <span class="text-[10px] opacity-60">
-                                {move || format!("(Limit: {})", format_speed(stats.get().up_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().up_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("up", val);
-                                                    close_details(up_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>
-
-                <div class="ml-auto flex items-center gap-4">
-                <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"
-                    title="Settings & Notification Permissions"
-                    on:click=move |_| {
-                        // Request push notification permission
-                        leptos::task::spawn_local(async {
-                            // ... existing logic ...
-                            crate::store::subscribe_to_push_notifications().await;
-                            // ... existing logic ...
-                        });
-                    }
-                >
-                     <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="M15 12a3 3 0 11-6 0 3 3 0 016 0z" />
-                    </svg>
-                </button>
-            </div>
-        </div>
-    }
-}

frontend/src/components/torrent/table.rs

@@ -1,20 +1,32 @@
 use leptos::prelude::*;
 use leptos::task::spawn_local;
+use wasm_bindgen::JsCast;
 use std::collections::HashSet;
-use icons::{ArrowUpDown, Inbox, Settings2, Play, Square, Trash2, Ellipsis};
+use icons::{ArrowUpDown, Inbox, Settings2, Play, Square, Trash2, Ellipsis, ArrowUp, ArrowDown, Check, ListFilter};
 use crate::store::{get_action_messages, show_toast};
 use crate::api;
 use shared::NotificationLevel;
 use crate::components::context_menu::TorrentContextMenu;
-use crate::components::ui::card::{Card, CardHeader, CardTitle, CardContent as CardBody};
 use crate::components::ui::data_table::*;
 use crate::components::ui::checkbox::Checkbox;
-use crate::components::ui::button::{Button, ButtonVariant, ButtonSize};
+use crate::components::ui::badge::{Badge, BadgeVariant};
+use crate::components::ui::button::{Button, ButtonVariant};
 use crate::components::ui::empty::*;
 use crate::components::ui::input::Input;
 use crate::components::ui::multi_select::*;
 use crate::components::ui::dropdown_menu::*;
-use crate::components::ui::alert_dialog::*;
+use crate::components::ui::alert_dialog::{
+    AlertDialog,
+    AlertDialogBody,
+    AlertDialogClose,
+    AlertDialogContent,
+    AlertDialogDescription,
+    AlertDialogFooter,
+    AlertDialogHeader,
+    AlertDialogTitle,
+    AlertDialogTrigger,
+};
+use tailwind_fuse::tw_merge;
 
 const ALL_COLUMNS: [(&str, &str); 8] = [
     ("Name", "Name"),
@@ -219,77 +231,162 @@ pub fn TorrentTable() -> impl IntoView {
 
                 <div class="flex items-center gap-2">
                     <Show when=move || has_selection.get()>
-                        <DropdownMenu>
-                            <DropdownMenuTrigger class="gap-2 bg-secondary text-secondary-foreground border-none hover:bg-secondary/80">
-                                <Ellipsis class="size-4" />
-                                {move || format!("Toplu İşlem ({})", selected_count.get())}
-                            </DropdownMenuTrigger>
-                            <DropdownMenuContent class="w-48">
-                                <DropdownMenuLabel>"Seçili Torrentler"</DropdownMenuLabel>
-                                <DropdownMenuGroup class="mt-2">
-                                    <DropdownMenuItem on:click=move |_| bulk_action("start")>
-                                        <Play class="mr-2 size-4" /> "Başlat"
-                                    </DropdownMenuItem>
-                                    <DropdownMenuItem on:click=move |_| bulk_action("stop")>
-                                        <Square class="mr-2 size-4" /> "Durdur"
-                                    </DropdownMenuItem>
-                                    
-                                    <div class="my-1 h-px bg-border" />
-                                    
-                                    <AlertDialog>
-                                        <AlertDialogTrigger class="w-full text-left">
-                                            <div class="inline-flex gap-2 items-center w-full rounded-sm px-2 py-1.5 text-sm transition-colors text-destructive hover:bg-destructive/10 focus:bg-destructive/10">
-                                                <Trash2 class="size-4" /> "Toplu Sil"
+                        <div class="flex items-center gap-2">
+                            <DropdownMenu>
+                                <DropdownMenuTrigger class="w-[140px] h-9 gap-2">
+                                    <Ellipsis class="size-4" />
+                                    {move || format!("Toplu İşlem ({})", selected_count.get())}
+                                </DropdownMenuTrigger>
+                                <DropdownMenuContent class="w-48">
+                                    <DropdownMenuLabel>"Seçili Torrentler"</DropdownMenuLabel>
+                                    <DropdownMenuGroup class="mt-2">
+                                        <DropdownMenuItem on:click=move |_| bulk_action("start")>
+                                            <Play class="mr-2 size-4" /> "Başlat"
+                                        </DropdownMenuItem>
+                                        <DropdownMenuItem on:click=move |_| bulk_action("stop")>
+                                            <Square class="mr-2 size-4" /> "Durdur"
+                                        </DropdownMenuItem>
+                                        
+                                        <div class="my-1 h-px bg-border" />
+                                        
+                                        // Trigger the hidden AlertDialog from this menu item
+                                        <DropdownMenuItem class="text-destructive focus:bg-destructive/10 cursor-pointer" on:click=move |_| {
+                                            if let Some(trigger) = document().get_element_by_id("bulk-delete-trigger") {
+                                                let _ = trigger.dyn_into::<web_sys::HtmlElement>().map(|el: web_sys::HtmlElement| el.click());
+                                            }
+                                        }>
+                                            <Trash2 class="mr-2 size-4" /> "Toplu Sil..."
+                                        </DropdownMenuItem>
+                                    </DropdownMenuGroup>
+                                </DropdownMenuContent>
+                            </DropdownMenu>
+
+                            // Hidden AlertDialog moved outside the DropdownMenuContent to ensure proper centering
+                            <AlertDialog>
+                                <AlertDialogTrigger attr:id="bulk-delete-trigger" class="hidden">""</AlertDialogTrigger>
+                                <AlertDialogContent class="sm:max-w-[425px]">
+                                    <AlertDialogBody>
+                                        <AlertDialogHeader class="space-y-3">
+                                            <AlertDialogTitle class="text-destructive flex items-center gap-2 text-xl">
+                                                <Trash2 class="size-6" />
+                                                "Toplu Silme Onayı"
+                                            </AlertDialogTitle>
+                                            <AlertDialogDescription class="text-sm leading-relaxed text-left">
+                                                {move || format!("Seçili {} adet torrent silinecek. Lütfen silme yöntemini seçin:", selected_count.get())}
+                                                <div class="mt-4 p-4 bg-destructive/5 rounded-lg border border-destructive/10 text-xs text-destructive/80 font-medium">
+                                                    "⚠️ Dikkat: Verilerle birlikte silme işlemi dosyaları diskten de kalıcı olarak kaldıracaktır."
+                                                </div>
+                                            </AlertDialogDescription>
+                                        </AlertDialogHeader>
+                                        <AlertDialogFooter class="mt-6">
+                                            <div class="flex flex-col-reverse sm:flex-row gap-3 w-full sm:justify-end">
+                                                <AlertDialogClose class="sm:flex-1 md:flex-none">"Vazgeç"</AlertDialogClose>
+                                                <div class="flex flex-col sm:flex-row gap-2">
+                                                    <Button 
+                                                        variant=ButtonVariant::Secondary
+                                                        class="w-full sm:w-auto font-medium"
+                                                        on:click=move |_| bulk_action("delete")
+                                                    >
+                                                        "Sadece Sil"
+                                                    </Button>
+                                                    <Button 
+                                                        variant=ButtonVariant::Destructive
+                                                        class="w-full sm:w-auto font-bold"
+                                                        on:click=move |_| bulk_action("delete_with_data")
+                                                    >
+                                                        "Verilerle Sil"
+                                                    </Button>
+                                                </div>
                                             </div>
-                                        </AlertDialogTrigger>
-                                        <AlertDialogContent>
-                                            <AlertDialogHeader>
-                                                <AlertDialogTitle>"Toplu Silme Onayı"</AlertDialogTitle>
-                                                <AlertDialogDescription>
-                                                    {move || format!("Seçili {} torrent silinecek. Bu işlem geri alınamaz.", selected_count.get())}
-                                                </AlertDialogDescription>
-                                            </AlertDialogHeader>
-                                            <AlertDialogFooter>
-                                                <AlertDialogClose>"İptal"</AlertDialogClose>
-                                                <Button variant=ButtonVariant::Destructive on:click=move |_| bulk_action("delete")>
-                                                    "Sil"
-                                                </Button>
-                                            </AlertDialogFooter>
-                                        </AlertDialogContent>
-                                    </AlertDialog>
+                                        </AlertDialogFooter>
+                                    </AlertDialogBody>
+                                </AlertDialogContent>
+                            </AlertDialog>
+                        </div>
+                    </Show>
+
+                    // Mobile Sort Menu
+                    <div class="block md:hidden">
+                        <DropdownMenu>
+                            <DropdownMenuTrigger class="w-[100px] h-9 gap-2 text-xs">
+                                <ListFilter class="size-4" />
+                                "Sırala"
+                            </DropdownMenuTrigger>
+                            <DropdownMenuContent class="w-56">
+                                <DropdownMenuLabel>"Sıralama Ölçütü"</DropdownMenuLabel>
+                                <DropdownMenuGroup class="mt-2">
+                                    {move || {
+                                        let current_col = sort_col.0.get();
+                                        let current_dir = sort_dir.0.get();
+                                        
+                                        let sort_items = vec![
+                                            (SortColumn::Name, "İsim"),
+                                            (SortColumn::Size, "Boyut"),
+                                            (SortColumn::Progress, "İlerleme"),
+                                            (SortColumn::Status, "Durum"),
+                                            (SortColumn::DownSpeed, "DL Hızı"),
+                                            (SortColumn::UpSpeed, "UP Hızı"),
+                                            (SortColumn::ETA, "Kalan Süre"),
+                                            (SortColumn::AddedDate, "Tarih"),
+                                        ];
+
+                                        sort_items.into_iter().map(|(col, label)| {
+                                            let is_active = current_col == col;
+                                            view! {
+                                                <DropdownMenuItem on:click=move |_| handle_sort(col)>
+                                                    <div class="flex items-center justify-between w-full">
+                                                        <div class="flex items-center gap-2">
+                                                            {if is_active { view! { <Check class="size-4 text-primary" /> }.into_any() } else { view! { <div class="size-4" /> }.into_any() }}
+                                                            <span class=if is_active { "font-bold text-primary" } else { "" }>{label}</span>
+                                                        </div>
+                                                        {if is_active {
+                                                            match current_dir {
+                                                                SortDirection::Ascending => view! { <ArrowUp class="size-3 opacity-50" /> }.into_any(),
+                                                                SortDirection::Descending => view! { <ArrowDown class="size-3 opacity-50" /> }.into_any(),
+                                                            }
+                                                        } else { view! { "" }.into_any() }}
+                                                    </div>
+                                                </DropdownMenuItem>
+                                            }.into_any()
+                                        }).collect_view()
+                                    }}
                                 </DropdownMenuGroup>
                             </DropdownMenuContent>
                         </DropdownMenu>
-                    </Show>
+                    </div>
 
-                    <MultiSelect values=visible_columns>
-                        <MultiSelectTrigger class="w-[140px] h-9">
-                            <div class="flex items-center gap-2 text-xs">
-                                <Settings2 class="size-4" />
-                                "Sütunlar"
-                            </div>
-                        </MultiSelectTrigger>
-                        <MultiSelectContent>
-                            <MultiSelectGroup>
-                                {ALL_COLUMNS.into_iter().map(|(id, label)| {
-                                    let id_val = id.to_string();
-                                    view! {
-                                        <MultiSelectItem>
-                                            <MultiSelectOption value=id_val.clone() attr:disabled=move || id_val == "Name">
-                                                {label}
-                                            </MultiSelectOption>
-                                        </MultiSelectItem>
-                                    }.into_any()
-                                }).collect_view()}
-                            </MultiSelectGroup>
-                        </MultiSelectContent>
-                    </MultiSelect>
+                    // Desktop Columns Menu
+                    <div class="hidden md:flex">
+                        <MultiSelect values=visible_columns>
+                            <MultiSelectTrigger class="w-[140px] h-9">
+                                <div class="flex items-center gap-2 text-xs">
+                                    <Settings2 class="size-4" />
+                                    "Sütunlar"
+                                </div>
+                            </MultiSelectTrigger>
+                            <MultiSelectContent>
+                                <MultiSelectGroup>
+                                    {ALL_COLUMNS.into_iter().map(|(id, label)| {
+                                        let id_val = id.to_string();
+                                        view! {
+                                            <MultiSelectItem>
+                                                <MultiSelectOption value=id_val.clone() attr:disabled=move || id_val == "Name">
+                                                    {label}
+                                                </MultiSelectOption>
+                                            </MultiSelectItem>
+                                        }.into_any()
+                                    }).collect_view()}
+                                </MultiSelectGroup>
+                            </MultiSelectContent>
+                        </MultiSelect>
+                    </div>
                 </div>
             </div>
 
-            // --- MAIN TABLE ---
+            // --- MAIN CONTENT ---
             <div class="flex-1 min-h-0 overflow-hidden">
-                <DataTableWrapper class="h-full bg-card/50">
+                // Desktop Table View
+                <DataTableWrapper class="hidden md:block h-full bg-card/50">
                     <div class="h-full overflow-auto">
                         <DataTable>
                             <DataTableHeader class="sticky top-0 bg-muted/80 backdrop-blur-sm z-10">
@@ -305,49 +402,49 @@ pub fn TorrentTable() -> impl IntoView {
                                     </DataTableHead>
                                     
                                     {move || visible_columns.get().contains("Name").then(|| view! {
-                                        <DataTableHead class="cursor-pointer group select-none" on:click=move |_| handle_sort(SortColumn::Name)>
+                                        <DataTableHead class="cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground" on:click=move |_| handle_sort(SortColumn::Name)>
                                             <div class="flex items-center gap-2">"Name" {move || sort_icon(SortColumn::Name)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("Size").then(|| view! {
-                                        <DataTableHead class="w-24 cursor-pointer group select-none" on:click=move |_| handle_sort(SortColumn::Size)>
+                                        <DataTableHead class="w-24 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground" on:click=move |_| handle_sort(SortColumn::Size)>
                                             <div class="flex items-center gap-2">"Size" {move || sort_icon(SortColumn::Size)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("Progress").then(|| view! {
-                                        <DataTableHead class="w-48 cursor-pointer group select-none" on:click=move |_| handle_sort(SortColumn::Progress)>
+                                        <DataTableHead class="w-48 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground" on:click=move |_| handle_sort(SortColumn::Progress)>
                                             <div class="flex items-center gap-2">"Progress" {move || sort_icon(SortColumn::Progress)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("Status").then(|| view! {
-                                        <DataTableHead class="w-24 cursor-pointer group select-none" on:click=move |_| handle_sort(SortColumn::Status)>
+                                        <DataTableHead class="w-24 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground" on:click=move |_| handle_sort(SortColumn::Status)>
                                             <div class="flex items-center gap-2">"Status" {move || sort_icon(SortColumn::Status)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("DownSpeed").then(|| view! {
-                                        <DataTableHead class="w-24 cursor-pointer group select-none text-right" on:click=move |_| handle_sort(SortColumn::DownSpeed)>
+                                        <DataTableHead class="w-24 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground text-right" on:click=move |_| handle_sort(SortColumn::DownSpeed)>
                                             <div class="flex items-center justify-end gap-2">"DL Speed" {move || sort_icon(SortColumn::DownSpeed)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("UpSpeed").then(|| view! {
-                                        <DataTableHead class="w-24 cursor-pointer group select-none text-right" on:click=move |_| handle_sort(SortColumn::UpSpeed)>
+                                        <DataTableHead class="w-24 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground text-right" on:click=move |_| handle_sort(SortColumn::UpSpeed)>
                                             <div class="flex items-center justify-end gap-2">"UP Speed" {move || sort_icon(SortColumn::UpSpeed)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("ETA").then(|| view! {
-                                        <DataTableHead class="w-24 cursor-pointer group select-none text-right" on:click=move |_| handle_sort(SortColumn::ETA)>
+                                        <DataTableHead class="w-24 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground text-right" on:click=move |_| handle_sort(SortColumn::ETA)>
                                             <div class="flex items-center justify-end gap-2">"ETA" {move || sort_icon(SortColumn::ETA)}</div>
                                         </DataTableHead>
                                     }).into_any()}
                                     
                                     {move || visible_columns.get().contains("AddedDate").then(|| view! {
-                                        <DataTableHead class="w-32 cursor-pointer group select-none text-right" on:click=move |_| handle_sort(SortColumn::AddedDate)>
+                                        <DataTableHead class="w-32 cursor-pointer group select-none transition-all duration-100 active:scale-[0.98] hover:bg-muted/30 hover:text-foreground text-right" on:click=move |_| handle_sort(SortColumn::AddedDate)>
                                             <div class="flex items-center justify-end gap-2">"Date" {move || sort_icon(SortColumn::AddedDate)}</div>
                                         </DataTableHead>
                                     }).into_any()}
@@ -407,6 +504,44 @@ pub fn TorrentTable() -> impl IntoView {
                         </DataTable>
                     </div>
                 </DataTableWrapper>
+
+                // Mobile Card View
+                <div class="block md:hidden h-full overflow-y-auto space-y-4 pb-32 px-1">
+                     <Show
+                        when=move || !filtered_hashes.get().is_empty()
+                        fallback=move || view! {
+                            <div class="flex flex-col items-center justify-center h-64 opacity-50 text-muted-foreground">
+                                <Inbox class="size-12 mb-2" />
+                                <p>"Torrent Bulunamadı"</p>
+                            </div>
+                        }.into_any()
+                    >
+                        <For each=move || filtered_hashes.get() key=|hash| hash.clone() children={
+                            let on_action = on_action.clone();
+                            move |hash| {
+                                let h = hash.clone();
+                                let is_selected = Signal::derive(move || {
+                                    selected_hashes.with(|selected| selected.contains(&h))
+                                });
+                                let h_for_change = hash.clone();
+                                
+                                view! { 
+                                    <TorrentCard 
+                                        hash=hash.clone() 
+                                        on_action=on_action.clone() 
+                                        is_selected=is_selected
+                                        on_select=Callback::new(move |checked| {
+                                            selected_hashes.update(|selected| {
+                                                if checked { selected.insert(h_for_change.clone()); }
+                                                else { selected.remove(&h_for_change); }
+                                            });
+                                        })
+                                    /> 
+                                }
+                            }
+                        } />
+                    </Show>
+                </div>
             </div>
 
             <div class="hidden md:flex items-center justify-between px-2 py-1 text-[11px] text-muted-foreground bg-muted/20 border rounded-md">
@@ -443,7 +578,6 @@ fn TorrentRow(
                 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" };
                     
                     let is_active_selection = Memo::new(move |_| {
                         let selected = store.selected_torrent.get();
@@ -499,8 +633,18 @@ fn TorrentRow(
 
                                 {move || visible_columns.get().contains("Status").then({
                                     let status_text = format!("{:?}", t.status);
-                                    let color = status_color;
-                                    move || view! { <DataTableCell class={format!("text-xs font-semibold whitespace-nowrap {}", color)}>{status_text.clone()}</DataTableCell> }
+                                    let variant = match t.status {
+                                        shared::TorrentStatus::Seeding => BadgeVariant::Success,
+                                        shared::TorrentStatus::Downloading => BadgeVariant::Info,
+                                        shared::TorrentStatus::Paused => BadgeVariant::Warning,
+                                        shared::TorrentStatus::Error => BadgeVariant::Destructive,
+                                        _ => BadgeVariant::Secondary,
+                                    };
+                                    move || view! { 
+                                        <DataTableCell class="whitespace-nowrap">
+                                            <Badge variant=variant>{status_text.clone()}</Badge>
+                                        </DataTableCell> 
+                                    }
                                 }).into_any()}
 
                                 {move || visible_columns.get().contains("DownSpeed").then({
@@ -547,6 +691,8 @@ fn TorrentRow(
 fn TorrentCard(
     hash: String,
     on_action: Callback<(String, String)>,
+    is_selected: Signal<bool>,
+    on_select: Callback<bool>,
 ) -> impl IntoView {
     let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
     let h = hash.clone();
@@ -561,48 +707,73 @@ fn TorrentCard(
                 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" };
+                    let status_variant = match t.status { 
+                        shared::TorrentStatus::Seeding => BadgeVariant::Success, 
+                        shared::TorrentStatus::Downloading => BadgeVariant::Info, 
+                        shared::TorrentStatus::Paused => BadgeVariant::Warning, 
+                        shared::TorrentStatus::Error => BadgeVariant::Destructive, 
+                        _ => BadgeVariant::Secondary 
+                    };
                     let h_for_menu = stored_hash.get_value();
 
                     view! {
                         <TorrentContextMenu torrent_hash=h_for_menu on_action=on_action.clone()>
                             <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"
+                                class=move || tw_merge!(
+                                    "rounded-lg transition-all duration-200 border cursor-pointer select-none overflow-hidden active:scale-[0.98]",
+                                    if is_selected.get() { 
+                                        "bg-primary/10 border-primary shadow-sm" 
+                                    } else { 
+                                        "bg-card border-border hover:border-primary/50" 
                                     }
+                                )
+                                on:click=move |_| {
+                                    let current = is_selected.get();
+                                    on_select.run(!current);
+                                    store.selected_torrent.set(Some(stored_hash.get_value()));
                                 }
-                                on:click=move |_| store.selected_torrent.set(Some(stored_hash.get_value()))
                             >
-                            <Card class="h-full select-none cursor-pointer hover:border-primary transition-colors">
-                                <CardHeader class="p-3 pb-0">
-                                    <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>
-                                    </div>
-                                </CardHeader>
-                                <CardBody 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">
-                                            <span>{format_bytes(t.size)}</span>
-                                            <span>{format!("{:.1}%", t.percent_complete)}</span>
+                                <div class="p-4 space-y-3">
+                                    <div class="flex justify-between items-start gap-3">
+                                        <div class="flex-1 min-w-0">
+                                            <h3 class="text-sm font-bold leading-tight line-clamp-2 break-all">{t_name.clone()}</h3>
                                         </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>
+                                        <Badge variant=status_variant class="uppercase tracking-wider text-[10px]">
+                                            {format!("{:?}", t.status)}
+                                        </Badge>
+                                    </div>
+
+                                    <div class="space-y-1.5">
+                                        <div class="flex justify-between text-[10px] font-medium text-muted-foreground">
+                                            <span class="flex items-center gap-1">
+                                                <span class="opacity-70">"Boyut:"</span> {format_bytes(t.size)}
+                                            </span>
+                                            <span class="font-bold text-primary">{format!("{:.1}%", t.percent_complete)}</span>
+                                        </div>
+                                        <div class="h-2 w-full bg-secondary rounded-full overflow-hidden">
+                                            <div class="h-full bg-primary transition-all duration-500 ease-out" style=format!("width: {}%", t.percent_complete)></div>
                                         </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 class="grid grid-cols-2 gap-y-2 gap-x-4 text-[10px] font-mono pt-2 border-t border-border/40">
+                                        <div class="flex flex-col gap-0.5">
+                                            <span class="text-muted-foreground uppercase text-[8px] tracking-tighter">"İndirme"</span>
+                                            <span class="text-blue-600 dark:text-blue-400 font-bold">{format_speed(t.down_rate)}</span>
+                                        </div>
+                                        <div class="flex flex-col gap-0.5">
+                                            <span class="text-muted-foreground uppercase text-[8px] tracking-tighter">"Gönderme"</span>
+                                            <span class="text-green-600 dark:text-green-400 font-bold">{format_speed(t.up_rate)}</span>
+                                        </div>
+                                        <div class="flex flex-col gap-0.5">
+                                            <span class="text-muted-foreground uppercase text-[8px] tracking-tighter">"Kalan Süre"</span>
+                                            <span class="text-foreground font-medium">{format_duration(t.eta)}</span>
+                                        </div>
+                                        <div class="flex flex-col gap-0.5 items-end text-right">
+                                            <span class="text-muted-foreground uppercase text-[8px] tracking-tighter">"Eklenme"</span>
+                                            <span class="text-foreground/70">{format_date(t.added_date)}</span>
+                                        </div>
                                     </div>
-                                </CardBody>
-                            </Card>
+                                </div>
                             </div>
                         </TorrentContextMenu>
                     }.into_any()
@@ -610,4 +781,4 @@ fn TorrentCard(
             }
         </Show>
     }.into_any()
-}
+}

frontend/src/components/ui/accordion.rs

@@ -1,39 +1,31 @@
 use leptos::prelude::*;
-use tw_merge::tw_merge;
 
 #[component]
 pub fn Accordion(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!("w-full", class);
-    view! { <div class=class>{children()}</div> }
+    let _ = (children, class);
+    view! { <div>"Accordion Not Implemented"</div> }
 }
 
 #[component]
 pub fn AccordionItem(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!("border-b", class);
-    view! { <div class=class>{children()}</div> }
+    let _ = (children, class);
+    view! { <div>"AccordionItem Not Implemented"</div> }
 }
 
 #[component]
 pub fn AccordionHeader(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!("flex", class);
-    view! { <div class=class>{children()}</div> }
+    let _ = (children, class);
+    view! { <div>"AccordionHeader Not Implemented"</div> }
 }
 
 #[component]
 pub fn AccordionTrigger(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!(
-        "flex flex-1 items-center justify-between py-4 font-medium transition-all hover:underline [&[data-state=open]>svg]:rotate-180",
-        class
-    );
-    view! {
-        <button type="button" class=class>
-            {children()}
-        </button>
-    }
+    let _ = (children, class);
+    view! { <div>"AccordionTrigger Not Implemented"</div> }
 }
 
 #[component]
 pub fn AccordionContent(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!("overflow-hidden text-sm transition-all", class);
-    view! { <div class=class>{children()}</div> }
+    let _ = (children, class);
+    view! { <div>"AccordionContent Not Implemented"</div> }
 }

frontend/src/components/ui/badge.rs

@@ -0,0 +1,41 @@
+use leptos::prelude::*;
+use tailwind_fuse::tw_merge;
+
+#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display)]
+pub enum BadgeVariant {
+    #[default]
+    Default,
+    Secondary,
+    Destructive,
+    Success,
+    Warning,
+    Info,
+}
+
+#[component]
+pub fn Badge(
+    children: Children,
+    #[prop(optional, default = BadgeVariant::Default)] variant: BadgeVariant,
+    #[prop(optional, into)] class: String,
+) -> impl IntoView {
+    let variant_classes = match variant {
+        BadgeVariant::Default => "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
+        BadgeVariant::Secondary => "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
+        BadgeVariant::Destructive => "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
+        BadgeVariant::Success => "border-transparent bg-green-500/10 text-green-600 dark:text-green-400 border-green-500/20",
+        BadgeVariant::Warning => "border-transparent bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 border-yellow-500/20",
+        BadgeVariant::Info => "border-transparent bg-blue-500/10 text-blue-600 dark:text-blue-400 border-blue-500/20",
+    };
+
+    let class = tw_merge!(
+        "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",
+        variant_classes,
+        class
+    );
+
+    view! {
+        <div class=class>
+            {children()}
+        </div>
+    }
+}

frontend/src/components/ui/context_menu.rs

@@ -209,7 +209,7 @@ pub fn ContextMenuTrigger(
             class=trigger_class
             data-name="ContextMenuTrigger"
             data-context-trigger=ctx.target_id
-            on:contextmenu=move |e: web_sys::MouseEvent| {
+            on:contextmenu=move |_e: web_sys::MouseEvent| {
                 if let Some(cb) = on_open {
                     cb.run(());
                 }

frontend/src/components/ui/data_table.rs

@@ -1,6 +1,6 @@
 // * Reuse @table.rs
 pub use crate::components::ui::table::{
-    Table as DataTable, TableBody as DataTableBody, TableCaption as DataTableCaption, TableCell as DataTableCell,
-    TableFooter as DataTableFooter, TableHead as DataTableHead, TableHeader as DataTableHeader,
+    Table as DataTable, TableBody as DataTableBody, TableCell as DataTableCell,
+    TableHead as DataTableHead, TableHeader as DataTableHeader,
     TableRow as DataTableRow, TableWrapper as DataTableWrapper,
-};
+};

frontend/src/components/ui/dialog.rs

@@ -18,10 +18,6 @@ mod components {
 
 pub use components::*;
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
 #[derive(Clone)]
 struct DialogContext {
     target_id: String,
@@ -30,11 +26,8 @@ struct DialogContext {
 #[component]
 pub fn Dialog(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
     let dialog_target_id = use_random_id_for("dialog");
-
     let ctx = DialogContext { target_id: dialog_target_id.clone() };
-
     let merged_class = tw_merge!("w-fit", class);
-
     view! {
         <Provider value=ctx>
             <div class=merged_class data-name="__Dialog">
@@ -53,16 +46,8 @@ pub fn DialogTrigger(
 ) -> impl IntoView {
     let ctx = expect_context::<DialogContext>();
     let trigger_id = format!("trigger_{}", ctx.target_id);
-
     view! {
-        <Button
-            class=class
-            attr:id=trigger_id
-            attr:tabindex="0"
-            attr:data-dialog-trigger=ctx.target_id
-            variant=variant
-            size=size
-        >
+        <Button class=class attr:id=trigger_id attr:tabindex="0" attr:data-dialog-trigger=ctx.target_id variant=variant size=size>
             {children()}
         </Button>
     }
@@ -78,130 +63,56 @@ pub fn DialogContent(
 ) -> impl IntoView {
     let ctx = expect_context::<DialogContext>();
     let merged_class = tw_merge!(
-        // "flex flex-col gap-4", // TODO 🐛 Bug when I try to have this.. Using DialogBody instead.
         "relative bg-background border rounded-2xl shadow-lg p-6 w-full max-w-[calc(100%-2rem)] max-h-[85vh] fixed top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] z-100 transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100",
         class
     );
-
     let backdrop_data_name = format!("{}Backdrop", data_name_prefix);
     let content_data_name = format!("{}Content", data_name_prefix);
-
     let target_id_clone = ctx.target_id.clone();
     let backdrop_id = format!("{}_backdrop", ctx.target_id);
     let target_id_for_script = ctx.target_id.clone();
     let backdrop_id_for_script = backdrop_id.clone();
     let backdrop_behavior = if close_on_backdrop_click { "auto" } else { "manual" };
-
     view! {
-        <script src="/hooks/lock_scroll.js"></script>
-
-        <div
-            data-name=backdrop_data_name
-            id=backdrop_id
-            class="fixed inset-0 transition-opacity duration-200 pointer-events-none z-60 bg-black/50 data-[state=closed]:opacity-0 data-[state=open]:opacity-100"
-            data-state="closed"
-        />
-
-        <div
-            data-name=content_data_name
-            class=merged_class
-            id=ctx.target_id
-            data-target="target__dialog"
-            data-state="closed"
-            data-backdrop=backdrop_behavior
-            style="pointer-events: none;"
-        >
-            <button
-                type="button"
-                class=format!(
-                    "absolute top-4 right-4 p-1 rounded-sm focus:ring-2 focus:ring-offset-2 focus:outline-none [&_svg:not([class*='size-'])]:size-4 focus:ring-ring{}",
-                    if hide_close_button.unwrap_or(false) { " hidden" } else { "" },
-                )
-                data-dialog-close=target_id_clone.clone()
-                aria-label="Close dialog"
-            >
+        <script src="/lock_scroll.js"></script>
+        <div data-name=backdrop_data_name id=backdrop_id class="fixed inset-0 transition-opacity duration-200 pointer-events-none z-60 bg-black/50 data-[state=closed]:opacity-0 data-[state=open]:opacity-100" data-state="closed" />
+        <div data-name=content_data_name class=merged_class id=ctx.target_id data-target="target__dialog" data-state="closed" data-backdrop=backdrop_behavior style="pointer-events: none;">
+            <button type="button" class=format!("absolute top-4 right-4 p-1 rounded-sm focus:ring-2 focus:ring-offset-2 focus:outline-none [&_svg:not([class*='size-'])]:size-4 focus:ring-ring{}", if hide_close_button.unwrap_or(false) { " hidden" } else { "" }) data-dialog-close=target_id_clone.clone() aria-label="Close dialog">
                 <span class="hidden">"Close Dialog"</span>
                 <X />
             </button>
-
             {children()}
         </div>
-
         <script>
-            {format!(
-                r#"
+            {format!(r#"
                 (function() {{
                     const setupDialog = () => {{
                         const dialog = document.querySelector('#{}');
                         const backdrop = document.querySelector('#{}');
                         const trigger = document.querySelector('[data-dialog-trigger="{}"]');
-
-                        if (!dialog || !backdrop || !trigger) {{
-                            setTimeout(setupDialog, 50);
-                            return;
-                        }}
-
-                        if (dialog.hasAttribute('data-initialized')) {{
-                            return;
-                        }}
+                        if (!dialog || !backdrop || !trigger || dialog.hasAttribute('data-initialized')) return;
                         dialog.setAttribute('data-initialized', 'true');
-
                         const openDialog = () => {{
-                            // Lock scrolling
-                            window.ScrollLock.lock();
-
+                            if (window.ScrollLock) window.ScrollLock.lock();
                             dialog.setAttribute('data-state', 'open');
                             backdrop.setAttribute('data-state', 'open');
                             dialog.style.pointerEvents = 'auto';
                             backdrop.style.pointerEvents = 'auto';
                         }};
-
                         const closeDialog = () => {{
                             dialog.setAttribute('data-state', 'closed');
                             backdrop.setAttribute('data-state', 'closed');
                             dialog.style.pointerEvents = 'none';
                             backdrop.style.pointerEvents = 'none';
-
-                            // Unlock scrolling after animation
-                            window.ScrollLock.unlock(200);
+                            if (window.ScrollLock) window.ScrollLock.unlock(200);
                         }};
-
-                        // Open dialog when trigger is clicked
                         trigger.addEventListener('click', openDialog);
-
-                        // Close buttons
-                        const closeButtons = dialog.querySelectorAll('[data-dialog-close]');
-                        closeButtons.forEach(btn => {{
-                            btn.addEventListener('click', closeDialog);
-                        }});
-
-                        // Close on backdrop click (if data-backdrop="auto")
-                        backdrop.addEventListener('click', () => {{
-                            if (dialog.getAttribute('data-backdrop') === 'auto') {{
-                                closeDialog();
-                            }}
-                        }});
-
-                        // Handle ESC key to close
-                        document.addEventListener('keydown', (e) => {{
-                            if (e.key === 'Escape' && dialog.getAttribute('data-state') === 'open') {{
-                                e.preventDefault();
-                                closeDialog();
-                            }}
-                        }});
+                        dialog.querySelectorAll('[data-dialog-close]').forEach(btn => btn.addEventListener('click', closeDialog));
+                        backdrop.addEventListener('click', () => {{ if (dialog.getAttribute('data-backdrop') === 'auto') closeDialog(); }});
                     }};
-
-                    if (document.readyState === 'loading') {{
-                        document.addEventListener('DOMContentLoaded', setupDialog);
-                    }} else {{
-                        setupDialog();
-                    }}
+                    setupDialog();
                 }})();
-                "#,
-                target_id_for_script,
-                backdrop_id_for_script,
-                target_id_for_script,
-            )}
+            "#, target_id_for_script, backdrop_id_for_script, target_id_for_script)}
         </script>
     }
 }
@@ -214,15 +125,8 @@ pub fn DialogClose(
     #[prop(default = ButtonSize::Default)] size: ButtonSize,
 ) -> impl IntoView {
     let ctx = expect_context::<DialogContext>();
-
     view! {
-        <Button
-            class=class
-            attr:data-dialog-close=ctx.target_id
-            attr:aria-label="Close dialog"
-            variant=variant
-            size=size
-        >
+        <Button class=class attr:data-dialog-close=ctx.target_id attr:aria-label="Close dialog" variant=variant size=size>
             {children()}
         </Button>
     }
@@ -235,17 +139,11 @@ pub fn DialogAction(
     #[prop(default = ButtonVariant::Default)] variant: ButtonVariant,
     #[prop(default = ButtonSize::Default)] size: ButtonSize,
 ) -> impl IntoView {
+    let _ = (class, variant, size);
     let ctx = expect_context::<DialogContext>();
-
     view! {
-        <Button
-            class=class
-            attr:data-dialog-close=ctx.target_id
-            attr:aria-label="Close dialog"
-            variant=variant
-            size=size
-        >
+        <Button attr:data-dialog-close=ctx.target_id attr:aria-label="Close dialog">
             {children()}
         </Button>
     }
-}
+}

frontend/src/components/ui/dropdown_menu.rs

@@ -1,4 +1,3 @@
-use icons::{Check, ChevronRight};
 use leptos::context::Provider;
 use leptos::prelude::*;
 use leptos_ui::clx;
@@ -18,27 +17,20 @@ mod components {
 
 pub use components::*;
 
-/* ========================================================== */
-/*                     RADIO GROUP                            */
-/* ========================================================== */
-
 #[derive(Clone)]
 struct DropdownMenuRadioContext<T: Clone + PartialEq + Send + Sync + 'static> {
     value_signal: RwSignal<T>,
 }
 
-/// A group of radio items where only one can be selected at a time.
 #[component]
 pub fn DropdownMenuRadioGroup<T>(
     children: Children,
-    /// The signal holding the current selected value
     value: RwSignal<T>,
 ) -> impl IntoView
 where
     T: Clone + PartialEq + Send + Sync + 'static,
 {
     let ctx = DropdownMenuRadioContext { value_signal: value };
-
     view! {
         <Provider value=ctx>
             <ul data-name="DropdownMenuRadioGroup" role="group" class="group">
@@ -48,11 +40,9 @@ where
     }
 }
 
-/// A radio item that shows a checkmark when selected.
 #[component]
 pub fn DropdownMenuRadioItem<T>(
     children: Children,
-    /// The value this item represents
     value: T,
     #[prop(optional, into)] class: String,
 ) -> impl IntoView
@@ -60,16 +50,13 @@ where
     T: Clone + PartialEq + Send + Sync + 'static,
 {
     let ctx = expect_context::<DropdownMenuRadioContext<T>>();
-
     let value_for_check = value.clone();
     let value_for_click = value.clone();
     let is_selected = move || ctx.value_signal.get() == value_for_check;
-
     let merged_class = tw_merge!(
         "group inline-flex gap-2 items-center w-full rounded-sm pl-2 pr-2 py-1.5 text-sm cursor-pointer no-underline transition-colors duration-200 text-popover-foreground hover:bg-accent hover:text-accent-foreground [&_svg:not([class*='size-'])]:size-4",
         class
     );
-
     view! {
         <li
             data-name="DropdownMenuRadioItem"
@@ -82,138 +69,53 @@ where
             }
         >
             {children()}
-            <Check class="ml-auto opacity-0 size-4 text-muted-foreground group-aria-checked:opacity-100" />
+            <icons::Check class="ml-auto opacity-0 size-4 text-muted-foreground group-aria-checked:opacity-100" />
         </li>
     }
 }
 
-/// An action item in a dropdown menu (no checkmark, just triggers an action).
 #[component]
 pub fn DropdownMenuAction(
     children: Children,
     #[prop(optional, into)] class: String,
     #[prop(optional, into)] href: Option<String>,
 ) -> impl IntoView {
-    let _ctx = expect_context::<DropdownMenuContext>();
-
     let class = tw_merge!(
         "inline-flex gap-2 items-center w-full text-sm text-left transition-colors duration-200 focus:outline-none focus-visible:outline-none text-popover-foreground [&_svg:not([class*='size-'])]:size-4 hover:bg-accent hover:text-accent-foreground",
         class
     );
-
     if let Some(href) = href {
-        // Render as <a> tag when href is provided
         view! {
             <a data-name="DropdownMenuAction" class=class href=href data-dropdown-close="true">
                 {children()}
             </a>
-
-            <script>
-                {r#"
-                (function() {
-                const link = document.currentScript.previousElementSibling;
-                if (!link) return;
-                
-                link.addEventListener('click', function() {
-                // Close dropdown on route change after navigation
-                let currentPath = window.location.pathname;
-                const checkRouteChange = () => {
-                if (window.location.pathname !== currentPath) {
-                currentPath = window.location.pathname;
-                
-                // Find and close the dropdown
-                const dropdown = link.closest('[data-target="target__dropdown"]');
-                if (dropdown) {
-                dropdown.setAttribute('data-state', 'closed');
-                dropdown.style.pointerEvents = 'none';
-                
-                // Unlock scroll
-                if (window.ScrollLock) {
-                window.ScrollLock.unlock(200);
-                }
-                }
-                
-                clearInterval(routeCheckInterval);
-                }
-                };
-                
-                const routeCheckInterval = setInterval(checkRouteChange, 50);
-                
-                // Clear interval after 2 seconds to prevent memory leaks
-                setTimeout(() => clearInterval(routeCheckInterval), 2000);
-                });
-                })();
-                "#}
-            </script>
-        }
-        .into_any()
+        }.into_any()
     } else {
-        // Render as <button> tag when no href
         view! {
             <button type="button" data-name="DropdownMenuAction" class=class data-dropdown-close="true">
                 {children()}
             </button>
-        }
-        .into_any()
+        }.into_any()
     }
 }
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
 #[derive(Clone, Copy, PartialEq, Eq, Default)]
+#[allow(dead_code)]
 pub enum DropdownMenuAlign {
-    #[default]
-    Start,
-    StartOuter,
-    End,
-    EndOuter,
-    Center,
+    #[default] Start, StartOuter, End, EndOuter, Center,
 }
 
 #[derive(Clone)]
 struct DropdownMenuContext {
     target_id: String,
-    align: DropdownMenuAlign,
 }
 
 #[component]
-pub fn DropdownMenu(
-    children: Children,
-    #[prop(default = DropdownMenuAlign::default())] align: DropdownMenuAlign,
-) -> impl IntoView {
+pub fn DropdownMenu(children: Children) -> impl IntoView {
     let dropdown_target_id = use_random_id_for("dropdown");
-
-    let ctx = DropdownMenuContext { target_id: dropdown_target_id.clone(), align };
-
+    let ctx = DropdownMenuContext { target_id: dropdown_target_id.clone() };
     view! {
         <Provider value=ctx>
-            <style>
-                "
-                /* Submenu Styles */
-                .dropdown__menu_sub_content {
-                    position: absolute;
-                    inset-inline-start: calc(100% + 8px);
-                    inset-block-start: -4px;
-                    z-index: 100;
-                    min-inline-size: 160px;
-                    opacity: 0;
-                    visibility: hidden;
-                    transform: translateX(-8px);
-                    transition: all 0.2s ease-out;
-                    pointer-events: none;
-                }
-                
-                .dropdown__menu_sub_trigger:hover .dropdown__menu_sub_content {
-                    opacity: 1;
-                    visibility: visible;
-                    transform: translateX(0);
-                    pointer-events: auto;
-                }
-                "
-            </style>
-
             <div data-name="DropdownMenu">{children()}</div>
         </Provider>
     }
@@ -223,314 +125,105 @@ pub fn DropdownMenu(
 pub fn DropdownMenuTrigger(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
     let ctx = expect_context::<DropdownMenuContext>();
     let button_class = tw_merge!(
-        "px-4 py-2 h-9 inline-flex justify-center items-center text-sm font-medium whitespace-nowrap rounded-md transition-colors w-fit focus:outline-none focus:ring-1 focus:ring-ring focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4  border bg-background border-input hover:bg-accent hover:text-accent-foreground",
+        "px-4 py-2 h-9 inline-flex justify-center items-center text-sm font-medium whitespace-nowrap rounded-md transition-colors w-fit focus:outline-none focus:ring-1 focus:ring-ring focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&_svg:not([class*='size-'])]:size-4 border bg-background border-input hover:bg-accent hover:text-accent-foreground",
         class
     );
-
     view! {
-        <button
-            type="button"
-            class=button_class
-            data-name="DropdownMenuTrigger"
-            data-dropdown-trigger=ctx.target_id
-            tabindex="0"
-        >
+        <button type="button" class=button_class data-name="DropdownMenuTrigger" data-dropdown-trigger=ctx.target_id tabindex="0">
             {children()}
         </button>
     }
 }
 
 #[derive(Clone, Copy, PartialEq, Eq, Default)]
+#[allow(dead_code)]
 pub enum DropdownMenuPosition {
-    #[default]
-    Auto,
-    Top,
-    Bottom,
+    #[default] Auto, Top, Bottom,
 }
 
 #[component]
 pub fn DropdownMenuContent(
     children: Children,
     #[prop(optional, into)] class: String,
+    #[prop(default = DropdownMenuAlign::default())] align: DropdownMenuAlign,
     #[prop(default = DropdownMenuPosition::default())] position: DropdownMenuPosition,
 ) -> impl IntoView {
     let ctx = expect_context::<DropdownMenuContext>();
-
     let base_classes = "z-50 p-1 rounded-md border bg-card shadow-md h-fit fixed transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100";
-    let width_class = match ctx.align {
+    let width_class = match align {
         DropdownMenuAlign::Center => "min-w-full",
         _ => "w-[180px]",
     };
-
     let class = tw_merge!(width_class, base_classes, class);
-
     let target_id_for_script = ctx.target_id.clone();
-    let align_for_script = match ctx.align {
-        DropdownMenuAlign::Start => "start",
-        DropdownMenuAlign::StartOuter => "start-outer",
-        DropdownMenuAlign::End => "end",
-        DropdownMenuAlign::EndOuter => "end-outer",
+    let align_for_script = match align {
+        DropdownMenuAlign::Start => "start", DropdownMenuAlign::StartOuter => "start-outer",
+        DropdownMenuAlign::End => "end", DropdownMenuAlign::EndOuter => "end-outer",
         DropdownMenuAlign::Center => "center",
     };
-
     let position_for_script = match position {
-        DropdownMenuPosition::Auto => "auto",
-        DropdownMenuPosition::Top => "top",
-        DropdownMenuPosition::Bottom => "bottom",
+        DropdownMenuPosition::Auto => "auto", DropdownMenuPosition::Top => "top", DropdownMenuPosition::Bottom => "bottom",
     };
-
     view! {
-        <div
-            data-name="DropdownMenuContent"
-            class=class
-            id=ctx.target_id
-            data-target="target__dropdown"
-            data-state="closed"
-            data-align=align_for_script
-            data-position=position_for_script
-            style="pointer-events: none;"
-        >
+        <div data-name="DropdownMenuContent" class=class id=ctx.target_id data-target="target__dropdown" data-state="closed" data-align=align_for_script data-position=position_for_script style="pointer-events: none;">
             {children()}
         </div>
-
         <script>
-            {format!(
-                r#"
+            {format!(r#"
                 (function() {{
                     const setupDropdown = () => {{
                         const dropdown = document.querySelector('#{}');
                         const trigger = document.querySelector('[data-dropdown-trigger="{}"]');
-
-                        if (!dropdown || !trigger) {{
-                            setTimeout(setupDropdown, 50);
-                            return;
-                        }}
-
-                        if (dropdown.hasAttribute('data-initialized')) {{
-                            return;
-                        }}
+                        if (!dropdown || !trigger || dropdown.hasAttribute('data-initialized')) return;
                         dropdown.setAttribute('data-initialized', 'true');
-
                         let isOpen = false;
-
-                        const updatePosition = () => {{
-                            const triggerRect = trigger.getBoundingClientRect();
-                            const dropdownRect = dropdown.getBoundingClientRect();
-                            const viewportHeight = window.innerHeight;
-                            const viewportWidth = window.innerWidth;
-                            const spaceBelow = viewportHeight - triggerRect.bottom;
-                            const spaceAbove = triggerRect.top;
-
-                            const align = dropdown.getAttribute('data-align') || 'start';
-                            const position = dropdown.getAttribute('data-position') || 'auto';
-
-                            // Determine if we should position above
-                            let shouldPositionAbove = false;
-                            if (position === 'top') {{
-                                shouldPositionAbove = true;
-                            }} else if (position === 'bottom') {{
-                                shouldPositionAbove = false;
-                            }} else {{
-                                // Auto: position above if there's space above AND not enough space below
-                                shouldPositionAbove = spaceAbove >= dropdownRect.height && spaceBelow < dropdownRect.height;
-                            }}
-
-                            switch (align) {{
-                                case 'start':
-                                    if (shouldPositionAbove) {{
-                                        dropdown.style.top = `${{triggerRect.top - dropdownRect.height - 6}}px`;
-                                        dropdown.style.transformOrigin = 'left bottom';
-                                    }} else {{
-                                        dropdown.style.top = `${{triggerRect.bottom + 6}}px`;
-                                        dropdown.style.transformOrigin = 'left top';
-                                    }}
-                                    dropdown.style.left = `${{triggerRect.left}}px`;
-                                    break;
-
-                                case 'end':
-                                    if (shouldPositionAbove) {{
-                                        dropdown.style.top = `${{triggerRect.top - dropdownRect.height - 6}}px`;
-                                        dropdown.style.transformOrigin = 'right bottom';
-                                    }} else {{
-                                        dropdown.style.top = `${{triggerRect.bottom + 6}}px`;
-                                        dropdown.style.transformOrigin = 'right top';
-                                    }}
-                                    dropdown.style.left = `${{triggerRect.right - dropdownRect.width}}px`;
-                                    break;
-
-                                case 'start-outer':
-                                    if (shouldPositionAbove) {{
-                                        dropdown.style.top = `${{triggerRect.top - dropdownRect.height - 6}}px`;
-                                        dropdown.style.transformOrigin = 'right bottom';
-                                    }} else {{
-                                        dropdown.style.top = `${{triggerRect.top}}px`;
-                                        dropdown.style.transformOrigin = 'right top';
-                                    }}
-                                    dropdown.style.left = `${{triggerRect.left - dropdownRect.width - 16}}px`;
-                                    break;
-
-                                case 'end-outer':
-                                    if (shouldPositionAbove) {{
-                                        dropdown.style.top = `${{triggerRect.top - dropdownRect.height - 6}}px`;
-                                        dropdown.style.transformOrigin = 'left bottom';
-                                    }} else {{
-                                        dropdown.style.top = `${{triggerRect.top}}px`;
-                                        dropdown.style.transformOrigin = 'left top';
-                                    }}
-                                    dropdown.style.left = `${{triggerRect.right + 8}}px`;
-                                    break;
-
-                                case 'center':
-                                    if (shouldPositionAbove) {{
-                                        dropdown.style.top = `${{triggerRect.top - dropdownRect.height - 6}}px`;
-                                        dropdown.style.transformOrigin = 'center bottom';
-                                    }} else {{
-                                        dropdown.style.top = `${{triggerRect.bottom + 6}}px`;
-                                        dropdown.style.transformOrigin = 'center top';
-                                    }}
-                                    dropdown.style.left = `${{triggerRect.left}}px`;
-                                    dropdown.style.minWidth = `${{triggerRect.width}}px`;
-                                    break;
-                            }}
-                        }};
-
                         const openDropdown = () => {{
                             isOpen = true;
-
-                            // Set state to open first to remove scale transform for accurate measurements
                             dropdown.setAttribute('data-state', 'open');
-
-                            // Make dropdown invisible but rendered to measure true height
-                            dropdown.style.visibility = 'hidden';
                             dropdown.style.pointerEvents = 'auto';
-
-                            // Force reflow to ensure height is calculated
-                            dropdown.offsetHeight;
-
-                            // Calculate position with accurate height
-                            updatePosition();
-
-                            // Now make it visible
-                            dropdown.style.visibility = 'visible';
-
-                            // Lock all scrollable elements
-                            window.ScrollLock.lock();
-
-                            // Close on click outside
-                            setTimeout(() => {{
-                                document.addEventListener('click', handleClickOutside);
-                            }}, 0);
+                            if (window.ScrollLock) window.ScrollLock.lock();
+                            setTimeout(() => {{ document.addEventListener('click', handleClickOutside); }}, 0);
                         }};
-
                         const closeDropdown = () => {{
                             isOpen = false;
                             dropdown.setAttribute('data-state', 'closed');
                             dropdown.style.pointerEvents = 'none';
                             document.removeEventListener('click', handleClickOutside);
-
-                            // Unlock scroll after animation (200ms delay)
-                            window.ScrollLock.unlock(200);
+                            if (window.ScrollLock) window.ScrollLock.unlock(200);
                         }};
-
-                        const handleClickOutside = (e) => {{
-                            if (!dropdown.contains(e.target) && !trigger.contains(e.target)) {{
-                                closeDropdown();
-                            }}
-                        }};
-
-                        // Toggle dropdown when trigger is clicked
+                        const handleClickOutside = (e) => {{ if (!dropdown.contains(e.target) && !trigger.contains(e.target)) closeDropdown(); }};
                         trigger.addEventListener('click', (e) => {{
                             e.stopPropagation();
-
-                            // Check if any other dropdown is open
-                            const allDropdowns = document.querySelectorAll('[data-target=\"target__dropdown\"]');
-                            let otherDropdownOpen = false;
-                            allDropdowns.forEach(dd => {{
-                                if (dd !== dropdown && dd.getAttribute('data-state') === 'open') {{
-                                    otherDropdownOpen = true;
-                                    dd.setAttribute('data-state', 'closed');
-                                    dd.style.pointerEvents = 'none';
-                                    // Unlock scroll
-                                    if (window.ScrollLock) {{
-                                        window.ScrollLock.unlock(200);
-                                    }}
-                                }}
-                            }});
-
-                            // If another dropdown was open, just close it and don't open this one
-                            if (otherDropdownOpen) {{
-                                return;
-                            }}
-
-                            // Normal toggle behavior
-                            if (isOpen) {{
-                                closeDropdown();
-                            }} else {{
-                                openDropdown();
-                            }}
-                        }});
-
-                        // Close when action is clicked
-                        const actions = dropdown.querySelectorAll('[data-dropdown-close]');
-                        actions.forEach(action => {{
-                            action.addEventListener('click', () => {{
-                                closeDropdown();
-                            }});
-                        }});
-
-                        // Handle ESC key to close
-                        document.addEventListener('keydown', (e) => {{
-                            if (e.key === 'Escape' && isOpen) {{
-                                e.preventDefault();
-                                closeDropdown();
-                            }}
+                            if (isOpen) closeDropdown(); else openDropdown();
                         }});
+                        dropdown.querySelectorAll('[data-dropdown-close]').forEach(action => action.addEventListener('click', closeDropdown));
                     }};
-
-                    if (document.readyState === 'loading') {{
-                        document.addEventListener('DOMContentLoaded', setupDropdown);
-                    }} else {{
-                        setupDropdown();
-                    }}
+                    setupDropdown();
                 }})();
-                "#,
-                target_id_for_script,
-                target_id_for_script,
-            )}
+            "#, target_id_for_script, target_id_for_script)}
         </script>
     }
 }
 
 #[component]
 pub fn DropdownMenuSub(children: Children) -> impl IntoView {
-    // TODO. Find a better way for dropdown__menu_sub_trigger.
-    clx! {DropdownMenuSubRoot, li, "dropdown__menu_sub_trigger", " relative inline-flex relative gap-2 items-center py-1.5 px-2 w-full text-sm no-underline rounded-sm transition-colors duration-200 cursor-pointer text-popover-foreground [&_svg:not([class*='size-'])]:size-4 hover:bg-accent hover:text-accent-foreground"}
-
+    clx! {DropdownMenuSubRoot, li, "dropdown__menu_sub_trigger", "relative inline-flex gap-2 items-center py-1.5 px-2 w-full text-sm no-underline rounded-sm transition-colors duration-200 cursor-pointer text-popover-foreground hover:bg-accent hover:text-accent-foreground"}
     view! { <DropdownMenuSubRoot>{children()}</DropdownMenuSubRoot> }
 }
 
 #[component]
 pub fn DropdownMenuSubTrigger(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
     let class = tw_merge!("flex items-center justify-between w-full", class);
-
     view! {
         <span attr:data-name="DropdownMenuSubTrigger" class=class>
             <span class="flex gap-2 items-center">{children()}</span>
-            <ChevronRight class="opacity-70 size-4" />
+            <icons::ChevronRight class="opacity-70 size-4" />
         </span>
     }
 }
 
 #[component]
 pub fn DropdownMenuSubItem(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!(
-        "inline-flex gap-2 items-center w-full rounded-sm px-3 py-2 text-sm transition-all duration-150 ease text-popover-foreground hover:bg-accent hover:text-accent-foreground cursor-pointer hover:translate-x-[2px]",
-        class
-    );
-
-    view! {
-        <li data-name="DropdownMenuSubItem" class=class data-dropdown-close="true">
-            {children()}
-        </li>
-    }
-}
+    let class = tw_merge!("inline-flex gap-2 items-center w-full rounded-sm px-3 py-2 text-sm transition-all duration-150 ease text-popover-foreground hover:bg-accent hover:text-accent-foreground cursor-pointer hover:translate-x-[2px]", class);
+    view! { <li data-name="DropdownMenuSubItem" class=class data-dropdown-close="true">{children()}</li> }
+}

frontend/src/components/ui/mod.rs

@@ -1,5 +1,6 @@
 pub mod accordion;
 pub mod alert_dialog;
+pub mod badge;
 pub mod button;
 pub mod card;
 pub mod checkbox;
@@ -14,6 +15,7 @@ pub mod select;
 pub mod separator;
 pub mod sheet;
 pub mod sidenav;
+pub mod skeleton;
 pub mod svg_icon;
 pub mod table;
 pub mod theme_toggle;

frontend/src/components/ui/multi_select.rs

@@ -1,43 +1,29 @@
 use std::collections::HashSet;
-
 use icons::{Check, ChevronDown, ChevronUp};
 use leptos::context::Provider;
 use leptos::prelude::*;
 use tw_merge::*;
-
 use crate::components::hooks::use_can_scroll_vertical::use_can_scroll_vertical;
 use crate::components::hooks::use_random::use_random_id_for;
-// * Reuse @select.rs
 pub use crate::components::ui::select::{
-    SelectGroup as MultiSelectGroup, SelectItem as MultiSelectItem, SelectLabel as MultiSelectLabel,
+    SelectGroup as MultiSelectGroup, SelectItem as MultiSelectItem,
 };
 
 #[derive(Clone, Copy, PartialEq, Eq, Default)]
+#[allow(dead_code)]
 pub enum MultiSelectAlign {
-    Start,
-    #[default]
-    Center,
-    End,
+    Start, #[default] Center, End,
 }
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
 #[component]
 pub fn MultiSelectValue(#[prop(optional, into)] placeholder: String) -> impl IntoView {
     let multi_select_ctx = expect_context::<MultiSelectContext>();
-
     view! {
         <span data-name="MultiSelectValue" class="text-sm text-muted-foreground truncate">
             {move || {
                 let values = multi_select_ctx.values_signal.get();
-                if values.is_empty() {
-                    placeholder.clone()
-                } else {
-                    let count = values.len();
-                    if count == 1 { "1 selected".to_string() } else { format!("{} selected", count) }
-                }
+                if values.is_empty() { placeholder.clone() }
+                else { let count = values.len(); if count == 1 { "1 selected".to_string() } else { format!("{} selected", count) } }
             }}
         </span>
     }
@@ -50,41 +36,17 @@ pub fn MultiSelectOption(
     #[prop(optional, into)] value: Option<String>,
 ) -> impl IntoView {
     let multi_select_ctx = expect_context::<MultiSelectContext>();
-
     let value_clone = value.clone();
     let is_selected = Signal::derive(move || {
-        if let Some(ref val) = value_clone {
-            multi_select_ctx.values_signal.with(|values| values.contains(val))
-        } else {
-            false
-        }
+        if let Some(ref val) = value_clone { multi_select_ctx.values_signal.with(|values| values.contains(val)) } else { false }
     });
-
-    let class = tw_merge!(
-        "group inline-flex gap-2 items-center w-full text-sm text-left transition-colors duration-200 focus:outline-none focus-visible:outline-none text-popover-foreground [&_svg:not([class*='size-'])]:size-4 hover:bg-accent hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-50",
-        class
-    );
-
+    let class = tw_merge!("group inline-flex gap-2 items-center w-full text-sm text-left transition-colors duration-200 focus:outline-none focus-visible:outline-none text-popover-foreground hover:bg-accent hover:text-accent-foreground disabled:cursor-not-allowed disabled:opacity-50", class);
     view! {
-        <button
-            type="button"
-            data-name="MultiSelectOption"
-            class=class
-            role="option"
-            aria-selected=move || is_selected.get().to_string()
+        <button type="button" data-name="MultiSelectOption" class=class role="option" aria-selected=move || is_selected.get().to_string()
             on:click=move |ev: web_sys::MouseEvent| {
-                ev.prevent_default();
-                ev.stop_propagation();
+                ev.prevent_default(); ev.stop_propagation();
                 if let Some(val) = value.clone() {
-                    multi_select_ctx
-                        .values_signal
-                        .update(|values| {
-                            if values.contains(&val) {
-                                values.remove(&val);
-                            } else {
-                                values.insert(val);
-                            }
-                        });
+                    multi_select_ctx.values_signal.update(|values| { if values.contains(&val) { values.remove(&val); } else { values.insert(val); } });
                 }
             }
         >
@@ -94,10 +56,6 @@ pub fn MultiSelectOption(
     }
 }
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
 #[derive(Clone)]
 struct MultiSelectContext {
     target_id: String,
@@ -113,9 +71,7 @@ pub fn MultiSelect(
 ) -> impl IntoView {
     let multi_select_target_id = use_random_id_for("multi_select");
     let values_signal = values.unwrap_or_else(|| RwSignal::new(HashSet::<String>::new()));
-
     let multi_select_ctx = MultiSelectContext { target_id: multi_select_target_id.clone(), values_signal, align };
-
     view! {
         <Provider value=multi_select_ctx>
             <div data-name="MultiSelect" class="relative w-fit">
@@ -126,32 +82,12 @@ pub fn MultiSelect(
 }
 
 #[component]
-pub fn MultiSelectTrigger(
-    children: Children,
-    #[prop(optional, into)] class: String,
-    #[prop(optional, into)] id: String,
-) -> impl IntoView {
-    let multi_select_ctx = expect_context::<MultiSelectContext>();
-
-    let peer_class = if !id.is_empty() { format!("peer/{}", id) } else { String::new() };
-
-    let button_class = tw_merge!(
-        "w-full p-2 h-9 inline-flex items-center justify-between text-sm font-medium whitespace-nowrap rounded-md transition-colors focus:outline-none focus:ring-1 focus:ring-ring focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&_svg:not(:last-child)]:mr-2 [&_svg:not(:first-child)]:ml-2 [&_svg:not([class*='size-'])]:size-4  border bg-background border-input hover:bg-accent hover:text-accent-foreground",
-        &peer_class,
-        class
-    );
-
-    let button_id = if !id.is_empty() { id } else { format!("trigger_{}", multi_select_ctx.target_id) };
-
+pub fn MultiSelectTrigger(children: Children, #[prop(optional, into)] class: String, #[prop(optional, into)] id: String) -> impl IntoView {
+    let ctx = expect_context::<MultiSelectContext>();
+    let button_class = tw_merge!("w-full p-2 h-9 inline-flex items-center justify-between text-sm font-medium whitespace-nowrap rounded-md transition-colors focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 border bg-background border-input hover:bg-accent hover:text-accent-foreground", class);
+    let button_id = if !id.is_empty() { id } else { format!("trigger_{}", ctx.target_id) };
     view! {
-        <button
-            type="button"
-            data-name="MultiSelectTrigger"
-            class=button_class
-            id=button_id
-            tabindex="0"
-            data-multi-select-trigger=multi_select_ctx.target_id
-        >
+        <button type="button" data-name="MultiSelectTrigger" class=button_class id=button_id tabindex="0" data-multi-select-trigger=ctx.target_id>
             {children()}
             <ChevronDown class="text-muted-foreground" />
         </button>
@@ -161,134 +97,33 @@ pub fn MultiSelectTrigger(
 #[component]
 pub fn MultiSelectContent(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
     let multi_select_ctx = expect_context::<MultiSelectContext>();
-
-    let align_str = match multi_select_ctx.align {
-        MultiSelectAlign::Start => "start",
-        MultiSelectAlign::Center => "center",
-        MultiSelectAlign::End => "end",
-    };
-
-    let class = tw_merge!(
-        "w-[150px] overflow-auto z-50 p-1 rounded-md border bg-card shadow-md h-fit max-h-[300px] absolute top-[calc(100%+4px)] transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100 data-[align=start]:left-0 data-[align=center]:left-1/2 data-[align=center]:-translate-x-1/2 data-[align=end]:right-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
-        class
-    );
-
-    let target_id_for_script = multi_select_ctx.target_id.clone();
-    let target_id_for_script_2 = multi_select_ctx.target_id.clone();
-
-    // Scroll indicator signals
-    let (on_scroll, can_scroll_up_signal, can_scroll_down_signal) = use_can_scroll_vertical();
-
+    let align_str = match multi_select_ctx.align { MultiSelectAlign::Start => "start", MultiSelectAlign::Center => "center", MultiSelectAlign::End => "end" };
+    let class = tw_merge!("w-[150px] overflow-auto z-50 p-1 rounded-md border bg-card shadow-md h-fit max-h-[300px] absolute top-[calc(100%+4px)] transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100 data-[align=start]:left-0 data-[align=center]:left-1/2 data-[align=center]:-translate-x-1/2 data-[align=end]:right-0 [scrollbar-width:none] [&::-webkit-scrollbar]:hidden", class);
+    let target_id = multi_select_ctx.target_id.clone();
+    let (on_scroll, can_scroll_up, can_scroll_down) = use_can_scroll_vertical();
     view! {
-        <div
-            data-name="MultiSelectContent"
-            class=class
-            id=multi_select_ctx.target_id
-            data-target="target__multi_select"
-            data-state="closed"
-            data-align=align_str
-            style="pointer-events: none;"
-            on:scroll=move |ev| on_scroll.run(ev)
-        >
-            <div
-                data-scroll-up="true"
-                class=move || {
-                    let is_up: bool = can_scroll_up_signal.get();
-                    if is_up {
-                        "sticky -top-1 z-10 flex items-center justify-center py-1 bg-card"
-                    } else {
-                        "hidden"
-                    }
-                }
-            >
-                <ChevronUp class="size-4 text-muted-foreground" />
-            </div>
+        <div data-name="MultiSelectContent" class=class id=target_id.clone() data-target="target__multi_select" data-state="closed" data-align=align_str style="pointer-events: none;" on:scroll=move |ev| on_scroll.run(ev)>
+            <div class=move || if can_scroll_up.get() { "sticky -top-1 z-10 flex items-center justify-center py-1 bg-card" } else { "hidden" }><ChevronUp class="size-4 text-muted-foreground" /></div>
             {children()}
-            <div
-                data-scroll-down="true"
-                class=move || {
-                    let is_down: bool = can_scroll_down_signal.get();
-                    if is_down {
-                        "sticky -bottom-1 z-10 flex items-center justify-center py-1 bg-card"
-                    } else {
-                        "hidden"
-                    }
-                }
-            >
-                <ChevronDown class="size-4 text-muted-foreground" />
-            </div>
+            <div class=move || if can_scroll_down.get() { "sticky -bottom-1 z-10 flex items-center justify-center py-1 bg-card" } else { "hidden" }><ChevronDown class="size-4 text-muted-foreground" /></div>
         </div>
-
         <script>
-            {format!(
-                r#"
+            {format!(r#"
                 (function() {{
-                    const setupMultiSelect = () => {{
-                        const multiSelect = document.querySelector('#{}');
-                        const trigger = document.querySelector('[data-multi-select-trigger="{}"]');
-
-                        if (!multiSelect || !trigger) {{
-                            setTimeout(setupMultiSelect, 50);
-                            return;
-                        }}
-
-                        if (multiSelect.hasAttribute('data-initialized')) {{
-                            return;
-                        }}
-                        multiSelect.setAttribute('data-initialized', 'true');
-
+                    const setup = () => {{
+                        const ms = document.querySelector('#{}');
+                        const tr = document.querySelector('[data-multi-select-trigger="{}"]');
+                        if (!ms || !tr || ms.hasAttribute('data-initialized')) return;
+                        ms.setAttribute('data-initialized', 'true');
                         let isOpen = false;
-
-                        const openMultiSelect = () => {{
-                            isOpen = true;
-                            if (window.ScrollLock) window.ScrollLock.lock();
-                            multiSelect.setAttribute('data-state', 'open');
-                            multiSelect.style.pointerEvents = 'auto';
-                            const triggerRect = trigger.getBoundingClientRect();
-                            multiSelect.style.minWidth = `${{triggerRect.width}}px`;
-                            multiSelect.dispatchEvent(new Event('scroll'));
-                            setTimeout(() => {{
-                                document.addEventListener('click', handleClickOutside);
-                            }}, 0);
-                        }};
-
-                        const closeMultiSelect = () => {{
-                            isOpen = false;
-                            multiSelect.setAttribute('data-state', 'closed');
-                            multiSelect.style.pointerEvents = 'none';
-                            document.removeEventListener('click', handleClickOutside);
-                            if (window.ScrollLock) window.ScrollLock.unlock(200);
-                        }};
-
-                        const handleClickOutside = (e) => {{
-                            if (!multiSelect.contains(e.target) && !trigger.contains(e.target)) {{
-                                closeMultiSelect();
-                            }}
-                        }};
-
-                        trigger.addEventListener('click', (e) => {{
-                            e.stopPropagation();
-                            if (isOpen) closeMultiSelect(); else openMultiSelect();
-                        }});
-
-                        document.addEventListener('keydown', (e) => {{
-                            if (e.key === 'Escape' && isOpen) {{
-                                e.preventDefault();
-                                closeMultiSelect();
-                            }}
-                        }});
+                        const open = () => {{ isOpen = true; ms.setAttribute('data-state', 'open'); ms.style.pointerEvents = 'auto'; if (window.ScrollLock) window.ScrollLock.lock(); setTimeout(() => document.addEventListener('click', clickOut), 0); }};
+                        const close = () => {{ isOpen = false; ms.setAttribute('data-state', 'closed'); ms.style.pointerEvents = 'none'; document.removeEventListener('click', clickOut); if (window.ScrollLock) window.ScrollLock.unlock(200); }};
+                        const clickOut = (e) => {{ if (!ms.contains(e.target) && !tr.contains(e.target)) close(); }};
+                        tr.addEventListener('click', (e) => {{ e.stopPropagation(); if (isOpen) close(); else open(); }});
                     }};
-
-                    if (document.readyState === 'loading') {{
-                        document.addEventListener('DOMContentLoaded', setupMultiSelect);
-                    }} else {{
-                        setupMultiSelect();
-                    }}
+                    setup();
                 }})();
-                "#,
-                target_id_for_script,
-                target_id_for_script_2,
-            )}
+            "#, target_id, target_id)}
         </script>
-    }.into_any()
+    }
 }

frontend/src/components/ui/select.rs

@@ -1,311 +1,34 @@
-use icons::{Check, ChevronDown, ChevronUp};
-use leptos::context::Provider;
 use leptos::prelude::*;
-use leptos_ui::clx;
-use strum::{AsRefStr, Display};
-use tw_merge::*;
 
-use crate::components::hooks::use_can_scroll_vertical::use_can_scroll_vertical;
-use crate::components::hooks::use_random::use_random_id_for;
+#[component] pub fn SelectGroup(children: Children) -> impl IntoView { view! { <div class="px-1 py-1">{children()}</div> } }
+#[component] pub fn SelectItem(children: Children) -> impl IntoView { view! { <div class="relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-accent focus:text-accent-foreground">{children()}</div> } }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, Default, Display, AsRefStr)]
-pub enum SelectPosition {
-    #[default]
-    Below,
-    Above,
-}
-
-mod components {
-    use super::*;
-    clx! {SelectLabel, span, "px-2 py-1.5 text-sm font-medium data-inset:pl-8", "mb-1"}
-    clx! {SelectItem, li, "inline-flex gap-2 items-center w-full rounded-sm px-2 py-1.5 text-sm no-underline transition-colors duration-200 text-popover-foreground hover:bg-accent hover:text-accent-foreground [&_svg:not([class*='size-'])]:size-4"}
-}
-
-pub use components::*;
-
-#[component]
-pub fn SelectGroup(
-    children: Children,
-    #[prop(optional, into)] class: String,
-    #[prop(default = "Select options".into(), into)] aria_label: String,
-) -> impl IntoView {
-    let merged_class = tw_merge!("group", class);
-
-    view! {
-        <ul data-name="SelectGroup" role="listbox" aria-label=aria_label class=merged_class>
-            {children()}
-        </ul>
-    }
-}
+#[derive(Clone, Copy, PartialEq, Eq, Default, Debug)]
+#[allow(dead_code)]
+pub enum SelectPosition { #[default] Below, Above }
 
 #[component]
 pub fn SelectValue(#[prop(optional, into)] placeholder: String) -> impl IntoView {
-    let select_ctx = expect_context::<SelectContext>();
-
-    view! {
-        <span data-name="SelectValue" class="text-sm text-muted-foreground truncate">
-            {move || { select_ctx.value_signal.get().unwrap_or_else(|| placeholder.clone()) }}
-        </span>
-    }
+    view! { <span class="text-sm text-muted-foreground">{placeholder}</span> }
 }
 
 #[component]
-pub fn SelectOption(
-    children: Children,
-    #[prop(optional, into)] class: String,
-    #[prop(default = false.into(), into)] aria_selected: Signal<bool>,
-    #[prop(optional, into)] value: Option<String>,
-) -> impl IntoView {
-    let ctx = expect_context::<SelectContext>();
-
-    let merged_class = tw_merge!(
-        "group inline-flex gap-2 items-center w-full rounded-sm px-2 py-1.5 text-sm cursor-pointer no-underline transition-colors duration-200 text-popover-foreground hover:bg-accent hover:text-accent-foreground [&_svg:not([class*='size-'])]:size-4",
-        class
-    );
-
-    let value_for_check = value.clone();
-    let is_selected = move || aria_selected.get() || ctx.value_signal.get() == value_for_check;
-
-    view! {
-        <li
-            data-name="SelectOption"
-            class=merged_class
-            role="option"
-            tabindex="0"
-            aria-selected=move || is_selected().to_string()
-            data-select-option="true"
-            on:click=move |_| {
-                let val = value.clone();
-                ctx.value_signal.set(val.clone());
-                if let Some(on_change) = ctx.on_change {
-                    on_change.run(val);
-                }
-            }
-        >
-            {children()}
-            <Check class="ml-auto opacity-0 size-4 text-muted-foreground group-aria-selected:opacity-100" />
-        </li>
-    }
-}
-
-#[derive(Clone)]
-struct SelectContext {
-    target_id: String,
-    value_signal: RwSignal<Option<String>>,
-    on_change: Option<Callback<Option<String>>>,
+pub fn SelectOption(children: Children, #[prop(optional, into)] value: Option<String>) -> impl IntoView {
+    let _ = value;
+    view! { <div role="option">{children()}</div> }
 }
 
 #[component]
-pub fn Select(
-    children: Children,
-    #[prop(optional, into)] class: String,
-    #[prop(optional, into)] default_value: Option<String>,
-    #[prop(optional)] on_change: Option<Callback<Option<String>>>,
-) -> impl IntoView {
-    let select_target_id = use_random_id_for("select");
-    let value_signal = RwSignal::new(default_value);
-
-    let ctx = SelectContext { target_id: select_target_id.clone(), value_signal, on_change };
-
-    let merged_class = tw_merge!("relative w-fit", class);
-
-    view! {
-        <Provider value=ctx>
-            <div data-name="Select" class=merged_class>
-                {children()}
-            </div>
-        </Provider>
-    }
+pub fn Select(children: Children) -> impl IntoView {
+    view! { <div>{children()}</div> }
 }
 
 #[component]
-pub fn SelectTrigger(
-    children: Children,
-    #[prop(optional, into)] class: String,
-    #[prop(optional, into)] id: String,
-) -> impl IntoView {
-    let ctx = expect_context::<SelectContext>();
-
-    let peer_class = if !id.is_empty() { format!("peer/{}", id) } else { String::new() };
-
-    let button_class = tw_merge!(
-        "w-full p-2 h-9 inline-flex items-center justify-between text-sm font-medium whitespace-nowrap rounded-md transition-colors focus:outline-none focus:ring-1 focus:ring-ring focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&_svg:not(:last-child)]:mr-2 [&_svg:not(:first-child)]:ml-2 [&_svg:not([class*='size-'])]:size-4 border bg-background border-input hover:bg-accent hover:text-accent-foreground",
-        &peer_class,
-        class
-    );
-
-    let button_id = if !id.is_empty() { id } else { format!("trigger_{}", ctx.target_id) };
-
-    view! {
-        <button
-            type="button"
-            data-name="SelectTrigger"
-            class=button_class
-            id=button_id
-            tabindex="0"
-            data-select-trigger=ctx.target_id
-        >
-            {children()}
-            <ChevronDown class="text-muted-foreground" />
-        </button>
-    }
+pub fn SelectTrigger(children: Children) -> impl IntoView {
+    view! { <button type="button">{children()}</button> }
 }
 
 #[component]
-pub fn SelectContent(
-    children: Children,
-    #[prop(optional, into)] class: String,
-    #[prop(default = SelectPosition::default())] position: SelectPosition,
-    #[prop(optional)] on_close: Option<Callback<()>>,
-) -> impl IntoView {
-    let ctx = expect_context::<SelectContext>();
-
-    let merged_class = tw_merge!(
-        "w-[150px] overflow-auto z-50 p-1 rounded-md border bg-card shadow-md h-fit max-h-[300px] absolute top-[calc(100%+4px)] left-0 data-[position=Above]:top-auto data-[position=Above]:bottom-[calc(100%+4px)] transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100 data-[state=closed]:data-[position=Below]:origin-top data-[state=open]:data-[position=Below]:origin-top data-[state=closed]:data-[position=Above]:origin-bottom data-[state=open]:data-[position=Above]:origin-bottom [scrollbar-width:none] [&::-webkit-scrollbar]:hidden",
-        class
-    );
-
-    let target_id_for_script = ctx.target_id.clone();
-    let target_id_for_script_2 = ctx.target_id.clone();
-
-    // Scroll indicator signals
-    let (on_scroll, can_scroll_up_signal, can_scroll_down_signal) = use_can_scroll_vertical();
-
-    view! {
-        <div
-            data-name="SelectContent"
-            class=merged_class
-            on:selectclose=move |_: web_sys::CustomEvent| {
-                if let Some(cb) = on_close {
-                    cb.run(());
-                }
-            }
-            id=ctx.target_id
-            data-target="target__select"
-            data-state="closed"
-            data-position=position.to_string()
-            style="pointer-events: none;"
-            on:scroll=move |ev| on_scroll.run(ev)
-        >
-            <div
-                data-scroll-up="true"
-                class=move || {
-                    let is_up: bool = can_scroll_up_signal.get();
-                    if is_up {
-                        "sticky -top-1 z-10 flex items-center justify-center py-1 bg-card"
-                    } else {
-                        "hidden"
-                    }
-                }
-            >
-                <ChevronUp class="size-4 text-muted-foreground" />
-            </div>
-            {children()}
-            <div
-                data-scroll-down="true"
-                class=move || {
-                    let is_down: bool = can_scroll_down_signal.get();
-                    if is_down {
-                        "sticky -bottom-1 z-10 flex items-center justify-center py-1 bg-card"
-                    } else {
-                        "hidden"
-                    }
-                }
-            >
-                <ChevronDown class="size-4 text-muted-foreground" />
-            </div>
-        </div>
-
-        <script>
-            {format!(
-                r#"
-                (function() {{
-                    const setupSelect = () => {{
-                        const select = document.querySelector('#{}');
-                        const trigger = document.querySelector('[data-select-trigger="{}"]');
-
-                        if (!select || !trigger) {{
-                            setTimeout(setupSelect, 50);
-                            return;
-                        }}
-
-                        if (select.hasAttribute('data-initialized')) {{
-                            return;
-                        }}
-                        select.setAttribute('data-initialized', 'true');
-
-                        let isOpen = false;
-
-                        const updatePosition = () => {{
-                            const triggerRect = trigger.getBoundingClientRect();
-                            const viewportHeight = window.innerHeight;
-                            const spaceBelow = viewportHeight - triggerRect.bottom;
-                            const spaceAbove = triggerRect.top;
-
-                            if (spaceBelow < 200 && spaceAbove > spaceBelow) {{
-                                select.setAttribute('data-position', 'Above');
-                            }} else {{
-                                select.setAttribute('data-position', 'Below');
-                            }}
-
-                            select.style.minWidth = `${{triggerRect.width}}px`;
-                        }};
-
-                        const openSelect = () => {{
-                            isOpen = true;
-                            if (window.ScrollLock) window.ScrollLock.lock();
-                            updatePosition();
-                            select.setAttribute('data-state', 'open');
-                            select.style.pointerEvents = 'auto';
-                            select.dispatchEvent(new Event('scroll'));
-                            setTimeout(() => {{
-                                document.addEventListener('click', handleClickOutside);
-                            }}, 0);
-                        }};
-
-                        const closeSelect = () => {{
-                            isOpen = false;
-                            select.setAttribute('data-state', 'closed');
-                            select.style.pointerEvents = 'none';
-                            document.removeEventListener('click', handleClickOutside);
-                            select.dispatchEvent(new CustomEvent('selectclose', {{ bubbles: false }}));
-                            if (window.ScrollLock) window.ScrollLock.unlock(200);
-                        }};
-
-                        const handleClickOutside = (e) => {{
-                            if (!select.contains(e.target) && !trigger.contains(e.target)) {{
-                                closeSelect();
-                            }}
-                        }};
-
-                        trigger.addEventListener('click', (e) => {{
-                            e.stopPropagation();
-                            if (isOpen) closeSelect(); else openSelect();
-                        }});
-
-                        const options = select.querySelectorAll('[data-select-option]');
-                        options.forEach(option => {{
-                            option.addEventListener('click', () => closeSelect());
-                        }});
-
-                        document.addEventListener('keydown', (e) => {{
-                            if (e.key === 'Escape' && isOpen) {{
-                                e.preventDefault();
-                                closeSelect();
-                            }}
-                        }});
-                    }};
-
-                    if (document.readyState === 'loading') {{
-                        document.addEventListener('DOMContentLoaded', setupSelect);
-                    }} else {{
-                        setupSelect();
-                    }}
-                }})();
-                "#,
-                target_id_for_script,
-                target_id_for_script_2,
-            )}
-        </script>
-    }.into_any()
-}
+pub fn SelectContent(children: Children) -> impl IntoView {
+    view! { <div>{children()}</div> }
+}

frontend/src/components/ui/separator.rs

@@ -1,35 +1,21 @@
 use leptos::prelude::*;
-use tw_merge::*;
+use tailwind_fuse::tw_merge;
+
+#[derive(Clone, Copy, PartialEq, Eq, Default, Debug)]
+pub enum SeparatorOrientation { #[default] Horizontal, Vertical }
 
 #[component]
 pub fn Separator(
     #[prop(into, optional)] orientation: Signal<SeparatorOrientation>,
     #[prop(into, optional)] class: String,
-    // children: Children,
 ) -> impl IntoView {
-    let merged_class = Memo::new(move |_| {
-        let orientation = orientation.get();
-        let separator = SeparatorClass { orientation };
-        separator.with_class(class.clone())
-    });
-
-    view! { <div class=merged_class role="separator" /> }
+    let class_signal = move || tw_merge!(
+        "shrink-0 bg-border",
+        match orientation.get() {
+            SeparatorOrientation::Horizontal => "h-[1px] w-full",
+            SeparatorOrientation::Vertical => "h-full w-[1px]",
+        },
+        class.clone()
+    );
+    view! { <div class=class_signal role="none" /> }
 }
-
-/* ========================================================== */
-/*                       🧬 STRUCT 🧬                         */
-/* ========================================================== */
-
-#[derive(TwClass, Default)]
-#[tw(class = "shrink-0 bg-border")]
-pub struct SeparatorClass {
-    orientation: SeparatorOrientation,
-}
-
-#[derive(TwVariant)]
-pub enum SeparatorOrientation {
-    #[tw(default, class = "w-full h-[1px]")]
-    Default,
-    #[tw(class = "h-full w-[1px]")]
-    Vertical,
-}

frontend/src/components/ui/sheet.rs

@@ -18,32 +18,19 @@ mod components {
 
 pub use components::*;
 
-/* ========================================================== */
-/*                     ✨ CONTEXT ✨                          */
-/* ========================================================== */
-
 #[derive(Clone)]
 pub struct SheetContext {
     pub target_id: String,
 }
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
-pub type SheetVariant = ButtonVariant;
-pub type SheetSize = ButtonSize;
-
 #[component]
 pub fn Sheet(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
+    let _ = class;
     let sheet_target_id = use_random_id_for("sheet");
     let ctx = SheetContext { target_id: sheet_target_id };
-
-    let merged_class = tw_merge!("", class);
-
     view! {
         <Provider value=ctx>
-            <div data-name="Sheet" class=merged_class>
+            <div data-name="Sheet">
                 {children()}
             </div>
         </Provider>
@@ -59,7 +46,6 @@ pub fn SheetTrigger(
 ) -> impl IntoView {
     let ctx = expect_context::<SheetContext>();
     let trigger_id = format!("trigger_{}", ctx.target_id);
-
     view! {
         <Button class=class attr:id=trigger_id attr:data-sheet-trigger=ctx.target_id variant=variant size=size>
             {children()}
@@ -75,7 +61,6 @@ pub fn SheetClose(
     #[prop(default = ButtonSize::Default)] size: ButtonSize,
 ) -> impl IntoView {
     let ctx = expect_context::<SheetContext>();
-
     view! {
         <Button class=class attr:data-sheet-close=ctx.target_id attr:aria-label="Close sheet" variant=variant size=size>
             {children()}
@@ -91,131 +76,68 @@ pub fn SheetContent(
     #[prop(into, optional)] hide_close_button: Option<bool>,
 ) -> impl IntoView {
     let ctx = expect_context::<SheetContext>();
-
     let backdrop_id = format!("{}_backdrop", ctx.target_id);
     let target_id_for_script = ctx.target_id.clone();
     let backdrop_id_for_script = backdrop_id.clone();
-
     let merged_class = tw_merge!(
         "fixed z-100 bg-card shadow-lg p-6 transition-transform duration-300 overflow-y-auto overscroll-y-contain",
         direction.initial_position(),
         direction.closed_class(),
         class
     );
-
     view! {
-        <div
-            data-name="SheetBackdrop"
-            id=backdrop_id
-            class="fixed inset-0 transition-opacity duration-200 pointer-events-none z-60 bg-black/50 data-[state=closed]:opacity-0 data-[state=open]:opacity-100"
-            data-state="closed"
-        />
-
-        <div
-            data-name="SheetContent"
-            class=merged_class
-            id=ctx.target_id
-            data-direction=direction.to_string()
-            data-state="closed"
-            style="pointer-events: none;"
-        >
-            <button
-                type="button"
-                class=format!(
-                    "absolute top-4 right-4 p-1 rounded-sm focus:ring-2 focus:ring-offset-2 focus:outline-none [&_svg:not([class*='size-'])]:size-4 focus:ring-ring{}",
-                    if hide_close_button.unwrap_or(false) { " hidden" } else { "" },
-                )
-                data-sheet-close=ctx.target_id.clone()
-                aria-label="Close sheet"
-            >
+        <div data-name="SheetBackdrop" id=backdrop_id class="fixed inset-0 transition-opacity duration-200 pointer-events-none z-60 bg-black/50 data-[state=closed]:opacity-0 data-[state=open]:opacity-100" data-state="closed" />
+        <div data-name="SheetContent" class=merged_class id=ctx.target_id data-direction=direction.to_string() data-state="closed" style="pointer-events: none;">
+            <button type="button" class=format!("absolute top-4 right-4 p-1 rounded-sm focus:ring-2 focus:ring-offset-2 focus:outline-none [&_svg:not([class*='size-'])]:size-4 focus:ring-ring{}", if hide_close_button.unwrap_or(false) { " hidden" } else { "" }) data-sheet-close=ctx.target_id.clone() aria-label="Close sheet">
                 <span class="hidden">"Close Sheet"</span>
                 <X />
             </button>
-
             {children()}
         </div>
-
         <script>
-            {format!(
-                r#"
+            {format!(r#"
                 (function() {{
                     const setupSheet = () => {{
                         const sheet = document.querySelector('#{}');
                         const backdrop = document.querySelector('#{}');
                         const trigger = document.querySelector('[data-sheet-trigger="{}"]');
-
-                        if (!sheet || !backdrop || !trigger) {{
-                            setTimeout(setupSheet, 50);
-                            return;
-                        }}
-
-                        if (sheet.hasAttribute('data-initialized')) {{
-                            return;
-                        }}
+                        if (!sheet || !backdrop || !trigger || sheet.hasAttribute('data-initialized')) return;
                         sheet.setAttribute('data-initialized', 'true');
-
                         const openSheet = () => {{
                             if (window.ScrollLock) window.ScrollLock.lock();
                             sheet.setAttribute('data-state', 'open');
                             backdrop.setAttribute('data-state', 'open');
                             sheet.style.pointerEvents = 'auto';
                             backdrop.style.pointerEvents = 'auto';
-                            const direction = sheet.getAttribute('data-direction');
                             sheet.classList.remove('translate-x-full', '-translate-x-full', 'translate-y-full', '-translate-y-full');
                             sheet.classList.add('translate-x-0', 'translate-y-0');
                         }};
-
                         const closeSheet = () => {{
                             sheet.setAttribute('data-state', 'closed');
                             backdrop.setAttribute('data-state', 'closed');
                             sheet.style.pointerEvents = 'none';
                             backdrop.style.pointerEvents = 'none';
-                            const direction = sheet.getAttribute('data-direction');
                             sheet.classList.remove('translate-x-0', 'translate-y-0');
+                            const direction = sheet.getAttribute('data-direction');
                             if (direction === 'Right') sheet.classList.add('translate-x-full');
                             else if (direction === 'Left') sheet.classList.add('-translate-x-full');
-                            else if (direction === 'Top') sheet.classList.add('-translate-y-full');
-                            else if (direction === 'Bottom') sheet.classList.add('translate-y-full');
                             if (window.ScrollLock) window.ScrollLock.unlock(300);
                         }};
-
                         trigger.addEventListener('click', openSheet);
-                        const closeButtons = sheet.querySelectorAll('[data-sheet-close]');
-                        closeButtons.forEach(btn => btn.addEventListener('click', closeSheet));
+                        sheet.querySelectorAll('[data-sheet-close]').forEach(btn => btn.addEventListener('click', closeSheet));
                         backdrop.addEventListener('click', closeSheet);
-                        document.addEventListener('keydown', (e) => {{
-                            if (e.key === 'Escape' && sheet.getAttribute('data-state') === 'open') {{
-                                e.preventDefault();
-                                closeSheet();
-                            }}
-                        }});
                     }};
-
-                    if (document.readyState === 'loading') {{
-                        document.addEventListener('DOMContentLoaded', setupSheet);
-                    }} else {{
-                        setupSheet();
-                    }}
+                    setupSheet();
                 }})();
-                "#,
-                target_id_for_script,
-                backdrop_id_for_script,
-                target_id_for_script,
-            )}
+            "#, target_id_for_script, backdrop_id_for_script, target_id_for_script)}
         </script>
-    }.into_any()
+    }
 }
 
-/* ========================================================== */
-/*                     ✨ ENUM ✨                             */
-/* ========================================================== */
-
 #[derive(Clone, Copy, strum::AsRefStr, strum::Display)]
+#[allow(dead_code)]
 pub enum SheetDirection {
-    Right,
-    Left,
-    Top,
-    Bottom,
+    Right, Left, Top, Bottom,
 }
 
 impl SheetDirection {
@@ -227,7 +149,6 @@ impl SheetDirection {
             SheetDirection::Bottom => "translate-y-full",
         }
     }
-
     fn initial_position(self) -> &'static str {
         match self {
             SheetDirection::Right => "top-0 right-0 h-full w-[400px]",

frontend/src/components/ui/sidenav.rs

@@ -1,232 +1,69 @@
 use leptos::prelude::*;
-use leptos_router::hooks::use_location;
-use leptos_ui::{clx, variants, void};
+use tw_merge::tw_merge;
 
-mod components {
-    use super::*;
-    clx! {SidenavWrapper, div, "group/sidenav-wrapper has-data-[variant=Inset]:bg-sidenav flex h-full w-full"}
-    // clx! {SidenavInset, div, "bg-background relative flex w-full flex-1 flex-col md:peer-data-[variant=Inset]:m-2 md:peer-data-[variant=Inset]:ml-0 md:peer-data-[variant=Inset]:rounded-xl md:peer-data-[variant=Inset]:shadow-sm md:peer-data-[variant=Inset]:peer-data-[state=Collapsed]:ml-2"}
-    clx! {SidenavInset, div, "bg-background relative flex w-full flex-1 flex-col data-[variant=Inset]:rounded-lg data-[variant=Inset]:border data-[variant=Inset]:border-sidenav-border data-[variant=Inset]:shadow-sm data-[variant=Inset]:m-2"}
-    // * data-[], not group-data-[]
-    clx! {SidenavInner, div, "flex flex-col w-full h-full bg-sidenav data-[variant=Floating]:rounded-lg data-[variant=Floating]:border data-[variant=Floating]:border-sidenav-border data-[variant=Floating]:shadow-sm"}
-    clx! {SidenavHeader, div, "flex flex-col gap-2 p-2"}
-    clx! {SidenavMenu, ul, "flex flex-col gap-1 w-full min-w-0"}
-    clx! {SidenavMenuSub, ul, "border-sidenav-border mx-3.5 flex min-w-0 translate-x-px flex-col gap-1 border-l px-2.5 py-0.5 group-data-[collapsible=Icon]:hidden"}
-    clx! {SidenavMenuItem, li, "relative group/menu-item"}
-    clx! {SidenavContent, div, "scrollbar__on_hover", "flex min-h-0 flex-1 flex-col gap-2 overflow-auto group-data-[collapsible=Icon]:overflow-hidden"}
-    clx! {SidenavGroup, div, "flex relative flex-col p-2 w-full min-w-0"}
-    clx! {SidenavGroupContent, div, "w-full text-sm"}
-    clx! {SidenavGroupLabel, div, "text-sidenav-foreground/70 ring-sidenav-ring flex h-8 shrink-0 items-center rounded-md px-2 text-xs font-medium outline-hidden transition-[margin,opacity] duration-200 ease-linear focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0 group-data-[collapsible=Icon]:-mt-8 group-data-[collapsible=Icon]:opacity-0"}
-    clx! {SidenavFooter, footer, "flex flex-col gap-2 p-2"}
-    // Button "More"
-    clx! {DropdownMenuTriggerEllipsis, button, "text-sidenav-foreground ring-sidenav-ring hover:bg-sidenav-accent hover:text-sidenav-accent-foreground peer-hover/menu-button:text-sidenav-accent-foreground absolute top-1.5 right-1 flex aspect-square w-5 items-center justify-center rounded-md p-0 outline-hidden transition-transform focus-visible:ring-2 [&>svg]:size-4 [&>svg]:shrink-0 after:absolute after:-inset-2 md:after:hidden peer-data-[size=sm]/menu-button:top-1 peer-data-[size=default]/menu-button:top-1.5 peer-data-[size=lg]/menu-button:top-2.5 group-data-[collapsible=Icon]:hidden peer-data-[active=true]/menu-button:text-sidenav-accent-foreground group-focus-within/menu-item:opacity-100 group-hover/menu-item:opacity-100 data-[state=open]:opacity-100 md:opacity-0"}
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+#[allow(dead_code)]
+pub enum SidenavState { #[default] Expanded, Collapsed }
 
-    void! {SidenavInput, input,
-        "file:text-foreground placeholder:text-muted-foreground selection:bg-primary selection:text-primary-foreground dark:bg-input/30 border-input flex h-9 w-full min-w-0 rounded-md border bg-transparent px-3 py-1 text-base shadow-xs transition-[color,box-shadow] outline-none file:inline-flex file:h-7 file:border-0 file:bg-transparent file:text-sm file:font-medium disabled:pointer-events-none disabled:cursor-not-allowed disabled:opacity-50 md:text-sm",
-        "focus-visible:border-ring focus-visible:ring-ring/50",
-        "focus-visible:ring-2", // TODO. Port tw_merge to Tailwind V4.
-     // "focus-visible:ring-[3px]", // TODO. Port tw_merge to Tailwind V4.
-        "aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
-        "read-only:bg-muted",
-        // Specific to Sidenav
-        "w-full h-8 shadow-none bg-background"
-    }
+#[derive(Clone)]
+pub struct SidenavContext {
+    pub state: RwSignal<SidenavState>,
 }
 
-pub use components::*;
-
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
 #[component]
-pub fn SidenavLink(
-    children: Children,
-    #[prop(into)] href: String,
-    #[prop(optional, into)] class: String,
-) -> impl IntoView {
-    let merged_class = tw_merge!(
-        "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left outline-hidden ring-sidenav-ring transition-[width,height,padding] focus-visible:ring-2 active:bg-sidenav-accent active:text-sidenav-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidenav=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 aria-[current=page]:bg-sidenav-accent aria-[current=page]:font-semibold aria-[current=page]:text-sidenav-accent-foreground data-[state=open]:hover:bg-sidenav-accent data-[state=open]:hover:text-sidenav-accent-foreground group-data-[collapsible=Icon]:size-8! group-data-[collapsible=Icon]:p-2! [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0 hover:bg-sidenav-accent hover:text-sidenav-accent-foreground h-8 text-sm",
-        class
-    );
-
-    let location = use_location();
-
-    // Check if the link is active based on current path
-    let href_clone = href.clone();
-    let is_active = move || {
-        let path = location.pathname.get();
-        path == href_clone || path.starts_with(&format!("{}/", href_clone))
-    };
-
-    let aria_current = move || if is_active() { "page" } else { "false" };
-
-    view! {
-        <a data-name="SidenavLink" class=merged_class href=href aria-current=aria_current>
-            {children()}
-        </a>
-    }
+pub fn SidenavWrapper(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
+    let state = RwSignal::new(SidenavState::Expanded);
+    provide_context(SidenavContext { state });
+    let class = tw_merge!("flex min-h-screen w-full bg-background", class);
+    view! { <div class=class>{children()}</div> }
 }
 
-variants! {
-    SidenavMenuButton {
-        base: "peer/menu-button flex w-full items-center gap-2 overflow-hidden rounded-md p-2 text-left text-sm outline-hidden ring-sidenav-ring transition-[width,height,padding] hover:bg-sidenav-accent hover:text-sidenav-accent-foreground focus-visible:ring-2 active:bg-sidenav-accent active:text-sidenav-accent-foreground disabled:pointer-events-none disabled:opacity-50 group-has-data-[sidenav=menu-action]/menu-item:pr-8 aria-disabled:pointer-events-none aria-disabled:opacity-50 aria-[current=page]:bg-sidenav-accent aria-[current=page]:font-medium aria-[current=page]:text-sidenav-accent-foreground data-[state=open]:hover:bg-sidenav-accent data-[state=open]:hover:text-sidenav-accent-foreground [&>span:last-child]:truncate [&>svg]:size-4 [&>svg]:shrink-0   group-data-[collapsible=Icon]:size-8! group-data-[collapsible=Icon]:p-0!   [&>svg]:stroke-2 aria-[current=page]:[&>svg]:stroke-[2.7]",
-        variants: {
-            variant: {
-                Default: "hover:bg-sidenav-accent hover:text-sidenav-accent-foreground", // Already in base
-                Outline: "bg-background shadow-[0_0_0_1px_hsl(var(--sidenav-border))] hover:bg-sidenav-accent hover:text-sidenav-accent-foreground hover:shadow-[0_0_0_1px_hsl(var(--sidenav-accent))]",
-            },
-            size: {
-                Default: "h-8 text-sm",
-                Sm: "h-7 text-xs",
-                Lg: "h-12",
-            }
+#[component]
+pub fn Sidenav(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
+    let ctx = expect_context::<SidenavContext>();
+    let class_signal = move || tw_merge!(
+        "hidden md:flex flex-col border-r bg-card transition-all duration-300",
+        match ctx.state.get() {
+            SidenavState::Expanded => "w-[var(--sidenav-width)]",
+            SidenavState::Collapsed => "w-[var(--sidenav-width-icon)]",
         },
-        component: {
-            element: button,
-            support_href: true,
-            support_aria_current: true
-        }
-    }
-}
-
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
-#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display, strum::IntoStaticStr)]
-pub enum SidenavVariant {
-    #[default]
-    Sidenav,
-    Floating,
-    Inset,
-}
-
-#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display)]
-pub enum SidenavSide {
-    #[default]
-    Left,
-    Right,
-}
-
-#[derive(Default, Clone, Copy, PartialEq, Eq, strum::Display)]
-pub enum SidenavCollapsible {
-    #[default]
-    Offcanvas,
-    None,
-    Icon,
+        class.clone()
+    );
+    view! { <aside class=class_signal>{children()}</aside> }
 }
 
 #[component]
-pub fn Sidenav(
-    #[prop(into, optional)] class: String,
-    #[prop(default = SidenavVariant::default())] variant: SidenavVariant,
-    #[prop(default = SidenavState::default())] data_state: SidenavState,
-    #[prop(default = SidenavSide::default())] data_side: SidenavSide,
-    #[prop(default = SidenavCollapsible::default())] data_collapsible: SidenavCollapsible,
+pub fn SidenavInset(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
+    let class = tw_merge!("flex flex-col flex-1 min-w-0", class);
+    view! { <main class=class>{children()}</main> }
+}
+
+#[component] pub fn SidenavHeader(children: Children) -> impl IntoView { view! { <div class="flex flex-col">{children()}</div> } }
+#[component] pub fn SidenavContent(children: Children) -> impl IntoView { view! { <div class="flex-1 overflow-auto">{children()}</div> } }
+#[component] pub fn SidenavFooter(children: Children) -> impl IntoView { view! { <div class="mt-auto">{children()}</div> } }
+#[component] pub fn SidenavGroup(children: Children) -> impl IntoView { view! { <div class="px-2 py-2">{children()}</div> } }
+#[component] pub fn SidenavGroupLabel(children: Children) -> impl IntoView { view! { <div class="px-2 py-1.5 text-xs font-medium text-muted-foreground">{children()}</div> } }
+#[component] pub fn SidenavGroupContent(children: Children) -> impl IntoView { view! { <div class="space-y-1">{children()}</div> } }
+#[component] pub fn SidenavMenu(children: Children) -> impl IntoView { view! { <nav class="grid gap-1">{children()}</nav> } }
+#[component] pub fn SidenavMenuItem(children: Children) -> impl IntoView { view! { <div>{children()}</div> } }
+
+#[derive(Clone, Copy, PartialEq, Eq, Default)]
+pub enum SidenavMenuButtonVariant { #[default] Default, Outline }
+
+#[component]
+pub fn SidenavMenuButton(
     children: Children,
+    #[prop(into, optional)] variant: Signal<SidenavMenuButtonVariant>,
+    #[prop(into, optional)] class: Signal<String>,
 ) -> impl IntoView {
-    view! {
-        {if data_collapsible == SidenavCollapsible::None {
-            view! {
-                <aside
-                    data-name="Sidenav"
-                    class=tw_merge!(
-                        "flex flex-col h-full bg-sidenav text-sidenav-foreground w-(--sidenav-width)", class.clone()
-                    )
-                >
-                    {children()}
-                </aside>
-            }
-                .into_any()
-        } else {
-            view! {
-                <aside
-                    data-name="Sidenav"
-                    data-sidenav=data_state.to_string()
-                    data-side=data_side.to_string()
-                    class="hidden md:block group peer text-sidenav-foreground data-[state=Collapsed]:hidden"
-                >
-                    // * SidenavGap: This is what handles the sidenav gap on desktop
-                    <div
-                        data-name="SidenavGap"
-                        class=tw_merge!(
-                            "relative w-(--sidenav-width) bg-transparent transition-[width] duration-200 ease-linear",
-                            "group-data-[collapsible=Offcanvas]:w-0",
-                            "group-data-[side=Right]:rotate-180",
-                            match variant {
-                                SidenavVariant::Sidenav => "group-data-[collapsible=Icon]:w-(--sidenav-width-icon)",
-                                SidenavVariant::Floating | SidenavVariant::Inset =>
-                                    "group-data-[collapsible=Icon]:w-[calc(var(--sidenav-width-icon)+(--spacing(4)))]",
-                            }
-                        )
-                    />
-                    <div
-                        data-name="SidenavContainer"
-                        class=tw_merge!(
-                            "fixed inset-y-0 z-10 hidden h-svh w-(--sidenav-width) transition-[left,right,width] duration-200 ease-linear md:flex",
-                            class,
-                            match data_side {
-                                SidenavSide::Left => "left-0 group-data-[collapsible=Offcanvas]:left-[calc(var(--sidenav-width)*-1)]",
-                                SidenavSide::Right => "right-0 group-data-[collapsible=Offcanvas]:right-[calc(var(--sidenav-width)*-1)]"
-                            },
-                            match variant {
-                                 SidenavVariant::Sidenav => "group-data-[collapsible=Icon]:w-(--sidenav-width-icon) group-data-[side=Left]:border-r group-data-[side=Right]:border-l",
-                                SidenavVariant::Floating | SidenavVariant::Inset =>
-                                    "p-2 group-data-[collapsible=Icon]:w-[calc(var(--sidenav-width-icon)+(--spacing(4))+2px)]",
-                            },
-                        )
-                    >
-                        // * Act as a Sidenav for the onclick trigger to work with nested Sidenavs.
-                        <SidenavInner attr:data-sidenav="Sidenav" attr:data-variant=variant.to_string()>
-                            {children()}
-                            <SidenavToggleRail />
-                        </SidenavInner>
-                    </div>
-                </aside>
-            }
-                .into_any()
-        }}
-    }
+    let class_signal = move || tw_merge!(
+        "flex w-full items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium transition-colors hover:bg-accent hover:text-accent-foreground",
+        if variant.get() == SidenavMenuButtonVariant::Outline { "border border-input bg-background shadow-xs" } else { "" },
+        class.get()
+    );
+    view! { <button class=class_signal>{children()}</button> }
 }
 
-/* ========================================================== */
-/*                     ✨ FUNCTIONS ✨                        */
-/* ========================================================== */
-
-#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display)]
-pub enum SidenavState {
-    #[default]
-    Expanded,
-    Collapsed,
+#[component] pub fn SidenavLink(children: Children, #[prop(into)] href: String) -> impl IntoView {
+    view! { <a href=href class="flex items-center gap-2 rounded-md px-2 py-1.5 text-sm font-medium hover:bg-accent">{children()}</a> }
 }
-
-const ONCLICK_TRIGGER: &str = "document.querySelector('[data-name=\"Sidenav\"]').setAttribute('data-state', document.querySelector('[data-name=\"Sidenav\"]').getAttribute('data-state') === 'Collapsed' ? 'Expanded' : 'Collapsed')";
-
-#[component]
-pub fn SidenavTrigger(children: Children) -> impl IntoView {
-    view! {
-        // TODO. Use Button.
-
-        <button
-            onclick=ONCLICK_TRIGGER
-            data-name="SidenavTrigger"
-            class="inline-flex gap-2 justify-center items-center -ml-1 text-sm font-medium whitespace-nowrap rounded-md transition-all outline-none disabled:opacity-50 disabled:pointer-events-none [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4 shrink-0 [&_svg]:shrink-0 aria-invalid:ring-destructive/20 aria-invalid:border-destructive size-7 dark:aria-invalid:ring-destructive/40 dark:hover:bg-accent/50 hover:bg-accent hover:text-accent-foreground focus-visible:border-ring focus-visible:ring-ring/50 focus-visible:ring-[3px]"
-        >
-            {children()}
-        </button>
-    }
-}
-
-#[component]
-fn SidenavToggleRail() -> impl IntoView {
-    view! {
-        <button
-            data-name="SidenavToggleRail"
-            aria-label="Toggle Sidenav"
-            tabindex="-1"
-            onclick=ONCLICK_TRIGGER
-            class="hidden absolute inset-y-0 z-20 w-4 transition-all ease-linear -translate-x-1/2 sm:flex group-data-[side=Left]:-right-4 group-data-[side=Right]:left-0 after:absolute after:inset-y-0 after:left-1/2 after:w-[2px] in-data-[side=Left]:cursor-w-resize in-data-[side=Right]:cursor-e-resize [[data-side=Left][data-state=Collapsed]_&]:cursor-e-resize [[data-side=Right][data-state=Collapsed]_&]:cursor-w-resize group-data-[collapsible=Offcanvas]:translate-x-0 group-data-[collapsible=Offcanvas]:after:left-full [[data-side=Left][data-collapsible=Offcanvas]_&]:-right-2 [[data-side=Right][data-collapsible=Offcanvas]_&]:-left-0eft-2 hover:after:bg-sidenav-border hover:group-data-[collapsible=Offcanvas]:bg-sidenav"
-        />
-    }
-}

frontend/src/components/ui/skeleton.rs

@@ -0,0 +1,13 @@
+use leptos::prelude::*;
+use tw_merge::tw_merge;
+
+#[component]
+pub fn Skeleton(
+    #[prop(optional, into)] class: String,
+) -> impl IntoView {
+    let class = tw_merge!(
+        "animate-pulse rounded-md bg-muted",
+        class
+    );
+    view! { <div class=class /> }
+}

frontend/src/components/ui/table.rs

@@ -15,6 +15,7 @@ pub fn Table(children: Children, #[prop(optional, into)] class: String) -> impl
 
 #[component]
 pub fn TableCaption(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
+    let _ = class;
     let class = tw_merge!("mt-4 text-sm text-muted-foreground", class);
     view! { <caption class=class>{children()}</caption> }
 }
@@ -33,7 +34,11 @@ pub fn TableRow(children: Children, #[prop(optional, into)] class: String) -> im
 
 #[component]
 pub fn TableHead(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
-    let class = tw_merge!("h-10 px-4 text-left align-middle font-medium text-muted-foreground whitespace-nowrap", class);
+    let class = tw_merge!(
+        "h-10 px-4 text-left align-middle font-medium text-muted-foreground whitespace-nowrap",
+        "transition-all duration-100 active:scale-[0.98] cursor-pointer select-none hover:bg-muted/30 hover:text-foreground",
+        class
+    );
     view! { <th class=class>{children()}</th> }
 }
 
@@ -51,6 +56,7 @@ pub fn TableCell(children: Children, #[prop(optional, into)] class: String) -> i
 
 #[component]
 pub fn TableFooter(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
+    let _ = class;
     let class = tw_merge!("border-t bg-muted/50 font-medium [&>tr]:last:border-b-0", class);
     view! { <tfoot class=class>{children()}</tfoot> }
 }

frontend/src/components/ui/toast.rs

@@ -32,6 +32,7 @@ pub struct ToastData {
     pub description: Option<String>,
     pub variant: ToastType,
     pub duration: u64, // ms
+    pub is_exiting: RwSignal<bool>,
 }
 
 #[derive(Clone, Copy)]
@@ -48,6 +49,7 @@ pub fn SonnerTrigger(
     is_expanded: Signal<bool>,
     #[prop(optional)] on_dismiss: Option<Callback<()>>,
 ) -> impl IntoView {
+    let _ = is_expanded; // Silence unused warning while keeping prop name intact for builder
     let variant_classes = match toast.variant {
         ToastType::Default => "bg-background text-foreground border-border",
         ToastType::Success => "bg-background text-foreground border-border [&_.icon]:text-green-500",
@@ -65,47 +67,42 @@ pub fn SonnerTrigger(
         _ => "bg-primary",
     };
 
-    // Stacking & Expansion Logic
+    // Simplified Style (No manual translateY needed with Flexbox)
     let style = move || {
-        let is_bottom = position.to_string().contains("Bottom");
-        let y_direction = if is_bottom { -1.0 } else { 1.0 };
-        
-        let (translate_y, scale, opacity) = if is_expanded.get() {
-            // Expanded state: Full list layout
-            let y = index as f64 * 70.0; // height + gap
-            (y * y_direction, 1.0, 1.0)
-        } else {
-            // Stacked state: Sonner look
-            let y = index as f64 * 10.0; 
-            let s = 1.0 - (index as f64 * 0.05);
-            let o = if index > 2 { 0.0 } else { 1.0 - (index as f64 * 0.2) };
-            (y * y_direction, s, o)
-        };
-
         format!(
-            "z-index: {}; transform: translateY({}px) scale({}); opacity: {};",
-            total - index,
-            translate_y,
-            scale,
-            opacity
+            "z-index: {}; opacity: 1; transition: all 0.3s ease;",
+            total - index
         )
     };
 
+    let animation_class = move || {
+        let pos = position.to_string();
+        let is_left = pos.contains("Left");
+        let is_exiting = toast.is_exiting.get();
+        
+        match (is_left, is_exiting) {
+            (true, false) => "animate-sonner-in-left",
+            (true, true) => "animate-sonner-out-left",
+            (false, false) => "animate-sonner-in-right",
+            (false, true) => "animate-sonner-out-right",
+        }
+    };
+
     let icon = match toast.variant {
-        ToastType::Success => Some(view! { <span class="icon font-bold">"✓"</span> }.into_any()),
-        ToastType::Error => Some(view! { <span class="icon font-bold">"✕"</span> }.into_any()),
-        ToastType::Warning => Some(view! { <span class="icon font-bold">"⚠"</span> }.into_any()),
-        ToastType::Info => Some(view! { <span class="icon font-bold">"ℹ"</span> }.into_any()),
+        ToastType::Success => Some(view! { <span class="icon font-bold text-lg">"✓"</span> }.into_any()),
+        ToastType::Error => Some(view! { <span class="icon font-bold text-lg">"✕"</span> }.into_any()),
+        ToastType::Warning => Some(view! { <span class="icon font-bold text-lg">"⚠"</span> }.into_any()),
+        ToastType::Info => Some(view! { <span class="icon font-bold text-lg">"ℹ"</span> }.into_any()),
         _ => None,
     };
 
     view! {
         <div
-            class=tw_merge!(
-                "absolute transition-all duration-300 ease-in-out cursor-pointer pointer-events-auto overflow-hidden",
-                "flex items-center gap-3 w-full max-w-[calc(100vw-2rem)] sm:max-w-[380px] p-4 rounded-lg border shadow-lg bg-card",
-                if position.to_string().contains("Bottom") { "bottom-0" } else { "top-0" },
-                variant_classes
+            class=move || tw_merge!(
+                "relative transition-all duration-300 ease-in-out cursor-pointer pointer-events-auto",
+                "flex items-center gap-3 w-full max-w-[calc(100vw-2rem)] sm:max-w-[380px] p-4 rounded-lg border shadow-xl bg-card",
+                variant_classes,
+                animation_class()
             )
             style=style
             on:click=move |_| {
@@ -116,13 +113,13 @@ pub fn SonnerTrigger(
         >
             {icon}
             <div class="flex flex-col gap-0.5 overflow-hidden flex-1">
-                <div class="text-sm font-semibold truncate leading-tight">{toast.title}</div>
-                {move || toast.description.as_ref().map(|d| view! { <div class="text-xs opacity-70 truncate">{d.clone()}</div> })}
+                <div class="text-sm font-bold truncate leading-tight">{toast.title}</div>
+                {move || toast.description.as_ref().map(|d| view! { <div class="text-xs opacity-80 truncate">{d.clone()}</div> })}
             </div>
 
             // Progress Bar
             <div 
-                class=tw_merge!("absolute bottom-0 left-0 h-1 w-full opacity-20", bar_color)
+                class=tw_merge!("absolute bottom-0 left-0 h-1 w-full opacity-30", bar_color)
                 style=format!(
                     "animation: sonner-progress {}ms linear forwards; transform-origin: left;",
                     toast.duration
@@ -146,7 +143,8 @@ pub fn provide_toaster() {
 pub fn Toaster(#[prop(default = SonnerPosition::default())] position: SonnerPosition) -> impl IntoView {
     let store = use_context::<ToasterStore>().expect("Toaster context not found");
     let toasts = store.toasts;
-    let is_hovered = RwSignal::new(false);
+
+    let is_bottom = position.to_string().contains("Bottom");
 
     let container_class = match position {
         SonnerPosition::TopLeft => "left-6 top-6 items-start",
@@ -159,26 +157,34 @@ pub fn Toaster(#[prop(default = SonnerPosition::default())] position: SonnerPosi
 
     view! {
         <style>
-            "@keyframes sonner-progress { from { transform: scaleX(1); } to { transform: scaleX(0); } }"
+            "@keyframes sonner-progress { from { transform: scaleX(1); } to { transform: scaleX(0); } }
+             @keyframes sonner-in-right { from { transform: translateX(100%); opacity: 0; } to { transform: translateX(0); opacity: 1; } }
+             @keyframes sonner-out-right { from { transform: translateX(0); opacity: 1; } to { transform: translateX(100%); opacity: 0; } }
+             @keyframes sonner-in-left { from { transform: translateX(-100%); opacity: 0; } to { transform: translateX(0); opacity: 1; } }
+             @keyframes sonner-out-left { from { transform: translateX(0); opacity: 1; } to { transform: translateX(-100%); opacity: 0; } }
+             .animate-sonner-in-right { animation: sonner-in-right 0.3s ease-out forwards; }
+             .animate-sonner-out-right { animation: sonner-out-right 0.3s ease-in forwards; }
+             .animate-sonner-in-left { animation: sonner-in-left 0.3s ease-out forwards; }
+             .animate-sonner-out-left { animation: sonner-out-left 0.3s ease-in forwards; }"
         </style>
         <div 
             class=tw_merge!(
-                "fixed z-[100] flex flex-col pointer-events-none min-h-[100px] w-full sm:w-[400px]",
+                "fixed z-[100] flex gap-3 pointer-events-none w-full sm:w-[400px]",
+                if is_bottom { "flex-col-reverse" } else { "flex-col" },
                 container_class,
                 "pb-[env(safe-area-inset-bottom)] pt-[env(safe-area-inset-top)] px-4 sm:px-0"
             )
-            on:mouseenter=move |_| is_hovered.set(true)
-            on:mouseleave=move |_| is_hovered.set(false)
         >
             <For
                 each=move || {
                     let list = toasts.get();
-                    list.into_iter().rev().enumerate().collect::<Vec<_>>()
+                    list.into_iter().enumerate().collect::<Vec<_>>()
                 }
                 key=|(_, toast)| toast.id
                 children=move |(index, toast)| {
                     let id = toast.id;
                     let total = toasts.with(|t| t.len());
+                    let is_exiting = toast.is_exiting;
                     
                     view! {
                         <SonnerTrigger
@@ -186,9 +192,13 @@ pub fn Toaster(#[prop(default = SonnerPosition::default())] position: SonnerPosi
                             index=index
                             total=total
                             position=position
-                            is_expanded=is_hovered.into()
+                            is_expanded=Signal::derive(move || true)
                             on_dismiss=Callback::new(move |_| {
-                                toasts.update(|vec| vec.retain(|t| t.id != id));
+                                is_exiting.set(true);
+                                leptos::task::spawn_local(async move {
+                                    gloo_timers::future::TimeoutFuture::new(300).await;
+                                    toasts.update(|vec| vec.retain(|t| t.id != id));
+                                });
                             })
                         />
                     }
@@ -209,6 +219,7 @@ pub fn toast(title: impl Into<String>, variant: ToastType) {
             description: None,
             variant,
             duration: 4000,
+            is_exiting: RwSignal::new(false),
         };
         
         toasts.update(|t| {
@@ -219,8 +230,11 @@ pub fn toast(title: impl Into<String>, variant: ToastType) {
         });
 
         let duration = new_toast.duration;
+        let is_exiting = new_toast.is_exiting;
         leptos::task::spawn_local(async move {
             gloo_timers::future::TimeoutFuture::new(duration as u32).await;
+            is_exiting.set(true);
+            gloo_timers::future::TimeoutFuture::new(300).await;
             toasts.update(|vec| vec.retain(|t| t.id != id));
         });
     }