From adf682a981d9f005695d2286957e99f95244535c Mon Sep 17 00:00:00 2001 From: Amatsugu Date: Thu, 29 May 2025 21:27:15 -0400 Subject: [PATCH] misc --- AobaClient/src/components/basic/button.rs | 8 +++---- AobaClient/src/components/basic/input.rs | 14 +++++++----- AobaClient/src/components/media_grid.rs | 15 +++---------- AobaClient/src/components/media_item.rs | 26 ++++++----------------- AobaClient/src/components/navbar.rs | 9 +++----- AobaClient/src/components/notif.rs | 17 ++++++--------- AobaClient/src/components/search.rs | 7 +++--- AobaClient/src/layouts/main_layout.rs | 9 ++++---- AobaClient/src/main.rs | 2 +- AobaClient/src/views/home.rs | 4 +--- AobaClient/src/views/login.rs | 26 +++++++++++++++-------- AobaClient/src/views/settings.rs | 5 +---- 12 files changed, 59 insertions(+), 83 deletions(-) diff --git a/AobaClient/src/components/basic/button.rs b/AobaClient/src/components/basic/button.rs index df7940e..8b59cc2 100644 --- a/AobaClient/src/components/basic/button.rs +++ b/AobaClient/src/components/basic/button.rs @@ -19,10 +19,10 @@ pub fn Button(props: ButtonProps) -> Element { rsx! { button { onclick: move |event| { - event.prevent_default(); - if let Some(h) = props.onclick { - h.call(event); - } + event.prevent_default(); + if let Some(h) = props.onclick { + h.call(event); + } }, "{props.text}" } diff --git a/AobaClient/src/components/basic/input.rs b/AobaClient/src/components/basic/input.rs index 1275e38..81d786c 100644 --- a/AobaClient/src/components/basic/input.rs +++ b/AobaClient/src/components/basic/input.rs @@ -17,14 +17,18 @@ pub fn Input(props: InputProps) -> Element { let ph = props.placeholder.unwrap_or(label.clone()); rsx! { label { - "{label}", + "{label}" input { - type : props.r#type.unwrap_or("text".into()), + r#type: props.r#type.unwrap_or("text".into()), value: props.value, - oninput: move |e| if let Some(mut s) = props.value { s.set(e.value()); }, + oninput: move |e| { + if let Some(mut s) = props.value { + s.set(e.value()); + } + }, name: props.name, - placeholder:ph, - required: props.required + placeholder: ph, + required: props.required, } } } diff --git a/AobaClient/src/components/media_grid.rs b/AobaClient/src/components/media_grid.rs index 73ce7d8..1a6aa12 100644 --- a/AobaClient/src/components/media_grid.rs +++ b/AobaClient/src/components/media_grid.rs @@ -49,7 +49,7 @@ pub fn MediaGrid(props: MediaGridProps) -> Element { match media_result.cloned() { Some(value) => match value { Ok(result) => rsx! { - div{ + div { class: "mediaGrid", {result.items.iter().map(|itm| rsx!{ MediaItem { item: itm.clone() } @@ -57,7 +57,7 @@ pub fn MediaGrid(props: MediaGridProps) -> Element { } }, Err(msg) => rsx! { - div{ + div { class: "mediaGrid", div { "Failed to load results: {msg}" @@ -69,18 +69,9 @@ pub fn MediaGrid(props: MediaGridProps) -> Element { div{ class: "mediaGrid", div { - "No results could be loaded" + "Loading..." } } }, } } - -pub fn Nested() -> Element { - rsx! { - div{ - "test", - slot { } - } - } -} diff --git a/AobaClient/src/components/media_item.rs b/AobaClient/src/components/media_item.rs index 3b31489..9d0207b 100644 --- a/AobaClient/src/components/media_item.rs +++ b/AobaClient/src/components/media_item.rs @@ -15,25 +15,13 @@ pub fn MediaItem(props: MediaItemProps) -> Element { let src = format!("{HOST}/m/thumb/{id}"); rsx! { - a{ - class: "mediaItem", - href: "{HOST}/m/{id}", - target: "_blank", - img{ src: src } - span { - class: "info", - span{ - class: "name", - "{filename}" - }, - span{ - class: "details", - span{ - "{mtype}" - }, - span{ - "{props.item.view_count}" - }, + a { class: "mediaItem", href: "{HOST}/m/{id}", target: "_blank", + img { src } + span { class: "info", + span { class: "name", "{filename}" } + span { class: "details", + span { "{mtype}" } + span { "{props.item.view_count}" } } } } diff --git a/AobaClient/src/components/navbar.rs b/AobaClient/src/components/navbar.rs index 23d43f4..0d25e0c 100644 --- a/AobaClient/src/components/navbar.rs +++ b/AobaClient/src/components/navbar.rs @@ -32,7 +32,7 @@ pub fn MainNaviagation() -> Element { pub fn Branding() -> Element { rsx! { div { class: "branding", - img {src: NAV_ICON, alt: "Aoba"} + img { src: NAV_ICON, alt: "Aoba" } } } } @@ -50,10 +50,7 @@ pub fn Utils() -> Element { rsx! { div { class: "utils", - div{ - onclick: move |_| auth_context.logout(), - "Logout" - } - } + div { onclick: move |_| auth_context.logout(), "Logout" } + } } } diff --git a/AobaClient/src/components/notif.rs b/AobaClient/src/components/notif.rs index 670496d..e732cd4 100644 --- a/AobaClient/src/components/notif.rs +++ b/AobaClient/src/components/notif.rs @@ -25,20 +25,15 @@ pub fn Notif(props: NotifProps) -> Element { }; let m = props.message; rsx! { - div{ - class: "notif {type_class}", - div{ - class: "icon", + div { class: "notif {type_class}", + div { class: "icon", match t { - NotifType::Notice => icons::Error(), - NotifType::Error => icons::Error(), - NotifType::Warning => icons::Warn(), + NotifType::Notice => icons::Error(), + NotifType::Error => icons::Error(), + NotifType::Warning => icons::Warn(), } } - div{ - class: "message", - "{m}" - } + div { class: "message", "{m}" } } } } diff --git a/AobaClient/src/components/search.rs b/AobaClient/src/components/search.rs index 8545343..b7d6128 100644 --- a/AobaClient/src/components/search.rs +++ b/AobaClient/src/components/search.rs @@ -3,13 +3,12 @@ use dioxus::prelude::*; #[component] pub fn Search(query: Signal) -> Element { rsx! { - div{ - class: "searchBar stickyTop", + div { class: "searchBar stickyTop", input { - type: "search", + r#type: "search", placeholder: "Search Files", value: query, - oninput: move |event| query.set(event.value()) + oninput: move |event| query.set(event.value()), } } } diff --git a/AobaClient/src/layouts/main_layout.rs b/AobaClient/src/layouts/main_layout.rs index b775ebb..b2d994d 100644 --- a/AobaClient/src/layouts/main_layout.rs +++ b/AobaClient/src/layouts/main_layout.rs @@ -7,14 +7,13 @@ pub fn MainLayout() -> Element { let auth_context = use_context::(); if auth_context.jwt.cloned().is_none() { - return rsx! { Login { } }; + return rsx! { + Login {} + }; } return rsx! { Navbar {} - div{ - id: "content", - Outlet:: {} - } + div { id: "content", Outlet:: {} } }; } diff --git a/AobaClient/src/main.rs b/AobaClient/src/main.rs index 449244e..664690e 100644 --- a/AobaClient/src/main.rs +++ b/AobaClient/src/main.rs @@ -40,6 +40,6 @@ fn App() -> Element { rel: "stylesheet", href: "https://fonts.googleapis.com/css2?family=Noto+Sans:ital,wght@0,100..900;1,100..900&display=swap", } - Router:: { } + Router:: {} } } diff --git a/AobaClient/src/views/home.rs b/AobaClient/src/views/home.rs index 8f90220..68b4641 100644 --- a/AobaClient/src/views/home.rs +++ b/AobaClient/src/views/home.rs @@ -6,9 +6,7 @@ pub fn Home() -> Element { let query = use_signal(|| "".to_string()); rsx! { - Search { - query: query - }, + Search { query } MediaGrid { query: query.cloned() } } } diff --git a/AobaClient/src/views/login.rs b/AobaClient/src/views/login.rs index 13383c1..2f995aa 100644 --- a/AobaClient/src/views/login.rs +++ b/AobaClient/src/views/login.rs @@ -52,18 +52,26 @@ pub fn Login() -> Element { }; rsx! { - div{ - id: "centralModal", + div { id: "centralModal", if let Some(err) = error.cloned() { - Notif{ type: NotifType::Error, message: err} + Notif { r#type: NotifType::Error, message: err } } - form{ - Input { type : "text", name: "username", label: "Username", value: username, required: true }, - Input { type : "password", name: "password", label: "Password", value: password, required: true }, - button { - onclick: login, - "Login!", + form { + Input { + r#type: "text", + name: "username", + label: "Username", + value: username, + required: true, } + Input { + r#type: "password", + name: "password", + label: "Password", + value: password, + required: true, + } + button { onclick: login, "Login!" } } } } diff --git a/AobaClient/src/views/settings.rs b/AobaClient/src/views/settings.rs index 0f8c066..91ed5df 100644 --- a/AobaClient/src/views/settings.rs +++ b/AobaClient/src/views/settings.rs @@ -25,10 +25,7 @@ pub fn Settings() -> Element { rsx! { "this is settings" div { - pre { - class: "codeSelect", - "{d}" - } + pre { class: "codeSelect", "{d}" } } } }