diff --git a/admin/src/App.tsx b/admin/src/App.tsx index 24249a9..947aa12 100644 --- a/admin/src/App.tsx +++ b/admin/src/App.tsx @@ -1,18 +1,18 @@ -import { Routes, Route, Navigate } from 'react-router-dom' -import { useAuthStore } from './stores/authStore' +import { Navigate, Route, Routes } from 'react-router-dom' +import DashboardLayout from './components/DashboardLayout' import ErrorBoundary from './components/ErrorBoundary' import ProtectedRoute from './components/ProtectedRoute' +import Categories from './pages/Categories' +import Dashboard from './pages/Dashboard' import LoginPage from './pages/LoginPage' import NotFound from './pages/NotFound' -import DashboardLayout from './components/DashboardLayout' -import Dashboard from './pages/Dashboard' import Photos from './pages/Photos' import PhotoUpload from './pages/PhotoUpload' -import Categories from './pages/Categories' -import Tags from './pages/Tags' -import Users from './pages/Users' import Settings from './pages/Settings' +import Tags from './pages/Tags' import TestApi from './pages/TestApi' +import Users from './pages/Users' +import { useAuthStore } from './stores/authStore' function App() { const { isAuthenticated } = useAuthStore() @@ -36,21 +36,21 @@ function App() { } /> } /> } /> - - } + } /> - - } + } /> } /> @@ -59,4 +59,4 @@ function App() { ) } -export default App \ No newline at end of file +export default App diff --git a/admin/src/components/DashboardLayout.tsx b/admin/src/components/DashboardLayout.tsx index 1f327bd..7849384 100644 --- a/admin/src/components/DashboardLayout.tsx +++ b/admin/src/components/DashboardLayout.tsx @@ -1,28 +1,35 @@ -import React, { useState } from 'react' -import { Link, useLocation, useNavigate } from 'react-router-dom' -import { useQuery } from '@tanstack/react-query' -import { Button } from '@/components/ui/button' import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar' import { Badge } from '@/components/ui/badge' +import { Button } from '@/components/ui/button' +import { + DropdownMenu, + DropdownMenuContent, + DropdownMenuItem, + DropdownMenuLabel, + DropdownMenuSeparator, + DropdownMenuTrigger, +} from '@/components/ui/dropdown-menu' import { Separator } from '@/components/ui/separator' -import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuSeparator, DropdownMenuTrigger } from '@/components/ui/dropdown-menu' import { Sheet, SheetContent, SheetTrigger } from '@/components/ui/sheet' -import { - LayoutDashboard, - Camera, - FolderOpen, - Tags, - Users, - Settings, +import { cn } from '@/lib/utils' +import { authService } from '@/services/authService' +import { useAuthStore } from '@/stores/authStore' +import { useQuery } from '@tanstack/react-query' +import { + Bell, + Camera, + FolderOpen, + LayoutDashboard, LogOut, Menu, + Search, + Settings, + Tags, User, - Bell, - Search + Users, } from 'lucide-react' -import { cn } from '@/lib/utils' -import { useAuthStore } from '@/stores/authStore' -import { authService } from '@/services/authService' +import React, { useState } from 'react' +import { Link, useLocation, useNavigate } from 'react-router-dom' import { toast } from 'sonner' interface DashboardLayoutProps { @@ -81,10 +88,10 @@ export default function DashboardLayout({ children }: DashboardLayoutProps) { {/* Navigation */}