refactor: reorder imports for better organization in App and AppSidebar components
This commit is contained in:
132
src/App.tsx
132
src/App.tsx
@@ -1,19 +1,17 @@
|
|||||||
import { AppLayout } from '@/components/AppLayout'
|
import { AppLayout } from '@/components/AppLayout'
|
||||||
import { ProtectedRoute } from '@/components/ProtectedRoute'
|
|
||||||
import { Button } from '@/components/ui/button'
|
|
||||||
import { AuthProvider } from '@/components/AuthProvider'
|
import { AuthProvider } from '@/components/AuthProvider'
|
||||||
import { SocketProvider } from '@/contexts/SocketContext'
|
import { ProtectedRoute } from '@/components/ProtectedRoute'
|
||||||
import { MusicPlayerProvider } from '@/contexts/MusicPlayerContext'
|
import { MusicPlayerProvider } from '@/contexts/MusicPlayerContext'
|
||||||
|
import { SocketProvider } from '@/contexts/SocketContext'
|
||||||
import { AccountPage } from '@/pages/AccountPage'
|
import { AccountPage } from '@/pages/AccountPage'
|
||||||
import { AdminUsersPage } from '@/pages/AdminUsersPage'
|
|
||||||
import { AdminSoundsPage } from '@/pages/AdminSoundsPage'
|
import { AdminSoundsPage } from '@/pages/AdminSoundsPage'
|
||||||
import { DashboardPage } from '@/pages/DashboardPage'
|
import { DashboardPage } from '@/pages/DashboardPage'
|
||||||
import { LoginPage } from '@/pages/LoginPage'
|
import { LoginPage } from '@/pages/LoginPage'
|
||||||
import { RegisterPage } from '@/pages/RegisterPage'
|
import { RegisterPage } from '@/pages/RegisterPage'
|
||||||
import { SoundboardPage } from '@/pages/SoundboardPage'
|
import { SoundboardPage } from '@/pages/SoundboardPage'
|
||||||
import { Navigate, Route, BrowserRouter as Router, Routes } from 'react-router'
|
import { Navigate, Route, BrowserRouter as Router, Routes } from 'react-router'
|
||||||
import { ThemeProvider } from './components/ThemeProvider'
|
|
||||||
import { Toaster } from 'sonner'
|
import { Toaster } from 'sonner'
|
||||||
|
import { ThemeProvider } from './components/ThemeProvider'
|
||||||
|
|
||||||
function App() {
|
function App() {
|
||||||
return (
|
return (
|
||||||
@@ -23,67 +21,73 @@ function App() {
|
|||||||
<SocketProvider>
|
<SocketProvider>
|
||||||
<MusicPlayerProvider>
|
<MusicPlayerProvider>
|
||||||
<Router>
|
<Router>
|
||||||
<Routes>
|
<Routes>
|
||||||
<Route path="/login" element={<LoginPage />} />
|
<Route path="/login" element={<LoginPage />} />
|
||||||
<Route path="/register" element={<RegisterPage />} />
|
<Route path="/register" element={<RegisterPage />} />
|
||||||
|
|
||||||
{/* Protected routes with layout */}
|
{/* Protected routes with layout */}
|
||||||
<Route
|
<Route
|
||||||
path="/dashboard"
|
path="/dashboard"
|
||||||
element={
|
element={
|
||||||
<ProtectedRoute>
|
<ProtectedRoute>
|
||||||
<AppLayout
|
<AppLayout
|
||||||
title="Dashboard"
|
title="Dashboard"
|
||||||
description="Welcome to your dashboard"
|
description="Welcome to your dashboard"
|
||||||
>
|
>
|
||||||
<DashboardPage />
|
<DashboardPage />
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
</ProtectedRoute>
|
</ProtectedRoute>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
path="/account"
|
path="/account"
|
||||||
element={
|
element={
|
||||||
<ProtectedRoute>
|
<ProtectedRoute>
|
||||||
<AppLayout
|
<AppLayout
|
||||||
title="Account"
|
title="Account"
|
||||||
description="Manage your account settings and preferences"
|
description="Manage your account settings and preferences"
|
||||||
>
|
>
|
||||||
<AccountPage />
|
<AccountPage />
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
</ProtectedRoute>
|
</ProtectedRoute>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
path="/soundboard"
|
path="/soundboard"
|
||||||
element={
|
element={
|
||||||
<ProtectedRoute>
|
<ProtectedRoute>
|
||||||
<AppLayout
|
<AppLayout
|
||||||
title="Soundboard"
|
title="Soundboard"
|
||||||
description="Play and manage sound effects"
|
description="Play and manage sound effects"
|
||||||
>
|
>
|
||||||
<SoundboardPage />
|
<SoundboardPage />
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
</ProtectedRoute>
|
</ProtectedRoute>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
<Route
|
<Route
|
||||||
path="/admin/sounds"
|
path="/admin/sounds"
|
||||||
element={
|
element={
|
||||||
<ProtectedRoute requireAdmin>
|
<ProtectedRoute requireAdmin>
|
||||||
<AppLayout
|
<AppLayout
|
||||||
title="Sound Management"
|
title="Sound Management"
|
||||||
description="Scan and normalize sound files"
|
description="Scan and normalize sound files"
|
||||||
>
|
>
|
||||||
<AdminSoundsPage />
|
<AdminSoundsPage />
|
||||||
</AppLayout>
|
</AppLayout>
|
||||||
</ProtectedRoute>
|
</ProtectedRoute>
|
||||||
}
|
}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Route path="/" element={<Navigate to="/dashboard" replace />} />
|
<Route
|
||||||
<Route path="*" element={<Navigate to="/dashboard" replace />} />
|
path="/"
|
||||||
</Routes>
|
element={<Navigate to="/dashboard" replace />}
|
||||||
|
/>
|
||||||
|
<Route
|
||||||
|
path="*"
|
||||||
|
element={<Navigate to="/dashboard" replace />}
|
||||||
|
/>
|
||||||
|
</Routes>
|
||||||
</Router>
|
</Router>
|
||||||
</MusicPlayerProvider>
|
</MusicPlayerProvider>
|
||||||
</SocketProvider>
|
</SocketProvider>
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import {
|
|||||||
useSidebar,
|
useSidebar,
|
||||||
} from '@/components/ui/sidebar'
|
} from '@/components/ui/sidebar'
|
||||||
import { useAuth } from '@/hooks/use-auth'
|
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 { Link, useLocation } from 'react-router'
|
||||||
import { NavUser } from './NavUser'
|
|
||||||
import { NavPlan } from './NavPlan'
|
import { NavPlan } from './NavPlan'
|
||||||
|
import { NavUser } from './NavUser'
|
||||||
|
|
||||||
const navigationItems = [
|
const navigationItems = [
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user