Compare commits
1 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c8139f9338 |
3
Cargo.lock
generated
3
Cargo.lock
generated
@@ -320,11 +320,9 @@ dependencies = [
|
|||||||
"dotenvy",
|
"dotenvy",
|
||||||
"futures",
|
"futures",
|
||||||
"governor",
|
"governor",
|
||||||
"icons",
|
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
"leptos",
|
"leptos",
|
||||||
"leptos_axum",
|
"leptos_axum",
|
||||||
"leptos_ui",
|
|
||||||
"mime_guess",
|
"mime_guess",
|
||||||
"openssl",
|
"openssl",
|
||||||
"quick-xml",
|
"quick-xml",
|
||||||
@@ -345,7 +343,6 @@ dependencies = [
|
|||||||
"tower_governor",
|
"tower_governor",
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
"tw_merge",
|
|
||||||
"utoipa",
|
"utoipa",
|
||||||
"utoipa-swagger-ui",
|
"utoipa-swagger-ui",
|
||||||
"web-push",
|
"web-push",
|
||||||
|
|||||||
@@ -2,9 +2,6 @@
|
|||||||
members = ["backend", "frontend", "shared"]
|
members = ["backend", "frontend", "shared"]
|
||||||
resolver = "2"
|
resolver = "2"
|
||||||
|
|
||||||
[[workspace.metadata.leptos]]
|
|
||||||
tailwind-input-file = "frontend/input.css"
|
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
# En küçük binary boyutu
|
# En küçük binary boyutu
|
||||||
opt-level = "z"
|
opt-level = "z"
|
||||||
|
|||||||
@@ -46,7 +46,4 @@ governor = "0.10.4"
|
|||||||
# Leptos
|
# Leptos
|
||||||
leptos = { version = "0.8.15", features = ["nightly"] }
|
leptos = { version = "0.8.15", features = ["nightly"] }
|
||||||
leptos_axum = { version = "0.8.7" }
|
leptos_axum = { version = "0.8.7" }
|
||||||
jsonwebtoken = "9"
|
jsonwebtoken = "9"
|
||||||
tw_merge = { version = "0.1.17", features = ["variant"] }
|
|
||||||
icons = { version = "0.18.0", features = ["leptos"] }
|
|
||||||
leptos_ui = "0.3.20"
|
|
||||||
@@ -7,7 +7,6 @@ use rust_embed::RustEmbed;
|
|||||||
|
|
||||||
pub mod auth;
|
pub mod auth;
|
||||||
pub mod setup;
|
pub mod setup;
|
||||||
pub mod notifications;
|
|
||||||
|
|
||||||
#[derive(RustEmbed)]
|
#[derive(RustEmbed)]
|
||||||
#[folder = "../frontend/dist"]
|
#[folder = "../frontend/dist"]
|
||||||
|
|||||||
@@ -1,54 +0,0 @@
|
|||||||
use axum::{
|
|
||||||
extract::{State, Query},
|
|
||||||
http::StatusCode,
|
|
||||||
};
|
|
||||||
use serde::Deserialize;
|
|
||||||
use shared::{AppEvent, SystemNotification, NotificationLevel};
|
|
||||||
use crate::AppState;
|
|
||||||
|
|
||||||
#[derive(Deserialize)]
|
|
||||||
pub struct TorrentFinishedQuery {
|
|
||||||
pub name: String,
|
|
||||||
pub hash: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn torrent_finished_handler(
|
|
||||||
State(state): State<AppState>,
|
|
||||||
Query(params): Query<TorrentFinishedQuery>,
|
|
||||||
) -> StatusCode {
|
|
||||||
tracing::info!("WEBHOOK: Received notification from rTorrent. Name: {:?}, Hash: {:?}", params.name, params.hash);
|
|
||||||
|
|
||||||
let torrent_name = if params.name.is_empty() || params.name == "$d.name=" {
|
|
||||||
"Bilinmeyen Torrent".to_string()
|
|
||||||
} else {
|
|
||||||
params.name.clone()
|
|
||||||
};
|
|
||||||
|
|
||||||
let message = format!("Torrent tamamlandı: {}", torrent_name);
|
|
||||||
|
|
||||||
// 1. Send to active SSE clients (for Toast)
|
|
||||||
let notification = SystemNotification {
|
|
||||||
level: NotificationLevel::Success,
|
|
||||||
message: message.clone(),
|
|
||||||
};
|
|
||||||
let _ = state.event_bus.send(AppEvent::Notification(notification));
|
|
||||||
|
|
||||||
// 2. Send Web Push Notification (for Background)
|
|
||||||
#[cfg(feature = "push-notifications")]
|
|
||||||
{
|
|
||||||
let push_store = state.push_store.clone();
|
|
||||||
let title = "Torrent Tamamlandı".to_string();
|
|
||||||
let body = message;
|
|
||||||
let name_for_log = torrent_name.clone();
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
|
||||||
tracing::info!("Attempting to send Web Push notification for torrent: {}", name_for_log);
|
|
||||||
match crate::push::send_push_notification(&push_store, &title, &body).await {
|
|
||||||
Ok(_) => tracing::info!("Web Push notification task completed for: {}", name_for_log),
|
|
||||||
Err(e) => tracing::error!("Failed to send Web Push notification for {}: {:?}", name_for_log, e),
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
StatusCode::OK
|
|
||||||
}
|
|
||||||
@@ -60,7 +60,6 @@ async fn auth_middleware(
|
|||||||
|| path.starts_with("/api/server_fns/get_setup_status")
|
|| path.starts_with("/api/server_fns/get_setup_status")
|
||||||
|| path.starts_with("/api/server_fns/Setup")
|
|| path.starts_with("/api/server_fns/Setup")
|
||||||
|| path.starts_with("/api/server_fns/setup")
|
|| path.starts_with("/api/server_fns/setup")
|
||||||
|| path.starts_with("/api/internal/")
|
|
||||||
|| path.starts_with("/swagger-ui")
|
|| path.starts_with("/swagger-ui")
|
||||||
|| path.starts_with("/api-docs")
|
|| path.starts_with("/api-docs")
|
||||||
|| !path.starts_with("/api/")
|
|| !path.starts_with("/api/")
|
||||||
@@ -314,7 +313,7 @@ async fn main() {
|
|||||||
let loop_interval = if active_clients > 0 {
|
let loop_interval = if active_clients > 0 {
|
||||||
Duration::from_secs(1)
|
Duration::from_secs(1)
|
||||||
} else {
|
} else {
|
||||||
Duration::from_secs(60)
|
Duration::from_secs(30)
|
||||||
};
|
};
|
||||||
|
|
||||||
// 1. Fetch Torrents
|
// 1. Fetch Torrents
|
||||||
@@ -435,7 +434,6 @@ async fn main() {
|
|||||||
let db_for_ctx = db.clone();
|
let db_for_ctx = db.clone();
|
||||||
let app = app
|
let app = app
|
||||||
.route("/api/events", get(sse::sse_handler))
|
.route("/api/events", get(sse::sse_handler))
|
||||||
.route("/api/internal/torrent-finished", post(handlers::notifications::torrent_finished_handler))
|
|
||||||
.route("/api/server_fns/{*fn_name}", post({
|
.route("/api/server_fns/{*fn_name}", post({
|
||||||
let scgi_path = scgi_path_for_ctx.clone();
|
let scgi_path = scgi_path_for_ctx.clone();
|
||||||
let db = db_for_ctx.clone();
|
let db = db_for_ctx.clone();
|
||||||
|
|||||||
@@ -191,21 +191,11 @@ pub async fn send_push_notification(
|
|||||||
tracing::debug!("Push notification sent to: {}", subscription.endpoint);
|
tracing::debug!("Push notification sent to: {}", subscription.endpoint);
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
let err_msg = format!("{:?}", e);
|
tracing::error!("Failed to send push notification to {}: {}", subscription.endpoint, e);
|
||||||
tracing::error!("Delivery failed for {}: {}", subscription.endpoint, err_msg);
|
|
||||||
// Always remove on delivery failure (Gone, Unauthorized, etc.)
|
|
||||||
tracing::info!("Removing problematic subscription after delivery failure: {}", subscription.endpoint);
|
|
||||||
let _ = store.remove_subscription(&subscription.endpoint).await;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => tracing::error!("Failed to build push message: {}", e),
|
||||||
let err_msg = format!("{:?}", e);
|
|
||||||
tracing::error!("Encryption/Build failed for {}: {}", subscription.endpoint, err_msg);
|
|
||||||
// Always remove on encryption failure
|
|
||||||
tracing::info!("Removing problematic subscription after encryption failure: {}", subscription.endpoint);
|
|
||||||
let _ = store.remove_subscription(&subscription.endpoint).await;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(e) => tracing::error!("Failed to build VAPID signature: {}", e),
|
Err(e) => tracing::error!("Failed to build VAPID signature: {}", e),
|
||||||
|
|||||||
@@ -3,69 +3,70 @@
|
|||||||
|
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
--radius: 0.625rem;
|
--background: 0 0% 100%;
|
||||||
--background: oklch(1 0 0);
|
--foreground: 240 10% 3.9%;
|
||||||
--foreground: oklch(0.145 0 0);
|
--card: 0 0% 100%;
|
||||||
--card: oklch(1 0 0);
|
--card-foreground: 240 10% 3.9%;
|
||||||
--card-foreground: oklch(0.145 0 0);
|
--popover: 0 0% 100%;
|
||||||
--popover: oklch(1 0 0);
|
--popover-foreground: 240 10% 3.9%;
|
||||||
--popover-foreground: oklch(0.145 0 0);
|
--primary: 240 5.9% 10%;
|
||||||
--primary: oklch(0.205 0 0);
|
--primary-foreground: 0 0% 98%;
|
||||||
--primary-foreground: oklch(0.985 0 0);
|
--secondary: 240 4.8% 95.9%;
|
||||||
--secondary: oklch(0.97 0 0);
|
--secondary-foreground: 240 5.9% 10%;
|
||||||
--secondary-foreground: oklch(0.205 0 0);
|
--muted: 240 4.8% 95.9%;
|
||||||
--muted: oklch(0.97 0 0);
|
--muted-foreground: 240 3.8% 46.1%;
|
||||||
--muted-foreground: oklch(0.556 0 0);
|
--accent: 240 4.8% 95.9%;
|
||||||
--accent: oklch(0.97 0 0);
|
--accent-foreground: 240 5.9% 10%;
|
||||||
--accent-foreground: oklch(0.205 0 0);
|
--destructive: 0 84.2% 60.2%;
|
||||||
--destructive: oklch(0.577 0.245 27.325);
|
--destructive-foreground: 0 0% 98%;
|
||||||
--border: oklch(0.922 0 0);
|
--border: 240 5.9% 90%;
|
||||||
--input: oklch(0.922 0 0);
|
--input: 240 5.9% 90%;
|
||||||
--ring: oklch(0.708 0 0);
|
--ring: 240 5.9% 10%;
|
||||||
|
--radius: 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.dark {
|
.dark {
|
||||||
--background: oklch(0.145 0 0);
|
--background: 240 10% 3.9%;
|
||||||
--foreground: oklch(0.985 0 0);
|
--foreground: 0 0% 98%;
|
||||||
--card: oklch(0.205 0 0);
|
--card: 240 10% 3.9%;
|
||||||
--card-foreground: oklch(0.985 0 0);
|
--card-foreground: 0 0% 98%;
|
||||||
--popover: oklch(0.205 0 0);
|
--popover: 240 10% 3.9%;
|
||||||
--popover-foreground: oklch(0.985 0 0);
|
--popover-foreground: 0 0% 98%;
|
||||||
--primary: oklch(0.922 0 0);
|
--primary: 0 0% 98%;
|
||||||
--primary-foreground: oklch(0.205 0 0);
|
--primary-foreground: 240 5.9% 10%;
|
||||||
--secondary: oklch(0.269 0 0);
|
--secondary: 240 3.7% 15.9%;
|
||||||
--secondary-foreground: oklch(0.985 0 0);
|
--secondary-foreground: 0 0% 98%;
|
||||||
--muted: oklch(0.269 0 0);
|
--muted: 240 3.7% 15.9%;
|
||||||
--muted-foreground: oklch(0.708 0 0);
|
--muted-foreground: 240 5% 64.9%;
|
||||||
--accent: oklch(0.269 0 0);
|
--accent: 240 3.7% 15.9%;
|
||||||
--accent-foreground: oklch(0.985 0 0);
|
--accent-foreground: 0 0% 98%;
|
||||||
--destructive: oklch(0.704 0.191 22.216);
|
--destructive: 0 62.8% 30.6%;
|
||||||
--border: oklch(1 0 0 / 10%);
|
--destructive-foreground: 0 0% 98%;
|
||||||
--input: oklch(1 0 0 / 15%);
|
--border: 240 3.7% 15.9%;
|
||||||
--ring: oklch(0.556 0 0);
|
--input: 240 3.7% 15.9%;
|
||||||
|
--ring: 240 4.9% 83.9%;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@theme inline {
|
@theme inline {
|
||||||
--color-background: var(--background);
|
--color-background: hsl(var(--background));
|
||||||
--color-foreground: var(--foreground);
|
--color-foreground: hsl(var(--foreground));
|
||||||
--color-card: var(--card);
|
--color-card: hsl(var(--card));
|
||||||
--color-card-foreground: var(--card-foreground);
|
--color-card-foreground: hsl(var(--card-foreground));
|
||||||
--color-popover: var(--popover);
|
--color-popover: hsl(var(--popover));
|
||||||
--color-popover-foreground: var(--popover-foreground);
|
--color-popover-foreground: hsl(var(--popover-foreground));
|
||||||
--color-primary: var(--primary);
|
--color-primary: hsl(var(--primary));
|
||||||
--color-primary-foreground: var(--primary-foreground);
|
--color-primary-foreground: hsl(var(--primary-foreground));
|
||||||
--color-secondary: var(--secondary);
|
--color-secondary: hsl(var(--secondary));
|
||||||
--color-secondary-foreground: var(--secondary-foreground);
|
--color-secondary-foreground: hsl(var(--secondary-foreground));
|
||||||
--color-muted: var(--muted);
|
--color-muted: hsl(var(--muted));
|
||||||
--color-muted-foreground: var(--muted-foreground);
|
--color-muted-foreground: hsl(var(--muted-foreground));
|
||||||
--color-accent: var(--accent);
|
--color-accent: hsl(var(--accent));
|
||||||
--color-accent-foreground: var(--accent-foreground);
|
--color-accent-foreground: hsl(var(--accent-foreground));
|
||||||
--color-destructive: var(--destructive);
|
--color-destructive: hsl(var(--destructive));
|
||||||
--color-destructive-foreground: var(--destructive-foreground);
|
--color-destructive-foreground: hsl(var(--destructive-foreground));
|
||||||
--color-border: var(--border);
|
--color-border: hsl(var(--border));
|
||||||
--color-input: var(--input);
|
--color-input: hsl(var(--input));
|
||||||
--color-ring: var(--ring);
|
--color-ring: hsl(var(--ring));
|
||||||
--radius-sm: calc(var(--radius) - 4px);
|
--radius-sm: calc(var(--radius) - 4px);
|
||||||
--radius-md: calc(var(--radius) - 2px);
|
--radius-md: calc(var(--radius) - 2px);
|
||||||
--radius-lg: var(--radius);
|
--radius-lg: var(--radius);
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ use crate::components::auth::setup::Setup;
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use leptos::task::spawn_local;
|
use leptos::task::spawn_local;
|
||||||
use leptos_router::components::{Router, Routes, Route};
|
use leptos_router::components::{Router, Routes, Route};
|
||||||
use leptos_router::hooks::{use_navigate, use_location};
|
use leptos_router::hooks::use_navigate;
|
||||||
use crate::components::ui::toast::Toaster;
|
use crate::components::ui::toast::Toaster;
|
||||||
use crate::components::hooks::use_theme_mode::ThemeMode;
|
use crate::components::hooks::use_theme_mode::ThemeMode;
|
||||||
|
|
||||||
@@ -41,7 +41,6 @@ pub fn App() -> impl IntoView {
|
|||||||
fn InnerApp() -> impl IntoView {
|
fn InnerApp() -> impl IntoView {
|
||||||
crate::store::provide_torrent_store();
|
crate::store::provide_torrent_store();
|
||||||
let store = use_context::<crate::store::TorrentStore>();
|
let store = use_context::<crate::store::TorrentStore>();
|
||||||
let _loc = use_location();
|
|
||||||
|
|
||||||
let is_loading = signal(true);
|
let is_loading = signal(true);
|
||||||
let is_authenticated = signal(false);
|
let is_authenticated = signal(false);
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use crate::components::ui::context_menu::{
|
use crate::components::ui::context_menu::*;
|
||||||
ContextMenu, ContextMenuContent, ContextMenuItem, ContextMenuTrigger,
|
|
||||||
};
|
|
||||||
use crate::components::ui::button_action::ButtonAction;
|
|
||||||
use crate::components::ui::button::ButtonVariant;
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn TorrentContextMenu(
|
pub fn TorrentContextMenu(
|
||||||
@@ -11,61 +7,72 @@ pub fn TorrentContextMenu(
|
|||||||
torrent_hash: String,
|
torrent_hash: String,
|
||||||
on_action: Callback<(String, String)>,
|
on_action: Callback<(String, String)>,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
let hash_c1 = torrent_hash.clone();
|
let hash = StoredValue::new(torrent_hash);
|
||||||
let hash_c2 = torrent_hash.clone();
|
|
||||||
let hash_c3 = torrent_hash.clone();
|
|
||||||
let hash_c4 = torrent_hash.clone();
|
|
||||||
|
|
||||||
let on_action_stored = StoredValue::new(on_action);
|
let menu_action = move |action: &'static str| {
|
||||||
|
on_action.run((action.to_string(), hash.get_value()));
|
||||||
|
};
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<ContextMenu>
|
<ContextMenu>
|
||||||
<ContextMenuTrigger>
|
<ContextMenuTrigger>
|
||||||
{children()}
|
{children()}
|
||||||
</ContextMenuTrigger>
|
</ContextMenuTrigger>
|
||||||
<ContextMenuContent class="w-56 p-1.5">
|
|
||||||
<ContextMenuItem on:click={let h = hash_c1; move |_| {
|
<ContextMenuContent class="w-56">
|
||||||
on_action_stored.get_value().run(("start".to_string(), h.clone()));
|
<ContextMenuAction
|
||||||
crate::components::ui::context_menu::close_context_menu();
|
class="px-2 py-1.5 hover:bg-accent hover:text-accent-foreground rounded-sm"
|
||||||
}}>
|
on:click=move |_| menu_action("start")
|
||||||
"Başlat"
|
>
|
||||||
</ContextMenuItem>
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
|
||||||
<ContextMenuItem on:click={let h = hash_c2; move |_| {
|
<path stroke-linecap="round" stroke-linejoin="round" d="M5.25 5.653c0-.856.917-1.398 1.667-.986l11.54 6.348a1.125 1.125 0 010 1.971l-11.54 6.347a1.125 1.125 0 01-1.667-.985V5.653z" />
|
||||||
on_action_stored.get_value().run(("stop".to_string(), h.clone()));
|
</svg>
|
||||||
crate::components::ui::context_menu::close_context_menu();
|
"Start"
|
||||||
}}>
|
</ContextMenuAction>
|
||||||
"Durdur"
|
|
||||||
</ContextMenuItem>
|
|
||||||
|
|
||||||
<div class="my-1.5 h-px bg-border/50" />
|
|
||||||
|
|
||||||
// --- Modern Hold-to-Action Buttons ---
|
|
||||||
<div class="space-y-1">
|
|
||||||
<ButtonAction
|
|
||||||
variant=ButtonVariant::Ghost
|
|
||||||
class="w-full justify-start h-8 px-2 text-xs text-destructive hover:bg-destructive/10 hover:text-destructive transition-none"
|
|
||||||
hold_duration=800
|
|
||||||
on_action={let h = hash_c3; move || {
|
|
||||||
on_action_stored.get_value().run(("delete".to_string(), h.clone()));
|
|
||||||
crate::components::ui::context_menu::close_context_menu();
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
"Sil (Basılı Tut)"
|
|
||||||
</ButtonAction>
|
|
||||||
|
|
||||||
<ButtonAction
|
<ContextMenuAction
|
||||||
variant=ButtonVariant::Destructive
|
class="px-2 py-1.5 hover:bg-accent hover:text-accent-foreground rounded-sm"
|
||||||
class="w-full justify-start h-8 px-2 text-xs font-bold"
|
on:click=move |_| menu_action("stop")
|
||||||
hold_duration=1200
|
>
|
||||||
on_action={let h = hash_c4; move || {
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
|
||||||
on_action_stored.get_value().run(("delete_with_data".to_string(), h.clone()));
|
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
|
||||||
crate::components::ui::context_menu::close_context_menu();
|
</svg>
|
||||||
}}
|
"Stop"
|
||||||
>
|
</ContextMenuAction>
|
||||||
"Verilerle Sil (Basılı Tut)"
|
|
||||||
</ButtonAction>
|
<ContextMenuAction
|
||||||
</div>
|
class="px-2 py-1.5 hover:bg-accent hover:text-accent-foreground rounded-sm"
|
||||||
|
on:click=move |_| menu_action("recheck")
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0l3.181 3.183a8.25 8.25 0 0013.803-3.7M4.031 9.865a8.25 8.25 0 0113.803-3.7l3.181 3.182m0-4.991v4.99" />
|
||||||
|
</svg>
|
||||||
|
"Recheck"
|
||||||
|
</ContextMenuAction>
|
||||||
|
|
||||||
|
<div class="-mx-1 my-1 h-px bg-border" />
|
||||||
|
|
||||||
|
<ContextMenuAction
|
||||||
|
class="px-2 py-1.5 text-destructive hover:bg-destructive/10 hover:text-destructive rounded-sm"
|
||||||
|
on:click=move |_| menu_action("delete")
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.164h-2.34c-1.18 0-2.09.984-2.09 2.164v.916m7.5 0a48.667 48.667 0 00-7.5 0" />
|
||||||
|
</svg>
|
||||||
|
"Remove"
|
||||||
|
</ContextMenuAction>
|
||||||
|
|
||||||
|
<ContextMenuHoldAction
|
||||||
|
class="text-destructive hover:bg-destructive/10 hover:text-destructive"
|
||||||
|
on_hold_complete=move |_| menu_action("delete_with_data")
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="mr-2 h-4 w-4 opacity-70">
|
||||||
|
<path stroke-linecap="round" stroke-linejoin="round" d="M20.25 7.5l-.625 10.632a2.25 2.25 0 01-2.247 2.118H6.622a2.25 2.25 0 01-2.247-2.118L3.75 7.5m6 4.125l2.25 2.25m0 0l2.25 2.25M12 13.875l2.25-2.25M12 13.875l-2.25-2.25M3.375 7.5h17.25c.621 0 1.125-.504 1.125-1.125v-1.5c0-.621-.504-1.125-1.125-1.125H3.375c-.621 0-1.125.504-1.125 1.125v1.5c0 .621.504 1.125 1.125 1.125z" />
|
||||||
|
</svg>
|
||||||
|
"Remove with Data"
|
||||||
|
<span class="ml-auto text-[10px] opacity-50">"Hold"</span>
|
||||||
|
</ContextMenuHoldAction>
|
||||||
</ContextMenuContent>
|
</ContextMenuContent>
|
||||||
</ContextMenu>
|
</ContextMenu>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,3 @@
|
|||||||
use leptos::prelude::*;
|
|
||||||
|
|
||||||
pub fn use_random_id_for(prefix: &str) -> String {
|
pub fn use_random_id_for(prefix: &str) -> String {
|
||||||
format!("{}_{}", prefix, js_sys::Math::random().to_string().replace(".", ""))
|
format!("{}_{}", prefix, js_sys::Math::random().to_string().replace(".", ""))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,26 +8,15 @@ pub struct ThemeMode {
|
|||||||
|
|
||||||
const LOCALSTORAGE_KEY: &str = "darkmode";
|
const LOCALSTORAGE_KEY: &str = "darkmode";
|
||||||
|
|
||||||
/// Hook to access the dark mode context
|
|
||||||
///
|
|
||||||
/// Returns the ThemeMode instance from context for easy access
|
|
||||||
pub fn use_theme_mode() -> ThemeMode {
|
pub fn use_theme_mode() -> ThemeMode {
|
||||||
expect_context::<ThemeMode>()
|
expect_context::<ThemeMode>()
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================== */
|
|
||||||
/* ✨ FUNCTIONS ✨ */
|
|
||||||
/* ========================================================== */
|
|
||||||
|
|
||||||
impl ThemeMode {
|
impl ThemeMode {
|
||||||
#[must_use]
|
|
||||||
/// Initializes a new ThemeMode instance.
|
|
||||||
pub fn init() -> Self {
|
pub fn init() -> Self {
|
||||||
let theme_mode = Self { state: RwSignal::new(false) };
|
let theme_mode = Self { state: RwSignal::new(false) };
|
||||||
|
|
||||||
provide_context(theme_mode);
|
provide_context(theme_mode);
|
||||||
|
|
||||||
// Use Effect to handle browser-only initialization
|
|
||||||
Effect::new(move |_| {
|
Effect::new(move |_| {
|
||||||
let initial = Self::get_storage_state().unwrap_or(Self::prefers_dark_mode());
|
let initial = Self::get_storage_state().unwrap_or(Self::prefers_dark_mode());
|
||||||
theme_mode.state.set(initial);
|
theme_mode.state.set(initial);
|
||||||
@@ -43,45 +32,14 @@ impl ThemeMode {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_dark(&self) {
|
|
||||||
self.set(true);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn set_light(&self) {
|
|
||||||
self.set(false);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// - `dark`: Set to `true` for dark mode, and `false` for light mode.
|
|
||||||
pub fn set(&self, dark: bool) {
|
|
||||||
self.state.set(dark);
|
|
||||||
Self::set_storage_state(dark);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn get(&self) -> bool {
|
pub fn get(&self) -> bool {
|
||||||
self.state.get()
|
self.state.get()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn is_dark(&self) -> bool {
|
|
||||||
self.state.get()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[must_use]
|
|
||||||
pub fn is_light(&self) -> bool {
|
|
||||||
!self.state.get()
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ========================================================== */
|
|
||||||
/* ✨ FUNCTIONS ✨ */
|
|
||||||
/* ========================================================== */
|
|
||||||
|
|
||||||
/// Retrieves the local storage object, if available.
|
|
||||||
fn get_storage() -> Option<Storage> {
|
fn get_storage() -> Option<Storage> {
|
||||||
window().local_storage().ok().flatten()
|
window().local_storage().ok().flatten()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Retrieves the dark mode state from local storage, if available.
|
|
||||||
fn get_storage_state() -> Option<bool> {
|
fn get_storage_state() -> Option<bool> {
|
||||||
Self::get_storage()
|
Self::get_storage()
|
||||||
.and_then(|storage| storage.get(LOCALSTORAGE_KEY).ok())
|
.and_then(|storage| storage.get(LOCALSTORAGE_KEY).ok())
|
||||||
@@ -89,7 +47,6 @@ impl ThemeMode {
|
|||||||
.and_then(|entry| entry.parse::<bool>().ok())
|
.and_then(|entry| entry.parse::<bool>().ok())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Checks whether the user's system prefers dark mode based on media queries.
|
|
||||||
fn prefers_dark_mode() -> bool {
|
fn prefers_dark_mode() -> bool {
|
||||||
window()
|
window()
|
||||||
.match_media("(prefers-color-scheme: dark)")
|
.match_media("(prefers-color-scheme: dark)")
|
||||||
@@ -99,10 +56,9 @@ impl ThemeMode {
|
|||||||
.unwrap_or_default()
|
.unwrap_or_default()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Stores the dark mode state in local storage.
|
|
||||||
fn set_storage_state(state: bool) {
|
fn set_storage_state(state: bool) {
|
||||||
if let Some(storage) = Self::get_storage() {
|
if let Some(storage) = Self::get_storage() {
|
||||||
storage.set(LOCALSTORAGE_KEY, state.to_string().as_str()).ok();
|
let _ = storage.set(LOCALSTORAGE_KEY, state.to_string().as_str());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,12 +6,24 @@ pub fn Footer() -> impl IntoView {
|
|||||||
let year = chrono::Local::now().format("%Y").to_string();
|
let year = chrono::Local::now().format("%Y").to_string();
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<footer class="mt-auto pb-6 px-4">
|
<footer class="mt-auto px-4 py-6 md:px-8">
|
||||||
<Separator class="mb-4 opacity-30" />
|
<Separator class="mb-6 opacity-50" />
|
||||||
<div class="flex items-center justify-center gap-2 text-[10px] uppercase tracking-widest text-muted-foreground/60 font-medium">
|
<div class="flex flex-col items-center justify-between gap-4 md:flex-row">
|
||||||
<span>{format!("© {} VibeTorrent", year)}</span>
|
<p class="text-center text-sm leading-loose text-muted-foreground md:text-left">
|
||||||
<span class="size-1 rounded-full bg-muted-foreground/30" />
|
{format!("© {} VibeTorrent. Tüm hakları saklıdır.", year)}
|
||||||
<span>"v3.0.0-beta"</span>
|
</p>
|
||||||
|
<div class="flex items-center gap-4 text-sm font-medium text-muted-foreground">
|
||||||
|
<a
|
||||||
|
href="https://git.karatatar.com/admin/vibetorrent"
|
||||||
|
target="_blank"
|
||||||
|
rel="noreferrer"
|
||||||
|
class="underline underline-offset-4 hover:text-foreground transition-colors"
|
||||||
|
>
|
||||||
|
"Gitea"
|
||||||
|
</a>
|
||||||
|
<span class="size-1 rounded-full bg-muted-foreground/30" />
|
||||||
|
<span class="text-[10px] tracking-widest uppercase opacity-70">"v3.0.0-beta"</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</footer>
|
</footer>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ use leptos::task::spawn_local;
|
|||||||
use crate::components::ui::sidenav::*;
|
use crate::components::ui::sidenav::*;
|
||||||
use crate::components::ui::button::{Button, ButtonVariant, ButtonSize};
|
use crate::components::ui::button::{Button, ButtonVariant, ButtonSize};
|
||||||
use crate::components::ui::theme_toggle::ThemeToggle;
|
use crate::components::ui::theme_toggle::ThemeToggle;
|
||||||
use crate::components::ui::switch::Switch;
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Sidebar() -> impl IntoView {
|
pub fn Sidebar() -> impl IntoView {
|
||||||
@@ -66,19 +65,6 @@ pub fn Sidebar() -> impl IntoView {
|
|||||||
username().chars().next().unwrap_or('?').to_uppercase().to_string()
|
username().chars().next().unwrap_or('?').to_uppercase().to_string()
|
||||||
};
|
};
|
||||||
|
|
||||||
let on_push_toggle = move |checked: bool| {
|
|
||||||
spawn_local(async move {
|
|
||||||
if checked {
|
|
||||||
crate::store::subscribe_to_push_notifications().await;
|
|
||||||
} else {
|
|
||||||
crate::store::unsubscribe_from_push_notifications().await;
|
|
||||||
}
|
|
||||||
if let Ok(enabled) = crate::store::is_push_subscribed().await {
|
|
||||||
store.push_enabled.set(enabled);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<SidenavHeader>
|
<SidenavHeader>
|
||||||
<div class="flex items-center gap-2 px-2 py-4">
|
<div class="flex items-center gap-2 px-2 py-4">
|
||||||
@@ -147,49 +133,35 @@ pub fn Sidebar() -> impl IntoView {
|
|||||||
</SidenavContent>
|
</SidenavContent>
|
||||||
|
|
||||||
<SidenavFooter>
|
<SidenavFooter>
|
||||||
<div class="flex flex-col gap-4 p-4">
|
<div class="flex items-center gap-3 p-2 rounded-lg border bg-muted/30 shadow-xs overflow-hidden">
|
||||||
// Push Notification Toggle
|
<div class="h-8 w-8 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xs font-medium shrink-0 border border-primary-foreground/10">
|
||||||
<div class="flex items-center justify-between px-2 py-1 bg-muted/20 rounded-md border border-border/50">
|
{first_letter}
|
||||||
<div class="flex flex-col gap-0.5">
|
|
||||||
<span class="text-[10px] font-bold uppercase tracking-wider text-foreground/70">"Bildirimler"</span>
|
|
||||||
<span class="text-[9px] text-muted-foreground">"Web Push"</span>
|
|
||||||
</div>
|
|
||||||
<Switch
|
|
||||||
checked=Signal::from(store.push_enabled)
|
|
||||||
on_checked_change=Callback::new(on_push_toggle)
|
|
||||||
/>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="flex-1 overflow-hidden">
|
||||||
<div class="flex items-center gap-3 p-2 rounded-lg border bg-muted/30 shadow-xs overflow-hidden">
|
<div class="font-medium text-[11px] truncate text-foreground leading-tight">{username}</div>
|
||||||
<div class="h-8 w-8 rounded-full bg-primary text-primary-foreground flex items-center justify-center text-xs font-medium shrink-0 border border-primary-foreground/10">
|
<div class="text-[9px] text-muted-foreground truncate opacity-70">"Yönetici"</div>
|
||||||
{first_letter}
|
</div>
|
||||||
</div>
|
|
||||||
<div class="flex-1 overflow-hidden">
|
<div class="flex items-center gap-1">
|
||||||
<div class="font-medium text-[11px] truncate text-foreground leading-tight">{username}</div>
|
<ThemeToggle />
|
||||||
<div class="text-[9px] text-muted-foreground truncate opacity-70">"Yönetici"</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center gap-1">
|
<Button
|
||||||
<ThemeToggle />
|
variant=ButtonVariant::Ghost
|
||||||
|
size=ButtonSize::Icon
|
||||||
<Button
|
class="size-7 text-destructive hover:bg-destructive/10"
|
||||||
variant=ButtonVariant::Ghost
|
on:click=move |_| {
|
||||||
size=ButtonSize::Icon
|
spawn_local(async move {
|
||||||
class="size-7 text-destructive hover:bg-destructive/10"
|
if shared::server_fns::auth::logout().await.is_ok() {
|
||||||
on:click=move |_| {
|
let window = web_sys::window().expect("window should exist");
|
||||||
spawn_local(async move {
|
let _ = window.location().set_href("/login");
|
||||||
if shared::server_fns::auth::logout().await.is_ok() {
|
}
|
||||||
let window = web_sys::window().expect("window should exist");
|
});
|
||||||
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="size-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>
|
||||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
|
</Button>
|
||||||
<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>
|
||||||
</div>
|
</div>
|
||||||
</SidenavFooter>
|
</SidenavFooter>
|
||||||
|
|||||||
@@ -1,13 +1,14 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use icons::{PanelLeft, Plus};
|
use icons::PanelLeft;
|
||||||
use crate::components::torrent::add_torrent::AddTorrentDialogContent;
|
use crate::components::torrent::add_torrent::AddTorrentDialog;
|
||||||
use crate::components::ui::button::{ButtonVariant, ButtonSize};
|
use crate::components::ui::button::{Button, ButtonVariant, ButtonSize};
|
||||||
use crate::components::ui::sheet::{Sheet, SheetContent, SheetTrigger, SheetDirection};
|
use crate::components::ui::sheet::{Sheet, SheetContent, SheetTrigger, SheetDirection};
|
||||||
use crate::components::ui::dialog::{Dialog, DialogContent, DialogTrigger};
|
|
||||||
use crate::components::layout::sidebar::Sidebar;
|
use crate::components::layout::sidebar::Sidebar;
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Toolbar() -> impl IntoView {
|
pub fn Toolbar() -> impl IntoView {
|
||||||
|
let show_add_modal = signal(false);
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<div class="flex min-h-14 h-auto items-center border-b border-border bg-background px-4" style="padding-top: env(safe-area-inset-top);">
|
<div class="flex min-h-14 h-auto items-center border-b border-border bg-background px-4" style="padding-top: env(safe-area-inset-top);">
|
||||||
// Sol kısım: Menü butonu (Mobil) + Add Torrent
|
// Sol kısım: Menü butonu (Mobil) + Add Torrent
|
||||||
@@ -32,24 +33,25 @@ pub fn Toolbar() -> impl IntoView {
|
|||||||
</Sheet>
|
</Sheet>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<Dialog>
|
<Button
|
||||||
<DialogTrigger
|
on:click=move |_| show_add_modal.1.set(true)
|
||||||
variant=ButtonVariant::Default
|
class="gap-2"
|
||||||
class="gap-2"
|
>
|
||||||
>
|
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="2" stroke="currentColor" class="w-4 h-4 md:w-5 md:h-5">
|
||||||
<Plus class="w-4 h-4 md:w-5 md:h-5" />
|
<path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
|
||||||
<span class="hidden sm:inline">"Add Torrent"</span>
|
</svg>
|
||||||
<span class="sm:hidden">"Add"</span>
|
<span class="hidden sm:inline">"Add Torrent"</span>
|
||||||
</DialogTrigger>
|
<span class="sm:hidden">"Add"</span>
|
||||||
<DialogContent id="add-torrent-dialog" class="sm:max-w-[425px]">
|
</Button>
|
||||||
<AddTorrentDialogContent />
|
|
||||||
</DialogContent>
|
|
||||||
</Dialog>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
// Sağ kısım boş
|
// Sağ kısım boş
|
||||||
<div class="flex flex-1 items-center justify-end gap-2">
|
<div class="flex flex-1 items-center justify-end gap-2">
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<Show when=move || show_add_modal.0.get()>
|
||||||
|
<AddTorrentDialog on_close=Callback::new(move |()| show_add_modal.1.set(false)) />
|
||||||
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,17 @@
|
|||||||
use leptos::prelude::*;
|
use leptos::prelude::*;
|
||||||
use leptos::task::spawn_local;
|
use leptos::task::spawn_local;
|
||||||
use wasm_bindgen::JsCast;
|
|
||||||
use crate::components::ui::input::{Input, InputType};
|
use crate::components::ui::input::{Input, InputType};
|
||||||
|
use crate::store::TorrentStore;
|
||||||
use crate::api;
|
use crate::api;
|
||||||
use crate::components::ui::button::Button;
|
|
||||||
use crate::components::ui::dialog::{
|
use crate::components::ui::button::{Button, ButtonVariant};
|
||||||
DialogBody, DialogHeader, DialogTitle, DialogDescription, DialogFooter, DialogClose
|
|
||||||
};
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn AddTorrentDialogContent() -> impl IntoView {
|
pub fn AddTorrentDialog(
|
||||||
|
on_close: Callback<()>,
|
||||||
|
) -> impl IntoView {
|
||||||
|
let _store = use_context::<TorrentStore>().expect("TorrentStore not provided");
|
||||||
|
|
||||||
let uri = RwSignal::new(String::new());
|
let uri = RwSignal::new(String::new());
|
||||||
let is_loading = signal(false);
|
let is_loading = signal(false);
|
||||||
let error_msg = signal(Option::<String>::None);
|
let error_msg = signal(Option::<String>::None);
|
||||||
@@ -19,30 +21,20 @@ pub fn AddTorrentDialogContent() -> impl IntoView {
|
|||||||
let uri_val = uri.get();
|
let uri_val = uri.get();
|
||||||
|
|
||||||
if uri_val.is_empty() {
|
if uri_val.is_empty() {
|
||||||
error_msg.1.set(Some("Lütfen bir Magnet URI veya URL girin".to_string()));
|
error_msg.1.set(Some("Please enter a Magnet URI or URL".to_string()));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
is_loading.1.set(true);
|
is_loading.1.set(true);
|
||||||
error_msg.1.set(None);
|
error_msg.1.set(None);
|
||||||
|
|
||||||
|
let on_close = on_close.clone();
|
||||||
spawn_local(async move {
|
spawn_local(async move {
|
||||||
match api::torrent::add(&uri_val).await {
|
match api::torrent::add(&uri_val).await {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
log::info!("Torrent added successfully");
|
log::info!("Torrent added successfully");
|
||||||
crate::store::toast_success("Torrent başarıyla eklendi");
|
crate::store::toast_success("Torrent başarıyla eklendi");
|
||||||
|
on_close.run(());
|
||||||
// Programmatically close the dialog by triggering the close button
|
|
||||||
if let Some(doc) = web_sys::window().and_then(|w| w.document()) {
|
|
||||||
if let Some(el) = doc.get_element_by_id("add-torrent-dialog") {
|
|
||||||
if let Some(close_btn) = el.query_selector("[data-dialog-close]").ok().flatten() {
|
|
||||||
let _ = close_btn.dyn_into::<web_sys::HtmlElement>().map(|btn| btn.click());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uri.set(String::new());
|
|
||||||
is_loading.1.set(false);
|
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
log::error!("Failed to add torrent: {:?}", e);
|
log::error!("Failed to add torrent: {:?}", e);
|
||||||
@@ -53,16 +45,29 @@ pub fn AddTorrentDialogContent() -> impl IntoView {
|
|||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|
||||||
|
let handle_backdrop = {
|
||||||
|
let on_close = on_close.clone();
|
||||||
|
move |e: web_sys::MouseEvent| {
|
||||||
|
e.stop_propagation();
|
||||||
|
on_close.run(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<DialogBody>
|
// Backdrop overlay
|
||||||
<DialogHeader>
|
<div
|
||||||
<DialogTitle>"Add Torrent"</DialogTitle>
|
class="fixed inset-0 z-50 bg-background/80 backdrop-blur-sm"
|
||||||
<DialogDescription>
|
on:click=handle_backdrop
|
||||||
"Enter a Magnet link or a .torrent file URL."
|
/>
|
||||||
</DialogDescription>
|
// Dialog panel
|
||||||
</DialogHeader>
|
<div class="fixed left-1/2 top-1/2 z-50 grid w-full max-w-lg -translate-x-1/2 -translate-y-1/2 gap-4 border bg-card p-6 shadow-lg rounded-lg sm:max-w-[425px]">
|
||||||
|
// Header
|
||||||
|
<div class="flex flex-col space-y-1.5 text-center sm:text-left">
|
||||||
|
<h2 class="text-lg font-semibold leading-none tracking-tight">"Add Torrent"</h2>
|
||||||
|
<p class="text-sm text-muted-foreground">"Enter a Magnet link or a .torrent file URL."</p>
|
||||||
|
</div>
|
||||||
|
|
||||||
<form on:submit=handle_submit class="space-y-4 pt-4">
|
<form on:submit=handle_submit class="space-y-4">
|
||||||
<Input
|
<Input
|
||||||
r#type=InputType::Text
|
r#type=InputType::Text
|
||||||
placeholder="magnet:?xt=urn:btih:..."
|
placeholder="magnet:?xt=urn:btih:..."
|
||||||
@@ -76,10 +81,14 @@ pub fn AddTorrentDialogContent() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
})}
|
})}
|
||||||
|
|
||||||
<DialogFooter class="pt-2">
|
<div class="flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2">
|
||||||
<DialogClose>
|
<Button
|
||||||
|
variant=ButtonVariant::Ghost
|
||||||
|
attr:r#type="button"
|
||||||
|
on:click=move |_| on_close.run(())
|
||||||
|
>
|
||||||
"Cancel"
|
"Cancel"
|
||||||
</DialogClose>
|
</Button>
|
||||||
<Button
|
<Button
|
||||||
attr:r#type="submit"
|
attr:r#type="submit"
|
||||||
attr:disabled=move || is_loading.0.get()
|
attr:disabled=move || is_loading.0.get()
|
||||||
@@ -93,8 +102,21 @@ pub fn AddTorrentDialogContent() -> impl IntoView {
|
|||||||
leptos::either::Either::Right(view! { "Add" })
|
leptos::either::Either::Right(view! { "Add" })
|
||||||
}}
|
}}
|
||||||
</Button>
|
</Button>
|
||||||
</DialogFooter>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</DialogBody>
|
|
||||||
|
// Close button (X)
|
||||||
|
<Button
|
||||||
|
variant=ButtonVariant::Ghost
|
||||||
|
class="absolute right-2 top-2 size-8 p-0 opacity-70 hover:opacity-100"
|
||||||
|
on:click=move |_| on_close.run(())
|
||||||
|
>
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="h-4 w-4">
|
||||||
|
<path d="M18 6 6 18"></path>
|
||||||
|
<path d="m6 6 12 12"></path>
|
||||||
|
</svg>
|
||||||
|
<span class="sr-only">"Close"</span>
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -544,14 +544,14 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="flex items-center justify-between px-2 py-1.5 text-[10px] md:text-[11px] text-muted-foreground bg-muted/20 border rounded-md">
|
<div class="hidden md:flex items-center justify-between px-2 py-1 text-[11px] text-muted-foreground bg-muted/20 border rounded-md">
|
||||||
<div class="flex gap-3 md:gap-4">
|
<div class="flex gap-4">
|
||||||
<span>{move || format!("Toplam: {} torrent", filtered_hashes.get().len())}</span>
|
<span>{move || format!("Toplam: {} torrent", filtered_hashes.get().len())}</span>
|
||||||
<Show when=move || has_selection.get()>
|
<Show when=move || has_selection.get()>
|
||||||
<span class="text-primary font-bold">{move || format!("{} seçili", selected_count.get())}</span>
|
<span class="text-primary font-medium">{move || format!("{} torrent seçili", selected_count.get())}</span>
|
||||||
</Show>
|
</Show>
|
||||||
</div>
|
</div>
|
||||||
<div class="opacity-50">"VibeTorrent v3"</div>
|
<div>"VibeTorrent v3"</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
}.into_any()
|
}.into_any()
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ pub enum BadgeVariant {
|
|||||||
#[default]
|
#[default]
|
||||||
Default,
|
Default,
|
||||||
Secondary,
|
Secondary,
|
||||||
Outline,
|
|
||||||
Destructive,
|
Destructive,
|
||||||
Success,
|
Success,
|
||||||
Warning,
|
Warning,
|
||||||
@@ -22,7 +21,6 @@ pub fn Badge(
|
|||||||
let variant_classes = match variant {
|
let variant_classes = match variant {
|
||||||
BadgeVariant::Default => "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
|
BadgeVariant::Default => "border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
|
||||||
BadgeVariant::Secondary => "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
|
BadgeVariant::Secondary => "border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
|
||||||
BadgeVariant::Outline => "text-foreground",
|
|
||||||
BadgeVariant::Destructive => "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
|
BadgeVariant::Destructive => "border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
|
||||||
BadgeVariant::Success => "border-transparent bg-green-500/10 text-green-600 dark:text-green-400 border-green-500/20",
|
BadgeVariant::Success => "border-transparent bg-green-500/10 text-green-600 dark:text-green-400 border-green-500/20",
|
||||||
BadgeVariant::Warning => "border-transparent bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 border-yellow-500/20",
|
BadgeVariant::Warning => "border-transparent bg-yellow-500/10 text-yellow-600 dark:text-yellow-400 border-yellow-500/20",
|
||||||
|
|||||||
@@ -1,72 +0,0 @@
|
|||||||
use leptos::prelude::*;
|
|
||||||
use tailwind_fuse::tw_merge;
|
|
||||||
use crate::components::ui::button::{Button, ButtonVariant};
|
|
||||||
|
|
||||||
#[component]
|
|
||||||
pub fn ButtonAction(
|
|
||||||
children: Children,
|
|
||||||
#[prop(into)] on_action: Callback<()>,
|
|
||||||
#[prop(optional, into)] class: String,
|
|
||||||
#[prop(default = 1000)] hold_duration: u64,
|
|
||||||
#[prop(default = ButtonVariant::Default)] variant: ButtonVariant,
|
|
||||||
) -> impl IntoView {
|
|
||||||
let is_holding = RwSignal::new(false);
|
|
||||||
let generation = StoredValue::new(0u64);
|
|
||||||
|
|
||||||
let on_down = move |_| {
|
|
||||||
generation.update_value(|g| *g += 1);
|
|
||||||
is_holding.set(true);
|
|
||||||
};
|
|
||||||
|
|
||||||
let on_up = move |_| is_holding.set(false);
|
|
||||||
|
|
||||||
Effect::new(move |_| {
|
|
||||||
if is_holding.get() {
|
|
||||||
let current_gen = generation.get_value();
|
|
||||||
leptos::task::spawn_local(async move {
|
|
||||||
gloo_timers::future::TimeoutFuture::new(hold_duration as u32).await;
|
|
||||||
// Double validation: Is user still holding AND is it the SAME hold attempt?
|
|
||||||
if is_holding.get_untracked() && generation.get_value() == current_gen {
|
|
||||||
on_action.run(());
|
|
||||||
is_holding.set(false);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let merged_class = move || tw_merge!(
|
|
||||||
"relative overflow-hidden transition-all active:scale-[0.98]",
|
|
||||||
class.clone()
|
|
||||||
);
|
|
||||||
|
|
||||||
view! {
|
|
||||||
<style>
|
|
||||||
"@keyframes button-hold-progress {
|
|
||||||
from { width: 0%; }
|
|
||||||
to { width: 100%; }
|
|
||||||
}
|
|
||||||
.animate-button-hold {
|
|
||||||
animation: button-hold-progress var(--button-hold-duration) linear forwards;
|
|
||||||
}"
|
|
||||||
</style>
|
|
||||||
<Button
|
|
||||||
variant=variant
|
|
||||||
class=merged_class()
|
|
||||||
attr:style=format!("--button-hold-duration: {}ms", hold_duration)
|
|
||||||
on:mousedown=on_down
|
|
||||||
on:mouseup=on_up
|
|
||||||
on:mouseleave=on_up
|
|
||||||
on:touchstart=move |_| is_holding.set(true)
|
|
||||||
on:touchend=move |_| is_holding.set(false)
|
|
||||||
>
|
|
||||||
// Progress Overlay
|
|
||||||
<Show when=move || is_holding.get()>
|
|
||||||
<div class="absolute inset-0 bg-white/20 dark:bg-black/20 pointer-events-none animate-button-hold" />
|
|
||||||
</Show>
|
|
||||||
|
|
||||||
<span class="relative z-10 flex items-center justify-center gap-2">
|
|
||||||
{children()}
|
|
||||||
</span>
|
|
||||||
</Button>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -78,6 +78,76 @@ pub fn ContextMenuAction(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[component]
|
||||||
|
pub fn ContextMenuHoldAction(
|
||||||
|
children: Children,
|
||||||
|
#[prop(into)] on_hold_complete: Callback<()>,
|
||||||
|
#[prop(optional, into)] class: String,
|
||||||
|
#[prop(default = 1000)] hold_duration: u64,
|
||||||
|
) -> impl IntoView {
|
||||||
|
let is_holding = RwSignal::new(false);
|
||||||
|
let progress = RwSignal::new(0.0);
|
||||||
|
|
||||||
|
let on_mousedown = move |_| {
|
||||||
|
is_holding.set(true);
|
||||||
|
progress.set(0.0);
|
||||||
|
};
|
||||||
|
|
||||||
|
let on_mouseup = move |_| {
|
||||||
|
is_holding.set(false);
|
||||||
|
progress.set(0.0);
|
||||||
|
};
|
||||||
|
|
||||||
|
Effect::new(move |_| {
|
||||||
|
if is_holding.get() {
|
||||||
|
let start_time = js_sys::Date::now();
|
||||||
|
let duration = hold_duration as f64;
|
||||||
|
|
||||||
|
leptos::task::spawn_local(async move {
|
||||||
|
while is_holding.get_untracked() {
|
||||||
|
let now = js_sys::Date::now();
|
||||||
|
let elapsed = now - start_time;
|
||||||
|
let p = (elapsed / duration).min(1.0);
|
||||||
|
progress.set(p * 100.0);
|
||||||
|
|
||||||
|
if p >= 1.0 {
|
||||||
|
on_hold_complete.run(());
|
||||||
|
is_holding.set(false);
|
||||||
|
close_context_menu();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
gloo_timers::future::TimeoutFuture::new(16).await; // ~60fps
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
let class = tw_merge!(
|
||||||
|
"relative flex cursor-pointer select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors overflow-hidden",
|
||||||
|
class
|
||||||
|
);
|
||||||
|
|
||||||
|
view! {
|
||||||
|
<div
|
||||||
|
class=class
|
||||||
|
on:mousedown=on_mousedown
|
||||||
|
on:mouseup=on_mouseup
|
||||||
|
on:mouseleave=on_mouseup
|
||||||
|
on:touchstart=move |_| on_mousedown(web_sys::MouseEvent::new("mousedown").unwrap())
|
||||||
|
on:touchend=move |_| on_mouseup(web_sys::MouseEvent::new("mouseup").unwrap())
|
||||||
|
>
|
||||||
|
// Progress background
|
||||||
|
<div
|
||||||
|
class="absolute inset-y-0 left-0 bg-destructive/20 transition-all duration-75 ease-linear pointer-events-none"
|
||||||
|
style=move || format!("width: {}%;", progress.get())
|
||||||
|
/>
|
||||||
|
<span class="relative z-10 flex items-center gap-2 w-full">
|
||||||
|
{children()}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
}.into_any()
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct ContextMenuContext {
|
struct ContextMenuContext {
|
||||||
target_id: String,
|
target_id: String,
|
||||||
@@ -139,7 +209,7 @@ pub fn ContextMenuTrigger(
|
|||||||
class=trigger_class
|
class=trigger_class
|
||||||
data-name="ContextMenuTrigger"
|
data-name="ContextMenuTrigger"
|
||||||
data-context-trigger=ctx.target_id
|
data-context-trigger=ctx.target_id
|
||||||
on:contextmenu=move |e: web_sys::MouseEvent| {
|
on:contextmenu=move |_e: web_sys::MouseEvent| {
|
||||||
if let Some(cb) = on_open {
|
if let Some(cb) = on_open {
|
||||||
cb.run(());
|
cb.run(());
|
||||||
}
|
}
|
||||||
@@ -327,7 +397,7 @@ pub fn ContextMenuContent(
|
|||||||
target_id_for_script,
|
target_id_for_script,
|
||||||
)}
|
)}
|
||||||
</script>
|
</script>
|
||||||
}
|
}.into_any()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
// * Reuse @table.rs
|
// * Reuse @table.rs
|
||||||
pub use crate::components::ui::table::{
|
pub use crate::components::ui::table::{
|
||||||
Table as DataTable, TableBody as DataTableBody, TableCaption as DataTableCaption, TableCell as DataTableCell,
|
Table as DataTable, TableBody as DataTableBody, TableCell as DataTableCell,
|
||||||
TableFooter as DataTableFooter, TableHead as DataTableHead, TableHeader as DataTableHeader,
|
TableHead as DataTableHead, TableHeader as DataTableHeader,
|
||||||
TableRow as DataTableRow, TableWrapper as DataTableWrapper,
|
TableRow as DataTableRow, TableWrapper as DataTableWrapper,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -72,13 +72,13 @@ pub fn DialogTrigger(
|
|||||||
pub fn DialogContent(
|
pub fn DialogContent(
|
||||||
children: Children,
|
children: Children,
|
||||||
#[prop(optional, into)] class: String,
|
#[prop(optional, into)] class: String,
|
||||||
#[prop(optional, into)] id: Option<String>,
|
|
||||||
#[prop(into, optional)] hide_close_button: Option<bool>,
|
#[prop(into, optional)] hide_close_button: Option<bool>,
|
||||||
#[prop(default = true)] close_on_backdrop_click: bool,
|
#[prop(default = true)] close_on_backdrop_click: bool,
|
||||||
#[prop(default = "Dialog")] data_name_prefix: &'static str,
|
#[prop(default = "Dialog")] data_name_prefix: &'static str,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
let ctx = expect_context::<DialogContext>();
|
let ctx = expect_context::<DialogContext>();
|
||||||
let merged_class = tw_merge!(
|
let merged_class = tw_merge!(
|
||||||
|
// "flex flex-col gap-4", // TODO 🐛 Bug when I try to have this.. Using DialogBody instead.
|
||||||
"relative bg-background border rounded-2xl shadow-lg p-6 w-full max-w-[calc(100%-2rem)] max-h-[85vh] fixed top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] z-100 transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100",
|
"relative bg-background border rounded-2xl shadow-lg p-6 w-full max-w-[calc(100%-2rem)] max-h-[85vh] fixed top-[50%] left-[50%] translate-x-[-50%] translate-y-[-50%] z-100 transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100",
|
||||||
class
|
class
|
||||||
);
|
);
|
||||||
@@ -88,14 +88,10 @@ pub fn DialogContent(
|
|||||||
|
|
||||||
let target_id_clone = ctx.target_id.clone();
|
let target_id_clone = ctx.target_id.clone();
|
||||||
let backdrop_id = format!("{}_backdrop", ctx.target_id);
|
let backdrop_id = format!("{}_backdrop", ctx.target_id);
|
||||||
|
let target_id_for_script = ctx.target_id.clone();
|
||||||
let backdrop_id_for_script = backdrop_id.clone();
|
let backdrop_id_for_script = backdrop_id.clone();
|
||||||
let backdrop_behavior = if close_on_backdrop_click { "auto" } else { "manual" };
|
let backdrop_behavior = if close_on_backdrop_click { "auto" } else { "manual" };
|
||||||
|
|
||||||
// Use provided id or fallback to random target_id
|
|
||||||
let final_id = id.unwrap_or_else(|| ctx.target_id.clone());
|
|
||||||
let final_id_for_script = final_id.clone();
|
|
||||||
let trigger_id_for_script = ctx.target_id.clone();
|
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<script src="/lock_scroll.js"></script>
|
<script src="/lock_scroll.js"></script>
|
||||||
|
|
||||||
@@ -109,7 +105,7 @@ pub fn DialogContent(
|
|||||||
<div
|
<div
|
||||||
data-name=content_data_name
|
data-name=content_data_name
|
||||||
class=merged_class
|
class=merged_class
|
||||||
id=final_id
|
id=ctx.target_id
|
||||||
data-target="target__dialog"
|
data-target="target__dialog"
|
||||||
data-state="closed"
|
data-state="closed"
|
||||||
data-backdrop=backdrop_behavior
|
data-backdrop=backdrop_behavior
|
||||||
@@ -151,7 +147,9 @@ pub fn DialogContent(
|
|||||||
dialog.setAttribute('data-initialized', 'true');
|
dialog.setAttribute('data-initialized', 'true');
|
||||||
|
|
||||||
const openDialog = () => {{
|
const openDialog = () => {{
|
||||||
if (window.ScrollLock) window.ScrollLock.lock();
|
// Lock scrolling
|
||||||
|
window.ScrollLock.lock();
|
||||||
|
|
||||||
dialog.setAttribute('data-state', 'open');
|
dialog.setAttribute('data-state', 'open');
|
||||||
backdrop.setAttribute('data-state', 'open');
|
backdrop.setAttribute('data-state', 'open');
|
||||||
dialog.style.pointerEvents = 'auto';
|
dialog.style.pointerEvents = 'auto';
|
||||||
@@ -163,18 +161,28 @@ pub fn DialogContent(
|
|||||||
backdrop.setAttribute('data-state', 'closed');
|
backdrop.setAttribute('data-state', 'closed');
|
||||||
dialog.style.pointerEvents = 'none';
|
dialog.style.pointerEvents = 'none';
|
||||||
backdrop.style.pointerEvents = 'none';
|
backdrop.style.pointerEvents = 'none';
|
||||||
|
|
||||||
|
// Unlock scrolling after animation
|
||||||
window.ScrollLock.unlock(200);
|
window.ScrollLock.unlock(200);
|
||||||
}};
|
}};
|
||||||
|
|
||||||
|
// Open dialog when trigger is clicked
|
||||||
trigger.addEventListener('click', openDialog);
|
trigger.addEventListener('click', openDialog);
|
||||||
dialog.querySelectorAll('[data-dialog-close]').forEach(btn => {{
|
|
||||||
|
// Close buttons
|
||||||
|
const closeButtons = dialog.querySelectorAll('[data-dialog-close]');
|
||||||
|
closeButtons.forEach(btn => {{
|
||||||
btn.addEventListener('click', closeDialog);
|
btn.addEventListener('click', closeDialog);
|
||||||
}});
|
}});
|
||||||
|
|
||||||
|
// Close on backdrop click (if data-backdrop="auto")
|
||||||
backdrop.addEventListener('click', () => {{
|
backdrop.addEventListener('click', () => {{
|
||||||
if (dialog.getAttribute('data-backdrop') === 'auto') {{
|
if (dialog.getAttribute('data-backdrop') === 'auto') {{
|
||||||
closeDialog();
|
closeDialog();
|
||||||
}}
|
}}
|
||||||
}});
|
}});
|
||||||
|
|
||||||
|
// Handle ESC key to close
|
||||||
document.addEventListener('keydown', (e) => {{
|
document.addEventListener('keydown', (e) => {{
|
||||||
if (e.key === 'Escape' && dialog.getAttribute('data-state') === 'open') {{
|
if (e.key === 'Escape' && dialog.getAttribute('data-state') === 'open') {{
|
||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
@@ -182,12 +190,17 @@ pub fn DialogContent(
|
|||||||
}}
|
}}
|
||||||
}});
|
}});
|
||||||
}};
|
}};
|
||||||
setupDialog();
|
|
||||||
|
if (document.readyState === 'loading') {{
|
||||||
|
document.addEventListener('DOMContentLoaded', setupDialog);
|
||||||
|
}} else {{
|
||||||
|
setupDialog();
|
||||||
|
}}
|
||||||
}})();
|
}})();
|
||||||
"#,
|
"#,
|
||||||
final_id_for_script,
|
target_id_for_script,
|
||||||
backdrop_id_for_script,
|
backdrop_id_for_script,
|
||||||
trigger_id_for_script,
|
target_id_for_script,
|
||||||
)}
|
)}
|
||||||
</script>
|
</script>
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,8 +94,6 @@ pub fn DropdownMenuAction(
|
|||||||
#[prop(optional, into)] class: String,
|
#[prop(optional, into)] class: String,
|
||||||
#[prop(optional, into)] href: Option<String>,
|
#[prop(optional, into)] href: Option<String>,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
let _ctx = expect_context::<DropdownMenuContext>();
|
|
||||||
|
|
||||||
let class = tw_merge!(
|
let class = tw_merge!(
|
||||||
"inline-flex gap-2 items-center w-full text-sm text-left transition-colors duration-200 focus:outline-none focus-visible:outline-none text-popover-foreground [&_svg:not([class*='size-'])]:size-4 hover:bg-accent hover:text-accent-foreground",
|
"inline-flex gap-2 items-center w-full text-sm text-left transition-colors duration-200 focus:outline-none focus-visible:outline-none text-popover-foreground [&_svg:not([class*='size-'])]:size-4 hover:bg-accent hover:text-accent-foreground",
|
||||||
class
|
class
|
||||||
@@ -175,17 +173,15 @@ pub enum DropdownMenuAlign {
|
|||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct DropdownMenuContext {
|
struct DropdownMenuContext {
|
||||||
target_id: String,
|
target_id: String,
|
||||||
align: DropdownMenuAlign,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn DropdownMenu(
|
pub fn DropdownMenu(
|
||||||
children: Children,
|
children: Children,
|
||||||
#[prop(default = DropdownMenuAlign::default())] align: DropdownMenuAlign,
|
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
let dropdown_target_id = use_random_id_for("dropdown");
|
let dropdown_target_id = use_random_id_for("dropdown");
|
||||||
|
|
||||||
let ctx = DropdownMenuContext { target_id: dropdown_target_id.clone(), align };
|
let ctx = DropdownMenuContext { target_id: dropdown_target_id.clone() };
|
||||||
|
|
||||||
view! {
|
view! {
|
||||||
<Provider value=ctx>
|
<Provider value=ctx>
|
||||||
@@ -252,12 +248,13 @@ pub enum DropdownMenuPosition {
|
|||||||
pub fn DropdownMenuContent(
|
pub fn DropdownMenuContent(
|
||||||
children: Children,
|
children: Children,
|
||||||
#[prop(optional, into)] class: String,
|
#[prop(optional, into)] class: String,
|
||||||
|
#[prop(default = DropdownMenuAlign::default())] align: DropdownMenuAlign,
|
||||||
#[prop(default = DropdownMenuPosition::default())] position: DropdownMenuPosition,
|
#[prop(default = DropdownMenuPosition::default())] position: DropdownMenuPosition,
|
||||||
) -> impl IntoView {
|
) -> impl IntoView {
|
||||||
let ctx = expect_context::<DropdownMenuContext>();
|
let ctx = expect_context::<DropdownMenuContext>();
|
||||||
|
|
||||||
let base_classes = "z-50 p-1 rounded-md border bg-card shadow-md h-fit fixed transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100";
|
let base_classes = "z-50 p-1 rounded-md border bg-card shadow-md h-fit fixed transition-all duration-200 data-[state=closed]:opacity-0 data-[state=closed]:scale-95 data-[state=open]:opacity-100 data-[state=open]:scale-100";
|
||||||
let width_class = match ctx.align {
|
let width_class = match align {
|
||||||
DropdownMenuAlign::Center => "min-w-full",
|
DropdownMenuAlign::Center => "min-w-full",
|
||||||
_ => "w-[180px]",
|
_ => "w-[180px]",
|
||||||
};
|
};
|
||||||
@@ -265,7 +262,7 @@ pub fn DropdownMenuContent(
|
|||||||
let class = tw_merge!(width_class, base_classes, class);
|
let class = tw_merge!(width_class, base_classes, class);
|
||||||
|
|
||||||
let target_id_for_script = ctx.target_id.clone();
|
let target_id_for_script = ctx.target_id.clone();
|
||||||
let align_for_script = match ctx.align {
|
let align_for_script = match align {
|
||||||
DropdownMenuAlign::Start => "start",
|
DropdownMenuAlign::Start => "start",
|
||||||
DropdownMenuAlign::StartOuter => "start-outer",
|
DropdownMenuAlign::StartOuter => "start-outer",
|
||||||
DropdownMenuAlign::End => "end",
|
DropdownMenuAlign::End => "end",
|
||||||
@@ -442,26 +439,6 @@ pub fn DropdownMenuContent(
|
|||||||
trigger.addEventListener('click', (e) => {{
|
trigger.addEventListener('click', (e) => {{
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
|
|
||||||
// Check if any other dropdown is open
|
|
||||||
const allDropdowns = document.querySelectorAll('[data-target=\"target__dropdown\"]');
|
|
||||||
let otherDropdownOpen = false;
|
|
||||||
allDropdowns.forEach(dd => {{
|
|
||||||
if (dd !== dropdown && dd.getAttribute('data-state') === 'open') {{
|
|
||||||
otherDropdownOpen = true;
|
|
||||||
dd.setAttribute('data-state', 'closed');
|
|
||||||
dd.style.pointerEvents = 'none';
|
|
||||||
// Unlock scroll
|
|
||||||
if (window.ScrollLock) {{
|
|
||||||
window.ScrollLock.unlock(200);
|
|
||||||
}}
|
|
||||||
}}
|
|
||||||
}});
|
|
||||||
|
|
||||||
// If another dropdown was open, just close it and don't open this one
|
|
||||||
if (otherDropdownOpen) {{
|
|
||||||
return;
|
|
||||||
}}
|
|
||||||
|
|
||||||
// Normal toggle behavior
|
// Normal toggle behavior
|
||||||
if (isOpen) {{
|
if (isOpen) {{
|
||||||
closeDropdown();
|
closeDropdown();
|
||||||
@@ -533,4 +510,4 @@ pub fn DropdownMenuSubItem(children: Children, #[prop(optional, into)] class: St
|
|||||||
{children()}
|
{children()}
|
||||||
</li>
|
</li>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ pub mod accordion;
|
|||||||
pub mod alert_dialog;
|
pub mod alert_dialog;
|
||||||
pub mod badge;
|
pub mod badge;
|
||||||
pub mod button;
|
pub mod button;
|
||||||
pub mod button_action;
|
|
||||||
pub mod card;
|
pub mod card;
|
||||||
pub mod checkbox;
|
pub mod checkbox;
|
||||||
pub mod context_menu;
|
pub mod context_menu;
|
||||||
@@ -18,7 +17,6 @@ pub mod sheet;
|
|||||||
pub mod sidenav;
|
pub mod sidenav;
|
||||||
pub mod skeleton;
|
pub mod skeleton;
|
||||||
pub mod svg_icon;
|
pub mod svg_icon;
|
||||||
pub mod switch;
|
|
||||||
pub mod table;
|
pub mod table;
|
||||||
pub mod theme_toggle;
|
pub mod theme_toggle;
|
||||||
pub mod toast;
|
pub mod toast;
|
||||||
@@ -9,7 +9,7 @@ use crate::components::hooks::use_can_scroll_vertical::use_can_scroll_vertical;
|
|||||||
use crate::components::hooks::use_random::use_random_id_for;
|
use crate::components::hooks::use_random::use_random_id_for;
|
||||||
// * Reuse @select.rs
|
// * Reuse @select.rs
|
||||||
pub use crate::components::ui::select::{
|
pub use crate::components::ui::select::{
|
||||||
SelectGroup as MultiSelectGroup, SelectItem as MultiSelectItem, SelectLabel as MultiSelectLabel,
|
SelectGroup as MultiSelectGroup, SelectItem as MultiSelectItem,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq, Eq, Default)]
|
#[derive(Clone, Copy, PartialEq, Eq, Default)]
|
||||||
|
|||||||
@@ -31,9 +31,6 @@ pub struct SheetContext {
|
|||||||
/* ✨ FUNCTIONS ✨ */
|
/* ✨ FUNCTIONS ✨ */
|
||||||
/* ========================================================== */
|
/* ========================================================== */
|
||||||
|
|
||||||
pub type SheetVariant = ButtonVariant;
|
|
||||||
pub type SheetSize = ButtonSize;
|
|
||||||
|
|
||||||
#[component]
|
#[component]
|
||||||
pub fn Sheet(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
|
pub fn Sheet(children: Children, #[prop(optional, into)] class: String) -> impl IntoView {
|
||||||
let sheet_target_id = use_random_id_for("sheet");
|
let sheet_target_id = use_random_id_for("sheet");
|
||||||
@@ -203,7 +200,7 @@ pub fn SheetContent(
|
|||||||
target_id_for_script,
|
target_id_for_script,
|
||||||
)}
|
)}
|
||||||
</script>
|
</script>
|
||||||
}.into_any()
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ========================================================== */
|
/* ========================================================== */
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
use leptos::prelude::*;
|
|
||||||
use tailwind_fuse::tw_merge;
|
|
||||||
|
|
||||||
#[component]
|
|
||||||
pub fn Switch(
|
|
||||||
#[prop(into)] checked: Signal<bool>,
|
|
||||||
#[prop(into, optional)] on_checked_change: Option<Callback<bool>>,
|
|
||||||
#[prop(into, optional)] class: String,
|
|
||||||
#[prop(into, optional)] disabled: Signal<bool>,
|
|
||||||
) -> impl IntoView {
|
|
||||||
let checked_val = move || checked.get();
|
|
||||||
let disabled_val = move || disabled.get();
|
|
||||||
|
|
||||||
let track_class = move || tw_merge!(
|
|
||||||
"inline-flex h-5 w-9 shrink-0 cursor-pointer items-center rounded-full border-2 border-transparent transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:ring-offset-background disabled:cursor-not-allowed disabled:opacity-50",
|
|
||||||
if checked_val() { "bg-primary" } else { "bg-input" },
|
|
||||||
class.clone()
|
|
||||||
);
|
|
||||||
|
|
||||||
let thumb_class = move || tw_merge!(
|
|
||||||
"pointer-events-none block h-4 w-4 rounded-full bg-background shadow-lg ring-0 transition-transform",
|
|
||||||
if checked_val() { "translate-x-4" } else { "translate-x-0" }
|
|
||||||
);
|
|
||||||
|
|
||||||
view! {
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
role="switch"
|
|
||||||
aria-checked=move || checked_val().to_string()
|
|
||||||
disabled=disabled_val
|
|
||||||
class=track_class
|
|
||||||
on:click=move |e| {
|
|
||||||
e.prevent_default();
|
|
||||||
if let Some(cb) = on_checked_change {
|
|
||||||
cb.run(!checked_val());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
>
|
|
||||||
<span class=thumb_class />
|
|
||||||
</button>
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -170,10 +170,9 @@ pub fn Toaster(#[prop(default = SonnerPosition::default())] position: SonnerPosi
|
|||||||
<div
|
<div
|
||||||
class=tw_merge!(
|
class=tw_merge!(
|
||||||
"fixed z-[100] flex gap-3 pointer-events-none w-full sm:w-[400px]",
|
"fixed z-[100] flex gap-3 pointer-events-none w-full sm:w-[400px]",
|
||||||
"left-1/2 -translate-x-1/2 sm:left-auto sm:translate-x-0 px-4 sm:px-0", // Mobile centering fix
|
|
||||||
if is_bottom { "flex-col-reverse" } else { "flex-col" },
|
if is_bottom { "flex-col-reverse" } else { "flex-col" },
|
||||||
container_class,
|
container_class,
|
||||||
"pb-[env(safe-area-inset-bottom)] pt-[env(safe-area-inset-top)]"
|
"pb-[env(safe-area-inset-bottom)] pt-[env(safe-area-inset-top)] px-4 sm:px-0"
|
||||||
)
|
)
|
||||||
>
|
>
|
||||||
<For
|
<For
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ use leptos::task::spawn_local;
|
|||||||
use shared::{AppEvent, GlobalStats, NotificationLevel, Torrent};
|
use shared::{AppEvent, GlobalStats, NotificationLevel, Torrent};
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
use struct_patch::traits::Patch;
|
use struct_patch::traits::Patch;
|
||||||
use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD as BASE64_URL};
|
|
||||||
use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
|
use base64::{Engine as _, engine::general_purpose::STANDARD as BASE64};
|
||||||
use wasm_bindgen::JsCast;
|
|
||||||
|
|
||||||
use crate::components::ui::toast::{ToastType, toast};
|
use crate::components::ui::toast::{ToastType, toast};
|
||||||
|
|
||||||
@@ -26,6 +24,8 @@ pub fn show_toast(level: NotificationLevel, message: impl Into<String>) {
|
|||||||
toast(msg, variant);
|
toast(msg, variant);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
pub fn toast_success(message: impl Into<String>) { show_toast(NotificationLevel::Success, message); }
|
pub fn toast_success(message: impl Into<String>) { show_toast(NotificationLevel::Success, message); }
|
||||||
pub fn toast_error(message: impl Into<String>) { show_toast(NotificationLevel::Error, message); }
|
pub fn toast_error(message: impl Into<String>) { show_toast(NotificationLevel::Error, message); }
|
||||||
|
|
||||||
@@ -54,7 +54,6 @@ pub struct TorrentStore {
|
|||||||
pub global_stats: RwSignal<GlobalStats>,
|
pub global_stats: RwSignal<GlobalStats>,
|
||||||
pub user: RwSignal<Option<String>>,
|
pub user: RwSignal<Option<String>>,
|
||||||
pub selected_torrent: RwSignal<Option<String>>,
|
pub selected_torrent: RwSignal<Option<String>>,
|
||||||
pub push_enabled: RwSignal<bool>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn provide_torrent_store() {
|
pub fn provide_torrent_store() {
|
||||||
@@ -64,20 +63,12 @@ pub fn provide_torrent_store() {
|
|||||||
let global_stats = RwSignal::new(GlobalStats::default());
|
let global_stats = RwSignal::new(GlobalStats::default());
|
||||||
let user = RwSignal::new(Option::<String>::None);
|
let user = RwSignal::new(Option::<String>::None);
|
||||||
let selected_torrent = RwSignal::new(Option::<String>::None);
|
let selected_torrent = RwSignal::new(Option::<String>::None);
|
||||||
let push_enabled = RwSignal::new(false);
|
|
||||||
|
|
||||||
let show_browser_notification = crate::utils::notification::use_app_notification();
|
let show_browser_notification = crate::utils::notification::use_app_notification();
|
||||||
|
|
||||||
let store = TorrentStore { torrents, filter, search_query, global_stats, user, selected_torrent, push_enabled };
|
let store = TorrentStore { torrents, filter, search_query, global_stats, user, selected_torrent };
|
||||||
provide_context(store);
|
provide_context(store);
|
||||||
|
|
||||||
// Initial check for push status
|
|
||||||
spawn_local(async move {
|
|
||||||
if let Ok(enabled) = is_push_subscribed().await {
|
|
||||||
push_enabled.set(enabled);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
let global_stats_for_sse = global_stats;
|
let global_stats_for_sse = global_stats;
|
||||||
let torrents_for_sse = torrents;
|
let torrents_for_sse = torrents;
|
||||||
let show_browser_notification = show_browser_notification.clone();
|
let show_browser_notification = show_browser_notification.clone();
|
||||||
@@ -88,12 +79,17 @@ pub fn provide_torrent_store() {
|
|||||||
let mut disconnect_notified = false;
|
let mut disconnect_notified = false;
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
|
||||||
|
log::debug!("SSE: Creating EventSource...");
|
||||||
let es_result = EventSource::new("/api/events");
|
let es_result = EventSource::new("/api/events");
|
||||||
match es_result {
|
match es_result {
|
||||||
Ok(mut es) => {
|
Ok(mut es) => {
|
||||||
|
log::debug!("SSE: EventSource created, subscribing...");
|
||||||
if let Ok(mut stream) = es.subscribe("message") {
|
if let Ok(mut stream) = es.subscribe("message") {
|
||||||
|
log::debug!("SSE: Subscribed to message channel");
|
||||||
let mut got_first_message = false;
|
let mut got_first_message = false;
|
||||||
while let Some(Ok((_, msg))) = stream.next().await {
|
while let Some(Ok((_, msg))) = stream.next().await {
|
||||||
|
log::debug!("SSE: Received message");
|
||||||
if !got_first_message {
|
if !got_first_message {
|
||||||
got_first_message = true;
|
got_first_message = true;
|
||||||
backoff_ms = 1000;
|
backoff_ms = 1000;
|
||||||
@@ -105,30 +101,47 @@ pub fn provide_torrent_store() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(data_str) = msg.data().as_string() {
|
if let Some(data_str) = msg.data().as_string() {
|
||||||
if let Ok(bytes) = BASE64.decode(&data_str) {
|
// Decode Base64
|
||||||
if let Ok(event) = rmp_serde::from_slice::<AppEvent>(&bytes) {
|
match BASE64.decode(&data_str) {
|
||||||
match event {
|
Ok(bytes) => {
|
||||||
AppEvent::FullList(list, _) => {
|
// Deserialize MessagePack
|
||||||
torrents_for_sse.update(|map| {
|
match rmp_serde::from_slice::<AppEvent>(&bytes) {
|
||||||
let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
|
Ok(event) => {
|
||||||
map.retain(|hash, _| new_hashes.contains(hash));
|
match event {
|
||||||
for new_torrent in list { map.insert(new_torrent.hash.clone(), new_torrent); }
|
AppEvent::FullList(list, _) => {
|
||||||
});
|
log::info!("SSE: Received FullList with {} torrents", list.len());
|
||||||
}
|
torrents_for_sse.update(|map| {
|
||||||
AppEvent::Update(patch) => {
|
let new_hashes: std::collections::HashSet<String> = list.iter().map(|t| t.hash.clone()).collect();
|
||||||
if let Some(hash) = patch.hash.clone() {
|
map.retain(|hash, _| new_hashes.contains(hash));
|
||||||
torrents_for_sse.update(|map| { if let Some(t) = map.get_mut(&hash) { t.apply(patch); } });
|
for new_torrent in list {
|
||||||
}
|
map.insert(new_torrent.hash.clone(), new_torrent);
|
||||||
}
|
}
|
||||||
AppEvent::Stats(stats) => { global_stats_for_sse.set(stats); }
|
});
|
||||||
AppEvent::Notification(n) => {
|
log::debug!("SSE: torrents map now has {} entries", torrents_for_sse.with(|m| m.len()));
|
||||||
show_toast(n.level.clone(), n.message.clone());
|
}
|
||||||
if n.message.contains("tamamlandı") || n.level == shared::NotificationLevel::Error {
|
AppEvent::Update(patch) => {
|
||||||
show_browser_notification("VibeTorrent", &n.message);
|
let hash_opt = patch.hash.clone();
|
||||||
|
if let Some(hash) = hash_opt {
|
||||||
|
torrents_for_sse.update(|map| {
|
||||||
|
if let Some(t) = map.get_mut(&hash) {
|
||||||
|
t.apply(patch);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
AppEvent::Stats(stats) => { global_stats_for_sse.set(stats); }
|
||||||
|
AppEvent::Notification(n) => {
|
||||||
|
show_toast(n.level.clone(), n.message.clone());
|
||||||
|
if n.message.contains("tamamlandı") || n.level == shared::NotificationLevel::Error {
|
||||||
|
show_browser_notification("VibeTorrent", &n.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Err(e) => log::error!("SSE: Failed to deserialize MessagePack: {}", e),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Err(e) => log::error!("SSE: Failed to decode Base64: {}", e),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -145,106 +158,13 @@ pub fn provide_torrent_store() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
log::debug!("SSE: Reconnecting in {}ms...", backoff_ms);
|
||||||
gloo_timers::future::TimeoutFuture::new(backoff_ms).await;
|
gloo_timers::future::TimeoutFuture::new(backoff_ms).await;
|
||||||
backoff_ms = std::cmp::min(backoff_ms * 2, 30000);
|
backoff_ms = std::cmp::min(backoff_ms * 2, 30000);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn is_push_subscribed() -> Result<bool, String> {
|
|
||||||
let window = web_sys::window().ok_or("no window")?;
|
|
||||||
let navigator = window.navigator();
|
|
||||||
let sw_container = navigator.service_worker();
|
|
||||||
|
|
||||||
let registration = wasm_bindgen_futures::JsFuture::from(sw_container.ready().map_err(|e| format!("{:?}", e))?)
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("{:?}", e))?
|
|
||||||
.dyn_into::<web_sys::ServiceWorkerRegistration>()
|
|
||||||
.map_err(|_| "not a registration")?;
|
|
||||||
|
|
||||||
let push_manager = registration.push_manager().map_err(|e| format!("{:?}", e))?;
|
|
||||||
let subscription = wasm_bindgen_futures::JsFuture::from(push_manager.get_subscription().map_err(|e| format!("{:?}", e))?)
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("{:?}", e))?;
|
|
||||||
|
|
||||||
Ok(!subscription.is_null())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn subscribe_to_push_notifications() {
|
pub async fn subscribe_to_push_notifications() {
|
||||||
let window = web_sys::window().expect("no window");
|
// ...
|
||||||
let navigator = window.navigator();
|
|
||||||
let sw_container = navigator.service_worker();
|
|
||||||
|
|
||||||
let registration = match wasm_bindgen_futures::JsFuture::from(sw_container.ready().expect("sw not ready")).await {
|
|
||||||
Ok(reg) => reg.dyn_into::<web_sys::ServiceWorkerRegistration>().expect("not a reg"),
|
|
||||||
Err(e) => { log::error!("SW Ready Error: {:?}", e); return; }
|
|
||||||
};
|
|
||||||
|
|
||||||
// 1. Get Public Key from Backend
|
|
||||||
let public_key_res: Result<String, _> = shared::server_fns::push::get_public_key().await;
|
|
||||||
let public_key = match public_key_res {
|
|
||||||
Ok(key) => key,
|
|
||||||
Err(e) => { log::error!("Failed to get public key: {:?}", e); return; }
|
|
||||||
};
|
|
||||||
|
|
||||||
// 2. Convert base64 key to Uint8Array
|
|
||||||
let decoded_key = BASE64_URL.decode(public_key.trim()).expect("invalid public key");
|
|
||||||
let key_array = js_sys::Uint8Array::from(&decoded_key[..]);
|
|
||||||
|
|
||||||
// 3. Prepare Options
|
|
||||||
let mut options = web_sys::PushSubscriptionOptionsInit::new();
|
|
||||||
options.set_user_visible_only(true);
|
|
||||||
options.set_application_server_key(&key_array.into());
|
|
||||||
|
|
||||||
// 4. Subscribe
|
|
||||||
let push_manager = registration.push_manager().expect("no push manager");
|
|
||||||
match wasm_bindgen_futures::JsFuture::from(push_manager.subscribe_with_options(&options).expect("subscribe failed")).await {
|
|
||||||
Ok(subscription) => {
|
|
||||||
let sub_js = subscription.clone();
|
|
||||||
|
|
||||||
// Use JS to extract JSON string representation
|
|
||||||
let json_str = js_sys::JSON::stringify(&sub_js).expect("stringify failed").as_string().expect("not a string");
|
|
||||||
let sub_obj: serde_json::Value = serde_json::from_str(&json_str).expect("serde from str failed");
|
|
||||||
|
|
||||||
let endpoint = sub_obj["endpoint"].as_str().expect("no endpoint").to_string();
|
|
||||||
let p256dh = sub_obj["keys"]["p256dh"].as_str().expect("no p256dh").to_string();
|
|
||||||
let auth = sub_obj["keys"]["auth"].as_str().expect("no auth").to_string();
|
|
||||||
|
|
||||||
// 5. Save to Backend
|
|
||||||
match shared::server_fns::push::subscribe_push(endpoint, p256dh, auth).await {
|
|
||||||
Ok(_) => {
|
|
||||||
log::info!("Push subscription saved successfully");
|
|
||||||
toast_success("Bildirimler aktif edildi");
|
|
||||||
}
|
|
||||||
Err(e) => log::error!("Failed to save subscription: {:?}", e),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => log::error!("Subscription Error: {:?}", e),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn unsubscribe_from_push_notifications() {
|
|
||||||
let window = web_sys::window().expect("no window");
|
|
||||||
let sw_container = window.navigator().service_worker();
|
|
||||||
|
|
||||||
let registration = wasm_bindgen_futures::JsFuture::from(sw_container.ready().expect("sw not ready")).await
|
|
||||||
.unwrap().dyn_into::<web_sys::ServiceWorkerRegistration>().unwrap();
|
|
||||||
|
|
||||||
let push_manager = registration.push_manager().unwrap();
|
|
||||||
if let Ok(sub_future) = push_manager.get_subscription() {
|
|
||||||
if let Ok(subscription) = wasm_bindgen_futures::JsFuture::from(sub_future).await {
|
|
||||||
if !subscription.is_null() {
|
|
||||||
let sub = subscription.dyn_into::<web_sys::PushSubscription>().unwrap();
|
|
||||||
let endpoint = sub.endpoint();
|
|
||||||
|
|
||||||
// 1. Unsubscribe in Browser
|
|
||||||
let _ = wasm_bindgen_futures::JsFuture::from(sub.unsubscribe().unwrap()).await;
|
|
||||||
|
|
||||||
// 2. Remove from Backend
|
|
||||||
let _ = shared::server_fns::push::unsubscribe_push(endpoint).await;
|
|
||||||
log::info!("Push subscription removed");
|
|
||||||
show_toast(NotificationLevel::Info, "Bildirimler kapatıldı");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
372
package-lock.json
generated
372
package-lock.json
generated
@@ -1,372 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "vibetorrent-v3",
|
|
||||||
"lockfileVersion": 3,
|
|
||||||
"requires": true,
|
|
||||||
"packages": {
|
|
||||||
"": {
|
|
||||||
"dependencies": {
|
|
||||||
"@tailwindcss/cli": "^4.1.18",
|
|
||||||
"tailwindcss": "^4.1.18",
|
|
||||||
"tw-animate-css": "^1.4.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@jridgewell/gen-mapping": {
|
|
||||||
"version": "0.3.13",
|
|
||||||
"resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
|
|
||||||
"integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@jridgewell/sourcemap-codec": "^1.5.0",
|
|
||||||
"@jridgewell/trace-mapping": "^0.3.24"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@jridgewell/remapping": {
|
|
||||||
"version": "2.3.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
|
|
||||||
"integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@jridgewell/gen-mapping": "^0.3.5",
|
|
||||||
"@jridgewell/trace-mapping": "^0.3.24"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@jridgewell/resolve-uri": {
|
|
||||||
"version": "3.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
|
|
||||||
"integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@jridgewell/sourcemap-codec": {
|
|
||||||
"version": "1.5.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
|
|
||||||
"integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@jridgewell/trace-mapping": {
|
|
||||||
"version": "0.3.31",
|
|
||||||
"resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
|
|
||||||
"integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@jridgewell/resolve-uri": "^3.1.0",
|
|
||||||
"@jridgewell/sourcemap-codec": "^1.4.14"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@parcel/watcher": {
|
|
||||||
"version": "2.5.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.5.6.tgz",
|
|
||||||
"integrity": "sha512-tmmZ3lQxAe/k/+rNnXQRawJ4NjxO2hqiOLTHvWchtGZULp4RyFeh6aU4XdOYBFe2KE1oShQTv4AblOs2iOrNnQ==",
|
|
||||||
"hasInstallScript": true,
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"detect-libc": "^2.0.3",
|
|
||||||
"is-glob": "^4.0.3",
|
|
||||||
"node-addon-api": "^7.0.0",
|
|
||||||
"picomatch": "^4.0.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10.0.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/parcel"
|
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"@parcel/watcher-android-arm64": "2.5.6",
|
|
||||||
"@parcel/watcher-darwin-arm64": "2.5.6",
|
|
||||||
"@parcel/watcher-darwin-x64": "2.5.6",
|
|
||||||
"@parcel/watcher-freebsd-x64": "2.5.6",
|
|
||||||
"@parcel/watcher-linux-arm-glibc": "2.5.6",
|
|
||||||
"@parcel/watcher-linux-arm-musl": "2.5.6",
|
|
||||||
"@parcel/watcher-linux-arm64-glibc": "2.5.6",
|
|
||||||
"@parcel/watcher-linux-arm64-musl": "2.5.6",
|
|
||||||
"@parcel/watcher-linux-x64-glibc": "2.5.6",
|
|
||||||
"@parcel/watcher-linux-x64-musl": "2.5.6",
|
|
||||||
"@parcel/watcher-win32-arm64": "2.5.6",
|
|
||||||
"@parcel/watcher-win32-ia32": "2.5.6",
|
|
||||||
"@parcel/watcher-win32-x64": "2.5.6"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@parcel/watcher-darwin-arm64": {
|
|
||||||
"version": "2.5.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.5.6.tgz",
|
|
||||||
"integrity": "sha512-Z2ZdrnwyXvvvdtRHLmM4knydIdU9adO3D4n/0cVipF3rRiwP+3/sfzpAwA/qKFL6i1ModaabkU7IbpeMBgiVEA==",
|
|
||||||
"cpu": [
|
|
||||||
"arm64"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10.0.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/parcel"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tailwindcss/cli": {
|
|
||||||
"version": "4.1.18",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tailwindcss/cli/-/cli-4.1.18.tgz",
|
|
||||||
"integrity": "sha512-sMZ+lZbDyxwjD2E0L7oRUjJ01Ffjtme5OtjvvnC+cV4CEDcbqzbp25TCpxHj6kWLU9+DlqJOiNgSOgctC2aZmg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@parcel/watcher": "^2.5.1",
|
|
||||||
"@tailwindcss/node": "4.1.18",
|
|
||||||
"@tailwindcss/oxide": "4.1.18",
|
|
||||||
"enhanced-resolve": "^5.18.3",
|
|
||||||
"mri": "^1.2.0",
|
|
||||||
"picocolors": "^1.1.1",
|
|
||||||
"tailwindcss": "4.1.18"
|
|
||||||
},
|
|
||||||
"bin": {
|
|
||||||
"tailwindcss": "dist/index.mjs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tailwindcss/node": {
|
|
||||||
"version": "4.1.18",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.18.tgz",
|
|
||||||
"integrity": "sha512-DoR7U1P7iYhw16qJ49fgXUlry1t4CpXeErJHnQ44JgTSKMaZUdf17cfn5mHchfJ4KRBZRFA/Coo+MUF5+gOaCQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@jridgewell/remapping": "^2.3.4",
|
|
||||||
"enhanced-resolve": "^5.18.3",
|
|
||||||
"jiti": "^2.6.1",
|
|
||||||
"lightningcss": "1.30.2",
|
|
||||||
"magic-string": "^0.30.21",
|
|
||||||
"source-map-js": "^1.2.1",
|
|
||||||
"tailwindcss": "4.1.18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tailwindcss/oxide": {
|
|
||||||
"version": "4.1.18",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.18.tgz",
|
|
||||||
"integrity": "sha512-EgCR5tTS5bUSKQgzeMClT6iCY3ToqE1y+ZB0AKldj809QXk1Y+3jB0upOYZrn9aGIzPtUsP7sX4QQ4XtjBB95A==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10"
|
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"@tailwindcss/oxide-android-arm64": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-darwin-arm64": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-darwin-x64": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-freebsd-x64": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-linux-arm64-gnu": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-linux-arm64-musl": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-linux-x64-gnu": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-linux-x64-musl": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-wasm32-wasi": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-win32-arm64-msvc": "4.1.18",
|
|
||||||
"@tailwindcss/oxide-win32-x64-msvc": "4.1.18"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@tailwindcss/oxide-darwin-arm64": {
|
|
||||||
"version": "4.1.18",
|
|
||||||
"resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.18.tgz",
|
|
||||||
"integrity": "sha512-Gc2q4Qhs660bhjyBSKgq6BYvwDz4G+BuyJ5H1xfhmDR3D8HnHCmT/BSkvSL0vQLy/nkMLY20PQ2OoYMO15Jd0A==",
|
|
||||||
"cpu": [
|
|
||||||
"arm64"
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 10"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/detect-libc": {
|
|
||||||
"version": "2.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
|
|
||||||
"integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
|
|
||||||
"license": "Apache-2.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/enhanced-resolve": {
|
|
||||||
"version": "5.19.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz",
|
|
||||||
"integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"graceful-fs": "^4.2.4",
|
|
||||||
"tapable": "^2.3.0"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10.13.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/graceful-fs": {
|
|
||||||
"version": "4.2.11",
|
|
||||||
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
|
|
||||||
"integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==",
|
|
||||||
"license": "ISC"
|
|
||||||
},
|
|
||||||
"node_modules/is-extglob": {
|
|
||||||
"version": "2.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
|
||||||
"integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/is-glob": {
|
|
||||||
"version": "4.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
|
||||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"is-extglob": "^2.1.1"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/jiti": {
|
|
||||||
"version": "2.6.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
|
|
||||||
"integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
|
||||||
"jiti": "lib/jiti-cli.mjs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/lightningcss": {
|
|
||||||
"version": "1.30.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz",
|
|
||||||
"integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==",
|
|
||||||
"license": "MPL-2.0",
|
|
||||||
"dependencies": {
|
|
||||||
"detect-libc": "^2.0.3"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 12.0.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/parcel"
|
|
||||||
},
|
|
||||||
"optionalDependencies": {
|
|
||||||
"lightningcss-android-arm64": "1.30.2",
|
|
||||||
"lightningcss-darwin-arm64": "1.30.2",
|
|
||||||
"lightningcss-darwin-x64": "1.30.2",
|
|
||||||
"lightningcss-freebsd-x64": "1.30.2",
|
|
||||||
"lightningcss-linux-arm-gnueabihf": "1.30.2",
|
|
||||||
"lightningcss-linux-arm64-gnu": "1.30.2",
|
|
||||||
"lightningcss-linux-arm64-musl": "1.30.2",
|
|
||||||
"lightningcss-linux-x64-gnu": "1.30.2",
|
|
||||||
"lightningcss-linux-x64-musl": "1.30.2",
|
|
||||||
"lightningcss-win32-arm64-msvc": "1.30.2",
|
|
||||||
"lightningcss-win32-x64-msvc": "1.30.2"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/lightningcss-darwin-arm64": {
|
|
||||||
"version": "1.30.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz",
|
|
||||||
"integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==",
|
|
||||||
"cpu": [
|
|
||||||
"arm64"
|
|
||||||
],
|
|
||||||
"license": "MPL-2.0",
|
|
||||||
"optional": true,
|
|
||||||
"os": [
|
|
||||||
"darwin"
|
|
||||||
],
|
|
||||||
"engines": {
|
|
||||||
"node": ">= 12.0.0"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/parcel"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/magic-string": {
|
|
||||||
"version": "0.30.21",
|
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
|
|
||||||
"integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@jridgewell/sourcemap-codec": "^1.5.5"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/mri": {
|
|
||||||
"version": "1.2.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz",
|
|
||||||
"integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=4"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/node-addon-api": {
|
|
||||||
"version": "7.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
|
|
||||||
"integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/picocolors": {
|
|
||||||
"version": "1.1.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
|
|
||||||
"integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
|
|
||||||
"license": "ISC"
|
|
||||||
},
|
|
||||||
"node_modules/picomatch": {
|
|
||||||
"version": "4.0.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz",
|
|
||||||
"integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=12"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/jonschlinkert"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/source-map-js": {
|
|
||||||
"version": "1.2.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
|
|
||||||
"integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
|
|
||||||
"license": "BSD-3-Clause",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=0.10.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/tailwindcss": {
|
|
||||||
"version": "4.1.18",
|
|
||||||
"resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.18.tgz",
|
|
||||||
"integrity": "sha512-4+Z+0yiYyEtUVCScyfHCxOYP06L5Ne+JiHhY2IjR2KWMIWhJOYZKLSGZaP5HkZ8+bY0cxfzwDE5uOmzFXyIwxw==",
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/tapable": {
|
|
||||||
"version": "2.3.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
|
|
||||||
"integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=6"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/webpack"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/tw-animate-css": {
|
|
||||||
"version": "1.4.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/tw-animate-css/-/tw-animate-css-1.4.0.tgz",
|
|
||||||
"integrity": "sha512-7bziOlRqH0hJx80h/3mbicLW7o8qLsH5+RaLR2t+OHM3D0JlWGODQKQ4cxbK7WlvmUxpcj6Kgu6EKqjrGFe3QQ==",
|
|
||||||
"license": "MIT",
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/Wombosvideo"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"type": "module",
|
|
||||||
"dependencies": {
|
|
||||||
"@tailwindcss/cli": "^4.1.18",
|
|
||||||
"tailwindcss": "^4.1.18",
|
|
||||||
"tw-animate-css": "^1.4.0"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -20,13 +20,3 @@ pub async fn subscribe_push(
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| ServerFnError::new(format!("Failed to save subscription: {}", e)))
|
.map_err(|e| ServerFnError::new(format!("Failed to save subscription: {}", e)))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[server(UnsubscribePush, "/api/server_fns")]
|
|
||||||
pub async fn unsubscribe_push(endpoint: String) -> Result<(), ServerFnError> {
|
|
||||||
let db_ctx = expect_context::<crate::DbContext>();
|
|
||||||
db_ctx
|
|
||||||
.db
|
|
||||||
.remove_push_subscription(&endpoint)
|
|
||||||
.await
|
|
||||||
.map_err(|e| ServerFnError::new(format!("Failed to remove subscription: {}", e)))
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
base_color = "neutral"
|
|
||||||
base_path_components = "backend/src/components"
|
|
||||||
Reference in New Issue
Block a user