refactor: layout

TinsFox · Nov 2, 2024 · c884b96 · c884b96
1 parent b1be784
commit c884b96
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 77 deletions.
diff --git a/src/components/layout/page-header.tsx b/src/components/layout/page-header.tsx
diff --git a/src/components/layout/search.tsx → src/components/search.tsx b/src/components/layout/search.tsx → src/components/search.tsx
@@ -10,8 +10,8 @@ import { Button } from "@/components/ui/button"
 import { languages } from "@/i18n"
 import { cn } from "@/lib/utils"
 
-import { Icons } from "../icons"
-import { useTheme } from "../theme/theme-provider"
+import { Icons } from "./icons"
+import { useTheme } from "./theme/theme-provider"
 import {
   CommandDialog,
   CommandEmpty,
@@ -20,7 +20,7 @@ import {
   CommandItem,
   CommandList,
   CommandSeparator,
-} from "../ui/command"
+} from "./ui/command"
 
 export function Search({ ...props }: ButtonProps & DialogProps) {
   const navigate = useNavigate()

diff --git a/src/pages/(admin)/charts/[chartName]/layout.tsx b/src/pages/(admin)/charts/[chartName]/layout.tsx
@@ -1,17 +1,17 @@
 import { Link, Outlet, useLoaderData } from "react-router-dom"
 
 import { Announcement } from "@/components/announcement"
-import {
-  PageActions,
-  PageHeader,
-  PageHeaderDescription,
-  PageHeaderHeading,
-} from "@/components/layout/page-header"
 import { ThemesSwitcher } from "@/components/theme/themes-selector"
 import { Button } from "@/components/ui/button"
 import { THEMES } from "@/lib/themes"
 
 import { ChartsNav } from "../charts-nav"
+import {
+  PageActions,
+  PageHeader,
+  PageHeaderDescription,
+  PageHeaderHeading,
+} from "../components/page-header"
 
 export const loader = async ({
   params,

diff --git a/src/pages/(admin)/layout.tsx b/src/pages/(admin)/layout.tsx
@@ -2,8 +2,8 @@ import { Link, Outlet, redirect } from "react-router-dom"
 
 import { AppSidebar } from "@/components/app-sidebar"
 import { Icons } from "@/components/icons"
-import { Search } from "@/components/layout/search"
 import { NavBreadcrumb } from "@/components/nav-breadcrumb"
+import { Search } from "@/components/search"
 import { ThemeCustomizer } from "@/components/theme/theme-customizer"
 import { ThemeSwitcher } from "@/components/theme/theme-switcher"
 import { Button } from "@/components/ui/button"

diff --git a/src/pages/(main)/layout.tsx b/src/pages/(main)/layout.tsx
@@ -1,7 +1,7 @@
 import { Link, Outlet } from "react-router-dom"
 
 import { Logo } from "@/components/icons/logo"
-import { Search } from "@/components/layout/search"
+import { Search } from "@/components/search"
 import { Button } from "@/components/ui/button"
 
 export function Component() {