diff --git a/src/App.tsx b/src/App.tsx index 0bd1350..8524ea4 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,19 +1,17 @@ import { AppLayout } from '@/components/AppLayout' -import { ProtectedRoute } from '@/components/ProtectedRoute' -import { Button } from '@/components/ui/button' import { AuthProvider } from '@/components/AuthProvider' -import { SocketProvider } from '@/contexts/SocketContext' +import { ProtectedRoute } from '@/components/ProtectedRoute' import { MusicPlayerProvider } from '@/contexts/MusicPlayerContext' +import { SocketProvider } from '@/contexts/SocketContext' import { AccountPage } from '@/pages/AccountPage' -import { AdminUsersPage } from '@/pages/AdminUsersPage' import { AdminSoundsPage } from '@/pages/AdminSoundsPage' import { DashboardPage } from '@/pages/DashboardPage' import { LoginPage } from '@/pages/LoginPage' import { RegisterPage } from '@/pages/RegisterPage' import { SoundboardPage } from '@/pages/SoundboardPage' import { Navigate, Route, BrowserRouter as Router, Routes } from 'react-router' -import { ThemeProvider } from './components/ThemeProvider' import { Toaster } from 'sonner' +import { ThemeProvider } from './components/ThemeProvider' function App() { return ( @@ -23,67 +21,73 @@ function App() { - - } /> - } /> + + } /> + } /> - {/* Protected routes with layout */} - - - - - - } - /> - - - - - - } - /> - - - - - - } - /> - - - - - - } - /> + {/* Protected routes with layout */} + + + + + + } + /> + + + + + + } + /> + + + + + + } + /> + + + + + + } + /> - } /> - } /> - + } + /> + } + /> + diff --git a/src/components/sidebar/AppSidebar.tsx b/src/components/sidebar/AppSidebar.tsx index a3dab9a..5aeecaf 100644 --- a/src/components/sidebar/AppSidebar.tsx +++ b/src/components/sidebar/AppSidebar.tsx @@ -9,10 +9,10 @@ import { useSidebar, } from '@/components/ui/sidebar' import { useAuth } from '@/hooks/use-auth' -import { Home, Users, Volume2, Settings } from 'lucide-react' +import { Home, Settings, Volume2 } from 'lucide-react' import { Link, useLocation } from 'react-router' -import { NavUser } from './NavUser' import { NavPlan } from './NavPlan' +import { NavUser } from './NavUser' const navigationItems = [ {