Merge pull request #75 from CSCE331-Fall2024/Vincent_Bug_Fixes

Fix routing on caShier
CSCE331-Fall2024 · Dec 8, 2024 · 2e66e24 · 2e66e24
2 parents ac74c08 + ec11448
commit 2e66e24
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/src/app/Customer/page.tsx b/src/app/Customer/page.tsx
@@ -141,18 +141,21 @@ export default function CustomerPage() {
           />
         ) : selectedCategory === "drinks" ? (
           <DrinksPage 
+            user="customer"
             category={selectedCategory} 
             setSelectedCategory={setSelectedCategory}
             addComboToCart={addComboToCart}
           />
         ) : selectedCategory === "appetizers" ? (
           <SidesPage 
+            user="customer"
             category={selectedCategory} 
             setSelectedCategory={setSelectedCategory}
             addComboToCart={addComboToCart}
           />
         ) : selectedCategory === "entrees" ? (
           <EntreesPage 
+            user="customer"
             category={selectedCategory} 
             setSelectedCategory={setSelectedCategory}
             addComboToCart={addComboToCart}

diff --git a/src/app/_components/drinks.tsx b/src/app/_components/drinks.tsx
@@ -28,10 +28,12 @@ interface Drink {
  * @returns {JSX.Element} The rendered DrinksPage component.
  */
 export default function DrinksPage({
+  user,
   category,
   setSelectedCategory,
   addComboToCart,
 }: {
+  user: string;
   category: string;
   setSelectedCategory: (category: string | null) => void;
   addComboToCart: (
@@ -101,7 +103,11 @@ export default function DrinksPage({
     });
 
     setSelectedCategory(null);
-    router.push("/Customer");
+    if (user.toLowerCase() === "customer") {
+      router.push("/Customer");
+    } else if (user.toLowerCase() === "cashier") {
+      router.push("/cashier");
+    }
   };
 
   return (

diff --git a/src/app/_components/entrees.tsx b/src/app/_components/entrees.tsx
@@ -25,10 +25,12 @@ interface Entree {
  * @returns {JSX.Element} The rendered EntreesPage component.
  */
 export default function EntreesPage({
+  user,
   category,
   setSelectedCategory,
   addComboToCart,
 }: {
+  user: string;
   category: string;
   setSelectedCategory: (category: string | null) => void;
   addComboToCart: (comboName: string, comboItems: Record<string, { id: number; name: string }[]>) => void;
@@ -112,7 +114,11 @@ export default function EntreesPage({
     });
 
     setSelectedCategory(null);
-    router.push("/Customer");
+    if (user.toLowerCase() === "customer") {
+      router.push("/Customer");
+    } else if (user.toLowerCase() === "cashier") {
+      router.push("/cashier");
+    }
   };
 
   return (

diff --git a/src/app/_components/sides.tsx b/src/app/_components/sides.tsx
@@ -25,10 +25,12 @@ interface Appetizer {
  * @returns {JSX.Element} The rendered SidesPage component.
  */
 export default function SidesPage({
+  user,
   category,
   setSelectedCategory,
   addComboToCart,
 }: {
+  user: string;
   category: string;
   setSelectedCategory: (category: string | null) => void;
   addComboToCart: (comboName: string, comboItems: Record<string, { id: number; name: string }[]>) => void;
@@ -111,7 +113,11 @@ export default function SidesPage({
     });
 
     setSelectedCategory(null);
-    router.push("/Customer");
+    if (user.toLowerCase() === "customer") {
+      router.push("/Customer");
+    } else if (user.toLowerCase() === "cashier") {
+      router.push("/cashier");
+    }
   };
 
   return (

diff --git a/src/app/cashier/page.tsx b/src/app/cashier/page.tsx
@@ -96,18 +96,21 @@ export default function CustomerPage() {
           />
         ) : selectedCategory === "drinks" ? (
           <DrinksPage 
+            user="cashier"
             category={selectedCategory} 
             setSelectedCategory={setSelectedCategory}
             addComboToCart={addComboToCart}
           />
         ) : selectedCategory === "appetizers" ? (
           <SidesPage 
+            user="cashier"
             category={selectedCategory} 
             setSelectedCategory={setSelectedCategory}
             addComboToCart={addComboToCart}
           />
         ) : selectedCategory === "entrees" ? (
           <EntreesPage 
+            user="cashier"
             category={selectedCategory} 
             setSelectedCategory={setSelectedCategory}
             addComboToCart={addComboToCart}