cargo fmt

src/components/ui/aspect_ratio.rs

@@ -1,8 +1,8 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 
 /// A simple wrapper component that maintains a specified aspect ratio for its content.
-/// 
+///
 /// # Example
 /// ```rust
 /// rsx! {

src/components/ui/calendar.rs

@@ -1,6 +1,6 @@
+use super::utils::merge_class;
 use crate::time::{Duration, NaiveDate};
 use dioxus::prelude::*;
-use super::utils::merge_class;
 const WEEKDAY_LABELS: [&str; 7] = ["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"];
 
 fn first_day_of_month(date: NaiveDate) -> NaiveDate {

src/components/ui/card.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Card(#[props(into, default)] class: Option<String>, children: Element) -> Element {
     let classes = merge_class("ui-card", class);

src/components/ui/checkbox.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Checkbox(
     #[props(default)] checked: bool,

src/components/ui/collapsible.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[derive(Clone)]
 struct CollapsibleContext {
     open: Signal<bool>,

src/components/ui/combobox.rs

@@ -1,6 +1,6 @@
-use dioxus::prelude::*;
-use super::utils::merge_class;
 use super::input::Input;
+use super::utils::merge_class;
+use dioxus::prelude::*;
 #[derive(Clone, PartialEq)]
 pub struct ComboboxOption {
     pub label: String,

src/components/ui/command.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::input::Input;
+use dioxus::prelude::*;
 
 #[derive(Clone, PartialEq)]
 pub struct CommandItem {

src/components/ui/dropdown_menu.rs

@@ -1,5 +1,5 @@
+use super::button::{Button, ButtonSize, ButtonVariant};
 use dioxus::prelude::*;
-use super::button::{Button, ButtonVariant, ButtonSize};
 
 #[derive(Clone, PartialEq)]
 pub enum DropdownItemVariant {
@@ -97,10 +97,7 @@ pub fn DropdownMenu(
 }
 
 #[component]
-fn DropdownMenuItemButton(
+fn DropdownMenuItemButton(item: DropdownMenuItem, on_click: EventHandler<String>) -> Element {
-    item: DropdownMenuItem,
-    on_click: EventHandler<String>,
-) -> Element {
     let value = item.value.clone();
 
     rsx! {
@@ -111,9 +108,9 @@ fn DropdownMenuItemButton(
             on_click: move |_| on_click.call(value.clone()),
             span { "{item.label}" }
             if let Some(shortcut) = item.shortcut {
-                span { 
+                span {
-                    style: "margin-left: auto; font-size: 0.75rem; opacity: 0.6;", 
+                    style: "margin-left: auto; font-size: 0.75rem; opacity: 0.6;",
-                    "{shortcut}" 
+                    "{shortcut}"
                 }
             }
         }

src/components/ui/file_drop_zone.rs

@@ -1,7 +1,7 @@
+use super::utils::merge_class;
 use dioxus::html::events::{DragEvent, FormEvent};
 use dioxus::html::{FileData, HasFileData};
 use dioxus::prelude::*;
-use super::utils::merge_class;
 #[derive(Clone, Debug, PartialEq)]
 pub struct FileMetadata {
     pub name: String,

src/components/ui/form_field.rs

@@ -1,6 +1,6 @@
+use super::utils::merge_class;
 use crate::components::ui::Label;
 use dioxus::prelude::*;
-use super::utils::merge_class;
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum FormMessageVariant {
     Helper,

src/components/ui/input.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Input(
     #[props(into, default)] class: Option<String>,

src/components/ui/label.rs

@@ -1,8 +1,8 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 
 /// Label component for form fields with consistent styling.
-/// 
+///
 /// # Example
 /// ```rust
 /// rsx! {

src/components/ui/menubar.rs

@@ -1,5 +1,5 @@
+use super::button::{Button, ButtonSize, ButtonVariant};
 use dioxus::prelude::*;
-use super::button::{Button, ButtonVariant, ButtonSize};
 
 #[derive(Clone, PartialEq)]
 pub struct MenubarItem {
@@ -111,15 +111,12 @@ fn MenubarMenuTrigger(
 }
 
 #[component]
-fn MenubarItemButton(
+fn MenubarItemButton(item: MenubarItem, on_select: EventHandler<String>) -> Element {
-    item: MenubarItem,
-    on_select: EventHandler<String>,
-) -> Element {
     let value = item.value.clone();
-    let variant = if item.destructive { 
+    let variant = if item.destructive {
-        ButtonVariant::Destructive 
+        ButtonVariant::Destructive
-    } else { 
+    } else {
-        ButtonVariant::Ghost 
+        ButtonVariant::Ghost
     };
 
     rsx! {
@@ -130,9 +127,9 @@ fn MenubarItemButton(
             on_click: move |_| on_select.call(value.clone()),
             span { "{item.label}" }
             if let Some(shortcut) = item.shortcut {
-                span { 
+                span {
-                    style: "margin-left: auto; font-size: 0.75rem; opacity: 0.6;", 
+                    style: "margin-left: auto; font-size: 0.75rem; opacity: 0.6;",
-                    "{shortcut}" 
+                    "{shortcut}"
                 }
             }
         }

src/components/ui/pagination.rs

@@ -1,5 +1,5 @@
+use super::button::{Button, ButtonSize, ButtonVariant};
 use dioxus::prelude::*;
-use super::button::{Button, ButtonVariant, ButtonSize};
 
 #[component]
 pub fn Pagination(
@@ -36,11 +36,11 @@ pub fn Pagination(
             for page in buttons {
                 {
                     if page == 0 {
-                        rsx! { 
+                        rsx! {
-                            span { 
+                            span {
-                                class: "ui-pagination-ellipsis", 
+                                class: "ui-pagination-ellipsis",
-                                "…" 
+                                "…"
-                            } 
+                            }
                         }
                     } else {
                         let is_active = current() == page;

src/components/ui/popover.rs

@@ -12,7 +12,9 @@ pub fn Popover(
     #[props(into, default = "bottom".to_string())] placement: String,
 ) -> Element {
     let mut open = use_signal(|| false);
-    use_context_provider(|| PopoverHandle { state: open.clone() });
+    use_context_provider(|| PopoverHandle {
+        state: open.clone(),
+    });
 
     rsx! {
         div {

src/components/ui/progress.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Progress(
     #[props(default = 0.0f32)] value: f32,

src/components/ui/radio_group.rs

@@ -1,7 +1,7 @@
 use std::sync::atomic::{AtomicUsize, Ordering};
 
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 static RADIO_GROUP_IDS: AtomicUsize = AtomicUsize::new(0);
 
 fn next_radio_group_name() -> String {

src/components/ui/scroll_area.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn ScrollArea(
     #[props(into, default)] class: Option<String>,

src/components/ui/separator.rs

@@ -1,8 +1,8 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 
 /// Horizontal or vertical separator/divider component.
-/// 
+///
 /// # Example
 /// ```rust
 /// rsx! {

src/components/ui/sidebar.rs

@@ -1,5 +1,5 @@
+use super::utils::{data_bool, merge_class};
 use dioxus::prelude::*;
-use super::utils::{merge_class, data_bool};
 #[component]
 pub fn Sidebar(
     #[props(default)] collapsed: bool,

src/components/ui/skeleton.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Skeleton(
     #[props(into, default)] class: Option<String>,

src/components/ui/slider.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Slider(
     #[props(default = 0.0f32)] value: f32,

src/components/ui/switch.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Switch(
     #[props(default)] checked: bool,

src/components/ui/tabs.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum TabsOrientation {

src/components/ui/textarea.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Textarea(
     #[props(into, default)] class: Option<String>,

src/components/ui/toggle.rs

@@ -1,5 +1,5 @@
-use dioxus::prelude::*;
 use super::utils::merge_class;
+use dioxus::prelude::*;
 #[component]
 pub fn Toggle(
     #[props(default)] pressed: bool,

src/components/ui/toggle_group.rs

@@ -1,6 +1,6 @@
+use super::utils::merge_class;
 use crate::components::ui::Toggle;
 use dioxus::prelude::*;
-use super::utils::merge_class;
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub enum ToggleGroupMode {
     Single,

src/components/ui/utils.rs

@@ -29,10 +29,7 @@ mod tests {
 
     #[test]
     fn test_merge_class_with_extra() {
-        assert_eq!(
+        assert_eq!(merge_class("base", Some("extra".to_string())), "base extra");
-            merge_class("base", Some("extra".to_string())),
-            "base extra"
-        );
     }
 
     #[test]

src/views/home.rs

@@ -1,9 +1,7 @@
 use crate::components::ui::{
-    Accordion, AccordionContent, AccordionItem, AccordionTrigger,
+    Accordion, AccordionContent, AccordionItem, AccordionTrigger, Badge, BadgeVariant, Button,
-    Badge, BadgeVariant, Button, ButtonVariant, Card, CardContent,
+    ButtonVariant, Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle, Progress,
-    CardDescription, CardFooter, CardHeader, CardTitle,
+    Tabs, TabsContent, TabsList, TabsTrigger,
-    Progress, Tabs,
-    TabsContent, TabsList, TabsTrigger,
 };
 use dioxus::prelude::*;
 

src/views/orders.rs

@@ -992,7 +992,7 @@ pub fn Orders() -> Element {
                             {
                                 let selected_rows = use_signal(|| std::collections::HashSet::<String>::new());
                                 let selected_count = selected_rows().len();
-                                
+
                                 let columns = vec![
                                     TableColumnConfig {
                                         id: "number".to_string(),