Changeset c44c5ed for my-react-app/src/App.js

Timestamp:

05/02/25 15:06:42 (2 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

142c0f8

Parents:

2518b3a

Message:

Fixed bugs and fully developed menu now. Readonly added.

File:

• my-react-app/src/App.js (modified) (2 diffs)

my-react-app/src/App.js

@@ -19 +19 @@
 import ReservationHistory from "./components/ReservationHistory";
 import AuthContent from "./components/AuthContent";
+import MenuList from "./components/MenuList";
+import ReadOnlyMenuList from "./components/ReadOnlyMenuList";
 
 const ProtectedRoute = ({ element, isAuthenticated }) => {
@@ -326 +328 @@
                         <div key={restaurant.id} className="card mb-3">
                             <div className="card-body">
-                                <RestaurantInfo key={restaurant.id} restaurant={restaurant}/>
-                                {/*<p>Available time slots</p>*/}
-                                <div className="d-flex flex-wrap">
-                                    {restaurant.tablesList && restaurant.tablesList.length > 0 ? (
+                                <div className="row">
+                                    {/* Narrow left column: info and actions */}
+                                    <div className="col-md-4">
+                                        <RestaurantInfo key={restaurant.id} restaurant={restaurant}/>
                                         <div className="d-flex flex-wrap">
-                                            {renderTimeSlots(restaurant.tablesList, restaurant)}
+                                            {restaurant.tablesList && restaurant.tablesList.length > 0 ? (
+                                                renderTimeSlots(restaurant.tablesList, restaurant)
+                                            ) : (
+                                                <p>No tables available for reservations at this restaurant</p>
+                                            )}
                                         </div>
-                                    ) : (
-                                        <p>No tables available for reservations at this restaurant</p>
-                                    )}
+                                        <button
+                                            className="btn btn-secondary mt-3"
+                                            onClick={() => handleGoToRestaurant(restaurant.restaurantId)}
+                                        >
+                                            Go to Restaurant
+                                        </button>
+                                    </div>
+
+                                    {/* Wide right column: menu */}
+                                    <div className="col-md-8">
+                                        <ReadOnlyMenuList restaurantId={restaurant.restaurantId}/>
+                                    </div>
                                 </div>
-                                <button
-                                    className="btn btn-secondary"
-                                    onClick={() => handleGoToRestaurant(restaurant.restaurantId)}
-                                >
-                                    Go to Restaurant
-                                </button>
                             </div>
                         </div>
                     ))}
                 </div>
+
 
                 {showCuisineSearch && (