Main demo (#4)

* Add conditional execution for CloudFront invalidation based on branch

* Comment out unused components and navigation items for future reference

* Comment out AdminBottomNavigationBar component for future reference

Author: av1choudharyy

.github/workflows/deploy.yml

@@ -193,6 +193,7 @@ jobs:
   invalidate_cloudfront:
     runs-on: ubuntu-latest
     needs: [sync_to_s3, deploy_cloudfront]
+    if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/stage'
     steps:
       - name: Checkout
         uses: actions/checkout@v4

src/components/admin/common/AdminBottomNavigationBar.tsx

@@ -2,7 +2,7 @@ import { BottomNavigation, BottomNavigationAction, Box } from '@mui/material';
 import { SyntheticEvent } from 'react';
 import RestaurantMenuIcon from '@mui/icons-material/RestaurantMenu';
 import ReceiptLongOutlinedIcon from '@mui/icons-material/ReceiptLongOutlined';
-import SpaceDashboardOutlinedIcon from '@mui/icons-material/SpaceDashboardOutlined';
+// import SpaceDashboardOutlinedIcon from '@mui/icons-material/SpaceDashboardOutlined';
 import { useNavigate, useParams } from 'react-router-dom';
 
 // Defining the structure of navigation items
@@ -12,17 +12,17 @@ interface NavigationItem {
   icon: JSX.Element;
 }
 
-const NAVIGATION_VALUES: Record<'Menu' | 'Dashboard' | 'Orders', NavigationItem> = {
+const NAVIGATION_VALUES: Record<'Menu' | 'Orders', NavigationItem> = {
   Menu: {
     label: 'Menu',
     href: '/admin/editMenu',
     icon: <RestaurantMenuIcon />,
   },
-  Dashboard: {
-    label: 'Dashboard',
-    href: '/admin/dashboard',
-    icon: <SpaceDashboardOutlinedIcon />,
-  },
+  // Dashboard: {
+  //   label: 'Dashboard',
+  //   href: '/admin/dashboard',
+  //   icon: <SpaceDashboardOutlinedIcon />,
+  // },
   Orders: {
     label: 'Orders',
     href: '/admin/orders',

src/components/common/MenuItemCard.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
 import { Box, Stack, Typography } from '@mui/material';
-import QuantityEditor from '../user/menu/QuantityEditor';
+// import QuantityEditor from '../user/menu/QuantityEditor';
 import { MenuItem } from '../../interfaces/MenuItem';
 import ItemEditor from '../admin/editMenu/ItemEditor';
 import CircleIcon from '@mui/icons-material/Circle';
@@ -107,7 +107,8 @@ const MenuItemCard = ({
               }}
             />
           ) : (
-            <QuantityEditor menuItem={menuItem} />
+            <></>
+            // <QuantityEditor menuItem={menuItem} />
           )}
         </Box>
         <Typography onClick={handleClick}>{getDescription()}</Typography>

src/main.tsx

@@ -11,7 +11,7 @@ import { createTheme, ThemeProvider } from '@mui/material';
 import Home from './routes/Home';
 import { MenuProvider } from './contexts/CartContext';
 import UserOrders from './routes/UserOrders';
-import Dashboard from './routes/Dashboard';
+// import Dashboard from './routes/Dashboard';
 import RestaurantOrders from './routes/RestaurantOrders';
 
 const router = createBrowserRouter([
@@ -27,10 +27,10 @@ const router = createBrowserRouter([
     path: '/:restaurantId/orders',
     element: <UserOrders />,
   },
-  {
-    path: '/:restaurantId/admin/dashboard',
-    element: <Dashboard />,
-  },
+  // {
+  //   path: '/:restaurantId/admin/dashboard',
+  //   element: <Dashboard />,
+  // },
   // {
   //   path: '/:restaurantId/trending',
   //   element: <Trending />,

src/routes/Dashboard.tsx

@@ -1,5 +1,5 @@
 import { Box, Skeleton, Typography, Grid2 as Grid, Card } from '@mui/material';
-import AdminBottomNavigationBar from '../components/admin/common/AdminBottomNavigationBar';
+// import AdminBottomNavigationBar from '../components/admin/common/AdminBottomNavigationBar';
 import { useState } from 'react';
 
 function Dashboard() {
@@ -65,7 +65,7 @@ function Dashboard() {
           ></Card>
         </Grid>
       </Grid>
-      <AdminBottomNavigationBar value='Dashboard' />
+      {/* <AdminBottomNavigationBar value='Dashboard' /> */}
     </Box>
   );
 }

src/routes/Menu.tsx

@@ -18,7 +18,7 @@ import {
   Typography,
 } from '@mui/material';
 import { SearchOutlined } from '@mui/icons-material';
-import UserBottomNavigationBar from '../components/user/common/UserBottomNavigationBar';
+// import UserBottomNavigationBar from '../components/user/common/UserBottomNavigationBar';
 import MenuItemCard from '../components/common/MenuItemCard';
 import CardButton from '../components/common/CardButton';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
@@ -1000,7 +1000,8 @@ export default function Menu({ admin = false }: { admin?: boolean }) {
         }}
       />
       {/* Bottom Navigation Bar */}
-      {admin ? <AdminBottomNavigationBar value={'Menu'} /> : <UserBottomNavigationBar value='Menu' />}
+      {/* {admin ? <AdminBottomNavigationBar value={'Menu'} /> : <UserBottomNavigationBar value='Menu' />} */}
+      {admin && <AdminBottomNavigationBar value={'Menu'} />}
     </Box>
   );
 }