+
-
+
{user ? (
@@ -73,64 +78,58 @@ function Navbar({ onSearch }) {
<>
{/* LOGIN */}
{/* SIGNUP */}
@@ -138,8 +137,7 @@ function Navbar({ onSearch }) {
)}
-
-
+
);
}
diff --git a/client/src/components/owner/OwnerAddRestaurantForm.jsx b/client/src/components/owner/OwnerAddRestaurantForm.jsx
index 1ee067b..ad5a2c0 100644
--- a/client/src/components/owner/OwnerAddRestaurantForm.jsx
+++ b/client/src/components/owner/OwnerAddRestaurantForm.jsx
@@ -6,11 +6,13 @@ import AuthContext from "../../context/AuthContext";
import axios from "axios";
import RestaurantsContext from "../../context/RestaurantsContext";
-function OwnerRestaurantRegistrationForm() {
- const [form, setForm] = useState({ name: "", category: "", address: "", hours: "", description: "", menu: "" });
+function OwnerRestaurantRegistrationForm({ onSuccess }) {
+ const initialForm = { name: "", category: "", address: "", hours: "", description: "", menu: "", latitude: "", longitude: "" };
+ const [form, setForm] = useState(initialForm);
const [imageDataUrl, setImageDataUrl] = useState(""); // full data URL with prefix
const [imagePreview, setImagePreview] = useState(null);
const { token } = useContext(AuthContext);
+ const { addRestaurant } = useContext(RestaurantsContext);
function handleChange(e) {
setForm({ ...form, [e.target.name]: e.target.value });
@@ -43,6 +45,7 @@ function OwnerRestaurantRegistrationForm() {
reader.readAsDataURL(file);
};
+
async function handleSubmit(e) {
e.preventDefault();
try {
@@ -53,6 +56,10 @@ function OwnerRestaurantRegistrationForm() {
hours: form.hours,
description: form.description,
menu: form.menu ? form.menu.split(",").map(item => item.trim()) : [],
+ location: {
+ lat: form.latitude,
+ lng: form.longitude
+ },
images: imageDataUrl ? [imageDataUrl] : [] // send as an array with full data URL prefix
};
@@ -65,9 +72,18 @@ function OwnerRestaurantRegistrationForm() {
});
if (res.status >= 200 && res.status < 300) {
+ const created = res.data;
alert("Restaurant created successfully!");
+
+ // notify parent (OwnerDashboard) if provided, otherwise add to global context
+ if (typeof onSuccess === 'function') {
+ onSuccess(created);
+ } else if (typeof addRestaurant === 'function') {
+ addRestaurant(created);
+ }
+
// reset form
- setForm({ name: "", category: "", address: "", hours: "", description: "", menu: "", price: "" });
+ setForm(initialForm);
setImageDataUrl("");
setImagePreview(null);
} else {
@@ -87,7 +103,8 @@ function OwnerRestaurantRegistrationForm() {
-
+
+
diff --git a/client/src/context/AuthContext.jsx b/client/src/context/AuthContext.jsx
index 6baf26d..9def606 100755
--- a/client/src/context/AuthContext.jsx
+++ b/client/src/context/AuthContext.jsx
@@ -88,7 +88,7 @@ export function AuthProvider({ children }) {
const isOwner = () => user?.role === "restaurant_owner" || !!user?.managedRestaurantId;
return (
-
+
{children}
);
diff --git a/client/src/context/RestaurantsContext.jsx b/client/src/context/RestaurantsContext.jsx
index 844d8db..02e3e41 100755
--- a/client/src/context/RestaurantsContext.jsx
+++ b/client/src/context/RestaurantsContext.jsx
@@ -105,18 +105,21 @@ export function RestaurantsProvider({ children }) {
}
async function deleteRestaurant(restaurantId) {
- // remove from DB
- axios.delete(`http://localhost:3000/api/restaurants/${restaurantId}`, {
+ // remove from DB and return the promise so callers can react
+ return axios.delete(`http://localhost:3000/api/restaurants/${restaurantId}`, {
headers: {
Authorization: `Bearer ${token}`
}
})
.then(() => {
// remove from local state
- setRestaurants((prev) => prev.filter(r => r._id != restaurantId));
- alert('Your restaurant is removed from our system')
+ setRestaurants((prev) => prev.filter((r) => r._id !== restaurantId));
+ alert('Your restaurant is removed from our system');
})
- .catch((err) => console.error("Error deleting review", err));
+ .catch((err) => {
+ console.error("Error deleting restaurant", err);
+ throw err;
+ });
}
function updateRestaurantImage(restaurantId, dataUrl) {
diff --git a/client/src/main.jsx b/client/src/main.jsx
index 1cf2c5a..094deea 100755
--- a/client/src/main.jsx
+++ b/client/src/main.jsx
@@ -1,8 +1,6 @@
import React from "react";
import ReactDOM from "react-dom/client";
import App from "./App";
-import 'bootstrap/dist/css/bootstrap.min.css';
-import 'bootstrap/dist/js/bootstrap.bundle.min.js';
ReactDOM.createRoot(document.getElementById("root")).render(
diff --git a/client/src/pages/OwnerDashboard.jsx b/client/src/pages/OwnerDashboard.jsx
index c685168..d494093 100644
--- a/client/src/pages/OwnerDashboard.jsx
+++ b/client/src/pages/OwnerDashboard.jsx
@@ -1,5 +1,4 @@
import React, { useContext, useEffect, useState } from "react";
-import { useNavigate } from "react-router-dom";
import AuthContext from "../context/AuthContext";
import RestaurantsContext from "../context/RestaurantsContext";
import FeaturedCard from "../components/home/FeaturedCard";
@@ -8,10 +7,9 @@ import axios from "axios";
function OwnerDashboard() {
const { user, token } = useContext(AuthContext);
- const { setRestaurants } = useContext(RestaurantsContext); // update global context
+ const { addRestaurant } = useContext(RestaurantsContext); // update global context via addRestaurant
const [ownerRestaurants, setOwnerRestaurants] = useState([]); // local state for this dashboard
const [showForm, setShowForm] = useState(false);
- const navigate = useNavigate();
// Fetch owned restaurants on mount
useEffect(() => {
@@ -46,10 +44,10 @@ function OwnerDashboard() {
{
- setOwnerRestaurants([...ownerRestaurants, newRestaurant]); // update local state
- setRestaurants((prev) => [...prev, newRestaurant]); // update global context
+ setOwnerRestaurants((prev) => [...prev, newRestaurant]); // update local state
+ addRestaurant(newRestaurant); // update global context
setShowForm(false); // hide form
- navigate(`/owner/restaurants/${newRestaurant._id}/edit`);
+ // stay on the dashboard — no redirect
}}
/>
)}
@@ -61,7 +59,12 @@ function OwnerDashboard() {
) : (
{ownerRestaurants.map((r) => (
-
+ setOwnerRestaurants((prev) => prev.filter((rr) => rr._id !== id))}
+ />
))}
)}
diff --git a/client/src/pages/RestaurantDetailsPage.jsx b/client/src/pages/RestaurantDetailsPage.jsx
index 615a5ea..e68e354 100755
--- a/client/src/pages/RestaurantDetailsPage.jsx
+++ b/client/src/pages/RestaurantDetailsPage.jsx
@@ -37,17 +37,19 @@ function RestaurantDetailsPage() {
+ {user.role == 'user'
+ && (
+ Reviews
+ {r.reviews && r.reviews.length === 0 && No reviews yet—be the first.
}
+
+ {r.reviews.map((rev) => )}
+
+
+
+
+ )
+ }
-
- Reviews
- {r.reviews && r.reviews.length === 0 && No reviews yet—be the first.
}
-
- {r.reviews.map((rev) => )}
-
-
-
-
-