Compare commits

..

12 Commits

Author SHA1 Message Date
spinline
575cfa4b38 Add 'Remember Me' feature to login (extends session to 30 days)
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 19:05:52 +03:00
spinline
9b18b97c49 Fetch and display actual username in sidebar profile section
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 17:17:16 +03:00
spinline
88723352fd Fix sidebar overlap: Add bottom padding to account for fixed status bar
All checks were successful
Build MIPS Binary / build (push) Successful in 4m12s
2026-02-07 17:07:30 +03:00
spinline
4231e0b3a7 Adjust sidebar layout to push profile section to the bottom and reduce avatar size
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 16:59:31 +03:00
spinline
1177412c87 Add user profile and logout button to sidebar footer
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 16:40:55 +03:00
spinline
aed753c64f Lower bcrypt cost to 6 to improve login speed on low-end hardware
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 16:24:06 +03:00
spinline
9d0eb11f16 Refactor App routing to fix infinite recursion and stack overflow errors
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 16:10:06 +03:00
spinline
3c13f99652 Improve App initialization logic with better error handling and logging to prevent infinite loading state
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:45:51 +03:00
spinline
a948215538 Change cookie SameSite policy to Lax to fix login redirection issue
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:38:56 +03:00
spinline
13424fceeb Demote 'Torrent status changed' log from INFO to DEBUG to reduce console noise
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:33:16 +03:00
spinline
e3eb5fbca9 Add detailed logging to login handler and use full page reload for auth navigation
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 15:28:44 +03:00
spinline
08f2f540fe Fix unused import and dead code warnings
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:20:23 +03:00
11 changed files with 437 additions and 218 deletions

View File

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

View File

@@ -85,7 +85,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
has_changes = true; has_changes = true;
// Log status changes for debugging // Log status changes for debugging
tracing::info!( tracing::debug!(
"Torrent status changed: {} ({}) {:?} -> {:?}", "Torrent status changed: {} ({}) {:?} -> {:?}",
new_t.name, new_t.hash, old_t.status, new_t.status new_t.name, new_t.hash, old_t.status, new_t.status
); );

View File

@@ -1,4 +1,4 @@
use crate::{db::Db, AppState}; use crate::AppState;
use axum::{ use axum::{
extract::{State, Json}, extract::{State, Json},
http::StatusCode, http::StatusCode,
@@ -13,6 +13,8 @@ use time::Duration;
pub struct LoginRequest { pub struct LoginRequest {
username: String, username: String,
password: String, password: String,
#[serde(default)]
remember_me: bool,
} }
#[derive(Serialize, ToSchema)] #[derive(Serialize, ToSchema)]
@@ -35,11 +37,16 @@ pub async fn login_handler(
jar: CookieJar, jar: CookieJar,
Json(payload): Json<LoginRequest>, Json(payload): Json<LoginRequest>,
) -> impl IntoResponse { ) -> impl IntoResponse {
tracing::info!("Login attempt for user: {}", payload.username);
let user = match state.db.get_user_by_username(&payload.username).await { let user = match state.db.get_user_by_username(&payload.username).await {
Ok(Some(u)) => u, Ok(Some(u)) => u,
Ok(None) => return (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response(), Ok(None) => {
tracing::warn!("Login failed: User not found for {}", payload.username);
return (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response();
}
Err(e) => { Err(e) => {
tracing::error!("DB error during login: {}", e); tracing::error!("DB error during login for {}: {}", payload.username, e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response(); return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
} }
}; };
@@ -48,31 +55,47 @@ pub async fn login_handler(
match bcrypt::verify(&payload.password, &password_hash) { match bcrypt::verify(&payload.password, &password_hash) {
Ok(true) => { Ok(true) => {
tracing::info!("Password verified for user: {}", payload.username);
// Create session // Create session
let token: String = (0..32).map(|_| { let token: String = (0..32).map(|_| {
use rand::{distributions::Alphanumeric, Rng}; use rand::{distributions::Alphanumeric, Rng};
rand::thread_rng().sample(Alphanumeric) as char rand::thread_rng().sample(Alphanumeric) as char
}).collect(); }).collect();
// Expires in 30 days // Expiration: 30 days if remember_me is true, else 1 day
let expires_in = 60 * 60 * 24 * 30; let expires_in = if payload.remember_me {
60 * 60 * 24 * 30
} else {
60 * 60 * 24
};
let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in; let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in;
if let Err(e) = state.db.create_session(user_id, &token, expires_at).await { if let Err(e) = state.db.create_session(user_id, &token, expires_at).await {
tracing::error!("Failed to create session: {}", e); tracing::error!("Failed to create session for {}: {}", payload.username, e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response(); return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response();
} }
let cookie = Cookie::build(("auth_token", token)) let mut cookie = Cookie::build(("auth_token", token))
.path("/") .path("/")
.http_only(true) .http_only(true)
.same_site(SameSite::Strict) .same_site(SameSite::Lax)
.max_age(Duration::seconds(expires_in))
.build(); .build();
(StatusCode::OK, jar.add(cookie), "Login successful").into_response() cookie.set_max_age(Duration::seconds(expires_in));
tracing::info!("Session created and cookie set for user: {}", payload.username);
(StatusCode::OK, jar.add(cookie), Json(UserResponse { username: payload.username })).into_response()
}
Ok(false) => {
tracing::warn!("Login failed: Invalid password for {}", payload.username);
(StatusCode::UNAUTHORIZED, "Invalid credentials").into_response()
}
Err(e) => {
tracing::error!("Bcrypt error for {}: {}", payload.username, e);
(StatusCode::INTERNAL_SERVER_ERROR, "Auth error").into_response()
} }
_ => (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response(),
} }
} }
@@ -104,7 +127,7 @@ pub async fn logout_handler(
get, get,
path = "/api/auth/check", path = "/api/auth/check",
responses( responses(
(status = 200, description = "Authenticated"), (status = 200, description = "Authenticated", body = UserResponse),
(status = 401, description = "Not authenticated") (status = 401, description = "Not authenticated")
) )
)] )]
@@ -114,7 +137,15 @@ pub async fn check_auth_handler(
) -> impl IntoResponse { ) -> impl IntoResponse {
if let Some(token) = jar.get("auth_token") { if let Some(token) = jar.get("auth_token") {
match state.db.get_session_user(token.value()).await { match state.db.get_session_user(token.value()).await {
Ok(Some(_)) => return StatusCode::OK.into_response(), Ok(Some(user_id)) => {
// Fetch username
// We need a helper in db.rs to get username by id, or we can use a direct query here if we don't want to change db.rs interface yet.
// But better to add `get_username_by_id` to db.rs
// For now let's query directly or via a new db method.
if let Ok(Some(username)) = state.db.get_username_by_id(user_id).await {
return (StatusCode::OK, Json(UserResponse { username })).into_response();
}
},
_ => {} // Invalid session _ => {} // Invalid session
} }
} }

View File

@@ -67,7 +67,9 @@ pub async fn setup_handler(
} }
// 3. Create User // 3. Create User
let password_hash = match bcrypt::hash(&payload.password, bcrypt::DEFAULT_COST) { // Lower cost for faster login on low-power devices (MIPS routers etc.)
// Default is usually 12, which takes ~3s on slow CPUs. 6 should be much faster.
let password_hash = match bcrypt::hash(&payload.password, 6) {
Ok(h) => h, Ok(h) => h,
Err(e) => { Err(e) => {
tracing::error!("Failed to hash password: {}", e); tracing::error!("Failed to hash password: {}", e);

View File

@@ -1,6 +1,4 @@
use crate::components::layout::sidebar::Sidebar; use crate::components::layout::protected::Protected;
use crate::components::layout::statusbar::StatusBar;
use crate::components::layout::toolbar::Toolbar;
use crate::components::toast::ToastContainer; use crate::components::toast::ToastContainer;
use crate::components::torrent::table::TorrentTable; use crate::components::torrent::table::TorrentTable;
use crate::components::auth::login::Login; use crate::components::auth::login::Login;
@@ -14,6 +12,11 @@ struct SetupStatus {
completed: bool, completed: bool,
} }
#[derive(Deserialize)]
struct UserResponse {
username: String,
}
#[component] #[component]
pub fn App() -> impl IntoView { pub fn App() -> impl IntoView {
crate::store::provide_torrent_store(); crate::store::provide_torrent_store();
@@ -25,77 +28,73 @@ pub fn App() -> impl IntoView {
// Check Auth & Setup Status on load // Check Auth & Setup Status on load
create_effect(move |_| { create_effect(move |_| {
spawn_local(async move { spawn_local(async move {
logging::log!("App initialization started...");
// 1. Check Setup Status // 1. Check Setup Status
let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await; let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
if let Ok(resp) = setup_res {
if let Ok(status) = resp.json::<SetupStatus>().await { match setup_res {
Ok(resp) => {
if resp.ok() {
match resp.json::<SetupStatus>().await {
Ok(status) => {
if !status.completed { if !status.completed {
// Redirect to setup if not completed logging::log!("Setup not completed, redirecting to /setup");
let navigate = use_navigate(); let navigate = use_navigate();
navigate("/setup", Default::default()); navigate("/setup", Default::default());
set_is_loading.set(false); set_is_loading.set(false);
return; return;
} }
} }
Err(e) => logging::error!("Failed to parse setup status: {}", e),
}
}
}
Err(e) => logging::error!("Network error checking setup status: {}", e),
} }
// 2. Check Auth Status // 2. Check Auth Status
let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await; let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
if let Ok(resp) = auth_res {
if resp.status() == 200 {
set_is_authenticated.set(true);
// Initialize push notifications logic only if authenticated match auth_res {
// ... (Push notification logic moved here or kept global but guarded) Ok(resp) => {
if resp.status() == 200 {
logging::log!("Authenticated!");
// Parse user info
if let Ok(user_info) = resp.json::<UserResponse>().await {
if let Some(store) = use_context::<crate::store::TorrentStore>() {
store.user.set(Some(user_info.username));
}
}
set_is_authenticated.set(true);
} else { } else {
logging::log!("Not authenticated, redirecting to /login");
let navigate = use_navigate(); let navigate = use_navigate();
// If we are already on login or setup, don't redirect loop
let pathname = window().location().pathname().unwrap_or_default(); let pathname = window().location().pathname().unwrap_or_default();
if pathname != "/login" && pathname != "/setup" { if pathname != "/login" && pathname != "/setup" {
navigate("/login", Default::default()); navigate("/login", Default::default());
} }
} }
} }
Err(e) => logging::error!("Network error checking auth status: {}", e),
}
set_is_loading.set(false); set_is_loading.set(false);
}); });
}); });
// Initialize push notifications (Only if authenticated)
// Initialize push notifications after user grants permission (Only if authenticated)
create_effect(move |_| { create_effect(move |_| {
if is_authenticated.get() { if is_authenticated.get() {
spawn_local(async { spawn_local(async {
// ... (Push notification logic kept same, shortened for brevity in this replace)
// Wait a bit for service worker to be ready // Wait a bit for service worker to be ready
gloo_timers::future::TimeoutFuture::new(2000).await; gloo_timers::future::TimeoutFuture::new(2000).await;
// Check if running on iOS and not standalone if crate::utils::platform::supports_push_notifications() && !crate::utils::platform::is_safari() {
if let Some(ios_message) = crate::utils::platform::get_ios_notification_info() {
log::warn!("iOS detected: {}", ios_message);
if let Some(store) = use_context::<crate::store::TorrentStore>() {
crate::store::show_toast_with_signal(
store.notifications,
shared::NotificationLevel::Info,
ios_message,
);
}
return;
}
if !crate::utils::platform::supports_push_notifications() {
return;
}
if crate::utils::platform::is_safari() {
if let Some(store) = use_context::<crate::store::TorrentStore>() {
crate::store::show_toast_with_signal(
store.notifications,
shared::NotificationLevel::Info,
"Bildirim izni için sağ alttaki ayarlar ⚙️ ikonuna basın.".to_string(),
);
}
return;
}
crate::store::subscribe_to_push_notifications().await; crate::store::subscribe_to_push_notifications().await;
}
}); });
} }
}); });
@@ -107,38 +106,29 @@ pub fn App() -> impl IntoView {
<Route path="/login" view=move || view! { <Login /> } /> <Route path="/login" view=move || view! { <Login /> } />
<Route path="/setup" view=move || view! { <Setup /> } /> <Route path="/setup" view=move || view! { <Setup /> } />
<Route path="/*" view=move || { <Route path="/" view=move || {
view! { view! {
<Show when=move || !is_loading.get() fallback=|| view! { <Show when=move || !is_loading.get() fallback=|| view! {
<div class="flex items-center justify-center h-screen bg-base-100"> <div class="flex items-center justify-center h-screen bg-base-100">
<span class="loading loading-spinner loading-lg"></span> <span class="loading loading-spinner loading-lg"></span>
</div> </div>
}> }>
<Show when=move || is_authenticated.get() fallback=|| view! { <Login /> }> <Show when=move || is_authenticated.get() fallback=|| ()>
// Protected Layout <Protected>
<div class="drawer lg:drawer-open h-full w-full"> <TorrentTable />
<input id="my-drawer" type="checkbox" class="drawer-toggle" /> </Protected>
</Show>
</Show>
}
}/>
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none"> <Route path="/settings" view=move || {
<Toolbar /> view! {
<Show when=move || !is_loading.get() fallback=|| ()>
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8"> <Show when=move || is_authenticated.get() fallback=|| ()>
<Routes> <Protected>
<Route path="/" view=move || view! { <TorrentTable /> } /> <div class="p-4">"Settings Page (Coming Soon)"</div>
<Route path="/settings" view=move || view! { <div class="p-4">"Settings Page (Coming Soon)"</div> } /> </Protected>
</Routes>
</main>
<StatusBar />
</div>
<div class="drawer-side z-40 transition-none duration-0">
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
<Sidebar />
</div>
</div>
</div>
</Show> </Show>
</Show> </Show>
} }

View File

@@ -1,17 +1,19 @@
use leptos::*; use leptos::*;
use leptos_router::*; use leptos_router::*;
use serde::{Deserialize, Serialize}; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]
struct LoginRequest { struct LoginRequest {
username: String, username: String,
password: String, password: String,
remember_me: bool,
} }
#[component] #[component]
pub fn Login() -> impl IntoView { pub fn Login() -> impl IntoView {
let (username, set_username) = create_signal(String::new()); let (username, set_username) = create_signal(String::new());
let (password, set_password) = create_signal(String::new()); let (password, set_password) = create_signal(String::new());
let (remember_me, set_remember_me) = create_signal(false);
let (error, set_error) = create_signal(Option::<String>::None); let (error, set_error) = create_signal(Option::<String>::None);
let (loading, set_loading) = create_signal(false); let (loading, set_loading) = create_signal(false);
@@ -20,10 +22,13 @@ pub fn Login() -> impl IntoView {
set_loading.set(true); set_loading.set(true);
set_error.set(None); set_error.set(None);
logging::log!("Attempting login for user: {}", username.get());
spawn_local(async move { spawn_local(async move {
let req = LoginRequest { let req = LoginRequest {
username: username.get(), username: username.get(),
password: password.get(), password: password.get(),
remember_me: remember_me.get(),
}; };
let client = gloo_net::http::Request::post("/api/auth/login") let client = gloo_net::http::Request::post("/api/auth/login")
@@ -32,15 +37,19 @@ pub fn Login() -> impl IntoView {
match client.send().await { match client.send().await {
Ok(resp) => { Ok(resp) => {
logging::log!("Login response status: {}", resp.status());
if resp.ok() { if resp.ok() {
// Redirect to home on success logging::log!("Login successful, redirecting...");
let navigate = use_navigate(); // Force a full reload to re-run auth checks in App.rs
navigate("/", Default::default()); let _ = window().location().set_href("/");
} else { } else {
let text = resp.text().await.unwrap_or_default();
logging::error!("Login failed: {}", text);
set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string())); set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
} }
} }
Err(_) => { Err(e) => {
logging::error!("Network error: {}", e);
set_error.set(Some("Bağlantı hatası".to_string())); set_error.set(Some("Bağlantı hatası".to_string()));
} }
} }
@@ -83,6 +92,19 @@ pub fn Login() -> impl IntoView {
/> />
</div> </div>
<div class="form-control mt-4">
<label class="label cursor-pointer justify-start gap-3">
<input
type="checkbox"
class="checkbox checkbox-primary checkbox-sm"
prop:checked=remember_me
on:change=move |ev| set_remember_me.set(event_target_checked(&ev))
disabled=move || loading.get()
/>
<span class="label-text">"Beni Hatırla"</span>
</label>
</div>
<Show when=move || error.get().is_some()> <Show when=move || error.get().is_some()>
<div class="alert alert-error mt-4 text-sm py-2"> <div class="alert alert-error mt-4 text-sm py-2">
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg> <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>

View File

@@ -1,6 +1,6 @@
use leptos::*; use leptos::*;
use leptos_router::*; use leptos_router::*;
use serde::{Deserialize, Serialize}; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]
struct SetupRequest { struct SetupRequest {
@@ -49,9 +49,8 @@ pub fn Setup() -> impl IntoView {
match client.send().await { match client.send().await {
Ok(resp) => { Ok(resp) => {
if resp.ok() { if resp.ok() {
// Redirect to login after setup // Redirect to login after setup (full reload to be safe)
let navigate = use_navigate(); let _ = window().location().set_href("/login");
navigate("/login", Default::default());
} else { } else {
let text = resp.text().await.unwrap_or_default(); let text = resp.text().await.unwrap_or_default();
set_error.set(Some(format!("Hata: {}", text))); set_error.set(Some(format!("Hata: {}", text)));

View File

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

View File

@@ -0,0 +1,30 @@
use leptos::*;
use crate::components::layout::sidebar::Sidebar;
use crate::components::layout::statusbar::StatusBar;
use crate::components::layout::toolbar::Toolbar;
#[component]
pub fn Protected(children: Children) -> impl IntoView {
view! {
<div class="drawer lg:drawer-open h-full w-full">
<input id="my-drawer" type="checkbox" class="drawer-toggle" />
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
<Toolbar />
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
{children()}
</main>
<StatusBar />
</div>
<div class="drawer-side z-40 transition-none duration-0">
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
<Sidebar />
</div>
</div>
</div>
}
}

View File

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

View File

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