Compare commits
8 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e878d1fe33 | ||
|
|
d88084fb9a | ||
|
|
f8639f2967 | ||
|
|
7129c9a8eb | ||
|
|
91202e7cf8 | ||
|
|
3c2fec8b8c | ||
|
|
ec23285a6a | ||
|
|
f075a87668 |
@@ -45,8 +45,15 @@
|
|||||||
--ring: oklch(0.556 0 0);
|
--ring: oklch(0.556 0 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@theme inline {
|
@theme inline {
|
||||||
|
--animate-shimmer: shimmer 2s infinite;
|
||||||
|
|
||||||
|
@keyframes shimmer {
|
||||||
|
100% {
|
||||||
|
transform: translateX(100%);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
--color-background: var(--background);
|
--color-background: var(--background);
|
||||||
--color-foreground: var(--foreground);
|
--color-foreground: var(--foreground);
|
||||||
--color-card: var(--card);
|
--color-card: var(--card);
|
||||||
@@ -76,6 +83,7 @@
|
|||||||
* {
|
* {
|
||||||
@apply border-border outline-ring/50;
|
@apply border-border outline-ring/50;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@apply bg-background text-foreground;
|
@apply bg-background text-foreground;
|
||||||
}
|
}
|
||||||
@@ -88,4 +96,4 @@
|
|||||||
dialog {
|
dialog {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
use crate::components::layout::protected::ProtectedLayout;
|
use crate::components::layout::protected::Protected;
|
||||||
use crate::components::ui::skeleton::Skeleton;
|
use crate::components::ui::skeleton::Skeleton;
|
||||||
use crate::components::torrent::table::TorrentTable;
|
use crate::components::torrent::table::TorrentTable;
|
||||||
use crate::components::auth::login::Login;
|
use crate::components::auth::login::Login;
|
||||||
@@ -50,11 +50,13 @@ fn InnerApp() -> impl IntoView {
|
|||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
log::info!("App initialization started...");
|
log::info!("App initialization started...");
|
||||||
|
gloo_console::log!("APP INIT: Checking setup status...");
|
||||||
|
|
||||||
// Check if setup is needed via Server Function
|
// Check if setup is needed via Server Function
|
||||||
match shared::server_fns::auth::get_setup_status().await {
|
match shared::server_fns::auth::get_setup_status().await {
|
||||||
Ok(status) => {
|
Ok(status) => {
|
||||||
if !status.completed {
|
if !status.completed {
|
||||||
|
log::info!("Setup not completed");
|
||||||
needs_setup.1.set(true);
|
needs_setup.1.set(true);
|
||||||
is_loading.1.set(false);
|
is_loading.1.set(false);
|
||||||
return;
|
return;
|
||||||
@@ -66,6 +68,7 @@ fn InnerApp() -> impl IntoView {
|
|||||||
// Check authentication via GetUser Server Function
|
// Check authentication via GetUser Server Function
|
||||||
match shared::server_fns::auth::get_user().await {
|
match shared::server_fns::auth::get_user().await {
|
||||||
Ok(Some(user_info)) => {
|
Ok(Some(user_info)) => {
|
||||||
|
log::info!("Authenticated as {}", user_info.username);
|
||||||
if let Some(s) = store {
|
if let Some(s) = store {
|
||||||
s.user.set(Some(user_info.username));
|
s.user.set(Some(user_info.username));
|
||||||
}
|
}
|
||||||
@@ -80,6 +83,7 @@ fn InnerApp() -> impl IntoView {
|
|||||||
}
|
}
|
||||||
|
|
||||||
is_loading.1.set(false);
|
is_loading.1.set(false);
|
||||||
|
crate::store::toast_success("VibeTorrent'e Hoşgeldiniz");
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -95,14 +99,11 @@ fn InnerApp() -> impl IntoView {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
let is_loading_val = move || is_loading.0.get();
|
|
||||||
let authenticated_val = move || is_authenticated.0.get();
|
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<div class="relative w-full h-screen" style="height: 100dvh;">
|
<div class="relative w-full h-screen" style="height: 100dvh;">
|
||||||
<Routes fallback=|| view! { <div class="p-4">"404 Not Found"</div> }.into_any()>
|
<Routes fallback=|| view! { <div class="p-4">"404 Not Found"</div> }>
|
||||||
<Route path=leptos_router::path!("/login") view=move || {
|
<Route path=leptos_router::path!("/login") view=move || {
|
||||||
let authenticated = authenticated_val();
|
let authenticated = is_authenticated.0.get();
|
||||||
let setup_needed = needs_setup.0.get();
|
let setup_needed = needs_setup.0.get();
|
||||||
|
|
||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
@@ -110,75 +111,93 @@ fn InnerApp() -> impl IntoView {
|
|||||||
let navigate = use_navigate();
|
let navigate = use_navigate();
|
||||||
navigate("/setup", Default::default());
|
navigate("/setup", Default::default());
|
||||||
} else if authenticated {
|
} else if authenticated {
|
||||||
|
log::info!("Already authenticated, redirecting to home");
|
||||||
let navigate = use_navigate();
|
let navigate = use_navigate();
|
||||||
navigate("/", Default::default());
|
navigate("/", Default::default());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
view! { <Login /> }.into_any()
|
view! { <Login /> }
|
||||||
} />
|
} />
|
||||||
<Route path=leptos_router::path!("/setup") view=move || {
|
<Route path=leptos_router::path!("/setup") view=move || {
|
||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
if authenticated_val() {
|
if is_authenticated.0.get() {
|
||||||
let navigate = use_navigate();
|
let navigate = use_navigate();
|
||||||
navigate("/", Default::default());
|
navigate("/", Default::default());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
view! { <Setup /> }.into_any()
|
view! { <Setup /> }
|
||||||
} />
|
} />
|
||||||
|
|
||||||
<Route path=leptos_router::path!("/") view=move || {
|
<Route path=leptos_router::path!("/") view=move || {
|
||||||
let navigate = use_navigate();
|
let navigate = use_navigate();
|
||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
if !is_loading_val() {
|
if !is_loading.0.get() {
|
||||||
if needs_setup.0.get() {
|
if needs_setup.0.get() {
|
||||||
|
log::info!("Setup not completed, redirecting to setup");
|
||||||
navigate("/setup", Default::default());
|
navigate("/setup", Default::default());
|
||||||
} else if !authenticated_val() {
|
} else if !is_authenticated.0.get() {
|
||||||
|
log::info!("Not authenticated, redirecting to login");
|
||||||
navigate("/login", Default::default());
|
navigate("/login", Default::default());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Show when=move || !is_loading_val() fallback=|| {
|
<Show when=move || !is_loading.0.get() fallback=|| {
|
||||||
|
// Standard 1: Always show Dashboard Skeleton
|
||||||
view! {
|
view! {
|
||||||
<div class="flex h-screen bg-background text-foreground overflow-hidden">
|
<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="w-56 border-r border-border p-4 space-y-4">
|
||||||
<Skeleton class="h-8 w-3/4" />
|
<Skeleton class="h-8 w-3/4" />
|
||||||
<div class="space-y-2">
|
<div class="space-y-2">
|
||||||
<Skeleton class="h-6 w-full" />
|
<Skeleton class="h-6 w-full" />
|
||||||
<Skeleton class="h-6 w-full" />
|
<Skeleton class="h-6 w-full" />
|
||||||
<Skeleton class="h-6 w-4/5" />
|
<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>
|
||||||
</div>
|
</div>
|
||||||
|
// Main content skeleton
|
||||||
<div class="flex-1 flex flex-col min-w-0">
|
<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="border-b border-border p-4 flex items-center gap-4">
|
||||||
<Skeleton class="h-8 w-48" />
|
<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>
|
||||||
<div class="flex-1 p-4 space-y-3">
|
<div class="flex-1 p-4 space-y-3">
|
||||||
<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-full" />
|
||||||
|
<Skeleton class="h-10 w-full" />
|
||||||
|
<Skeleton class="h-10 w-3/4" />
|
||||||
|
</div>
|
||||||
|
<div class="border-t border-border p-3">
|
||||||
|
<Skeleton class="h-5 w-96" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}.into_any()
|
}.into_any()
|
||||||
}>
|
}>
|
||||||
<Show when=move || authenticated_val() fallback=|| ()>
|
<Show when=move || is_authenticated.0.get() fallback=|| ()>
|
||||||
<ProtectedLayout>
|
<Protected>
|
||||||
<div class="flex flex-col h-full overflow-hidden">
|
<div class="flex flex-col h-full overflow-hidden">
|
||||||
<div class="flex-1 overflow-hidden">
|
<div class="flex-1 overflow-hidden">
|
||||||
<TorrentTable />
|
<TorrentTable />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</ProtectedLayout>
|
</Protected>
|
||||||
</Show>
|
</Show>
|
||||||
</Show>
|
</Show>
|
||||||
}.into_any()
|
}.into_any()
|
||||||
}/>
|
}/>
|
||||||
|
|
||||||
<Route path=leptos_router::path!("/settings") view=move || {
|
<Route path=leptos_router::path!("/settings") view=move || {
|
||||||
let authenticated = authenticated_val();
|
let authenticated = is_authenticated.0.get();
|
||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
if !authenticated {
|
if !authenticated {
|
||||||
let navigate = use_navigate();
|
let navigate = use_navigate();
|
||||||
@@ -187,14 +206,14 @@ fn InnerApp() -> impl IntoView {
|
|||||||
});
|
});
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Show when=move || !is_loading_val() fallback=|| ()>
|
<Show when=move || !is_loading.0.get() fallback=|| ()>
|
||||||
<Show when=move || authenticated fallback=|| ()>
|
<Show when=move || authenticated fallback=|| ()>
|
||||||
<ProtectedLayout>
|
<Protected>
|
||||||
<div class="p-4">"Settings Page (Coming Soon)"</div>
|
<div class="p-4">"Settings Page (Coming Soon)"</div>
|
||||||
</ProtectedLayout>
|
</Protected>
|
||||||
</Show>
|
</Show>
|
||||||
</Show>
|
</Show>
|
||||||
}.into_any()
|
}
|
||||||
}/>
|
}/>
|
||||||
</Routes>
|
</Routes>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
91
frontend/src/components/demos/demo_shimmer.rs
Normal file
91
frontend/src/components/demos/demo_shimmer.rs
Normal file
@@ -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>
|
||||||
|
}
|
||||||
|
}
|
||||||
1
frontend/src/components/demos/mod.rs
Normal file
1
frontend/src/components/demos/mod.rs
Normal file
@@ -0,0 +1 @@
|
|||||||
|
pub mod demo_shimmer;
|
||||||
@@ -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 {
|
const PREFIX: &str = "rust_ui"; // Must NOT contain "/" or "-"
|
||||||
format!("{}_{}", prefix, js_sys::Math::random().to_string().replace(".", ""))
|
|
||||||
|
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()
|
||||||
|
}
|
||||||
@@ -1,22 +1,29 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use crate::components::layout::sidebar::Sidebar;
|
use crate::components::layout::sidebar::Sidebar;
|
||||||
use crate::components::layout::toolbar::Toolbar;
|
use crate::components::layout::toolbar::Toolbar;
|
||||||
use crate::components::ui::sidenav::{SidenavWrapper, Sidenav, SidenavInset, SidenavState};
|
use crate::components::layout::footer::Footer;
|
||||||
|
use crate::components::ui::sidenav::{SidenavWrapper, Sidenav, SidenavInset};
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn ProtectedLayout(children: Children) -> impl IntoView {
|
pub fn Protected(children: Children) -> impl IntoView {
|
||||||
let sidenav_state = RwSignal::new(SidenavState::Expanded);
|
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<SidenavWrapper attr:style="--sidenav-width:16rem; --sidenav-width-icon:3rem;">
|
<SidenavWrapper attr:style="--sidenav-width:16rem; --sidenav-width-icon:3rem;">
|
||||||
<Sidenav data_state=Signal::from(sidenav_state)>
|
// Masaüstü Sidenav
|
||||||
|
<Sidenav>
|
||||||
<Sidebar />
|
<Sidebar />
|
||||||
</Sidenav>
|
</Sidenav>
|
||||||
|
|
||||||
|
// İçerik Alanı
|
||||||
<SidenavInset class="flex flex-col h-screen overflow-hidden">
|
<SidenavInset class="flex flex-col h-screen overflow-hidden">
|
||||||
<Toolbar sidenav_state=sidenav_state />
|
// Toolbar (Üst Bar)
|
||||||
<main class="flex-1 overflow-auto bg-muted/30">
|
<Toolbar />
|
||||||
{children()}
|
|
||||||
|
// Ana İçerik
|
||||||
|
<main class="flex-1 overflow-y-auto relative bg-background flex flex-col">
|
||||||
|
<div class="flex-1">
|
||||||
|
{children()}
|
||||||
|
</div>
|
||||||
|
<Footer />
|
||||||
</main>
|
</main>
|
||||||
</SidenavInset>
|
</SidenavInset>
|
||||||
</SidenavWrapper>
|
</SidenavWrapper>
|
||||||
|
|||||||
@@ -1,24 +1,55 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use crate::components::ui::sidenav::{SidenavTrigger, SidenavState};
|
use icons::{PanelLeft, Plus};
|
||||||
use crate::components::torrent::add_torrent::AddTorrent;
|
use crate::components::torrent::add_torrent::AddTorrentDialogContent;
|
||||||
|
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]
|
#[component]
|
||||||
pub fn Toolbar(
|
pub fn Toolbar() -> impl IntoView {
|
||||||
sidenav_state: RwSignal<SidenavState>
|
view! {
|
||||||
) -> impl IntoView {
|
<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);">
|
||||||
let header_view = view! {
|
// Sol kısım: Menü butonu (Mobil) + Add Torrent
|
||||||
<header class="h-14 border-b bg-background/95 backdrop-blur-sm flex items-center justify-between px-4 sticky top-0 z-30">
|
<div class="flex items-center gap-3">
|
||||||
<div class="flex items-center gap-4">
|
|
||||||
<SidenavTrigger data_state=sidenav_state />
|
// --- MOBILE SHEET (SIDEBAR) ---
|
||||||
<div class="h-4 w-px bg-border hidden md:block"></div>
|
<div class="lg:hidden">
|
||||||
<h2 class="text-sm font-semibold tracking-tight">"Torrents"</h2>
|
<Sheet>
|
||||||
|
<SheetTrigger variant=ButtonVariant::Ghost size=ButtonSize::Icon class="size-9">
|
||||||
|
<PanelLeft class="size-5" />
|
||||||
|
<span class="hidden">"Menüyü Aç"</span>
|
||||||
|
</SheetTrigger>
|
||||||
|
<SheetContent
|
||||||
|
direction=SheetDirection::Left
|
||||||
|
class="p-0 w-[18rem] bg-card border-r border-border"
|
||||||
|
hide_close_button=true
|
||||||
|
>
|
||||||
|
<div class="flex flex-col h-full overflow-hidden">
|
||||||
|
<Sidebar />
|
||||||
|
</div>
|
||||||
|
</SheetContent>
|
||||||
|
</Sheet>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Dialog>
|
||||||
|
<DialogTrigger
|
||||||
|
variant=ButtonVariant::Default
|
||||||
|
class="gap-2"
|
||||||
|
>
|
||||||
|
<Plus class="w-4 h-4 md:w-5 md:h-5" />
|
||||||
|
<span class="hidden sm:inline">"Add Torrent"</span>
|
||||||
|
<span class="sm:hidden">"Add"</span>
|
||||||
|
</DialogTrigger>
|
||||||
|
<DialogContent id="add-torrent-dialog" class="sm:max-w-[425px]">
|
||||||
|
<AddTorrentDialogContent />
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-center gap-2">
|
// Sağ kısım boş
|
||||||
<AddTorrent />
|
<div class="flex flex-1 items-center justify-end gap-2">
|
||||||
</div>
|
</div>
|
||||||
</header>
|
</div>
|
||||||
};
|
}
|
||||||
|
|
||||||
header_view
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,3 +5,4 @@ pub mod torrent;
|
|||||||
pub mod auth;
|
pub mod auth;
|
||||||
// pub mod toast; (Removed)
|
// pub mod toast; (Removed)
|
||||||
pub mod ui;
|
pub mod ui;
|
||||||
|
pub mod demos;
|
||||||
|
|||||||
@@ -3,26 +3,10 @@ use leptos::task::spawn_local;
|
|||||||
use wasm_bindgen::JsCast;
|
use wasm_bindgen::JsCast;
|
||||||
use crate::components::ui::input::{Input, InputType};
|
use crate::components::ui::input::{Input, InputType};
|
||||||
use crate::api;
|
use crate::api;
|
||||||
use crate::components::ui::button::{Button, ButtonVariant};
|
use crate::components::ui::button::Button;
|
||||||
use crate::components::ui::dialog::{
|
use crate::components::ui::dialog::{
|
||||||
Dialog, DialogTrigger, DialogContent, DialogBody, DialogHeader, DialogTitle, DialogDescription, DialogFooter, DialogClose
|
DialogBody, DialogHeader, DialogTitle, DialogDescription, DialogFooter, DialogClose
|
||||||
};
|
};
|
||||||
use icons::Play;
|
|
||||||
|
|
||||||
#[component]
|
|
||||||
pub fn AddTorrent() -> impl IntoView {
|
|
||||||
view! {
|
|
||||||
<Dialog>
|
|
||||||
<DialogTrigger variant=ButtonVariant::Default class="gap-2">
|
|
||||||
<Play class="size-4" />
|
|
||||||
<span class="hidden sm:inline">"Add Torrent"</span>
|
|
||||||
</DialogTrigger>
|
|
||||||
<DialogContent id="add-torrent-dialog">
|
|
||||||
<AddTorrentDialogContent />
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn AddTorrentDialogContent() -> impl IntoView {
|
pub fn AddTorrentDialogContent() -> impl IntoView {
|
||||||
|
|||||||
178
frontend/src/components/torrent/details.rs
Normal file
178
frontend/src/components/torrent/details.rs
Normal file
@@ -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() }
|
||||||
|
}
|
||||||
@@ -1,2 +1,3 @@
|
|||||||
pub mod table;
|
pub mod table;
|
||||||
pub mod add_torrent;
|
pub mod add_torrent;
|
||||||
|
pub mod details;
|
||||||
|
|||||||
@@ -553,6 +553,8 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
<div class="opacity-50">"VibeTorrent v3"</div>
|
<div class="opacity-50">"VibeTorrent v3"</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<crate::components::torrent::details::TorrentDetailsSheet />
|
||||||
</div>
|
</div>
|
||||||
}.into_any()
|
}.into_any()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,13 +3,17 @@ use leptos_ui::clx;
|
|||||||
|
|
||||||
mod components {
|
mod components {
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
clx! {Card, div, "bg-card text-card-foreground flex flex-col gap-4 rounded-xl border py-6 shadow-sm"}
|
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! {CardTitle, h2, "leading-none font-semibold"}
|
||||||
clx! {CardContent, div, "px-6"}
|
clx! {CardContent, div, "px-6"}
|
||||||
clx! {CardDescription, p, "text-muted-foreground text-sm"}
|
clx! {CardDescription, p, "text-muted-foreground text-sm"}
|
||||||
clx! {CardFooter, footer, "flex items-center px-6 [.border-t]:pt-6", "gap-2"}
|
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::*;
|
||||||
@@ -139,7 +139,7 @@ pub fn ContextMenuTrigger(
|
|||||||
class=trigger_class
|
class=trigger_class
|
||||||
data-name="ContextMenuTrigger"
|
data-name="ContextMenuTrigger"
|
||||||
data-context-trigger=ctx.target_id
|
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 {
|
if let Some(cb) = on_open {
|
||||||
cb.run(());
|
cb.run(());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,8 +17,10 @@ pub mod separator;
|
|||||||
pub mod sheet;
|
pub mod sheet;
|
||||||
pub mod sidenav;
|
pub mod sidenav;
|
||||||
pub mod skeleton;
|
pub mod skeleton;
|
||||||
|
pub mod shimmer;
|
||||||
pub mod svg_icon;
|
pub mod svg_icon;
|
||||||
pub mod switch;
|
pub mod switch;
|
||||||
pub mod table;
|
pub mod table;
|
||||||
|
pub mod tabs;
|
||||||
pub mod theme_toggle;
|
pub mod theme_toggle;
|
||||||
pub mod toast;
|
pub mod toast;
|
||||||
52
frontend/src/components/ui/shimmer.rs
Normal file
52
frontend/src/components/ui/shimmer.rs
Normal file
@@ -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>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
|
use leptos_router::hooks::use_location;
|
||||||
use leptos_ui::{clx, variants, void};
|
use leptos_ui::{clx, variants, void};
|
||||||
|
|
||||||
mod components {
|
mod components {
|
||||||
use super::*;
|
use super::*;
|
||||||
clx! {SidenavWrapper, div, "group/sidenav-wrapper has-data-[variant=Inset]:bg-sidenav flex h-full w-full"}
|
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"}
|
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! {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! {SidenavHeader, div, "flex flex-col gap-2 p-2"}
|
||||||
clx! {SidenavMenu, ul, "flex flex-col gap-1 w-full min-w-0"}
|
clx! {SidenavMenu, ul, "flex flex-col gap-1 w-full min-w-0"}
|
||||||
@@ -15,20 +18,82 @@ mod components {
|
|||||||
clx! {SidenavGroupContent, div, "w-full text-sm"}
|
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! {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"}
|
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"}
|
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"}
|
||||||
|
|
||||||
void! {SidenavInput, input,
|
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",
|
"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:border-ring focus-visible:ring-ring/50",
|
||||||
"focus-visible:ring-2",
|
"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",
|
"aria-invalid:ring-destructive/20 dark:aria-invalid:ring-destructive/40 aria-invalid:border-destructive",
|
||||||
"read-only:bg-muted",
|
"read-only:bg-muted",
|
||||||
|
// Specific to Sidenav
|
||||||
"w-full h-8 shadow-none bg-background"
|
"w-full h-8 shadow-none bg-background"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub use components::*;
|
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>
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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: {
|
||||||
|
element: button,
|
||||||
|
support_href: true,
|
||||||
|
support_aria_current: true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ========================================================== */
|
||||||
|
/* ✨ FUNCTIONS ✨ */
|
||||||
|
/* ========================================================== */
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display, strum::IntoStaticStr)]
|
#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display, strum::IntoStaticStr)]
|
||||||
pub enum SidenavVariant {
|
pub enum SidenavVariant {
|
||||||
#[default]
|
#[default]
|
||||||
@@ -52,6 +117,83 @@ pub enum SidenavCollapsible {
|
|||||||
Icon,
|
Icon,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[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,
|
||||||
|
children: Children,
|
||||||
|
) -> 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()
|
||||||
|
}}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ========================================================== */
|
||||||
|
/* ✨ FUNCTIONS ✨ */
|
||||||
|
/* ========================================================== */
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display)]
|
#[derive(Clone, Copy, PartialEq, Eq, Default, strum::Display)]
|
||||||
pub enum SidenavState {
|
pub enum SidenavState {
|
||||||
#[default]
|
#[default]
|
||||||
@@ -59,94 +201,32 @@ pub enum SidenavState {
|
|||||||
Collapsed,
|
Collapsed,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
const ONCLICK_TRIGGER: &str = "document.querySelector('[data-name=\"Sidenav\"]').setAttribute('data-state', document.querySelector('[data-name=\"Sidenav\"]').getAttribute('data-state') === 'Collapsed' ? 'Expanded' : 'Collapsed')";
|
||||||
pub fn Sidenav(
|
|
||||||
#[prop(into, optional)] class: String,
|
|
||||||
#[prop(default = SidenavVariant::default())] variant: SidenavVariant,
|
|
||||||
#[prop(into)] data_state: Signal<SidenavState>,
|
|
||||||
#[prop(default = SidenavSide::default())] data_side: SidenavSide,
|
|
||||||
#[prop(default = SidenavCollapsible::default())] data_collapsible: SidenavCollapsible,
|
|
||||||
children: Children,
|
|
||||||
) -> impl IntoView {
|
|
||||||
view! {
|
|
||||||
<aside
|
|
||||||
data-name="Sidenav"
|
|
||||||
data-state=move || data_state.get().to_string()
|
|
||||||
data-side=data_side.to_string()
|
|
||||||
data-collapsible=data_collapsible.to_string()
|
|
||||||
class="hidden md:block group peer text-sidenav-foreground h-full"
|
|
||||||
>
|
|
||||||
<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-[state=Collapsed]:w-(--sidenav-width-icon)",
|
|
||||||
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)]"
|
|
||||||
},
|
|
||||||
"group-data-[state=Collapsed]:w-(--sidenav-width-icon)",
|
|
||||||
match variant {
|
|
||||||
SidenavVariant::Sidenav => "group-data-[side=Left]:border-r group-data-[side=Right]:border-l",
|
|
||||||
SidenavVariant::Floating | SidenavVariant::Inset => "p-2",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
>
|
|
||||||
<SidenavInner attr:data-sidenav="Sidenav" attr:data-variant=variant.to_string()>
|
|
||||||
{children()}
|
|
||||||
</SidenavInner>
|
|
||||||
</div>
|
|
||||||
</aside>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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-[state=Collapsed]:size-8! group-data-[state=Collapsed]:p-0! [&>svg]:stroke-2 aria-[current=page]:[&>svg]:stroke-[2.7]",
|
|
||||||
variants: {
|
|
||||||
variant: {
|
|
||||||
Default: "hover:bg-sidenav-accent hover:text-sidenav-accent-foreground",
|
|
||||||
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: {
|
|
||||||
element: button,
|
|
||||||
support_href: true,
|
|
||||||
support_aria_current: true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn SidenavTrigger(
|
pub fn SidenavTrigger(children: Children) -> impl IntoView {
|
||||||
#[prop(into)] data_state: RwSignal<SidenavState>,
|
|
||||||
#[prop(optional, into)] class: String,
|
|
||||||
) -> impl IntoView {
|
|
||||||
view! {
|
view! {
|
||||||
|
// TODO. Use Button.
|
||||||
|
|
||||||
<button
|
<button
|
||||||
on:click=move |_| data_state.update(|s| *s = match s { SidenavState::Expanded => SidenavState::Collapsed, SidenavState::Collapsed => SidenavState::Expanded })
|
onclick=ONCLICK_TRIGGER
|
||||||
data-name="SidenavTrigger"
|
data-name="SidenavTrigger"
|
||||||
class=tw_merge!("inline-flex gap-2 justify-center items-center text-sm font-medium whitespace-nowrap rounded-md transition-all outline-none size-7 hover:bg-accent hover:text-accent-foreground focus-visible:ring-2", class)
|
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]"
|
||||||
>
|
>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="lucide lucide-panel-left"><rect width="18" height="18" x="3" y="3" rx="2"/><path d="M9 3v18"/></svg>
|
{children()}
|
||||||
</button>
|
</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"
|
||||||
|
/>
|
||||||
|
}
|
||||||
|
}
|
||||||
108
frontend/src/components/ui/tabs.rs
Normal file
108
frontend/src/components/ui/tabs.rs
Normal file
@@ -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>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -88,10 +88,13 @@ pub fn provide_torrent_store() {
|
|||||||
let mut disconnect_notified = false;
|
let mut disconnect_notified = false;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
log::info!("[SSE] Attempting to connect to /api/events...");
|
||||||
let es_result = EventSource::new("/api/events");
|
let es_result = EventSource::new("/api/events");
|
||||||
match es_result {
|
match es_result {
|
||||||
Ok(mut es) => {
|
Ok(mut es) => {
|
||||||
|
log::info!("[SSE] EventSource instantiated successfully.");
|
||||||
if let Ok(mut stream) = es.subscribe("message") {
|
if let Ok(mut stream) = es.subscribe("message") {
|
||||||
|
log::info!("[SSE] Subscribed to 'message' events.");
|
||||||
let mut got_first_message = false;
|
let mut got_first_message = false;
|
||||||
while let Some(Ok((_, msg))) = stream.next().await {
|
while let Some(Ok((_, msg))) = stream.next().await {
|
||||||
if !got_first_message {
|
if !got_first_message {
|
||||||
@@ -105,29 +108,40 @@ pub fn provide_torrent_store() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(data_str) = msg.data().as_string() {
|
if let Some(data_str) = msg.data().as_string() {
|
||||||
if let Ok(bytes) = BASE64.decode(&data_str) {
|
log::info!("[SSE] Received message: {:?}", data_str.chars().take(50).collect::<String>());
|
||||||
if let Ok(event) = rmp_serde::from_slice::<AppEvent>(&bytes) {
|
match BASE64.decode(&data_str) {
|
||||||
match event {
|
Ok(bytes) => {
|
||||||
AppEvent::FullList(list, _) => {
|
match rmp_serde::from_slice::<AppEvent>(&bytes) {
|
||||||
torrents_for_sse.update(|map| {
|
Ok(event) => {
|
||||||
let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
|
match event {
|
||||||
map.retain(|hash, _| new_hashes.contains(hash));
|
AppEvent::FullList(list, _) => {
|
||||||
for new_torrent in list { map.insert(new_torrent.hash.clone(), new_torrent); }
|
torrents_for_sse.update(|map| {
|
||||||
});
|
let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
|
||||||
}
|
map.retain(|hash, _| new_hashes.contains(hash));
|
||||||
AppEvent::Update(patch) => {
|
for new_torrent in list { map.insert(new_torrent.hash.clone(), new_torrent); }
|
||||||
if let Some(hash) = patch.hash.clone() {
|
});
|
||||||
torrents_for_sse.update(|map| { if let Some(t) = map.get_mut(&hash) { t.apply(patch); } });
|
}
|
||||||
}
|
AppEvent::Update(patch) => {
|
||||||
}
|
if let Some(hash) = patch.hash.clone() {
|
||||||
AppEvent::Stats(stats) => { global_stats_for_sse.set(stats); }
|
torrents_for_sse.update(|map| { if let Some(t) = map.get_mut(&hash) { t.apply(patch); } });
|
||||||
AppEvent::Notification(n) => {
|
}
|
||||||
show_toast(n.level.clone(), n.message.clone());
|
}
|
||||||
if n.message.contains("tamamlandı") || n.level == shared::NotificationLevel::Error {
|
AppEvent::Stats(stats) => { global_stats_for_sse.set(stats); }
|
||||||
show_browser_notification("VibeTorrent", &n.message);
|
AppEvent::Notification(n) => {
|
||||||
|
show_toast(n.level.clone(), n.message.clone());
|
||||||
|
if n.message.contains("tamamlandı") || n.level == shared::NotificationLevel::Error {
|
||||||
|
show_browser_notification("VibeTorrent", &n.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("[SSE] Failed to deserialize AppEvent: {:?}", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
log::error!("[SSE] Failed to decode base64: {:?}", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
const CACHE_NAME = "vibetorrent-v2";
|
const CACHE_NAME = "vibetorrent-v3";
|
||||||
const ASSETS_TO_CACHE = [
|
const ASSETS_TO_CACHE = [
|
||||||
"/",
|
"/",
|
||||||
"/index.html",
|
"/index.html",
|
||||||
@@ -51,6 +51,11 @@ self.addEventListener("activate", (event) => {
|
|||||||
self.addEventListener("fetch", (event) => {
|
self.addEventListener("fetch", (event) => {
|
||||||
const url = new URL(event.request.url);
|
const url = new URL(event.request.url);
|
||||||
|
|
||||||
|
// Skip unsupported schemes (like chrome-extension://)
|
||||||
|
if (!url.protocol.startsWith("http")) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Network-first strategy for API calls
|
// Network-first strategy for API calls
|
||||||
if (url.pathname.startsWith("/api/")) {
|
if (url.pathname.startsWith("/api/")) {
|
||||||
event.respondWith(
|
event.respondWith(
|
||||||
@@ -75,10 +80,12 @@ self.addEventListener("fetch", (event) => {
|
|||||||
fetch(event.request)
|
fetch(event.request)
|
||||||
.then((response) => {
|
.then((response) => {
|
||||||
// Cache the latest version of the HTML
|
// Cache the latest version of the HTML
|
||||||
const responseToCache = response.clone();
|
if (response && response.status === 200) {
|
||||||
caches.open(CACHE_NAME).then((cache) => {
|
const responseToCache = response.clone();
|
||||||
cache.put(event.request, responseToCache);
|
caches.open(CACHE_NAME).then((cache) => {
|
||||||
});
|
cache.put(event.request, responseToCache);
|
||||||
|
});
|
||||||
|
}
|
||||||
return response;
|
return response;
|
||||||
})
|
})
|
||||||
.catch(() => {
|
.catch(() => {
|
||||||
|
|||||||
Reference in New Issue
Block a user