fix(ui): prevent panic on unwrap when selected torrent is None

frontend/input.css

@@ -45,8 +45,15 @@
   --ring: oklch(0.556 0 0);
 }
 
-
 @theme inline {
+  --animate-shimmer: shimmer 2s infinite;
+
+  @keyframes shimmer {
+    100% {
+      transform: translateX(100%);
+    }
+  }
+
   --color-background: var(--background);
   --color-foreground: var(--foreground);
   --color-card: var(--card);
@@ -76,6 +83,7 @@
   * {
     @apply border-border outline-ring/50;
   }
+
   body {
     @apply bg-background text-foreground;
   }
@@ -88,4 +96,4 @@
   dialog {
     margin: auto;
   }
-}
+}

frontend/src/components/demos/demo_shimmer.rs

@@ -0,0 +1,91 @@
+use leptos::prelude::*;
+use leptos::task::spawn_local;
+use serde::{Deserialize, Serialize};
+
+use crate::components::ui::button::{Button, ButtonVariant};
+use crate::components::ui::card::{Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle};
+use crate::components::ui::shimmer::Shimmer;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct CardData {
+    pub title: String,
+    pub description: String,
+}
+
+/// Simulates a database fetch with 1 second delay
+#[server]
+pub async fn fetch_card_data() -> Result<CardData, ServerFnError> {
+    // Simulate network/database latency (only on server)
+    #[cfg(feature = "ssr")]
+    tokio::time::sleep(std::time::Duration::from_secs(1)).await;
+
+    Ok(CardData {
+        title: "Fetched Title".to_string(),
+        description: "This content was fetched from the server after a 1 second simulated delay. The shimmer effect automatically showed during the loading period.".to_string(),
+    })
+}
+
+#[component]
+pub fn DemoShimmer() -> impl IntoView {
+    // Loading state
+    let loading = RwSignal::new(false);
+
+    // Store fetched data
+    let card_data = RwSignal::new(None::<CardData>);
+
+    // Fetch handler using spawn_local for reliable repeated calls
+    let on_fetch = move |_| {
+        spawn_local(async move {
+            loading.set(true);
+            let result = fetch_card_data().await;
+            if let Ok(data) = result {
+                card_data.set(Some(data));
+            }
+            loading.set(false);
+        });
+    };
+
+    view! {
+        <div class="flex flex-col gap-4">
+            <div class="flex gap-2">
+                <Button variant=ButtonVariant::Outline on:click=move |_| loading.set(!loading.get())>
+                    "Toggle Loading"
+                </Button>
+                <Button variant=ButtonVariant::Default on:click=on_fetch>
+                    "Fetch Data (1s)"
+                </Button>
+            </div>
+
+            <Shimmer loading=Signal::from(loading)>
+                <Card class="max-w-lg lg:max-w-2xl">
+                    <CardHeader>
+                        <CardTitle>
+                            {move || {
+                                card_data.get().map(|data| data.title).unwrap_or_else(|| "Card Title".to_string())
+                            }}
+                        </CardTitle>
+                    </CardHeader>
+
+                    <CardContent>
+                        <CardDescription>
+                            {move || {
+                                card_data
+                                    .get()
+                                    .map(|data| data.description)
+                                    .unwrap_or_else(|| {
+                                        "Click 'Toggle Loading' for manual control, or 'Fetch Data' to simulate a real server call with 1 second delay."
+                                            .to_string()
+                                    })
+                            }}
+                        </CardDescription>
+                    </CardContent>
+
+                    <CardFooter class="justify-end">
+                        <Button variant=ButtonVariant::Outline>"Cancel"</Button>
+                        <Button>"Confirm"</Button>
+                    </CardFooter>
+                </Card>
+            </Shimmer>
+        </div>
+    }
+}

frontend/src/components/demos/mod.rs

@@ -0,0 +1 @@
+pub mod demo_shimmer;

frontend/src/components/hooks/use_random.rs

@@ -1,5 +1,31 @@
-// use leptos::prelude::*;
+use std::collections::hash_map::DefaultHasher;
+use std::hash::{Hash, Hasher};
+use std::sync::atomic::{AtomicUsize, Ordering};
 
-pub fn use_random_id_for(prefix: &str) -> String {
-    format!("{}_{}", prefix, js_sys::Math::random().to_string().replace(".", ""))
+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(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/layout/protected.rs

@@ -3,53 +3,20 @@ use crate::components::layout::sidebar::Sidebar;
 use crate::components::layout::toolbar::Toolbar;
 use crate::components::layout::footer::Footer;
 use crate::components::ui::sidenav::{SidenavWrapper, Sidenav, SidenavInset};
-use wasm_bindgen::JsCast;
 
 #[component]
 pub fn Protected(children: Children) -> impl IntoView {
-    let (collapsed, set_collapsed) = signal(false);
-
-    // Responsive Sidebar Logic
-    Effect::new(move |_| {
-        let window = web_sys::window().expect("window missing");
-        
-        // Initial check
-        let width = window.inner_width().unwrap().as_f64().unwrap_or(1920.0);
-        if width < 1280.0 {
-            set_collapsed.set(true);
-        } else {
-            set_collapsed.set(false);
-        }
-
-        // Listener
-        let closure = wasm_bindgen::closure::Closure::<dyn FnMut(_)>::new(move |_: web_sys::Event| {
-            let window = web_sys::window().expect("window missing");
-            let width = window.inner_width().unwrap().as_f64().unwrap_or(1920.0);
-            if width < 1280.0 {
-                set_collapsed.set(true);
-            } else {
-                set_collapsed.set(false);
-            }
-        });
-        
-        let _ = window.add_event_listener_with_callback("resize", closure.as_ref().unchecked_ref());
-        closure.forget(); // Leak memory intentionally for global listener (or store in a cleanup handle if needed, but for layout component it's fine)
-    });
-
     view! {
         <SidenavWrapper attr:style="--sidenav-width:16rem; --sidenav-width-icon:3rem;">
             // Masaüstü Sidenav
-            <Sidenav 
-                data_collapsible=crate::components::ui::sidenav::SidenavCollapsible::Icon 
-                data_state=if collapsed.get() { crate::components::ui::sidenav::SidenavState::Collapsed } else { crate::components::ui::sidenav::SidenavState::Expanded }
-            >
+            <Sidenav>
                 <Sidebar />
             </Sidenav>
 
             // İçerik Alanı
             <SidenavInset class="flex flex-col h-screen overflow-hidden">
                 // Toolbar (Üst Bar)
-                <Toolbar on_toggle_sidebar=Callback::new(move |_| set_collapsed.update(|c| *c = !*c)) />
+                <Toolbar />
                 
                 // Ana İçerik
                 <main class="flex-1 overflow-y-auto relative bg-background flex flex-col">

frontend/src/components/layout/sidebar.rs

@@ -87,7 +87,7 @@ pub fn Sidebar() -> impl IntoView {
                         <path stroke-linecap="round" stroke-linejoin="round" d="M15.362 5.214A8.252 8.252 0 0112 21 8.25 8.25 0 016.038 7.048 8.287 8.287 0 009 9.6a8.983 8.983 0 013.361-6.867 8.21 8.25 0 003 2.48z" />
                     </svg>
                 </div>
-                <div class="grid flex-1 text-left text-sm leading-tight overflow-hidden group-data-[state=Collapsed]:hidden">
+                <div class="grid flex-1 text-left text-sm leading-tight overflow-hidden">
                     <span class="truncate font-semibold text-foreground text-base">"VibeTorrent"</span>
                     <span class="truncate text-[10px] text-muted-foreground opacity-70">"v3.0.0"</span>
                 </div>
@@ -150,28 +150,26 @@ pub fn Sidebar() -> impl IntoView {
             <div class="flex flex-col gap-4 p-4">
                 // Push Notification Toggle
                 <div class="flex items-center justify-between px-2 py-1 bg-muted/20 rounded-md border border-border/50">
-                    <div class="flex flex-col gap-0.5 group-data-[state=Collapsed]:hidden">
+                    <div class="flex flex-col gap-0.5">
                         <span class="text-[10px] font-bold uppercase tracking-wider text-foreground/70">"Bildirimler"</span>
                         <span class="text-[9px] text-muted-foreground">"Web Push"</span>
                     </div>
-                    <div class="group-data-[state=Collapsed]:hidden">
-                        <Switch 
-                            checked=Signal::from(store.push_enabled) 
-                            on_checked_change=Callback::new(on_push_toggle)
-                        />
-                    </div>
+                    <Switch 
+                        checked=Signal::from(store.push_enabled) 
+                        on_checked_change=Callback::new(on_push_toggle)
+                    />
                 </div>
 
-                <div class="flex items-center gap-3 p-2 rounded-lg border bg-muted/30 shadow-xs overflow-hidden group-data-[state=Collapsed]:gap-0 group-data-[state=Collapsed]:justify-center group-data-[state=Collapsed]:p-0 group-data-[state=Collapsed]:border-none group-data-[state=Collapsed]:bg-transparent group-data-[state=Collapsed]:shadow-none">
+                <div class="flex items-center gap-3 p-2 rounded-lg border bg-muted/30 shadow-xs overflow-hidden">
                     <div class="h-8 w-8 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xs font-medium shrink-0 border border-primary-foreground/10">
                         {first_letter}
                     </div>
-                    <div class="flex-1 overflow-hidden group-data-[state=Collapsed]:hidden">
+                    <div class="flex-1 overflow-hidden">
                         <div class="font-medium text-[11px] truncate text-foreground leading-tight">{username}</div>
                         <div class="text-[9px] text-muted-foreground truncate opacity-70">"Yönetici"</div>
                     </div>
                     
-                    <div class="flex items-center gap-1 group-data-[state=Collapsed]:hidden">
+                    <div class="flex items-center gap-1">
                         <ThemeToggle />
                         
                         <Button
@@ -219,8 +217,8 @@ fn SidebarItem(
                 <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4 shrink-0">
                     <path stroke-linecap="round" stroke-linejoin="round" d=icon.clone() />
                 </svg>
-                <span class="flex-1 truncate group-data-[state=Collapsed]:hidden">{label}</span>
-                <span class="text-[10px] font-mono opacity-50 group-data-[state=Collapsed]:hidden">{count}</span>
+                <span class="flex-1 truncate">{label}</span>
+                <span class="text-[10px] font-mono opacity-50">{count}</span>
             </SidenavMenuButton>
         </SidenavMenuItem>
     }

frontend/src/components/layout/toolbar.rs

@@ -1,38 +1,24 @@
 use leptos::prelude::*;
 use icons::{PanelLeft, Plus};
 use crate::components::torrent::add_torrent::AddTorrentDialogContent;
-use crate::components::ui::button::{Button, ButtonVariant, ButtonSize};
+use crate::components::ui::button::{ButtonVariant, ButtonSize};
 use crate::components::ui::sheet::{Sheet, SheetContent, SheetTrigger, SheetDirection};
 use crate::components::ui::dialog::{Dialog, DialogContent, DialogTrigger};
 use crate::components::layout::sidebar::Sidebar;
 
 #[component]
-pub fn Toolbar(
-    on_toggle_sidebar: Callback<()>,
-) -> impl IntoView {
+pub fn Toolbar() -> impl IntoView {
     view! {
         <div class="flex min-h-14 h-auto items-center border-b border-border bg-background px-4" style="padding-top: env(safe-area-inset-top);">
             // Sol kısım: Menü butonu (Mobil) + Add Torrent
             <div class="flex items-center gap-3">
-                // Desktop Toggle
-                <div class="hidden lg:block">
-                    <Button
-                        variant=ButtonVariant::Ghost
-                        size=ButtonSize::Icon
-                        class="size-9"
-                        on:click=move |_| { on_toggle_sidebar.run(()); }
-                    >
-                         <PanelLeft class="size-5" />
-                         <span class="hidden">"Toggle Sidebar"</span>
-                    </Button>
-                </div>
-
-                // Mobile Toggle (Sheet)
+                
+                // --- MOBILE SHEET (SIDEBAR) ---
                 <div class="lg:hidden">
                     <Sheet>
                         <SheetTrigger variant=ButtonVariant::Ghost size=ButtonSize::Icon class="size-9">
                             <PanelLeft class="size-5" />
-                            <span class="hidden">"Open Menu"</span>
+                            <span class="hidden">"Menüyü Aç"</span>
                         </SheetTrigger>
                         <SheetContent 
                             direction=SheetDirection::Left 

frontend/src/components/mod.rs

@@ -5,3 +5,4 @@ pub mod torrent;
 pub mod auth;
 // pub mod toast; (Removed)
 pub mod ui;
+pub mod demos;

frontend/src/components/torrent/details.rs

@@ -0,0 +1,178 @@
+use leptos::prelude::*;
+use crate::components::ui::sheet::*;
+use crate::components::ui::tabs::*;
+use crate::components::ui::skeleton::*;
+use shared::Torrent;
+
+#[component]
+pub fn TorrentDetailsSheet() -> impl IntoView {
+    let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
+
+    // Setup an effect to open the sheet when a torrent is selected
+    Effect::new(move |_| {
+        if store.selected_torrent.get().is_some() {
+            if let Some(trigger) = document().get_element_by_id("torrent-details-trigger") {
+                use wasm_bindgen::JsCast;
+                let _ = trigger.dyn_into::<web_sys::HtmlElement>().map(|el| el.click());
+            }
+        }
+    });
+
+    let selected_torrent = Memo::new(move |_| {
+        let hash = store.selected_torrent.get()?;
+        store.torrents.with(|map| map.get(&hash).cloned())
+    });
+
+    view! {
+        <Sheet>
+            <SheetTrigger attr:id="torrent-details-trigger" class="hidden">""</SheetTrigger>
+            <SheetContent 
+                direction=SheetDirection::Bottom 
+                class="h-[80vh] sm:h-[60vh] rounded-t-xl sm:rounded-t-2xl p-0 flex flex-col gap-0 border-t border-border shadow-2xl" 
+                hide_close_button=true
+            >
+                <div class="px-6 py-4 border-b flex items-center justify-between sticky top-0 bg-card z-10">
+                    <div class="flex flex-col gap-1 min-w-0">
+                        <Show when=move || selected_torrent.get().is_some() fallback=move || view! { <Skeleton class="h-6 w-48" /> }>
+                            <h2 class="font-bold text-lg truncate">
+                                {move || selected_torrent.get().map(|t| t.name).unwrap_or_default()}
+                            </h2>
+                        </Show>
+                        <Show when=move || selected_torrent.get().is_some() fallback=move || view! { <Skeleton class="h-4 w-24" /> }>
+                            <p class="text-xs text-muted-foreground uppercase tracking-widest font-semibold flex items-center gap-2">
+                                {move || selected_torrent.get().map(|t| format!("{:?}", t.status)).unwrap_or_default()}
+                                <span class="bg-primary/20 text-primary px-1.5 py-0.5 rounded text-[10px] lowercase">{move || selected_torrent.get().map(|t| format!("{:.1}%", t.percent_complete)).unwrap_or_default()}</span>
+                            </p>
+                        </Show>
+                    </div>
+                    // Custom close button that also resets store.selected_torrent
+                    <SheetClose class="rounded-full p-2 hover:bg-muted transition-colors border-none shadow-none cursor-pointer">
+                        <icons::X class="size-5 opacity-70" on:click=move |_| store.selected_torrent.set(None) />
+                    </SheetClose>
+                </div>
+
+                <div class="flex-1 overflow-hidden p-6">
+                    <Tabs default_value="general" class="h-full flex flex-col">
+                        <TabsList class="w-full justify-start rounded-none border-b bg-transparent p-0">
+                            <TabsTrigger value="general" class="data-[state=active]:bg-transparent data-[state=active]:shadow-none data-[state=active]:border-b-2 data-[state=active]:border-primary rounded-none">
+                                "Genel"
+                            </TabsTrigger>
+                            <TabsTrigger value="files" class="data-[state=active]:bg-transparent data-[state=active]:shadow-none data-[state=active]:border-b-2 data-[state=active]:border-primary rounded-none">
+                                "Dosyalar"
+                            </TabsTrigger>
+                            <TabsTrigger value="trackers" class="data-[state=active]:bg-transparent data-[state=active]:shadow-none data-[state=active]:border-b-2 data-[state=active]:border-primary rounded-none">
+                                "İzleyiciler"
+                            </TabsTrigger>
+                            <TabsTrigger value="peers" class="data-[state=active]:bg-transparent data-[state=active]:shadow-none data-[state=active]:border-b-2 data-[state=active]:border-primary rounded-none">
+                                "Eşler"
+                            </TabsTrigger>
+                        </TabsList>
+
+                        <div class="flex-1 overflow-y-auto mt-4 pb-12">
+                            <TabsContent value="general" class="space-y-6 animate-in fade-in slide-in-from-bottom-2 duration-300">
+                                <crate::components::ui::shimmer::Shimmer 
+                                    loading=Signal::derive(move || selected_torrent.get().is_none())
+                                    shimmer_color="rgba(0,0,0,0.06)"
+                                    background_color="rgba(0,0,0,0.04)"
+                                >
+                                    {move || {
+                                        let t = selected_torrent.get().unwrap_or_else(|| shared::Torrent {
+                                            hash: "----------------------------------------".to_string(),
+                                            name: "Yükleniyor...".to_string(),
+                                            size: 0,
+                                            completed: 0,
+                                            down_rate: 0,
+                                            up_rate: 0,
+                                            eta: 0,
+                                            percent_complete: 0.0,
+                                            status: shared::TorrentStatus::Downloading,
+                                            error_message: "".to_string(),
+                                            added_date: 0,
+                                            label: None,
+                                        });
+
+                                        view! {
+                                            <div class="grid grid-cols-2 md:grid-cols-4 gap-6">
+                                                <InfoItem label="İndirilen / Toplam" value=format!("{} / {}", format_bytes(t.completed), format_bytes(t.size)) />
+                                                <InfoItem label="İndirme Hızı" value=format_speed(t.down_rate) class="text-blue-500" />
+                                                <InfoItem label="Gönderme Hızı" value=format_speed(t.up_rate) class="text-green-500" />
+                                                <InfoItem label="Eklenme Tarihi" value=format_date(t.added_date) />
+                                                <InfoItem label="Kalan Süre" value=format_duration(t.eta) />
+                                                <InfoItem label="Hash" value=t.hash class="col-span-2 md:col-span-4 break-all font-mono text-xs" />
+                                            </div>
+                                        }
+                                    }}
+                                </crate::components::ui::shimmer::Shimmer>
+                            </TabsContent>
+
+                            <TabsContent value="files" class="h-full">
+                                <div class="flex flex-col items-center justify-center h-48 opacity-60">
+                                    <icons::File class="size-12 mb-3 text-muted-foreground" />
+                                    <p class="text-sm font-medium">"Dosya listesi yakında eklenecek"</p>
+                                </div>
+                            </TabsContent>
+
+                            <TabsContent value="trackers" class="h-full">
+                                <div class="flex flex-col items-center justify-center h-48 opacity-60">
+                                    <icons::Settings2 class="size-12 mb-3 text-muted-foreground" />
+                                    <p class="text-sm font-medium">"İzleyici listesi yakında eklenecek"</p>
+                                </div>
+                            </TabsContent>
+
+                            <TabsContent value="peers" class="h-full">
+                                <div class="flex flex-col items-center justify-center h-48 opacity-60">
+                                    <icons::Users class="size-12 mb-3 text-muted-foreground" />
+                                    <p class="text-sm font-medium">"Eş listesi yakında eklenecek"</p>
+                                </div>
+                            </TabsContent>
+                        </div>
+                    </Tabs>
+                </div>
+            </SheetContent>
+        </Sheet>
+    }
+}
+
+#[component]
+fn InfoItem(
+    label: &'static str, 
+    value: String, 
+    #[prop(optional)] class: &'static str
+) -> impl IntoView {
+    view! {
+        <div class=tailwind_fuse::tw_merge!("flex flex-col gap-1", class)>
+            <span class="text-xs font-semibold text-muted-foreground uppercase opacity-80">{label}</span>
+            <span class="text-sm font-medium">{value}</span>
+        </div>
+    }
+}
+
+fn format_bytes(bytes: i64) -> String {
+    const UNITS: [&str; 6] = ["B", "KB", "MB", "GB", "TB", "PB"];
+    if bytes < 1024 { return format!("{} B", bytes); }
+    let i = (bytes as f64).log2().div_euclid(10.0) as usize;
+    format!("{:.1} {}", (bytes as f64) / 1024_f64.powi(i as i32), UNITS[i])
+}
+
+fn format_speed(bytes_per_sec: i64) -> String {
+    if bytes_per_sec == 0 { return "0 B/s".to_string(); }
+    format!("{}/s", format_bytes(bytes_per_sec))
+}
+
+fn format_duration(seconds: i64) -> String {
+    if seconds <= 0 { return "∞".to_string(); }
+    let days = seconds / 86400;
+    let hours = (seconds % 86400) / 3600;
+    let minutes = (seconds % 3600) / 60;
+    let secs = seconds % 60;
+    if days > 0 { format!("{}g {}s", days, hours) }
+    else if hours > 0 { format!("{}s {}d", hours, minutes) }
+    else if minutes > 0 { format!("{}d {}sn", minutes, secs) }
+    else { format!("{}sn", secs) }
+}
+
+fn format_date(timestamp: i64) -> String {
+    if timestamp <= 0 { return "N/A".to_string(); }
+    let dt = chrono::DateTime::from_timestamp(timestamp, 0);
+    match dt { Some(dt) => dt.format("%d/%m/%Y %H:%M").to_string(), None => "N/A".to_string() }
+}

frontend/src/components/torrent/mod.rs

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

frontend/src/components/torrent/table.rs

@@ -553,6 +553,8 @@ pub fn TorrentTable() -> impl IntoView {
                 </div>
                 <div class="opacity-50">"VibeTorrent v3"</div>
             </div>
+            
+            <crate::components::torrent::details::TorrentDetailsSheet />
         </div>
     }.into_any()
 }

frontend/src/components/ui/card.rs

@@ -3,13 +3,17 @@ use leptos_ui::clx;
 
 mod components {
     use super::*;
-
     clx! {Card, div, "bg-card text-card-foreground flex flex-col gap-4 rounded-xl border py-6 shadow-sm"}
-    clx! {CardHeader, div, "@container/card-header flex flex-col items-start gap-1.5 px-6 [.border-b]:pb-6"}
+    // TODO. Change data-slot=card-action by data-name="CardAction".
+    clx! {CardHeader, div, "@container/card-header flex flex-col items-start gap-1.5 px-6 [.border-b]:pb-6 sm:grid sm:auto-rows-min sm:grid-rows-[auto_auto] has-data-[slot=card-action]:sm:grid-cols-[1fr_auto]"}
     clx! {CardTitle, h2, "leading-none font-semibold"}
     clx! {CardContent, div, "px-6"}
     clx! {CardDescription, p, "text-muted-foreground text-sm"}
     clx! {CardFooter, footer, "flex items-center px-6 [.border-t]:pt-6", "gap-2"}
+
+    clx! {CardAction, div, "self-start sm:col-start-2 sm:row-span-2 sm:row-start-1 sm:justify-self-end"}
+    clx! {CardList, ul, "flex flex-col gap-4"}
+    clx! {CardItem, li, "flex items-center [&_svg:not([class*='size-'])]:size-4 [&_svg]:shrink-0"}
 }
 
-pub use components::*;
+pub use components::*;

frontend/src/components/ui/context_menu.rs

@@ -139,7 +139,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, TableCell as DataTableCell,
-    TableHead as DataTableHead, TableHeader as DataTableHeader,
+    Table as DataTable, TableBody as DataTableBody, TableCaption as DataTableCaption, TableCell as DataTableCell,
+    TableFooter as DataTableFooter, TableHead as DataTableHead, TableHeader as DataTableHeader,
     TableRow as DataTableRow, TableWrapper as DataTableWrapper,
 };

frontend/src/components/ui/dropdown_menu.rs

@@ -5,7 +5,7 @@ use leptos_ui::clx;
 use tw_merge::*;
 
 use crate::components::hooks::use_random::use_random_id_for;
-// pub use crate::components::ui::separator::Separator as DropdownMenuSeparator;
+pub use crate::components::ui::separator::Separator as DropdownMenuSeparator;
 
 mod components {
     use super::*;

frontend/src/components/ui/mod.rs

@@ -17,8 +17,10 @@ pub mod separator;
 pub mod sheet;
 pub mod sidenav;
 pub mod skeleton;
+pub mod shimmer;
 pub mod svg_icon;
 pub mod switch;
 pub mod table;
+pub mod tabs;
 pub mod theme_toggle;
 pub mod toast;

frontend/src/components/ui/multi_select.rs

@@ -9,7 +9,7 @@ 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,
+    SelectGroup as MultiSelectGroup, SelectItem as MultiSelectItem, SelectLabel as MultiSelectLabel,
 };
 
 #[derive(Clone, Copy, PartialEq, Eq, Default)]

frontend/src/components/ui/sheet.rs

@@ -16,7 +16,7 @@ mod components {
     clx! {SheetFooter, footer, "flex flex-col-reverse gap-2 sm:flex-row sm:justify-end"}
 }
 
-// pub use components::*;
+pub use components::*;
 
 /* ========================================================== */
 /*                     ✨ CONTEXT ✨                          */

frontend/src/components/ui/shimmer.rs

@@ -0,0 +1,52 @@
+use leptos::prelude::*;
+use tw_merge::*;
+
+use crate::components::hooks::use_random::use_random_id_for;
+
+#[component]
+pub fn Shimmer(
+    /// Controls shimmer visibility (works with any bool signal)
+    #[prop(into)]
+    loading: Signal<bool>,
+
+    /// Color of the shimmer wave (default: "rgba(255,255,255,0.15)")
+    #[prop(into, optional)]
+    shimmer_color: Option<String>,
+
+    /// Background color of shimmer blocks (default: "rgba(255,255,255,0.08)")
+    #[prop(into, optional)]
+    background_color: Option<String>,
+
+    /// Animation duration in seconds (default: 1.5)
+    #[prop(optional)]
+    duration: Option<f64>,
+
+    /// Fallback border-radius for text elements in px (default: 4)
+    #[prop(optional)]
+    fallback_border_radius: Option<f64>,
+
+    /// Additional classes
+    #[prop(into, optional)]
+    class: String,
+
+    /// Children to wrap
+    children: Children,
+) -> impl IntoView {
+    let shimmer_id = use_random_id_for("Shimmer");
+    let merged_class = tw_merge!("relative", class);
+
+    view! {
+        <div
+            id=shimmer_id
+            class=merged_class
+            data-name="Shimmer"
+            data-shimmer-loading=move || loading.get().to_string()
+            data-shimmer-color=shimmer_color
+            data-shimmer-bg-color=background_color
+            data-shimmer-duration=duration.map(|d| d.to_string())
+            data-shimmer-fallback-radius=fallback_border_radius.map(|r| r.to_string())
+        >
+            {children()}
+        </div>
+    }
+}

frontend/src/components/ui/sidenav.rs

@@ -145,8 +145,7 @@ pub fn Sidenav(
                     data-name="Sidenav"
                     data-sidenav=data_state.to_string()
                     data-side=data_side.to_string()
-                    data-collapsible=data_collapsible.to_string()
-                    class="hidden md:block group peer text-sidenav-foreground group-data-[collapsible=Offcanvas]:data-[state=Collapsed]:hidden"
+                    class="hidden md:block group peer text-sidenav-foreground data-[state=Collapsed]:hidden"
                 >
                     // * SidenavGap: This is what handles the sidenav gap on desktop
                     <div
@@ -156,9 +155,9 @@ pub fn Sidenav(
                             "group-data-[collapsible=Offcanvas]:w-0",
                             "group-data-[side=Right]:rotate-180",
                             match variant {
-                                SidenavVariant::Sidenav => "group-data-[collapsible=Icon]:group-data-[state=Collapsed]:w-(--sidenav-width-icon)",
+                                SidenavVariant::Sidenav => "group-data-[collapsible=Icon]:w-(--sidenav-width-icon)",
                                 SidenavVariant::Floating | SidenavVariant::Inset =>
-                                    "group-data-[collapsible=Icon]:group-data-[state=Collapsed]:w-[calc(var(--sidenav-width-icon)+(--spacing(4)))]",
+                                    "group-data-[collapsible=Icon]:w-[calc(var(--sidenav-width-icon)+(--spacing(4)))]",
                             }
                         )
                     />
@@ -172,9 +171,9 @@ pub fn Sidenav(
                                 SidenavSide::Right => "right-0 group-data-[collapsible=Offcanvas]:right-[calc(var(--sidenav-width)*-1)]"
                             },
                             match variant {
-                                 SidenavVariant::Sidenav => "group-data-[collapsible=Icon]:group-data-[state=Collapsed]:w-(--sidenav-width-icon) group-data-[side=Left]:border-r group-data-[side=Right]:border-l",
+                                 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]:group-data-[state=Collapsed]:w-[calc(var(--sidenav-width-icon)+(--spacing(4))+2px)]",
+                                    "p-2 group-data-[collapsible=Icon]:w-[calc(var(--sidenav-width-icon)+(--spacing(4))+2px)]",
                             },
                         )
                     >

frontend/src/components/ui/tabs.rs

@@ -0,0 +1,108 @@
+use leptos::context::Provider;
+use leptos::prelude::*;
+use tw_merge::tw_merge;
+
+#[derive(Clone)]
+pub struct TabsContext {
+    pub active_tab: RwSignal<String>,
+}
+
+#[component]
+pub fn Tabs(
+    #[prop(into)] default_value: String,
+    children: Children,
+    #[prop(optional, into)] class: String,
+) -> impl IntoView {
+    let active_tab = RwSignal::new(default_value);
+    let ctx = TabsContext { active_tab };
+
+    let merged_class = tw_merge!("w-full", &class);
+
+    view! {
+        <Provider value=ctx>
+            <div data-name="Tabs" class=merged_class>
+                {children()}
+            </div>
+        </Provider>
+    }
+}
+
+#[component]
+pub fn TabsList(
+    children: Children,
+    #[prop(optional, into)] class: String,
+) -> impl IntoView {
+    let merged_class = tw_merge!(
+        "inline-flex h-9 items-center justify-center rounded-lg bg-muted p-1 text-muted-foreground",
+        &class
+    );
+
+    view! {
+        <div data-name="TabsList" class=merged_class>
+            {children()}
+        </div>
+    }
+}
+
+#[component]
+pub fn TabsTrigger(
+    #[prop(into)] value: String,
+    children: Children,
+    #[prop(optional, into)] class: String,
+) -> impl IntoView {
+    let ctx = expect_context::<TabsContext>();
+    let v_clone = value.clone();
+    
+    let is_active = Memo::new(move |_| ctx.active_tab.get() == v_clone);
+
+    let merged_class = move || tw_merge!(
+        "inline-flex items-center justify-center whitespace-nowrap rounded-md px-3 py-1 text-sm font-medium ring-offset-background transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 cursor-pointer select-none",
+        if is_active.get() {
+            "bg-background text-foreground shadow-sm"
+        } else {
+            "hover:bg-background/50 hover:text-foreground"
+        },
+        &class
+    );
+
+    view! {
+        <button
+            data-name="TabsTrigger"
+            type="button"
+            class=merged_class
+            data-state=move || if is_active.get() { "active" } else { "inactive" }
+            on:click=move |_| ctx.active_tab.set(value.clone())
+        >
+            {children()}
+        </button>
+    }
+}
+
+#[component]
+pub fn TabsContent(
+    #[prop(into)] value: String,
+    children: Children,
+    #[prop(optional, into)] class: String,
+) -> impl IntoView {
+    let ctx = expect_context::<TabsContext>();
+    let v_clone = value.clone();
+    
+    let is_active = Memo::new(move |_| ctx.active_tab.get() == v_clone);
+
+    let merged_class = move || tw_merge!(
+        "mt-2 ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2",
+        if !is_active.get() { "hidden" } else { "" },
+        &class
+    );
+
+    view! {
+        <div
+            data-name="TabsContent"
+            class=merged_class
+            data-state=move || if is_active.get() { "active" } else { "inactive" }
+            tabindex=move || if is_active.get() { "0" } else { "-1" }
+        >
+            {children()}
+        </div>
+    }
+}

frontend/src/store.rs

@@ -192,7 +192,7 @@ pub async fn subscribe_to_push_notifications() {
     let key_array = js_sys::Uint8Array::from(&decoded_key[..]);
 
     // 3. Prepare Options
-    let options = web_sys::PushSubscriptionOptionsInit::new();
+    let mut options = web_sys::PushSubscriptionOptionsInit::new();
     options.set_user_visible_only(true);
     options.set_application_server_key(&key_array.into());