diff --git a/RestroHub-FrontEnd/index.html b/RestroHub-FrontEnd/index.html index 749afd9..8960357 100644 --- a/RestroHub-FrontEnd/index.html +++ b/RestroHub-FrontEnd/index.html @@ -7,8 +7,8 @@ - - + +
diff --git a/RestroHub-FrontEnd/package-lock.json b/RestroHub-FrontEnd/package-lock.json index f9ad811..953fde0 100644 --- a/RestroHub-FrontEnd/package-lock.json +++ b/RestroHub-FrontEnd/package-lock.json @@ -7810,4 +7810,4 @@ } } } -} +} \ No newline at end of file diff --git a/RestroHub-FrontEnd/src/App.jsx b/RestroHub-FrontEnd/src/App.jsx index ad7b24e..c41a1f2 100644 --- a/RestroHub-FrontEnd/src/App.jsx +++ b/RestroHub-FrontEnd/src/App.jsx @@ -3,6 +3,7 @@ import { BrowserRouter } from 'react-router-dom'; import AppRoutes from './routes'; import { ThemeProvider } from '@context/ThemeContext'; import './index.css'; +import './styles/global.css'; function App() { return ( diff --git a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/LiveOrders.jsx b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/LiveOrders.jsx index 1453264..8aa7f63 100644 --- a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/LiveOrders.jsx +++ b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/LiveOrders.jsx @@ -131,7 +131,7 @@ const LiveOrders = () => { // RENDER // ------------------------------------ return ( -
+
{/* Header */}
diff --git a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/QuickActions.jsx b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/QuickActions.jsx index 61e93e2..b4c95d6 100644 --- a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/QuickActions.jsx +++ b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/QuickActions.jsx @@ -167,7 +167,7 @@ const QuickActions = () => { // RENDER // ------------------------------------ return ( -
+

Quick Actions

{actions.map((action) => ( diff --git a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/RevenueChart.jsx b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/RevenueChart.jsx index 29ff0b6..f614765 100644 --- a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/RevenueChart.jsx +++ b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/RevenueChart.jsx @@ -67,7 +67,7 @@ const RevenueChart = () => { // RENDER // ------------------------------------ return ( -
+
{/* Header */}

Revenue (30 Days)

diff --git a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/StatsSection.jsx b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/StatsSection.jsx index 02b1f13..33f69fe 100644 --- a/RestroHub-FrontEnd/src/components/admin/dashboard/cards/StatsSection.jsx +++ b/RestroHub-FrontEnd/src/components/admin/dashboard/cards/StatsSection.jsx @@ -26,7 +26,7 @@ const StatCard = ({ title, value, change, positive, subtitle, icon: Icon, color, }; return ( -
+
@@ -71,7 +71,7 @@ const StatCard = ({ title, value, change, positive, subtitle, icon: Icon, color, const StatCardSkeleton = () => { const { isDark } = useAdminTheme(); return ( -
+
diff --git a/RestroHub-FrontEnd/src/components/admin/menu/menuCard/BulkActions.jsx b/RestroHub-FrontEnd/src/components/admin/menu/menuCard/BulkActions.jsx index 4a17e4e..daa90f4 100644 --- a/RestroHub-FrontEnd/src/components/admin/menu/menuCard/BulkActions.jsx +++ b/RestroHub-FrontEnd/src/components/admin/menu/menuCard/BulkActions.jsx @@ -99,7 +99,7 @@ const BulkActions = ({ onRefresh }) => { key={action.id} onClick={action.onClick} disabled={isLoading} - className="flex items-center gap-2 px-4 py-2 bg-white border border-gray-200 rounded-xl hover:bg-blue-50 hover:border-blue-200 hover:text-blue-600 text-sm transition-all disabled:opacity-50" + className="flex items-center gap-2 px-4 py-2 text-gray-500 bg-white border border-gray-200 rounded-xl hover:bg-blue-50 hover:border-blue-200 hover:text-blue-600 text-sm transition-all disabled:opacity-50" > {isLoading ? ( diff --git a/RestroHub-FrontEnd/src/components/admin/menu/menuCard/CategorySidebar.jsx b/RestroHub-FrontEnd/src/components/admin/menu/menuCard/CategorySidebar.jsx index 29fdfc1..f5cd6c4 100644 --- a/RestroHub-FrontEnd/src/components/admin/menu/menuCard/CategorySidebar.jsx +++ b/RestroHub-FrontEnd/src/components/admin/menu/menuCard/CategorySidebar.jsx @@ -1,17 +1,21 @@ import { useState, useEffect } from 'react'; import { ChevronRight, RefreshCw, FolderPlus } from 'lucide-react'; import api from "@services/common/api"; +import { useAdminTheme } from '@context/AdminThemeContext'; // ============================================ // SKELETON (Private) // ============================================ -const CategorySkeleton = () => ( -
- {[1, 2, 3, 4].map(i => ( -
- ))} -
-); +const CategorySkeleton = () => { + const { isDark } = useAdminTheme(); + return ( +
+ {[1, 2, 3, 4].map(i => ( +
+ ))} +
+ ); +}; // ============================================ // MAIN COMPONENT @@ -19,6 +23,7 @@ const CategorySkeleton = () => ( const CategorySidebar = ({ selectedCategory, onCategoryChange, onAddCategory, setAllCategories }) => { const [categories, setCategories] = useState([]); const [loading, setLoading] = useState(true); + const { isDark } = useAdminTheme(); // ------------------------------------ // FALLBACK DATA @@ -64,13 +69,13 @@ const CategorySidebar = ({ selectedCategory, onCategoryChange, onAddCategory, se // ------------------------------------ return (
-
+
{/* Header */}
-

Categories

+

Categories

@@ -87,7 +92,7 @@ const CategorySidebar = ({ selectedCategory, onCategoryChange, onAddCategory, se onClick={() => onCategoryChange(cat.categoryId)} className={`w-full flex items-center justify-between p-3 rounded-xl transition-all ${selectedCategory === cat.categoryId ? 'bg-blue-600 text-white shadow-md shadow-blue-200' - : 'hover:bg-blue-50 text-gray-600' + : isDark ? 'hover:bg-gray-700 text-gray-400' : 'hover:bg-blue-50 text-gray-600' }`} >
@@ -101,7 +106,7 @@ const CategorySidebar = ({ selectedCategory, onCategoryChange, onAddCategory, se > {cat.foodIds.length} - +
))} @@ -111,7 +116,7 @@ const CategorySidebar = ({ selectedCategory, onCategoryChange, onAddCategory, se {/* Add Category */}