Compare commits
27 Commits
release-20
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e23585dfea | ||
|
|
9d5092649f | ||
|
|
9f009bc18b | ||
|
|
643b83ac21 | ||
|
|
90b65240b2 | ||
|
|
69243a5590 | ||
|
|
10262142fc | ||
|
|
858a1c9b63 | ||
|
|
edfb7458f8 | ||
|
|
575cfa4b38 | ||
|
|
9b18b97c49 | ||
|
|
88723352fd | ||
|
|
4231e0b3a7 | ||
|
|
1177412c87 | ||
|
|
aed753c64f | ||
|
|
9d0eb11f16 | ||
|
|
3c13f99652 | ||
|
|
a948215538 | ||
|
|
13424fceeb | ||
|
|
e3eb5fbca9 | ||
|
|
08f2f540fe | ||
|
|
7361421641 | ||
|
|
d6ecc08398 | ||
|
|
472bac85f3 | ||
|
|
bb3ec14a75 | ||
|
|
d53d661ad1 | ||
|
|
92720c15b3 |
690
Cargo.lock
generated
690
Cargo.lock
generated
File diff suppressed because it is too large
Load Diff
@@ -33,3 +33,9 @@ utoipa-swagger-ui = { version = "9.0.2", features = ["axum"] }
|
|||||||
web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
|
web-push = { version = "0.10", default-features = false, features = ["hyper-client"], optional = true }
|
||||||
base64 = "0.22"
|
base64 = "0.22"
|
||||||
openssl = { version = "0.10", features = ["vendored"], optional = true }
|
openssl = { version = "0.10", features = ["vendored"], optional = true }
|
||||||
|
sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
|
||||||
|
bcrypt = "0.17.0"
|
||||||
|
axum-extra = { version = "0.10", features = ["cookie"] }
|
||||||
|
rand = "0.8"
|
||||||
|
anyhow = "1.0.101"
|
||||||
|
time = { version = "0.3.47", features = ["serde", "formatting", "parsing"] }
|
||||||
|
|||||||
131
backend/src/db.rs
Normal file
131
backend/src/db.rs
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite, Row};
|
||||||
|
use std::time::Duration;
|
||||||
|
use anyhow::Result;
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct Db {
|
||||||
|
pool: Pool<Sqlite>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Db {
|
||||||
|
pub async fn new(db_url: &str) -> Result<Self> {
|
||||||
|
let pool = SqlitePoolOptions::new()
|
||||||
|
.max_connections(5)
|
||||||
|
.acquire_timeout(Duration::from_secs(3))
|
||||||
|
.connect(db_url)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let db = Self { pool };
|
||||||
|
db.init().await?;
|
||||||
|
Ok(db)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn init(&self) -> Result<()> {
|
||||||
|
// Create users table
|
||||||
|
sqlx::query(
|
||||||
|
"CREATE TABLE IF NOT EXISTS users (
|
||||||
|
id INTEGER PRIMARY KEY,
|
||||||
|
username TEXT NOT NULL UNIQUE,
|
||||||
|
password_hash TEXT NOT NULL,
|
||||||
|
created_at DATETIME DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)",
|
||||||
|
)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
// Create sessions table
|
||||||
|
sqlx::query(
|
||||||
|
"CREATE TABLE IF NOT EXISTS sessions (
|
||||||
|
token TEXT PRIMARY KEY,
|
||||||
|
user_id INTEGER NOT NULL,
|
||||||
|
expires_at DATETIME NOT NULL,
|
||||||
|
FOREIGN KEY(user_id) REFERENCES users(id)
|
||||||
|
)",
|
||||||
|
)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- User Operations ---
|
||||||
|
|
||||||
|
pub async fn create_user(&self, username: &str, password_hash: &str) -> Result<()> {
|
||||||
|
sqlx::query("INSERT INTO users (username, password_hash) VALUES (?, ?)")
|
||||||
|
.bind(username)
|
||||||
|
.bind(password_hash)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
|
||||||
|
let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
|
||||||
|
.bind(username)
|
||||||
|
.fetch_optional(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
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> {
|
||||||
|
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
|
||||||
|
.fetch_one(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(row.0 > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
// --- Session Operations ---
|
||||||
|
|
||||||
|
pub async fn create_session(&self, user_id: i64, token: &str, expires_at: i64) -> Result<()> {
|
||||||
|
sqlx::query("INSERT INTO sessions (token, user_id, expires_at) VALUES (?, ?, datetime(?, 'unixepoch'))")
|
||||||
|
.bind(token)
|
||||||
|
.bind(user_id)
|
||||||
|
.bind(expires_at)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn get_session_user(&self, token: &str) -> Result<Option<i64>> {
|
||||||
|
let row = sqlx::query("SELECT user_id FROM sessions WHERE token = ? AND expires_at > datetime('now')")
|
||||||
|
.bind(token)
|
||||||
|
.fetch_optional(&self.pool)
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
Ok(row.map(|r| r.get(0)))
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_session(&self, token: &str) -> Result<()> {
|
||||||
|
sqlx::query("DELETE FROM sessions WHERE token = ?")
|
||||||
|
.bind(token)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_password(&self, user_id: i64, password_hash: &str) -> Result<()> {
|
||||||
|
sqlx::query("UPDATE users SET password_hash = ? WHERE id = ?")
|
||||||
|
.bind(password_hash)
|
||||||
|
.bind(user_id)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn delete_all_sessions_for_user(&self, user_id: i64) -> Result<()> {
|
||||||
|
sqlx::query("DELETE FROM sessions WHERE user_id = ?")
|
||||||
|
.bind(user_id)
|
||||||
|
.execute(&self.pool)
|
||||||
|
.await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
);
|
);
|
||||||
|
|||||||
154
backend/src/handlers/auth.rs
Normal file
154
backend/src/handlers/auth.rs
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
use crate::AppState;
|
||||||
|
use axum::{
|
||||||
|
extract::{State, Json},
|
||||||
|
http::StatusCode,
|
||||||
|
response::IntoResponse,
|
||||||
|
};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
|
||||||
|
use time::Duration;
|
||||||
|
|
||||||
|
#[derive(Deserialize, ToSchema)]
|
||||||
|
pub struct LoginRequest {
|
||||||
|
username: String,
|
||||||
|
password: String,
|
||||||
|
#[serde(default)]
|
||||||
|
remember_me: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema)]
|
||||||
|
pub struct UserResponse {
|
||||||
|
username: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
path = "/api/auth/login",
|
||||||
|
request_body = LoginRequest,
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Login successful"),
|
||||||
|
(status = 401, description = "Invalid credentials"),
|
||||||
|
(status = 500, description = "Internal server error")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn login_handler(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
jar: CookieJar,
|
||||||
|
Json(payload): Json<LoginRequest>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
tracing::info!("Login attempt for user: {}", payload.username);
|
||||||
|
|
||||||
|
let user = match state.db.get_user_by_username(&payload.username).await {
|
||||||
|
Ok(Some(u)) => u,
|
||||||
|
Ok(None) => {
|
||||||
|
tracing::warn!("Login failed: User not found for {}", payload.username);
|
||||||
|
return (StatusCode::UNAUTHORIZED, "Invalid credentials").into_response();
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("DB error during login for {}: {}", payload.username, e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let (user_id, password_hash) = user;
|
||||||
|
|
||||||
|
match bcrypt::verify(&payload.password, &password_hash) {
|
||||||
|
Ok(true) => {
|
||||||
|
tracing::info!("Password verified for user: {}", payload.username);
|
||||||
|
|
||||||
|
// Create session
|
||||||
|
let token: String = (0..32).map(|_| {
|
||||||
|
use rand::{distributions::Alphanumeric, Rng};
|
||||||
|
rand::thread_rng().sample(Alphanumeric) as char
|
||||||
|
}).collect();
|
||||||
|
|
||||||
|
// Expiration: 30 days if remember_me is true, else 1 day
|
||||||
|
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;
|
||||||
|
|
||||||
|
if let Err(e) = state.db.create_session(user_id, &token, expires_at).await {
|
||||||
|
tracing::error!("Failed to create session for {}: {}", payload.username, e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cookie = Cookie::build(("auth_token", token))
|
||||||
|
.path("/")
|
||||||
|
.http_only(true)
|
||||||
|
.same_site(SameSite::Lax)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
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()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
path = "/api/auth/logout",
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Logged out")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn logout_handler(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
jar: CookieJar,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
if let Some(token) = jar.get("auth_token") {
|
||||||
|
let _ = state.db.delete_session(token.value()).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
let cookie = Cookie::build(("auth_token", ""))
|
||||||
|
.path("/")
|
||||||
|
.http_only(true)
|
||||||
|
.max_age(Duration::seconds(-1)) // Expire immediately
|
||||||
|
.build();
|
||||||
|
|
||||||
|
(StatusCode::OK, jar.add(cookie), "Logged out").into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
path = "/api/auth/check",
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Authenticated", body = UserResponse),
|
||||||
|
(status = 401, description = "Not authenticated")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn check_auth_handler(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
jar: CookieJar,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
if let Some(token) = jar.get("auth_token") {
|
||||||
|
match state.db.get_session_user(token.value()).await {
|
||||||
|
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
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
StatusCode::UNAUTHORIZED.into_response()
|
||||||
|
}
|
||||||
@@ -18,6 +18,9 @@ use shared::{
|
|||||||
};
|
};
|
||||||
use utoipa::ToSchema;
|
use utoipa::ToSchema;
|
||||||
|
|
||||||
|
pub mod auth;
|
||||||
|
pub mod setup;
|
||||||
|
|
||||||
#[derive(RustEmbed)]
|
#[derive(RustEmbed)]
|
||||||
#[folder = "../frontend/dist"]
|
#[folder = "../frontend/dist"]
|
||||||
pub struct Asset;
|
pub struct Asset;
|
||||||
|
|||||||
125
backend/src/handlers/setup.rs
Normal file
125
backend/src/handlers/setup.rs
Normal file
@@ -0,0 +1,125 @@
|
|||||||
|
use crate::AppState;
|
||||||
|
use axum::{
|
||||||
|
extract::{State, Json},
|
||||||
|
http::StatusCode,
|
||||||
|
response::IntoResponse,
|
||||||
|
};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use utoipa::ToSchema;
|
||||||
|
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
|
||||||
|
use time::Duration;
|
||||||
|
|
||||||
|
#[derive(Deserialize, ToSchema)]
|
||||||
|
pub struct SetupRequest {
|
||||||
|
username: String,
|
||||||
|
password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, ToSchema)]
|
||||||
|
pub struct SetupStatusResponse {
|
||||||
|
completed: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
get,
|
||||||
|
path = "/api/setup/status",
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Setup status", body = SetupStatusResponse)
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn get_setup_status_handler(State(state): State<AppState>) -> impl IntoResponse {
|
||||||
|
let completed = match state.db.has_users().await {
|
||||||
|
Ok(has) => has,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("DB error checking users: {}", e);
|
||||||
|
false
|
||||||
|
}
|
||||||
|
};
|
||||||
|
Json(SetupStatusResponse { completed }).into_response()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[utoipa::path(
|
||||||
|
post,
|
||||||
|
path = "/api/setup",
|
||||||
|
request_body = SetupRequest,
|
||||||
|
responses(
|
||||||
|
(status = 200, description = "Setup completed and logged in"),
|
||||||
|
(status = 400, description = "Invalid request"),
|
||||||
|
(status = 403, description = "Setup already completed"),
|
||||||
|
(status = 500, description = "Internal server error")
|
||||||
|
)
|
||||||
|
)]
|
||||||
|
pub async fn setup_handler(
|
||||||
|
State(state): State<AppState>,
|
||||||
|
jar: CookieJar,
|
||||||
|
Json(payload): Json<SetupRequest>,
|
||||||
|
) -> impl IntoResponse {
|
||||||
|
// 1. Check if setup is already completed (i.e., users exist)
|
||||||
|
match state.db.has_users().await {
|
||||||
|
Ok(true) => return (StatusCode::FORBIDDEN, "Setup already completed").into_response(),
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("DB error checking users: {}", e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
|
||||||
|
}
|
||||||
|
Ok(false) => {} // Proceed
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Validate input
|
||||||
|
if payload.username.len() < 3 || payload.password.len() < 6 {
|
||||||
|
return (StatusCode::BAD_REQUEST, "Username must be at least 3 chars, password at least 6").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3. Create User
|
||||||
|
// Lower cost for faster login on low-power devices (MIPS routers etc.)
|
||||||
|
let password_hash = match bcrypt::hash(&payload.password, 6) {
|
||||||
|
Ok(h) => h,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to hash password: {}", e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to process password").into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
if let Err(e) = state.db.create_user(&payload.username, &password_hash).await {
|
||||||
|
tracing::error!("Failed to create user: {}", e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create user").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
// 4. Auto-Login (Create Session)
|
||||||
|
// Get the created user's ID
|
||||||
|
let user = match state.db.get_user_by_username(&payload.username).await {
|
||||||
|
Ok(Some(u)) => u,
|
||||||
|
Ok(None) => return (StatusCode::INTERNAL_SERVER_ERROR, "User created but not found").into_response(),
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("DB error fetching new user: {}", e);
|
||||||
|
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let (user_id, _) = user;
|
||||||
|
|
||||||
|
// Create session token
|
||||||
|
let token: String = (0..32).map(|_| {
|
||||||
|
use rand::{distributions::Alphanumeric, Rng};
|
||||||
|
rand::thread_rng().sample(Alphanumeric) as char
|
||||||
|
}).collect();
|
||||||
|
|
||||||
|
// Default expiration: 1 day (since it's not "remember me")
|
||||||
|
let expires_in = 60 * 60 * 24;
|
||||||
|
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 {
|
||||||
|
tracing::error!("Failed to create session for new user: {}", e);
|
||||||
|
// Even if session fails, setup is technically complete, but login failed.
|
||||||
|
// We return OK but user will have to login manually.
|
||||||
|
return (StatusCode::OK, "Setup completed, please login").into_response();
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut cookie = Cookie::build(("auth_token", token))
|
||||||
|
.path("/")
|
||||||
|
.http_only(true)
|
||||||
|
.same_site(SameSite::Lax)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
cookie.set_max_age(Duration::seconds(expires_in));
|
||||||
|
|
||||||
|
(StatusCode::OK, jar.add(cookie), "Setup completed and logged in").into_response()
|
||||||
|
}
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
mod db;
|
||||||
mod diff;
|
mod diff;
|
||||||
mod handlers;
|
mod handlers;
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
@@ -10,7 +11,12 @@ use axum::error_handling::HandleErrorLayer;
|
|||||||
use axum::{
|
use axum::{
|
||||||
routing::{get, post},
|
routing::{get, post},
|
||||||
Router,
|
Router,
|
||||||
|
middleware::{self, Next},
|
||||||
|
response::Response,
|
||||||
|
http::{StatusCode, Request},
|
||||||
|
body::Body,
|
||||||
};
|
};
|
||||||
|
use axum_extra::extract::cookie::CookieJar;
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use dotenvy::dotenv;
|
use dotenvy::dotenv;
|
||||||
use shared::{AppEvent, Torrent};
|
use shared::{AppEvent, Torrent};
|
||||||
@@ -32,10 +38,39 @@ pub struct AppState {
|
|||||||
pub tx: Arc<watch::Sender<Vec<Torrent>>>,
|
pub tx: Arc<watch::Sender<Vec<Torrent>>>,
|
||||||
pub event_bus: broadcast::Sender<AppEvent>,
|
pub event_bus: broadcast::Sender<AppEvent>,
|
||||||
pub scgi_socket_path: String,
|
pub scgi_socket_path: String,
|
||||||
|
pub db: db::Db,
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
pub push_store: push::PushSubscriptionStore,
|
pub push_store: push::PushSubscriptionStore,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn auth_middleware(
|
||||||
|
state: axum::extract::State<AppState>,
|
||||||
|
jar: CookieJar,
|
||||||
|
request: Request<Body>,
|
||||||
|
next: Next,
|
||||||
|
) -> Result<Response, StatusCode> {
|
||||||
|
// Skip auth for public paths
|
||||||
|
let path = request.uri().path();
|
||||||
|
if path.starts_with("/api/auth/login")
|
||||||
|
|| path.starts_with("/api/auth/check") // Used by frontend to decide where to go
|
||||||
|
|| path.starts_with("/api/setup")
|
||||||
|
|| path.starts_with("/swagger-ui")
|
||||||
|
|| path.starts_with("/api-docs")
|
||||||
|
|| !path.starts_with("/api/") // Allow static files (frontend)
|
||||||
|
{
|
||||||
|
return Ok(next.run(request).await);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check token
|
||||||
|
if let Some(token) = jar.get("auth_token") {
|
||||||
|
match state.db.get_session_user(token.value()).await {
|
||||||
|
Ok(Some(_)) => return Ok(next.run(request).await),
|
||||||
|
_ => {} // Invalid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Err(StatusCode::UNAUTHORIZED)
|
||||||
|
}
|
||||||
#[derive(Parser, Debug)]
|
#[derive(Parser, Debug)]
|
||||||
#[command(author, version, about, long_about = None)]
|
#[command(author, version, about, long_about = None)]
|
||||||
struct Args {
|
struct Args {
|
||||||
@@ -51,6 +86,14 @@ struct Args {
|
|||||||
/// Port to listen on
|
/// Port to listen on
|
||||||
#[arg(short, long, env = "PORT", default_value_t = 3000)]
|
#[arg(short, long, env = "PORT", default_value_t = 3000)]
|
||||||
port: u16,
|
port: u16,
|
||||||
|
|
||||||
|
/// Database URL
|
||||||
|
#[arg(long, env = "DATABASE_URL", default_value = "sqlite:vibetorrent.db")]
|
||||||
|
db_url: String,
|
||||||
|
|
||||||
|
/// Reset password for the specified user
|
||||||
|
#[arg(long)]
|
||||||
|
reset_password: Option<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
@@ -68,7 +111,12 @@ struct Args {
|
|||||||
handlers::get_global_limit_handler,
|
handlers::get_global_limit_handler,
|
||||||
handlers::set_global_limit_handler,
|
handlers::set_global_limit_handler,
|
||||||
handlers::get_push_public_key_handler,
|
handlers::get_push_public_key_handler,
|
||||||
handlers::subscribe_push_handler
|
handlers::subscribe_push_handler,
|
||||||
|
handlers::auth::login_handler,
|
||||||
|
handlers::auth::logout_handler,
|
||||||
|
handlers::auth::check_auth_handler,
|
||||||
|
handlers::setup::setup_handler,
|
||||||
|
handlers::setup::get_setup_status_handler
|
||||||
),
|
),
|
||||||
components(
|
components(
|
||||||
schemas(
|
schemas(
|
||||||
@@ -83,7 +131,11 @@ struct Args {
|
|||||||
shared::SetLabelRequest,
|
shared::SetLabelRequest,
|
||||||
shared::GlobalLimitRequest,
|
shared::GlobalLimitRequest,
|
||||||
push::PushSubscription,
|
push::PushSubscription,
|
||||||
push::PushKeys
|
push::PushKeys,
|
||||||
|
handlers::auth::LoginRequest,
|
||||||
|
handlers::setup::SetupRequest,
|
||||||
|
handlers::setup::SetupStatusResponse,
|
||||||
|
handlers::auth::UserResponse
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
tags(
|
tags(
|
||||||
@@ -105,7 +157,12 @@ struct ApiDoc;
|
|||||||
handlers::set_file_priority_handler,
|
handlers::set_file_priority_handler,
|
||||||
handlers::set_label_handler,
|
handlers::set_label_handler,
|
||||||
handlers::get_global_limit_handler,
|
handlers::get_global_limit_handler,
|
||||||
handlers::set_global_limit_handler
|
handlers::set_global_limit_handler,
|
||||||
|
handlers::auth::login_handler,
|
||||||
|
handlers::auth::logout_handler,
|
||||||
|
handlers::auth::check_auth_handler,
|
||||||
|
handlers::setup::setup_handler,
|
||||||
|
handlers::setup::get_setup_status_handler
|
||||||
),
|
),
|
||||||
components(
|
components(
|
||||||
schemas(
|
schemas(
|
||||||
@@ -118,7 +175,11 @@ struct ApiDoc;
|
|||||||
shared::TorrentTracker,
|
shared::TorrentTracker,
|
||||||
shared::SetFilePriorityRequest,
|
shared::SetFilePriorityRequest,
|
||||||
shared::SetLabelRequest,
|
shared::SetLabelRequest,
|
||||||
shared::GlobalLimitRequest
|
shared::GlobalLimitRequest,
|
||||||
|
handlers::auth::LoginRequest,
|
||||||
|
handlers::setup::SetupRequest,
|
||||||
|
handlers::setup::SetupStatusResponse,
|
||||||
|
handlers::auth::UserResponse
|
||||||
)
|
)
|
||||||
),
|
),
|
||||||
tags(
|
tags(
|
||||||
@@ -142,10 +203,92 @@ async fn main() {
|
|||||||
|
|
||||||
// Parse CLI Args
|
// Parse CLI Args
|
||||||
let args = Args::parse();
|
let args = Args::parse();
|
||||||
|
|
||||||
|
// Initialize Database
|
||||||
|
tracing::info!("Connecting to database: {}", args.db_url);
|
||||||
|
// Ensure the db file exists if it's sqlite
|
||||||
|
if args.db_url.starts_with("sqlite:") {
|
||||||
|
let path = args.db_url.trim_start_matches("sqlite:");
|
||||||
|
if !std::path::Path::new(path).exists() {
|
||||||
|
tracing::info!("Database file not found, creating: {}", path);
|
||||||
|
match std::fs::File::create(path) {
|
||||||
|
Ok(_) => tracing::info!("Created empty database file"),
|
||||||
|
Err(e) => tracing::error!("Failed to create database file: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let db: db::Db = match db::Db::new(&args.db_url).await {
|
||||||
|
Ok(db) => db,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to connect to database: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
tracing::info!("Database connected successfully.");
|
||||||
|
|
||||||
|
// Handle Password Reset
|
||||||
|
if let Some(username) = args.reset_password {
|
||||||
|
tracing::info!("Resetting password for user: {}", username);
|
||||||
|
|
||||||
|
// Check if user exists
|
||||||
|
let user_result = db.get_user_by_username(&username).await;
|
||||||
|
|
||||||
|
match user_result {
|
||||||
|
Ok(Some((user_id, _))) => {
|
||||||
|
// Generate random password
|
||||||
|
use rand::{distributions::Alphanumeric, Rng};
|
||||||
|
let new_password: String = rand::thread_rng()
|
||||||
|
.sample_iter(&Alphanumeric)
|
||||||
|
.take(12)
|
||||||
|
.map(char::from)
|
||||||
|
.collect();
|
||||||
|
|
||||||
|
// Hash password (low cost for performance)
|
||||||
|
let password_hash = match bcrypt::hash(&new_password, 6) {
|
||||||
|
Ok(h) => h,
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Failed to hash password: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
// Update in DB (using a direct query since db.rs doesn't have update_password yet)
|
||||||
|
// We should add `update_password` to db.rs for cleaner code, but for now direct query is fine or we can extend Db.
|
||||||
|
// Let's extend Db.rs first to be clean.
|
||||||
|
if let Err(e) = db.update_password(user_id, &password_hash).await {
|
||||||
|
tracing::error!("Failed to update password in DB: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
println!("--------------------------------------------------");
|
||||||
|
println!("Password reset successfully for user: {}", username);
|
||||||
|
println!("New Password: {}", new_password);
|
||||||
|
println!("--------------------------------------------------");
|
||||||
|
|
||||||
|
// Invalidate existing sessions for security
|
||||||
|
if let Err(e) = db.delete_all_sessions_for_user(user_id).await {
|
||||||
|
tracing::warn!("Failed to invalidate existing sessions: {}", e);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::process::exit(0);
|
||||||
|
},
|
||||||
|
Ok(None) => {
|
||||||
|
tracing::error!("User '{}' not found.", username);
|
||||||
|
std::process::exit(1);
|
||||||
|
},
|
||||||
|
Err(e) => {
|
||||||
|
tracing::error!("Database error: {}", e);
|
||||||
|
std::process::exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
tracing::info!("Starting VibeTorrent Backend...");
|
tracing::info!("Starting VibeTorrent Backend...");
|
||||||
tracing::info!("Socket: {}", args.socket);
|
tracing::info!("Socket: {}", args.socket);
|
||||||
tracing::info!("Port: {}", args.port);
|
tracing::info!("Port: {}", args.port);
|
||||||
|
|
||||||
|
// ... rest of the main function ...
|
||||||
// Startup Health Check
|
// Startup Health Check
|
||||||
let socket_path = std::path::Path::new(&args.socket);
|
let socket_path = std::path::Path::new(&args.socket);
|
||||||
if !socket_path.exists() {
|
if !socket_path.exists() {
|
||||||
@@ -181,6 +324,7 @@ async fn main() {
|
|||||||
tx: tx.clone(),
|
tx: tx.clone(),
|
||||||
event_bus: event_bus.clone(),
|
event_bus: event_bus.clone(),
|
||||||
scgi_socket_path: args.socket.clone(),
|
scgi_socket_path: args.socket.clone(),
|
||||||
|
db: db.clone(),
|
||||||
#[cfg(feature = "push-notifications")]
|
#[cfg(feature = "push-notifications")]
|
||||||
push_store: push::PushSubscriptionStore::new(),
|
push_store: push::PushSubscriptionStore::new(),
|
||||||
};
|
};
|
||||||
@@ -308,6 +452,13 @@ async fn main() {
|
|||||||
|
|
||||||
let app = Router::new()
|
let app = Router::new()
|
||||||
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
.merge(SwaggerUi::new("/swagger-ui").url("/api-docs/openapi.json", ApiDoc::openapi()))
|
||||||
|
// Setup & Auth Routes
|
||||||
|
.route("/api/setup/status", get(handlers::setup::get_setup_status_handler))
|
||||||
|
.route("/api/setup", post(handlers::setup::setup_handler))
|
||||||
|
.route("/api/auth/login", post(handlers::auth::login_handler))
|
||||||
|
.route("/api/auth/logout", post(handlers::auth::logout_handler))
|
||||||
|
.route("/api/auth/check", get(handlers::auth::check_auth_handler))
|
||||||
|
// App Routes
|
||||||
.route("/api/events", get(sse::sse_handler))
|
.route("/api/events", get(sse::sse_handler))
|
||||||
.route("/api/torrents/add", post(handlers::add_torrent_handler))
|
.route("/api/torrents/add", post(handlers::add_torrent_handler))
|
||||||
.route(
|
.route(
|
||||||
@@ -344,6 +495,7 @@ async fn main() {
|
|||||||
.route("/api/push/subscribe", post(handlers::subscribe_push_handler));
|
.route("/api/push/subscribe", post(handlers::subscribe_push_handler));
|
||||||
|
|
||||||
let app = app
|
let app = app
|
||||||
|
.layer(middleware::from_fn_with_state(app_state.clone(), auth_middleware))
|
||||||
.layer(TraceLayer::new_for_http())
|
.layer(TraceLayer::new_for_http())
|
||||||
.layer(
|
.layer(
|
||||||
CompressionLayer::new()
|
CompressionLayer::new()
|
||||||
|
|||||||
@@ -1,94 +1,148 @@
|
|||||||
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::setup::Setup;
|
||||||
use leptos::*;
|
use leptos::*;
|
||||||
use leptos_router::*;
|
use leptos_router::*;
|
||||||
|
use serde::Deserialize;
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
struct SetupStatus {
|
||||||
|
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();
|
||||||
|
|
||||||
// Initialize push notifications after user grants permission
|
// Auth State
|
||||||
|
let (is_loading, set_is_loading) = create_signal(true);
|
||||||
|
let (is_authenticated, set_is_authenticated) = create_signal(false);
|
||||||
|
|
||||||
|
// Check Auth & Setup Status on load
|
||||||
create_effect(move |_| {
|
create_effect(move |_| {
|
||||||
|
spawn_local(async move {
|
||||||
|
logging::log!("App initialization started...");
|
||||||
|
|
||||||
|
// 1. Check Setup Status
|
||||||
|
let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
|
||||||
|
|
||||||
|
match setup_res {
|
||||||
|
Ok(resp) => {
|
||||||
|
if resp.ok() {
|
||||||
|
match resp.json::<SetupStatus>().await {
|
||||||
|
Ok(status) => {
|
||||||
|
if !status.completed {
|
||||||
|
logging::log!("Setup not completed, redirecting to /setup");
|
||||||
|
let navigate = use_navigate();
|
||||||
|
navigate("/setup", Default::default());
|
||||||
|
set_is_loading.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => logging::error!("Failed to parse setup status: {}", e),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => logging::error!("Network error checking setup status: {}", e),
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2. Check Auth Status
|
||||||
|
let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
|
||||||
|
|
||||||
|
match auth_res {
|
||||||
|
Ok(resp) => {
|
||||||
|
if resp.status() == 200 {
|
||||||
|
logging::log!("Authenticated!");
|
||||||
|
|
||||||
|
// Parse user info
|
||||||
|
if let Ok(user_info) = resp.json::<UserResponse>().await {
|
||||||
|
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
||||||
|
store.user.set(Some(user_info.username));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
set_is_authenticated.set(true);
|
||||||
|
|
||||||
|
// If user is already authenticated but on login/setup page, redirect to home
|
||||||
|
let pathname = window().location().pathname().unwrap_or_default();
|
||||||
|
if pathname == "/login" || pathname == "/setup" {
|
||||||
|
logging::log!("Already authenticated, redirecting to home");
|
||||||
|
let navigate = use_navigate();
|
||||||
|
navigate("/", Default::default());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logging::log!("Not authenticated, redirecting to /login");
|
||||||
|
let navigate = use_navigate();
|
||||||
|
let pathname = window().location().pathname().unwrap_or_default();
|
||||||
|
if pathname != "/login" && pathname != "/setup" {
|
||||||
|
navigate("/login", Default::default());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => logging::error!("Network error checking auth status: {}", e),
|
||||||
|
}
|
||||||
|
set_is_loading.set(false);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
// Initialize push notifications (Only if authenticated)
|
||||||
|
create_effect(move |_| {
|
||||||
|
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);
|
|
||||||
|
|
||||||
// Show toast to inform user
|
|
||||||
if let Some(store) = use_context::<crate::store::TorrentStore>() {
|
|
||||||
crate::store::show_toast_with_signal(
|
|
||||||
store.notifications,
|
|
||||||
shared::NotificationLevel::Info,
|
|
||||||
ios_message,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check if push notifications are supported
|
|
||||||
if !crate::utils::platform::supports_push_notifications() {
|
|
||||||
log::warn!("Push notifications not supported on this platform");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Safari requires user gesture for notification permission
|
|
||||||
// Don't auto-request on Safari - user should click a button
|
|
||||||
if crate::utils::platform::is_safari() {
|
|
||||||
log::info!("Safari detected - notification permission requires user interaction");
|
|
||||||
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;
|
|
||||||
}
|
|
||||||
|
|
||||||
// For non-Safari browsers (Chrome, Firefox, Edge), attempt auto-subscribe
|
|
||||||
log::info!("Attempting to subscribe to push notifications...");
|
|
||||||
crate::store::subscribe_to_push_notifications().await;
|
crate::store::subscribe_to_push_notifications().await;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
// Main app wrapper - ensures proper stacking context
|
|
||||||
<div class="relative w-full h-screen" style="height: 100dvh;">
|
<div class="relative w-full h-screen" style="height: 100dvh;">
|
||||||
// Drawer layout
|
|
||||||
<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">
|
|
||||||
<Router>
|
<Router>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/" view=move || view! { <TorrentTable /> } />
|
<Route path="/login" view=move || view! { <Login /> } />
|
||||||
<Route path="/settings" view=move || view! { <div class="p-4">"Settings Page (Coming Soon)"</div> } />
|
<Route path="/setup" view=move || view! { <Setup /> } />
|
||||||
|
|
||||||
|
<Route path="/" view=move || {
|
||||||
|
view! {
|
||||||
|
<Show when=move || !is_loading.get() fallback=|| view! {
|
||||||
|
<div class="flex items-center justify-center h-screen bg-base-100">
|
||||||
|
<span class="loading loading-spinner loading-lg"></span>
|
||||||
|
</div>
|
||||||
|
}>
|
||||||
|
<Show when=move || is_authenticated.get() fallback=|| ()>
|
||||||
|
<Protected>
|
||||||
|
<TorrentTable />
|
||||||
|
</Protected>
|
||||||
|
</Show>
|
||||||
|
</Show>
|
||||||
|
}
|
||||||
|
}/>
|
||||||
|
|
||||||
|
<Route path="/settings" view=move || {
|
||||||
|
view! {
|
||||||
|
<Show when=move || !is_loading.get() fallback=|| ()>
|
||||||
|
<Show when=move || is_authenticated.get() fallback=|| ()>
|
||||||
|
<Protected>
|
||||||
|
<div class="p-4">"Settings Page (Coming Soon)"</div>
|
||||||
|
</Protected>
|
||||||
|
</Show>
|
||||||
|
</Show>
|
||||||
|
}
|
||||||
|
}/>
|
||||||
</Routes>
|
</Routes>
|
||||||
</Router>
|
</Router>
|
||||||
</main>
|
|
||||||
|
|
||||||
// StatusBar is rendered via fixed positioning, just mount it here
|
|
||||||
<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>
|
|
||||||
|
|
||||||
// Toast container - fixed positioning relative to viewport
|
|
||||||
<ToastContainer />
|
<ToastContainer />
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
|
|||||||
131
frontend/src/components/auth/login.rs
Normal file
131
frontend/src/components/auth/login.rs
Normal file
@@ -0,0 +1,131 @@
|
|||||||
|
use leptos::*;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct LoginRequest {
|
||||||
|
username: String,
|
||||||
|
password: String,
|
||||||
|
remember_me: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn Login() -> impl IntoView {
|
||||||
|
let (username, set_username) = create_signal(String::new());
|
||||||
|
let (password, set_password) = create_signal(String::new());
|
||||||
|
let (remember_me, set_remember_me) = create_signal(false);
|
||||||
|
let (error, set_error) = create_signal(Option::<String>::None);
|
||||||
|
let (loading, set_loading) = create_signal(false);
|
||||||
|
|
||||||
|
let handle_login = move |ev: web_sys::SubmitEvent| {
|
||||||
|
ev.prevent_default();
|
||||||
|
set_loading.set(true);
|
||||||
|
set_error.set(None);
|
||||||
|
|
||||||
|
logging::log!("Attempting login for user: {}", username.get());
|
||||||
|
|
||||||
|
spawn_local(async move {
|
||||||
|
let req = LoginRequest {
|
||||||
|
username: username.get(),
|
||||||
|
password: password.get(),
|
||||||
|
remember_me: remember_me.get(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let client = gloo_net::http::Request::post("/api/auth/login")
|
||||||
|
.json(&req)
|
||||||
|
.expect("Failed to create request");
|
||||||
|
|
||||||
|
match client.send().await {
|
||||||
|
Ok(resp) => {
|
||||||
|
logging::log!("Login response status: {}", resp.status());
|
||||||
|
if resp.ok() {
|
||||||
|
logging::log!("Login successful, redirecting...");
|
||||||
|
// Force a full reload to re-run auth checks in App.rs
|
||||||
|
let _ = window().location().set_href("/");
|
||||||
|
} else {
|
||||||
|
let text = resp.text().await.unwrap_or_default();
|
||||||
|
logging::error!("Login failed: {}", text);
|
||||||
|
set_error.set(Some("Kullanıcı adı veya şifre hatalı".to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
logging::error!("Network error: {}", e);
|
||||||
|
set_error.set(Some("Bağlantı hatası".to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
set_loading.set(false);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
view! {
|
||||||
|
<div class="flex items-center justify-center min-h-screen bg-base-200">
|
||||||
|
<div class="card w-full max-w-sm shadow-xl bg-base-100">
|
||||||
|
<div class="card-body">
|
||||||
|
<h2 class="card-title justify-center mb-4">"VibeTorrent Giriş"</h2>
|
||||||
|
|
||||||
|
<form on:submit=handle_login>
|
||||||
|
<div class="form-control w-full">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text">"Kullanıcı Adı"</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="Kullanıcı adınız"
|
||||||
|
class="input input-bordered w-full"
|
||||||
|
prop:value=username
|
||||||
|
on:input=move |ev| set_username.set(event_target_value(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-control w-full mt-4">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text">"Şifre"</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
placeholder="******"
|
||||||
|
class="input input-bordered w-full"
|
||||||
|
prop:value=password
|
||||||
|
on:input=move |ev| set_password.set(event_target_value(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-control mt-4">
|
||||||
|
<label class="label cursor-pointer justify-start gap-3">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
class="checkbox checkbox-primary checkbox-sm"
|
||||||
|
prop:checked=remember_me
|
||||||
|
on:change=move |ev| set_remember_me.set(event_target_checked(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
/>
|
||||||
|
<span class="label-text">"Beni Hatırla"</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Show when=move || error.get().is_some()>
|
||||||
|
<div class="alert alert-error mt-4 text-sm py-2">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
|
||||||
|
<span>{move || error.get()}</span>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div class="card-actions justify-end mt-6">
|
||||||
|
<button
|
||||||
|
class="btn btn-primary w-full"
|
||||||
|
type="submit"
|
||||||
|
disabled=move || loading.get()
|
||||||
|
>
|
||||||
|
<Show when=move || loading.get() fallback=|| "Giriş Yap">
|
||||||
|
<span class="loading loading-spinner"></span>
|
||||||
|
"Giriş Yapılıyor..."
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
2
frontend/src/components/auth/mod.rs
Normal file
2
frontend/src/components/auth/mod.rs
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
pub mod login;
|
||||||
|
pub mod setup;
|
||||||
144
frontend/src/components/auth/setup.rs
Normal file
144
frontend/src/components/auth/setup.rs
Normal file
@@ -0,0 +1,144 @@
|
|||||||
|
use leptos::*;
|
||||||
|
use serde::Serialize;
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct SetupRequest {
|
||||||
|
username: String,
|
||||||
|
password: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn Setup() -> impl IntoView {
|
||||||
|
let (username, set_username) = create_signal(String::new());
|
||||||
|
let (password, set_password) = create_signal(String::new());
|
||||||
|
let (confirm_password, set_confirm_password) = create_signal(String::new());
|
||||||
|
let (error, set_error) = create_signal(Option::<String>::None);
|
||||||
|
let (loading, set_loading) = create_signal(false);
|
||||||
|
|
||||||
|
let handle_setup = move |ev: web_sys::SubmitEvent| {
|
||||||
|
ev.prevent_default();
|
||||||
|
set_loading.set(true);
|
||||||
|
set_error.set(None);
|
||||||
|
|
||||||
|
let pass = password.get();
|
||||||
|
let confirm = confirm_password.get();
|
||||||
|
|
||||||
|
if pass != confirm {
|
||||||
|
set_error.set(Some("Şifreler eşleşmiyor".to_string()));
|
||||||
|
set_loading.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
if pass.len() < 6 {
|
||||||
|
set_error.set(Some("Şifre en az 6 karakter olmalıdır".to_string()));
|
||||||
|
set_loading.set(false);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
spawn_local(async move {
|
||||||
|
let req = SetupRequest {
|
||||||
|
username: username.get(),
|
||||||
|
password: pass,
|
||||||
|
};
|
||||||
|
|
||||||
|
let client = gloo_net::http::Request::post("/api/setup")
|
||||||
|
.json(&req)
|
||||||
|
.expect("Failed to create request");
|
||||||
|
|
||||||
|
match client.send().await {
|
||||||
|
Ok(resp) => {
|
||||||
|
if resp.ok() {
|
||||||
|
// Redirect to home after setup (auto-login handled by backend)
|
||||||
|
// Full reload to ensure auth state is refreshed
|
||||||
|
let _ = window().location().set_href("/");
|
||||||
|
} else {
|
||||||
|
let text = resp.text().await.unwrap_or_default();
|
||||||
|
set_error.set(Some(format!("Hata: {}", text)));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(_) => {
|
||||||
|
set_error.set(Some("Bağlantı hatası".to_string()));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
set_loading.set(false);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
view! {
|
||||||
|
<div class="flex items-center justify-center min-h-screen bg-base-200">
|
||||||
|
<div class="card w-full max-w-md shadow-xl bg-base-100">
|
||||||
|
<div class="card-body">
|
||||||
|
<h2 class="card-title justify-center mb-2">"VibeTorrent Kurulumu"</h2>
|
||||||
|
<p class="text-center text-sm opacity-70 mb-4">"Yönetici hesabınızı oluşturun"</p>
|
||||||
|
|
||||||
|
<form on:submit=handle_setup>
|
||||||
|
<div class="form-control w-full">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text">"Kullanıcı Adı"</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="text"
|
||||||
|
placeholder="admin"
|
||||||
|
class="input input-bordered w-full"
|
||||||
|
prop:value=username
|
||||||
|
on:input=move |ev| set_username.set(event_target_value(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-control w-full mt-4">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text">"Şifre"</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
placeholder="******"
|
||||||
|
class="input input-bordered w-full"
|
||||||
|
prop:value=password
|
||||||
|
on:input=move |ev| set_password.set(event_target_value(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-control w-full mt-4">
|
||||||
|
<label class="label">
|
||||||
|
<span class="label-text">"Şifre Tekrar"</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
type="password"
|
||||||
|
placeholder="******"
|
||||||
|
class="input input-bordered w-full"
|
||||||
|
prop:value=confirm_password
|
||||||
|
on:input=move |ev| set_confirm_password.set(event_target_value(&ev))
|
||||||
|
disabled=move || loading.get()
|
||||||
|
required
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<Show when=move || error.get().is_some()>
|
||||||
|
<div class="alert alert-error mt-4 text-sm py-2">
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>
|
||||||
|
<span>{move || error.get()}</span>
|
||||||
|
</div>
|
||||||
|
</Show>
|
||||||
|
|
||||||
|
<div class="card-actions justify-end mt-6">
|
||||||
|
<button
|
||||||
|
class="btn btn-primary w-full"
|
||||||
|
type="submit"
|
||||||
|
disabled=move || loading.get()
|
||||||
|
>
|
||||||
|
<Show when=move || loading.get() fallback=|| "Kurulumu Tamamla">
|
||||||
|
<span class="loading loading-spinner"></span>
|
||||||
|
"İşleniyor..."
|
||||||
|
</Show>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
|||||||
30
frontend/src/components/layout/protected.rs
Normal file
30
frontend/src/components/layout/protected.rs
Normal 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>
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -74,69 +74,202 @@ pub fn Sidebar() -> impl IntoView {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
view! {
|
let handle_logout = move |_| {
|
||||||
<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);">
|
spawn_local(async move {
|
||||||
<div class="p-2">
|
let client = gloo_net::http::Request::post("/api/auth/logout");
|
||||||
<ul class="menu w-full rounded-box gap-1">
|
if let Ok(resp) = client.send().await {
|
||||||
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
|
if resp.ok() {
|
||||||
<li>
|
// Force full reload to clear state
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
|
let _ = window().location().set_href("/login");
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
|
|
||||||
</svg>
|
|
||||||
"All"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
|
|
||||||
</svg>
|
|
||||||
"Downloading"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
|
|
||||||
</svg>
|
|
||||||
"Seeding"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
|
||||||
</svg>
|
|
||||||
"Completed"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
|
|
||||||
</svg>
|
|
||||||
"Paused"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
|
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
|
|
||||||
</svg>
|
|
||||||
"Inactive"
|
|
||||||
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
|
|
||||||
</button>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
</div>
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
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! {
|
||||||
|
|
||||||
|
<div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
|
||||||
|
|
||||||
|
<div class="p-2 flex-1 overflow-y-auto">
|
||||||
|
|
||||||
|
<ul class="menu w-full rounded-box gap-1">
|
||||||
|
|
||||||
|
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"All"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Downloading"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Seeding"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Completed"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Paused"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
<li>
|
||||||
|
|
||||||
|
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
"Inactive"
|
||||||
|
|
||||||
|
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</li>
|
||||||
|
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="p-4 border-t border-base-300 bg-base-200/50">
|
||||||
|
|
||||||
|
<div class="flex items-center gap-3">
|
||||||
|
|
||||||
|
<div class="avatar">
|
||||||
|
|
||||||
|
<div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
|
||||||
|
|
||||||
|
<span class="text-sm font-bold flex items-center justify-center h-full">{first_letter}</span>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="flex-1 overflow-hidden">
|
||||||
|
|
||||||
|
<div class="font-bold text-sm truncate">{username}</div>
|
||||||
|
|
||||||
|
<div class="text-[10px] text-base-content/60 truncate">"Online"</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button
|
||||||
|
|
||||||
|
class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
|
||||||
|
|
||||||
|
title="Logout"
|
||||||
|
|
||||||
|
on:click=handle_logout
|
||||||
|
|
||||||
|
>
|
||||||
|
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
|
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
|
||||||
|
|
||||||
|
</svg>
|
||||||
|
|
||||||
|
</button>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
|
||||||
|
}}
|
||||||
|
|||||||
@@ -132,7 +132,7 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<Show when=move || active_dropdown.get() != 0>
|
<Show when=move || active_dropdown.get() != 0>
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 z-[98] cursor-default"
|
class="fixed inset-0 z-[98] cursor-default"
|
||||||
on:click=move |_| close_all()
|
on:pointerdown=move |_| close_all()
|
||||||
></div>
|
></div>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
@@ -143,7 +143,10 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||||
title="Global Download Speed - Click to Set Limit"
|
title="Global Download Speed - Click to Set Limit"
|
||||||
on:click=move |_| toggle(1)
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
toggle(1);
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M19.5 13.5L12 21m0 0l-7.5-7.5M12 21V3" />
|
||||||
@@ -170,7 +173,8 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
||||||
on:click=move |_| {
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
set_limit("down", val);
|
set_limit("down", val);
|
||||||
close_all();
|
close_all();
|
||||||
}
|
}
|
||||||
@@ -192,7 +196,10 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<div
|
<div
|
||||||
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
class="flex items-center gap-2 cursor-pointer hover:text-primary transition-colors select-none"
|
||||||
title="Global Upload Speed - Click to Set Limit"
|
title="Global Upload Speed - Click to Set Limit"
|
||||||
on:click=move |_| toggle(2)
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
toggle(2);
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M4.5 10.5L12 3m0 0l7.5 7.5M12 3v18" />
|
||||||
@@ -219,7 +226,8 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold text-xs flex justify-between" } else { "text-xs flex justify-between" }
|
||||||
on:click=move |_| {
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
set_limit("up", val);
|
set_limit("up", val);
|
||||||
close_all();
|
close_all();
|
||||||
}
|
}
|
||||||
@@ -241,7 +249,10 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<div
|
<div
|
||||||
class="btn btn-ghost btn-xs btn-square"
|
class="btn btn-ghost btn-xs btn-square"
|
||||||
title="Change Theme"
|
title="Change Theme"
|
||||||
on:click=move |_| toggle(3)
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
|
toggle(3);
|
||||||
|
}
|
||||||
>
|
>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
|
||||||
<path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M9.53 16.122a3 3 0 0 0-5.78 1.128 2.25 2.25 0 0 1-2.4 2.245 4.5 4.5 0 0 0 8.4-2.245c0-.399-.078-.78-.22-1.128Zm0 0a15.998 15.998 0 0 0 3.388-1.62m-5.043-.025a15.994 15.994 0 0 1 1.622-3.395m3.42 3.42a15.995 15.995 0 0 0 4.764-4.648l3.876-5.814a1.151 1.151 0 0 0-1.597-1.597L14.146 6.32a15.996 15.996 0 0 0-4.649 4.763m3.42 3.42a6.776 6.776 0 0 0-3.42-3.42" />
|
||||||
@@ -261,7 +272,8 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
|
class=move || if current_theme.get() == theme { "bg-primary/10 text-primary font-bold text-xs capitalize" } else { "text-xs capitalize" }
|
||||||
on:click=move |_| {
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
set_current_theme.set(theme.to_string());
|
set_current_theme.set(theme.to_string());
|
||||||
if let Some(win) = web_sys::window() {
|
if let Some(win) = web_sys::window() {
|
||||||
if let Some(doc) = win.document() {
|
if let Some(doc) = win.document() {
|
||||||
@@ -282,7 +294,6 @@ pub fn StatusBar() -> impl IntoView {
|
|||||||
}
|
}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
class="btn btn-ghost btn-xs btn-square"
|
class="btn btn-ghost btn-xs btn-square"
|
||||||
title="Settings & Notification Permissions"
|
title="Settings & Notification Permissions"
|
||||||
|
|||||||
@@ -3,3 +3,4 @@ pub mod layout;
|
|||||||
pub mod modal;
|
pub mod modal;
|
||||||
pub mod toast;
|
pub mod toast;
|
||||||
pub mod torrent;
|
pub mod torrent;
|
||||||
|
pub mod auth;
|
||||||
|
|||||||
@@ -45,6 +45,22 @@ fn format_duration(seconds: i64) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn format_date(timestamp: i64) -> String {
|
||||||
|
if timestamp <= 0 {
|
||||||
|
return "-".to_string();
|
||||||
|
}
|
||||||
|
let date = js_sys::Date::new(&wasm_bindgen::JsValue::from_f64((timestamp * 1000) as f64));
|
||||||
|
|
||||||
|
// Simple formatting: YYYY-MM-DD HH:mm
|
||||||
|
let year = date.get_full_year();
|
||||||
|
let month = date.get_month() + 1; // 0-based
|
||||||
|
let day = date.get_date();
|
||||||
|
let hours = date.get_hours();
|
||||||
|
let minutes = date.get_minutes();
|
||||||
|
|
||||||
|
format!("{:04}-{:02}-{:02} {:02}:{:02}", year, month, day, hours, minutes)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
enum SortColumn {
|
enum SortColumn {
|
||||||
Name,
|
Name,
|
||||||
@@ -54,6 +70,7 @@ enum SortColumn {
|
|||||||
DownSpeed,
|
DownSpeed,
|
||||||
UpSpeed,
|
UpSpeed,
|
||||||
ETA,
|
ETA,
|
||||||
|
Added,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
@@ -66,8 +83,8 @@ enum SortDirection {
|
|||||||
pub fn TorrentTable() -> impl IntoView {
|
pub fn TorrentTable() -> impl IntoView {
|
||||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||||
|
|
||||||
let sort_col = create_rw_signal(SortColumn::Name);
|
let sort_col = create_rw_signal(SortColumn::Added);
|
||||||
let sort_dir = create_rw_signal(SortDirection::Ascending);
|
let sort_dir = create_rw_signal(SortDirection::Descending);
|
||||||
|
|
||||||
let filtered_torrents = move || {
|
let filtered_torrents = move || {
|
||||||
let mut torrents = store
|
let mut torrents = store
|
||||||
@@ -127,6 +144,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
||||||
a_eta.cmp(&b_eta)
|
a_eta.cmp(&b_eta)
|
||||||
}
|
}
|
||||||
|
SortColumn::Added => a.added_date.cmp(&b.added_date),
|
||||||
};
|
};
|
||||||
if dir == SortDirection::Descending {
|
if dir == SortDirection::Descending {
|
||||||
cmp.reverse()
|
cmp.reverse()
|
||||||
@@ -264,6 +282,9 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
||||||
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
||||||
</th>
|
</th>
|
||||||
|
<th class="w-32 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Added)>
|
||||||
|
<div class="flex items-center">"Added" {move || sort_arrow(SortColumn::Added)}</div>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -317,6 +338,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
||||||
|
<td class="text-right font-mono text-[11px] opacity-60 whitespace-nowrap">{format_date(t.added_date)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
}).collect::<Vec<_>>()}
|
}).collect::<Vec<_>>()}
|
||||||
@@ -329,7 +351,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<Show when=move || sort_open.get()>
|
<Show when=move || sort_open.get()>
|
||||||
<div
|
<div
|
||||||
class="fixed inset-0 z-[98] cursor-default"
|
class="fixed inset-0 z-[98] cursor-default"
|
||||||
on:click=move |_| set_sort_open.set(false)
|
on:pointerdown=move |_| set_sort_open.set(false)
|
||||||
></div>
|
></div>
|
||||||
</Show>
|
</Show>
|
||||||
|
|
||||||
@@ -340,7 +362,8 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<div
|
<div
|
||||||
role="button"
|
role="button"
|
||||||
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
class="btn btn-ghost btn-xs gap-1 opacity-70 font-normal"
|
||||||
on:click=move |_| {
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
let cur = sort_open.get_untracked();
|
let cur = sort_open.get_untracked();
|
||||||
set_sort_open.set(!cur);
|
set_sort_open.set(!cur);
|
||||||
}
|
}
|
||||||
@@ -353,10 +376,12 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<ul
|
<ul
|
||||||
class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
|
class="absolute top-full right-0 z-[100] menu p-2 shadow bg-base-100 rounded-box w-48 mt-1 border border-base-200 text-xs"
|
||||||
style=move || if sort_open.get() { "display: block" } else { "display: none" }
|
style=move || if sort_open.get() { "display: block" } else { "display: none" }
|
||||||
|
on:pointerdown=move |e| e.stop_propagation()
|
||||||
>
|
>
|
||||||
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
||||||
{
|
{
|
||||||
let columns = vec![
|
let columns = vec![
|
||||||
|
(SortColumn::Added, "Date Added"),
|
||||||
(SortColumn::Name, "Name"),
|
(SortColumn::Name, "Name"),
|
||||||
(SortColumn::Size, "Size"),
|
(SortColumn::Size, "Size"),
|
||||||
(SortColumn::Progress, "Progress"),
|
(SortColumn::Progress, "Progress"),
|
||||||
@@ -374,7 +399,8 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<li>
|
<li>
|
||||||
<button
|
<button
|
||||||
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
class=move || if is_active() { "bg-primary/10 text-primary font-bold flex justify-between" } else { "flex justify-between" }
|
||||||
on:click=move |_| {
|
on:pointerdown=move |e| {
|
||||||
|
e.stop_propagation();
|
||||||
handle_sort(col);
|
handle_sort(col);
|
||||||
set_sort_open.set(false);
|
set_sort_open.set(false);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user