diff --git a/app/blocks/navbar/app-navbar.tsx b/app/blocks/navbar/app-navbar.tsx index bcb9093e..78eee5ec 100644 --- a/app/blocks/navbar/app-navbar.tsx +++ b/app/blocks/navbar/app-navbar.tsx @@ -1,5 +1,8 @@ "use client" +import * as React from "react" + +import { CommandPalette } from "@/components/command-palette" import { ThemeSwitcher } from "@/components/theme-switcher" import { IconBag2, @@ -20,162 +23,171 @@ import { Avatar, Button, Menu, Navbar, Separator } from "ui" export function AppNavbar({ children, ...props }: React.ComponentProps) { const isUsingIcon = usePathname().includes("navbar-05") + const [open, setOpen] = React.useState(false) return ( - - - - - - - - {isUsingIcon && } - Store - - - {isUsingIcon && } - Mac - - - {isUsingIcon && } - iPad - - - {isUsingIcon && } - iPhone - - - {isUsingIcon && } - Watch - - Vision - Entertainment - Accessories - Support - - - - - - - - - - - - - - - - - Irsyad A. Panjaitan - @irsyadadl - - - - - - Dashboard - - - - Settings - - - - - Command Menu - - - - - Contact Support - - - - - Log out - - - - - - - - - - + <> + + + - - + + + {isUsingIcon && } + Store + + + {isUsingIcon && } + Mac + + + {isUsingIcon && } + iPad + + + {isUsingIcon && } + iPhone + + + {isUsingIcon && } + Watch + + Vision + Entertainment + Accessories + Support + + + + + + + + + + + + + + + + + Irsyad A. Panjaitan + @irsyadadl + + + + + + Dashboard + + + + Settings + + + + + Command Menu + + + + + Contact Support + + + + + Log out + + + + + + + - - - + + + + + - - - - - - - - - - Irsyad A. Panjaitan - @irsyadadl - - + + + + + + + + + + + + + + + + Irsyad A. Panjaitan + @irsyadadl + + - - - Dashboard - - - - Settings - - - - - Command Menu - - - - - Contact Support - - - - - Log out - - - - - + + + Dashboard + + + + Settings + + + + + Command Menu + + + + + Contact Support + + + + + Log out + + + + + - {children} - + {children} + + ) } diff --git a/app/blocks/sidebar/sidebar-02/layout.tsx b/app/blocks/sidebar/sidebar-02/layout.tsx index 12b0f76c..c71b99a2 100644 --- a/app/blocks/sidebar/sidebar-02/layout.tsx +++ b/app/blocks/sidebar/sidebar-02/layout.tsx @@ -3,6 +3,7 @@ import * as React from "react" import { AppSidebar } from "@/app/blocks/sidebar/app-sidebar" +import { CommandPalette } from "@/components/command-palette" import { IconChevronLgDown, IconCirclePerson, @@ -14,53 +15,58 @@ import { import { Avatar, Breadcrumbs, Button, Menu, Separator, Sidebar } from "ui" export default function Layout({ children }: { children: React.ReactNode }) { + const [open, setOpen] = React.useState(false) return ( - - - -
- - - + <> + - - Dashboard + + + +
+ + + - Settings - - -
- - - - - - - - - - Profile - - - - Settings - - - - Security - - - - Log out - - - -
-
-
{children}
-
-
+ + Dashboard + + Settings + +
+
+ + + + + + + + + + Profile + + + + Settings + + + + Security + + + + Log out + + + +
+
+
{children}
+
+
+ ) } diff --git a/components/ui/field.tsx b/components/ui/field.tsx index 602a6ade..beeddf5b 100644 --- a/components/ui/field.tsx +++ b/components/ui/field.tsx @@ -45,7 +45,7 @@ const fieldGroupPrefixStyles = tv({ "flex group-invalid:border-danger group-disabled:bg-secondary group-disabled:opacity-50 items-center group-invalid:focus-within:ring-danger/20", "has-[[data-slot=prefix]]:-mx-0.5 has-[[data-slot=suffix]]:-mx-0.5", "[&_button]:h-8 [&_button]:rounded-md [&_button]:px-2.5 [&_button]:before:rounded-[calc(theme(borderRadius.md)-1px)] [&_button]:after:rounded-[calc(theme(borderRadius.md)-1px)] dark:[&_button]:after:rounded-md", - "[&>[data-slot=prefix]]:ml-2.5 [&>[data-slot=prefix]]:text-muted-fg [&>[data-slot=prefix]>button]:ml-[-7px]", + "[&>[role=progressbar]]:mr-2.5 [&>[data-slot=prefix]]:ml-2.5 [&>[data-slot=prefix]]:text-muted-fg [&>[data-slot=prefix]>button]:ml-[-7px]", "[&>[data-slot=suffix]]:mr-2.5 [&>[data-slot=suffix]]:text-muted-fg [&>[data-slot=suffix]>button]:mr-[-7px]" ] }) diff --git a/components/ui/navbar.tsx b/components/ui/navbar.tsx index b4c6f629..f57a93d4 100644 --- a/components/ui/navbar.tsx +++ b/components/ui/navbar.tsx @@ -82,7 +82,7 @@ const Navbar = ({ const toggleNavbar = React.useCallback(() => { setOpen((open) => !open) - }, [isCompact, setOpen]) + }, [setOpen]) const contextValue = React.useMemo( () => ({ diff --git a/components/ui/text-field.tsx b/components/ui/text-field.tsx index f144ae2e..26263ba9 100644 --- a/components/ui/text-field.tsx +++ b/components/ui/text-field.tsx @@ -69,7 +69,7 @@ const TextField = ({ className={fieldGroupPrefixStyles({ className })} > {isPending && indicatorPlace === "prefix" ? ( - + ) : prefix ? ( {prefix}