refactor: reorganize components into domain folders

x0sina · x0sina · commit 8006d0299ad9 · 2025-11-11T19:44:24.000+03:30
diff --git a/dashboard/src/App.tsx b/dashboard/src/App.tsx
@@ -1,9 +1,9 @@
-import { ThemeProvider } from '@/components/theme-provider'
+import { ThemeProvider } from '@/components/common/theme-provider'
 import { router } from '@/router'
 import { QueryClientProvider } from '@tanstack/react-query'
 import { RouterProvider } from 'react-router'
 import { Toaster } from './components/ui/sonner'
-import DonationPopup from './components/donation-popup'
+import DonationPopup from './components/common/donation-popup'
 import './lib/dayjs'
 import { queryClient } from './utils/query-client'
 
diff --git a/dashboard/src/components/admins/admin-statistics.tsx b/dashboard/src/components/admins/admin-statistics.tsx
@@ -93,3 +93,4 @@ export default function AdminStatisticsSection({ data }: AdminsStatisticsProps)
     </div>
   )
 }
+
diff --git a/dashboard/src/components/admins/admin-status-badge.tsx b/dashboard/src/components/admins/admin-status-badge.tsx
@@ -49,3 +49,4 @@ export const AdminStatusBadge: FC<AdminStatusProps> = ({ isSudo, isDisabled }) =
     </Badge>
   )
 }
+
diff --git a/dashboard/src/components/admins/columns.tsx b/dashboard/src/components/admins/columns.tsx
@@ -4,7 +4,7 @@ import { ChartPie, ChevronDown, MoreVertical, Pen, Power, PowerOff, RefreshCw, T
 import { Button } from '@/components/ui/button'
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu.tsx'
 import { formatBytes } from '@/utils/formatByte.ts'
-import { AdminStatusBadge } from '@/components/admin-status-badge'
+import { AdminStatusBadge } from './admin-status-badge'
 
 interface ColumnSetupProps {
   t: (key: string) => string
diff --git a/dashboard/src/components/charts/all-nodes-stacked-bar-chart.tsx b/dashboard/src/components/charts/all-nodes-stacked-bar-chart.tsx
@@ -14,7 +14,7 @@ import { TrendingUp, Upload, Download, Calendar, Info } from 'lucide-react'
 import { dateUtils } from '@/utils/dateFormatter'
 import { TooltipProps } from 'recharts'
 import { useGetNodes, NodeResponse } from '@/service/api'
-import { useTheme } from '@/components/theme-provider'
+import { useTheme } from '@/components/common/theme-provider'
 import TimeSelector from './time-selector'
 import NodeStatsModal from '@/components/dialogs/node-stats-modal'
 
diff --git a/dashboard/src/components/common/copy-button.tsx b/dashboard/src/components/common/copy-button.tsx
diff --git a/dashboard/src/components/common/donation-popup.tsx b/dashboard/src/components/common/donation-popup.tsx
@@ -1,7 +1,7 @@
 import { Heart, X } from 'lucide-react'
 import { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Button } from './ui/button'
+import { Button } from '@/components/ui/button'
 import { cn } from '@/lib/utils'
 import { getAuthToken } from '@/utils/authStorage'
 
diff --git a/dashboard/src/components/common/github-star.tsx b/dashboard/src/components/common/github-star.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from '@/components/theme-provider'
+import { useTheme } from './theme-provider'
 import { REPO_URL } from '@/constants/Project'
 import GitHubButton from 'react-github-btn'
 
@@ -17,3 +17,4 @@ export const GithubStar = () => {
     </GitHubButton>
   )
 }
+
diff --git a/dashboard/src/components/common/language.tsx b/dashboard/src/components/common/language.tsx
@@ -68,3 +68,4 @@ export const Language: React.FC = () => {
     </DropdownMenu>
   )
 }
+
diff --git a/dashboard/src/components/common/loading-spinner.tsx b/dashboard/src/components/common/loading-spinner.tsx
diff --git a/dashboard/src/components/common/spinner.tsx b/dashboard/src/components/common/spinner.tsx
diff --git a/dashboard/src/components/common/theme-provider.tsx b/dashboard/src/components/common/theme-provider.tsx
@@ -701,3 +701,4 @@ export const useTheme = () => {
 
 // Export color themes for use in components
 export { colorThemes }
+
diff --git a/dashboard/src/components/common/theme-toggle.tsx b/dashboard/src/components/common/theme-toggle.tsx
@@ -1,4 +1,4 @@
-import { Theme, useTheme } from '@/components/theme-provider'
+import { Theme, useTheme } from './theme-provider'
 import { Button } from '@/components/ui/button'
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
 import { Popover, PopoverContent, PopoverTrigger } from '@/components/ui/popover'
@@ -83,3 +83,4 @@ export function ThemeToggle() {
     </DropdownMenu>
   )
 }
+
diff --git a/dashboard/src/components/dialogs/core-config-modal.tsx b/dashboard/src/components/dialogs/core-config-modal.tsx
@@ -1,4 +1,4 @@
-import { CopyButton } from '@/components/copy-button'
+import { CopyButton } from '@/components/common/copy-button'
 import { Button } from '@/components/ui/button'
 import { Checkbox } from '@/components/ui/checkbox'
 import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/components/ui/dialog'
@@ -26,7 +26,7 @@ import { UseFormReturn } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
 import { z } from 'zod'
-import { useTheme } from '../../components/theme-provider'
+import { useTheme } from '@/components/common/theme-provider'
 
 export const coreConfigFormSchema = z.object({
   name: z.string().min(1, 'Name is required'),
diff --git a/dashboard/src/components/dialogs/usage-modal.tsx b/dashboard/src/components/dialogs/usage-modal.tsx
@@ -15,7 +15,7 @@ import { dateUtils } from '@/utils/dateFormatter'
 import { TooltipProps } from 'recharts'
 import { Bar, BarChart, CartesianGrid, XAxis, YAxis, Cell } from 'recharts'
 import useDirDetection from '@/hooks/use-dir-detection'
-import { useTheme } from '@/components/theme-provider'
+import { useTheme } from '@/components/common/theme-provider'
 import NodeStatsModal from './node-stats-modal'
 
 // Helper function to determine period (copied from AllNodesStackedBarChart and CostumeBarChart)
diff --git a/dashboard/src/components/layout/footer.tsx b/dashboard/src/components/layout/footer.tsx
@@ -20,3 +20,4 @@ export const Footer: FC = ({ ...props }) => {
     </div>
   )
 }
+
diff --git a/dashboard/src/components/layout/github-star.tsx b/dashboard/src/components/layout/github-star.tsx
@@ -0,0 +1,20 @@
+import { useTheme } from '@/components/common/theme-provider'
+import { REPO_URL } from '@/constants/Project'
+import GitHubButton from 'react-github-btn'
+
+export const GithubStar = () => {
+  const { theme } = useTheme()
+  const gBtnColor = theme === 'dark' ? 'dark_dimmed' : theme
+  return (
+    <GitHubButton
+      href={REPO_URL}
+      data-color-scheme={`no-preference: ${gBtnColor}; light: ${gBtnColor}; dark: ${gBtnColor};`}
+      data-size="large"
+      data-show-count="true"
+      aria-label="Star PasarGuard on GitHub"
+    >
+      Star
+    </GitHubButton>
+  )
+}
+
diff --git a/dashboard/src/components/layout/goal-progress.tsx b/dashboard/src/components/layout/goal-progress.tsx
@@ -289,3 +289,4 @@ export function GoalProgress() {
     </Card>
   )
 }
+
diff --git a/dashboard/src/components/layout/nav-main.tsx b/dashboard/src/components/layout/nav-main.tsx
diff --git a/dashboard/src/components/layout/nav-secondary.tsx b/dashboard/src/components/layout/nav-secondary.tsx
diff --git a/dashboard/src/components/layout/nav-user.tsx b/dashboard/src/components/layout/nav-user.tsx
@@ -12,8 +12,8 @@ import { formatBytes } from '@/utils/formatByte'
 import { Badge } from '@/components/ui/badge'
 import { removeAuthToken } from '@/utils/authStorage'
 import { queryClient } from '@/utils/query-client'
-import { ThemeToggle } from '@/components/theme-toggle'
-import { Language } from '@/components/language'
+import { ThemeToggle } from '@/components/common/theme-toggle'
+import { Language } from '@/components/common/language'
 
 export function NavUser({
   username,
diff --git a/dashboard/src/components/layout/page-header.tsx b/dashboard/src/components/layout/page-header.tsx
diff --git a/dashboard/src/components/layout/page-transition.tsx b/dashboard/src/components/layout/page-transition.tsx
diff --git a/dashboard/src/components/layout/route-guard.tsx b/dashboard/src/components/layout/route-guard.tsx
diff --git a/dashboard/src/components/layout/sidebar.tsx b/dashboard/src/components/layout/sidebar.tsx
@@ -1,11 +1,11 @@
-import { GithubStar } from '@/components/github-star'
-import { GoalProgress } from '@/components/goal-progress'
-import { Language } from '@/components/language'
-import { NavMain } from '@/components/nav-main'
-import { NavSecondary } from '@/components/nav-secondary'
-import { NavUser } from '@/components/nav-user'
-import { useTheme } from '@/components/theme-provider'
-import { ThemeToggle } from '@/components/theme-toggle'
+import { GithubStar } from '@/components/layout/github-star'
+import { GoalProgress } from '@/components/layout/goal-progress'
+import { Language } from '@/components/common/language'
+import { NavMain } from '@/components/layout/nav-main'
+import { NavSecondary } from '@/components/layout/nav-secondary'
+import { NavUser } from '@/components/layout/nav-user'
+import { useTheme } from '@/components/common/theme-provider'
+import { ThemeToggle } from '@/components/common/theme-toggle'
 import { Sidebar, SidebarContent, SidebarFooter, SidebarHeader, SidebarMenu, SidebarMenuButton, SidebarMenuItem, SidebarRail, SidebarTrigger, useSidebar } from '@/components/ui/sidebar'
 import { Link } from 'react-router'
 import { DISCUSSION_GROUP, DOCUMENTATION, DONATION_URL, REPO_URL } from '@/constants/Project'
diff --git a/dashboard/src/components/layout/top-loading-bar.tsx b/dashboard/src/components/layout/top-loading-bar.tsx
@@ -1,6 +1,6 @@
 import { useEffect, useRef, useMemo, useState, memo } from 'react'
 import { useLocation } from 'react-router'
-import { useTheme } from '@/components/theme-provider'
+import { useTheme } from '@/components/common/theme-provider'
 import LoadingBar from 'react-top-loading-bar'
 
 const shouldIgnoreRoute = (pathname: string): boolean => {
diff --git a/dashboard/src/components/nodes/line-count-filter.tsx b/dashboard/src/components/nodes/line-count-filter.tsx
diff --git a/dashboard/src/components/nodes/since-logs-filter.tsx b/dashboard/src/components/nodes/since-logs-filter.tsx
diff --git a/dashboard/src/components/nodes/status-logs-filter.tsx b/dashboard/src/components/nodes/status-logs-filter.tsx
diff --git a/dashboard/src/components/nodes/terminal-line.tsx b/dashboard/src/components/nodes/terminal-line.tsx
diff --git a/dashboard/src/components/ui/sonner.tsx b/dashboard/src/components/ui/sonner.tsx
@@ -1,4 +1,4 @@
-import { useTheme } from '@/components/theme-provider'
+import { useTheme } from '@/components/common/theme-provider'
 import { Toaster as Sonner } from 'sonner'
 import useDirDetection from '@/hooks/use-dir-detection'
 
diff --git a/dashboard/src/components/users/action-buttons.tsx b/dashboard/src/components/users/action-buttons.tsx
@@ -11,15 +11,15 @@ import { FC, useCallback, useEffect, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
-import { CopyButton } from './copy-button'
-import QRCodeModal from './dialogs/qrcode-modal'
-import SetOwnerModal from './dialogs/set-owner-modal'
-import UsageModal from './dialogs/usage-modal'
-import UserModal from './dialogs/user-modal'
-import { UserSubscriptionClientsModal } from './dialogs/user-subscription-clients-modal'
-import UserAllIPsModal from './dialogs/user-all-ips-modal'
-import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from './ui/dropdown-menu'
-import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip'
+import { CopyButton } from '@/components/common/copy-button'
+import QRCodeModal from '@/components/dialogs/qrcode-modal'
+import SetOwnerModal from '@/components/dialogs/set-owner-modal'
+import UsageModal from '@/components/dialogs/usage-modal'
+import UserModal from '@/components/dialogs/user-modal'
+import { UserSubscriptionClientsModal } from '@/components/dialogs/user-subscription-clients-modal'
+import UserAllIPsModal from '@/components/dialogs/user-all-ips-modal'
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/components/ui/tooltip'
 
 type ActionButtonsProps = {
   user: UserResponse
diff --git a/dashboard/src/components/users/columns.tsx b/dashboard/src/components/users/columns.tsx
@@ -1,11 +1,11 @@
 import { UserResponse, UserStatus } from '@/service/api'
 import { ColumnDef } from '@tanstack/react-table'
 import { ChevronDown } from 'lucide-react'
-import ActionButtons from '../action-buttons'
-import { OnlineBadge } from '../online-badge'
-import { StatusBadge } from '../status-badge'
+import ActionButtons from './action-buttons'
+import { OnlineBadge } from './online-badge'
+import { StatusBadge } from './status-badge'
 import { Select, SelectContent, SelectItem, SelectTrigger } from '../ui/select'
-import UsageSliderCompact from '../usage-slider-compact'
+import UsageSliderCompact from './usage-slider-compact'
 
 export const setupColumns = ({
   t,
diff --git a/dashboard/src/components/users/data-table.tsx b/dashboard/src/components/users/data-table.tsx
@@ -5,10 +5,10 @@ import useDirDetection from '@/hooks/use-dir-detection'
 import { cn } from '@/lib/utils'
 import { UserResponse } from '@/service/api'
 import { ChevronDown, LoaderCircle, Rss } from 'lucide-react'
-import ActionButtons from '../action-buttons'
-import { OnlineStatus } from '../online-status'
-import { StatusBadge } from '../status-badge'
-import UsageSliderCompact from '../usage-slider-compact'
+import ActionButtons from './action-buttons'
+import { OnlineStatus } from './online-status'
+import { StatusBadge } from './status-badge'
+import UsageSliderCompact from './usage-slider-compact'
 import { useTranslation } from 'react-i18next'
 
 interface DataTableProps<TData extends UserResponse, TValue> {
diff --git a/dashboard/src/components/users/online-badge.tsx b/dashboard/src/components/users/online-badge.tsx
@@ -1,6 +1,6 @@
 import { FC } from 'react'
-import { dateUtils } from '../utils/dateFormatter'
-import { Tooltip, TooltipContent, TooltipTrigger, TooltipProvider } from './ui/tooltip'
+import { dateUtils } from '@/utils/dateFormatter'
+import { Tooltip, TooltipContent, TooltipTrigger, TooltipProvider } from '@/components/ui/tooltip'
 import { useTranslation } from 'react-i18next'
 import dayjs from '@/lib/dayjs'
 
@@ -78,3 +78,4 @@ export const OnlineBadge: FC<UserStatusProps> = ({ lastOnline }) => {
     </TooltipProvider>
   )
 }
+
diff --git a/dashboard/src/components/users/online-status.tsx b/dashboard/src/components/users/online-status.tsx
@@ -47,3 +47,4 @@ export const OnlineStatus: FC<UserStatusProps> = ({ lastOnline }) => {
     return <span className={cn('inline-block text-xs font-medium', dir === 'rtl' ? 'mr-0.5 md:mr-2' : 'ml-0.5 md:ml-2', 'text-gray-600 dark:text-gray-400')}>{timeText}</span>
   }
 }
+
diff --git a/dashboard/src/components/users/status-badge.tsx b/dashboard/src/components/users/status-badge.tsx
@@ -72,4 +72,5 @@ export const StatusBadge: FC<UserStatusProps> = ({ expiryDate = null, status: us
       </div>
     </div>
   )
-}
+}
+
diff --git a/dashboard/src/components/users/usage-slider-compact.tsx b/dashboard/src/components/users/usage-slider-compact.tsx
@@ -2,7 +2,7 @@ import { statusColors } from '@/constants/UserSettings'
 import { cn } from '@/lib/utils'
 import { formatBytes } from '@/utils/formatByte'
 import { useTranslation } from 'react-i18next'
-import { Progress } from './ui/progress'
+import { Progress } from '@/components/ui/progress'
 
 type UsageSliderProps = {
   used: number
diff --git a/dashboard/src/components/users/users-statistics.tsx b/dashboard/src/components/users/users-statistics.tsx
@@ -4,8 +4,8 @@ import { useGetSystemStats } from '@/service/api'
 import { Users, Wifi } from 'lucide-react'
 import { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Card, CardTitle } from './ui/card'
-import { CountUp } from './ui/count-up'
+import { Card, CardTitle } from '@/components/ui/card'
+import { CountUp } from '@/components/ui/count-up'
 
 const UsersStatistics = () => {
   const { t } = useTranslation()
@@ -102,3 +102,4 @@ const UsersStatistics = () => {
 }
 
 export default UsersStatistics
+
diff --git a/dashboard/src/pages/_dashboard._index.tsx b/dashboard/src/pages/_dashboard._index.tsx
@@ -27,7 +27,7 @@ import { lazy, Suspense, useCallback, useEffect, useRef, useState } from 'react'
 import { useForm } from 'react-hook-form'
 import { useTranslation } from 'react-i18next'
 import { toast } from 'sonner'
-import PageHeader from '@/components/page-header'
+import PageHeader from '@/components/layout/page-header'
 import { getDefaultUserForm, UseEditFormValues, UseFormValues } from './_dashboard.users'
 // Lazy load CoreConfigModal to prevent Monaco Editor from loading until needed
 const CoreConfigModal = lazy(() => import('@/components/dialogs/core-config-modal'))
diff --git a/dashboard/src/pages/_dashboard.admins.tsx b/dashboard/src/pages/_dashboard.admins.tsx
@@ -2,14 +2,14 @@ import { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Plus } from 'lucide-react'
 import { useForm } from 'react-hook-form'
-import PageHeader from '@/components/page-header'
+import PageHeader from '@/components/layout/page-header'
 import { Separator } from '@/components/ui/separator'
 import { toast } from 'sonner'
 import AdminsTable from '@/components/admins/admins-table'
 import AdminModal, { adminFormSchema, AdminFormValues } from '@/components/dialogs/admin-modal'
 import { useActivateAllDisabledUsers, useDisableAllActiveUsers, useGetAdmins, useModifyAdmin, useRemoveAdmin, useResetAdminUsage } from '@/service/api'
 import type { AdminDetails } from '@/service/api'
-import AdminsStatistics from '@/components/admin-statistics.tsx'
+import AdminsStatistics from '@/components/admins/admin-statistics'
 import { zodResolver } from '@hookform/resolvers/zod'
 import { queryClient } from '@/utils/query-client.ts'
 import useDynamicErrorHandler from '@/hooks/use-dynamic-errors'
diff --git a/dashboard/src/pages/_dashboard.bulk.tsx b/dashboard/src/pages/_dashboard.bulk.tsx
@@ -1,5 +1,5 @@
-import PageHeader from '@/components/page-header'
-import PageTransition from '@/components/page-transition'
+import PageHeader from '@/components/layout/page-header'
+import PageTransition from '@/components/layout/page-transition'
 import { getDocsUrl } from '@/utils/docs-url'
 import { ArrowUpDown, Calendar, Lock, Users2 } from 'lucide-react'
 import { useEffect, useState } from 'react'
diff --git a/dashboard/src/pages/_dashboard.groups.tsx b/dashboard/src/pages/_dashboard.groups.tsx
@@ -1,4 +1,4 @@
-import PageHeader from '@/components/page-header'
+import PageHeader from '@/components/layout/page-header'
 import { Separator } from '@/components/ui/separator'
 import { Plus } from 'lucide-react'
 import Groups from '@/components/groups/groups'
diff --git a/dashboard/src/pages/_dashboard.hosts.tsx b/dashboard/src/pages/_dashboard.hosts.tsx
@@ -1,5 +1,5 @@
 import MainSection, { HostFormValues } from '@/components/hosts/hosts'
-import PageHeader from '@/components/page-header'
+import PageHeader from '@/components/layout/page-header'
 import { Card, CardContent } from '@/components/ui/card'
 import { Separator } from '@/components/ui/separator'
 import { BaseHost, createHost, CreateHost, getHosts, modifyHost, MultiplexProtocol, ProxyHostALPN, ProxyHostFingerprint, Xudp } from '@/service/api'
diff --git a/dashboard/src/pages/_dashboard.nodes.logs.tsx b/dashboard/src/pages/_dashboard.nodes.logs.tsx
@@ -11,10 +11,10 @@ import { Input } from '@/components/ui/input'
 import { Alert, AlertDescription } from '@/components/ui/alert'
 import useDirDetection from '@/hooks/use-dir-detection'
 import { cn } from '@/lib/utils'
-import { TerminalLine } from '@/components/terminal-line'
-import { LineCountFilter } from '@/components/line-count-filter'
-import { SinceLogsFilter, type TimeFilter } from '@/components/since-logs-filter'
-import { StatusLogsFilter } from '@/components/status-logs-filter'
+import { TerminalLine } from '@/components/nodes/terminal-line'
+import { LineCountFilter } from '@/components/nodes/line-count-filter'
+import { SinceLogsFilter, type TimeFilter } from '@/components/nodes/since-logs-filter'
+import { StatusLogsFilter } from '@/components/nodes/status-logs-filter'
 import { parseLogs, getLogType, type LogLine } from '@/utils/logsUtils'
 import { EventSource } from 'eventsource'
 
diff --git a/dashboard/src/pages/_dashboard.nodes.tsx b/dashboard/src/pages/_dashboard.nodes.tsx
@@ -1,5 +1,5 @@
-import PageHeader from '@/components/page-header'
-import PageTransition from '@/components/page-transition'
+import PageHeader from '@/components/layout/page-header'
+import PageTransition from '@/components/layout/page-transition'
 import { getDocsUrl } from '@/utils/docs-url'
 import { Cpu, LucideIcon, Share2, Plus, FileText } from 'lucide-react'
 import { useEffect, useState } from 'react'
diff --git a/dashboard/src/pages/_dashboard.settings.theme.tsx b/dashboard/src/pages/_dashboard.settings.theme.tsx
@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next'
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/components/ui/card'
 import { RadioGroup, RadioGroupItem } from '@/components/ui/radio-group'
 import { Label } from '@/components/ui/label'
-import { useTheme, colorThemes, type ColorTheme, type Radius } from '@/components/theme-provider'
+import { useTheme, colorThemes, type ColorTheme, type Radius } from '@/components/common/theme-provider'
 import { useState } from 'react'
 import { toast } from 'sonner'
 import { cn } from '@/lib/utils'
diff --git a/dashboard/src/pages/_dashboard.settings.tsx b/dashboard/src/pages/_dashboard.settings.tsx
@@ -1,4 +1,4 @@
-import PageHeader from '@/components/page-header'
+import PageHeader from '@/components/layout/page-header'
 import { useAdmin } from '@/hooks/use-admin'
 import { cn } from '@/lib/utils'
 import { useGetSettings, useModifySettings } from '@/service/api'
diff --git a/dashboard/src/pages/_dashboard.statistics.tsx b/dashboard/src/pages/_dashboard.statistics.tsx
@@ -1,4 +1,4 @@
-import PageHeader from '@/components/page-header'
+import PageHeader from '@/components/layout/page-header'
 import MainContent from '@/components/statistics/statistics'
 import { Separator } from '@/components/ui/separator'
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
diff --git a/dashboard/src/pages/_dashboard.templates.tsx b/dashboard/src/pages/_dashboard.templates.tsx
@@ -1,6 +1,6 @@
 import UserTemplate from '../components/templates/user-template'
 import { useGetUserTemplates, useModifyUserTemplate, UserTemplateResponse, ShadowsocksMethods, XTLSFlows } from '@/service/api'
-import PageHeader from '@/components/page-header.tsx'
+import PageHeader from '@/components/layout/page-header'
 import { Plus } from 'lucide-react'
 import { Separator } from '@/components/ui/separator.tsx'
 import { Skeleton } from '@/components/ui/skeleton'
diff --git a/dashboard/src/pages/_dashboard.tsx b/dashboard/src/pages/_dashboard.tsx
diff --git a/dashboard/src/pages/_dashboard.users.tsx b/dashboard/src/pages/_dashboard.users.tsx
diff --git a/dashboard/src/pages/login.tsx b/dashboard/src/pages/login.tsx
diff --git a/dashboard/src/router.tsx b/dashboard/src/router.tsx

Original file line number	Diff line number	Diff line change
`@@ -93,3 +93,4 @@ export default function AdminStatisticsSection({ data }: AdminsStatisticsProps)`
`93`	`93`	`</div>`
`94`	`94`	`)`
`95`	`95`	`}`
	`96`	`+`
Original file line number	Diff line number	Diff line change
`@@ -49,3 +49,4 @@ export const AdminStatusBadge: FC<AdminStatusProps> = ({ isSudo, isDisabled }) =`
`49`	`49`	`</Badge>`
`50`	`50`	`)`
`51`	`51`	`}`
	`52`	`+`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { useTheme } from '@/components/theme-provider'`
	`1`	`+import { useTheme } from './theme-provider'`
`2`	`2`	`import { REPO_URL } from '@/constants/Project'`
`3`	`3`	`import GitHubButton from 'react-github-btn'`
`4`	`4`
`@@ -17,3 +17,4 @@ export const GithubStar = () => {`
`17`	`17`	`</GitHubButton>`
`18`	`18`	`)`
`19`	`19`	`}`
	`20`	`+`
Original file line number	Diff line number	Diff line change
`@@ -68,3 +68,4 @@ export const Language: React.FC = () => {`
`68`	`68`	`</DropdownMenu>`
`69`	`69`	`)`
`70`	`70`	`}`
	`71`	`+`