diff --git a/README.md b/README.md
new file mode 100644
index 0000000..debcba7
--- /dev/null
+++ b/README.md
@@ -0,0 +1,69 @@
+# find-addis
+
+**Short description:** find-addis is a small React + Express + MongoDB application to discover and review restaurants. The repo contains a `client` (React + Vite) and a `server` (Express + MongoDB) folder.
+
+---
+
+## ⚙️ Structure
+
+- `client/` — React frontend (Vite)
+- `server/` — Express API server (MongoDB)
+
+---
+
+## 🔧 Quick start
+
+Prerequisites
+
+- Node 18+ / npm or yarn
+- MongoDB (local or Atlas)
+
+Install
+
+```bash
+# from repository root
+npm install
+# or install separately under each subfolder
+cd client && npm install
+cd ../server && npm install
+```
+
+Development
+
+Run both services concurrently (recommended)
+
+```bash
+# from repository root (uses npm workspaces + concurrently)
+npm install
+npm run dev
+```
+
+Run individually (alternatives)
+
+```bash
+# run server in dev (nodemon)
+cd server && npm run dev
+# run client in dev (Vite)
+cd client && npm run dev
+```
+
+Production (build & serve frontend + run server)
+
+```bash
+# build frontend
+cd client && npm run build
+# serve client/build with any static file server (Nginx, serve, etc.) or configure server to serve static files
+# run server
+cd server && npm start
+```
+
+---
+
+## 📚 Contributing & Notes
+
+- Follow the existing code style and ESLint in `client/` (use `npm run lint`).
+- If you add new env vars, document them in `server/.env.example` (see `server/README.md`).
+
+---
+
+> For more details about usage, roadmap and endpoints, see `client/README.md` and `server/README.md`.
diff --git a/client/README.md b/client/README.md
old mode 100755
new mode 100644
index b31baa6..a78d0b3
--- a/client/README.md
+++ b/client/README.md
@@ -1,74 +1,72 @@
-# FindAddis
+# Client (React + Vite) — find-addis (Project README)
 
-A small React + Vite project with an Express + MongoDB backend. This README describes how to run the app locally.
+**Purpose:** This file documents how to run and build the frontend for the find-addis project. The app consumes the `find-addis` API (default `http://localhost:3000/api`).
 
-## Prerequisites
-- Node.js (16+ recommended)
-- npm
-- MongoDB (local `mongod`) or a MongoDB Atlas connection string
+---
 
-## Run locally (Frontend + Backend)
+## Functional Highlights
 
-1) Frontend (run from project root):
+- Browse restaurants, view details, filter by category/rating.
+- Users: signup/login, add favorites, write reviews.
+- Owners: signup/login, add restaurants, manage own restaurants.
 
-```bash
-cd "C:\Users\PC\Downloads\ReactProject-zip\ReactProject\FindAddis"
-npm install
-npm run dev
-```
+---
 
-Vite will print a local URL (e.g. `http://localhost:5173` or another available port).
+## How to run (dev)
 
-2) Backend (in a separate terminal):
+1. Install
 
 ```bash
-cd backend
+cd client
 npm install
-node server.js
 ```
 
-The backend defaults to port `5000` and uses the `MONGO_URI` environment variable to connect to MongoDB.
-
-Create `backend/.env` (already added in this repo) with values like:
+2. Start dev server
 
+```bash
+npm run dev
 ```
-MONGO_URI=mongodb://localhost:27017/findaddis
-PORT=5000
-```
 
-3) Seed sample data (optional):
+3. Open the app at the URL printed by Vite (usually `http://localhost:5173`).
+
+---
+
+## Build & Preview (production)
 
 ```bash
-curl http://localhost:5000/api/seed
+npm run build
+npm run preview # or npm start
 ```
 
-4) Verify:
-- Restaurants API: `http://localhost:5000/api/restaurants`
-- Frontend: visit the Vite URL printed by `npm run dev`.
+---
+
+## Environment configuration
+
+- Recommended: add `VITE_API_URL` to `.env` to avoid hard-coded `http://localhost:3000` strings.
+
+Example `.env`
 
-## Notes
-- Bootstrap is included and used sparingly for Navbar, Buttons, Forms and Grid.
-- If MongoDB is not running locally, replace `MONGO_URI` in `backend/.env` with your Atlas connection string.
-- Do not commit secrets. `backend/.env` in this repository should be replaced with safe values before sharing publicly.
+```
+VITE_API_URL="http://localhost:3000"
+```
 
-## Development tips
-- To enable automatic backend reloads, install `nodemon` and run `npx nodemon server.js` from the `backend` folder.
-- Linting: `npm run lint` (configured in the root `package.json`).
+---
 
-If you want, I can add a GitHub Actions workflow to run tests/lint on push.
-# React + Vite
+## Linting
 
-This template provides a minimal setup to get React working in Vite with HMR and some ESLint rules.
+```bash
+npm run lint
+```
 
-Currently, two official plugins are available:
+---
 
-- [@vitejs/plugin-react](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react) uses [Babel](https://babeljs.io/) (or [oxc](https://oxc.rs) when used in [rolldown-vite](https://vite.dev/guide/rolldown)) for Fast Refresh
-- [@vitejs/plugin-react-swc](https://github.com/vitejs/vite-plugin-react/blob/main/packages/plugin-react-swc) uses [SWC](https://swc.rs/) for Fast Refresh
+---
 
-## React Compiler
+## Configuration hygiene
 
-The React Compiler is not enabled on this template because of its impact on dev & build performances. To add it, see [this documentation](https://react.dev/learn/react-compiler/installation).
+- Some files reference the API base URL directly (for example, `http://localhost:3000`). For production, centralize the base URL using `VITE_API_URL` and an HTTP client helper (see suggested `src/utils/api.js` above).
+- Images are sent as base64; keep payloads within the server limit (default `5MB`) or use dedicated storage (e.g., S3 or Cloudinary) for large media.
 
-## Expanding the ESLint configuration
+---
 
-If you are developing a production application, we recommend using TypeScript with type-aware lint rules enabled. Check out the [TS template](https://github.com/vitejs/vite/tree/main/packages/create-vite/template-react-ts) for information on how to integrate TypeScript and [`typescript-eslint`](https://typescript-eslint.io) in your project.
+If you'd like, I can open a PR to replace the remaining direct API calls with the centralized helper and add `VITE_API_URL` to the repository's environment templates.
diff --git a/client/src/App.jsx b/client/src/App.jsx
index 4bcd35b..190f90a 100755
--- a/client/src/App.jsx
+++ b/client/src/App.jsx
@@ -11,6 +11,7 @@ import SearchResultsPage from "./pages/SearchResultsPage";
 import WriteReviewPage from "./pages/WriteReviewPage";
 import Login from "./pages/Login";
 import OwnerLoginPage from "./pages/OwnerLoginPage"
+import OwnerDashboard from "./pages/OwnerDashboard";
 import Signup from "./pages/Signup";
 import OwnerSignUp from "./pages/OwnerSignup";
 import UserProfilePage from "./pages/UserProfilePage";
@@ -46,6 +47,7 @@ function App() {
                 <Route path="/login" element={<Login />} />
                 <Route path="/signup" element={<Signup />} />
                 <Route path="/OwnerSignUp" element={<OwnerSignUp />} />
+                <Route path="/OwnerDashboard" element={<OwnerDashboard />} />
                 <Route path="/OwnerLoginPage" element={<OwnerLoginPage />} />
                 <Route path="/profile" element={<UserProfilePage />} />
                 <Route path="/favorites" element={<Favorites />} />
diff --git a/client/src/components/home/FeaturedCard.jsx b/client/src/components/home/FeaturedCard.jsx
index 4e5422f..5aabf20 100755
--- a/client/src/components/home/FeaturedCard.jsx
+++ b/client/src/components/home/FeaturedCard.jsx
@@ -11,13 +11,11 @@ import TomocaImg from '../../assets/tomoca.png';
 import Placeholder from "../../assets/addis-cafe.jpg";
 
 
-function FeaturedCard({ restaurant }) {
+function FeaturedCard({ restaurant, showDeleteButton }) {
 
-  const { toggleFavorite, isFavorite } = useContext(RestaurantsContext);
+  const { toggleFavorite, isFavorite, deleteRestaurant } = useContext(RestaurantsContext);
   const fav = isFavorite ? isFavorite(restaurant._id) : false;
 
-  // const inputRef = useRef(null);
-  // const [uploading, setUploading] = useState(false);
 
   // Default images for known restaurants
   const defaults = {
@@ -80,6 +78,8 @@ function FeaturedCard({ restaurant }) {
         <div className="featured-footer">
           {restaurant.address && <div className="featured-address">{restaurant.address}</div>}
           <Link to={`/restaurants/${restaurant._id}`} className="button button-small">View</Link>
+          {showDeleteButton && <button onClick={() => deleteRestaurant(restaurant._id)} className="button button-small">delete</button>}
+
         </div>
       </div>
     </article>
diff --git a/client/src/components/layout/Navbar.jsx b/client/src/components/layout/Navbar.jsx
index f6fc4a9..95f9355 100755
--- a/client/src/components/layout/Navbar.jsx
+++ b/client/src/components/layout/Navbar.jsx
@@ -41,7 +41,6 @@ function Navbar({ onSearch }) {
     <nav className="navbar navbar-expand-lg bg-white shadow-sm" style={{ position: "relative", zIndex: 1000 }}>
       <div className="container">
         <Link to="/" className="navbar-brand">Find Addis</Link>
-
         <form className="d-flex mx-auto w-50" onSubmit={submitSearch}>
           <input
             className="form-control me-2"
@@ -59,7 +58,7 @@ function Navbar({ onSearch }) {
 
         <div className="d-flex align-items-center">
           <nav className="me-3">
-            <Link to="/favorites" className="nav-link d-inline">Favorites</Link>
+            <Link to="/favorites" className="nav-link d-inline">Favorites </Link>
             <Link to="/restaurants" className="nav-link d-inline">Restaurants</Link>
           </nav>
 
diff --git a/client/src/components/layout/Sidebar.jsx b/client/src/components/layout/Sidebar.jsx
index f398e35..1caa1db 100755
--- a/client/src/components/layout/Sidebar.jsx
+++ b/client/src/components/layout/Sidebar.jsx
@@ -2,9 +2,7 @@ import React from "react";
 import Dropdown from "../common/Dropdown";
 
 function Sidebar({ filters, setFilters, restaurants }) {
-  console.log("Sidebar", restaurants)
   const uniqueCategories = [...new Set(restaurants.map(r => r.category))]
-  console.log('uniqueCategories', uniqueCategories)
   return (
     <aside className="sidebar-container">
       <div className="filter-block">
diff --git a/client/src/components/owner/OwnerAddRestaurantForm.jsx b/client/src/components/owner/OwnerAddRestaurantForm.jsx
new file mode 100644
index 0000000..1ee067b
--- /dev/null
+++ b/client/src/components/owner/OwnerAddRestaurantForm.jsx
@@ -0,0 +1,107 @@
+import React from "react";
+import { useState, useContext } from "react";
+import InputField from "../common/InputField";
+import Button from "../common/Button";
+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: "" });
+    const [imageDataUrl, setImageDataUrl] = useState(""); // full data URL with prefix
+    const [imagePreview, setImagePreview] = useState(null);
+    const { token } = useContext(AuthContext);
+
+    function handleChange(e) {
+        setForm({ ...form, [e.target.name]: e.target.value });
+    }
+
+    const handleImageChange = (e) => {
+        const file = e.target.files && e.target.files[0];
+        if (!file) return;
+
+        const validTypes = ["image/jpeg", "image/png", "image/gif", "image/webp"];
+        if (!validTypes.includes(file.type)) {
+            alert("Please select a valid image (jpg, png, gif, webp).");
+            return;
+        }
+
+        const maxSize = 3 * 1024 * 1024; // 3MB
+        if (file.size > maxSize) {
+            alert("Image is too large. Max size is 3MB.");
+            return;
+        }
+
+        const reader = new FileReader();
+        reader.onloadend = () => {
+            // reader.result is a data URL: data:<type>;base64,<data>
+            const dataUrl = reader.result;
+            // store the full data URL (including the data:image/...;base64, prefix)
+            setImageDataUrl(dataUrl);
+            setImagePreview(dataUrl);
+        };
+        reader.readAsDataURL(file);
+    };
+
+    async function handleSubmit(e) {
+        e.preventDefault();
+        try {
+            const payload = {
+                name: form.name,
+                category: form.category,
+                address: form.address,
+                hours: form.hours,
+                description: form.description,
+                menu: form.menu ? form.menu.split(",").map(item => item.trim()) : [],
+                images: imageDataUrl ? [imageDataUrl] : [] // send as an array with full data URL prefix
+            };
+
+            const res = await axios.post("http://localhost:3000/api/restaurants",
+                payload,
+                {
+                    headers: {
+                        Authorization: `Bearer ${token}`,
+                    }
+                });
+
+            if (res.status >= 200 && res.status < 300) {
+                alert("Restaurant created successfully!");
+                // reset form
+                setForm({ name: "", category: "", address: "", hours: "", description: "", menu: "", price: "" });
+                setImageDataUrl("");
+                setImagePreview(null);
+            } else {
+                alert(res.data?.message || "Error creating restaurant");
+            }
+        } catch (err) {
+            console.error(err);
+            alert(err.response?.data?.message || "Server error");
+        }
+    }
+
+    return (
+        <form className="signup-form" onSubmit={handleSubmit}>
+            <InputField name="name" label="Name" value={form.name} onChange={handleChange} placeholder="Restaurant name" />
+            <InputField name="category" label="Category" value={form.category} onChange={handleChange} placeholder="Ethiopian,Italian..." />
+            <InputField name="address" label="Address" value={form.address} onChange={handleChange} placeholder="Bole, Addis Ababa" />
+            <InputField name="hours" label="Hours" type="text" value={form.hours} onChange={handleChange} placeholder="Enter Working hours" />
+            <InputField name="description" label="Description" value={form.description} onChange={handleChange} placeholder="Enter what you serve" />
+            <InputField name="menu" label="Menu" type="text" value={form.menu} onChange={handleChange} placeholder="e.g. injera, tibs, coffee" />
+
+            <div className="form-group" style={{ marginBottom: 12 }}>
+                <label htmlFor="image">Profile Image</label>
+                <input id="image" name="image" type="file" accept="image/*" onChange={handleImageChange} />
+                {imagePreview && (
+                    <div style={{ marginTop: 8 }}>
+                        <img src={imagePreview} alt="Preview" style={{ width: 150, height: 'auto', display: 'block', borderRadius: 6 }} />
+                        <button type="button" style={{ marginTop: 6 }} onClick={() => { setImagePreview(null); setImageDataUrl(""); }}>Remove</button>
+                    </div>
+                )}
+            </div>
+
+            <Button type="submit">Add Restaurant</Button>
+        </form>
+    );
+}
+
+export default OwnerRestaurantRegistrationForm;
diff --git a/client/src/components/owner/OwnerSignupForm.jsx b/client/src/components/owner/OwnerSignupForm.jsx
index fd83cf6..918555f 100644
--- a/client/src/components/owner/OwnerSignupForm.jsx
+++ b/client/src/components/owner/OwnerSignupForm.jsx
@@ -13,7 +13,7 @@ function OwnerSignupForm({ onSignup }) {
     async function handleSubmit(e) {
         e.preventDefault();
         try {
-            const res = await fetch("http://localhost:3000/api/RestaurantOwners", {
+            const res = await fetch("http://localhost:3000/api/owners", {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json"
diff --git a/client/src/components/restaurant/RestaurantCard.jsx b/client/src/components/restaurant/RestaurantCard.jsx
index 1f7af3b..ea0f0f9 100755
--- a/client/src/components/restaurant/RestaurantCard.jsx
+++ b/client/src/components/restaurant/RestaurantCard.jsx
@@ -7,7 +7,7 @@ import Placeholder from "../../assets/addis-cafe.jpg";
 
 function RestaurantCard({ restaurant }) {
   const { toggleFavorite, isFavorite } = useContext(RestaurantsContext);
-  const fav = isFavorite ? isFavorite(restaurant.id) : false;
+  const fav = isFavorite ? isFavorite(restaurant._id) : false;
 
   const imgSrc = (restaurant.images && restaurant.images.length > 0 && restaurant.images[0]) || Placeholder;
 
@@ -15,7 +15,7 @@ function RestaurantCard({ restaurant }) {
     <div className="restaurant-card">
       <div className="restaurant-image-wrap">
         <Link
-          to={`/restaurants/${restaurant.id}`}
+          to={`/restaurants/${restaurant._id}`}
           className="restaurant-image-link"
         >
           <img
@@ -28,7 +28,7 @@ function RestaurantCard({ restaurant }) {
         </Link>
         <button
           className={`favorite-btn ${fav ? "fav-active" : ""}`}
-          onClick={() => toggleFavorite && toggleFavorite(restaurant.id)}
+          onClick={() => toggleFavorite && toggleFavorite(restaurant._id)}
           aria-label={fav ? "Remove from favorites" : "Add to favorites"}
           aria-pressed={fav ? "true" : "false"}
           title={fav ? "Remove from favorites" : "Add to favorites"}
@@ -63,7 +63,7 @@ function RestaurantCard({ restaurant }) {
         </button>
       </div>
       <div className="restaurant-card-body">
-        <Link to={`/restaurants/${restaurant.id}`} className="restaurant-name">
+        <Link to={`/restaurants/${restaurant._id}`} className="restaurant-name">
           {restaurant.name}
         </Link>
         <div className="restaurant-meta">
diff --git a/client/src/components/restaurant/Reviewcard.jsx b/client/src/components/restaurant/Reviewcard.jsx
index 4aee63a..1ca0c7b 100755
--- a/client/src/components/restaurant/Reviewcard.jsx
+++ b/client/src/components/restaurant/Reviewcard.jsx
@@ -5,7 +5,7 @@ import { useState, useContext } from "react";
 import RestaurantsContext from "../../context/RestaurantsContext";
 import AuthContext from "../../context/AuthContext";
 
-function ReviewCard({ review, restaurantId }) {
+function ReviewCard({ review, username, restaurantId }) {
   const { editReview, deleteReview } = useContext(RestaurantsContext);
   const { user, isAdmin } = useContext(AuthContext);
   const [open, setOpen] = useState(false);
@@ -33,6 +33,7 @@ function ReviewCard({ review, restaurantId }) {
         <div className="review-user">{review.user}</div>
         <StarRating value={review.rating} />
       </div>
+      <div className="review-text"><b>{username}</b></div>
       <div className="review-text">{review.text}</div>
       <div className="review-date">{review.date}</div>
       {canEdit() && (
diff --git a/client/src/components/user/LoginForm.jsx b/client/src/components/user/LoginForm.jsx
index 427cbb8..e4f6b30 100755
--- a/client/src/components/user/LoginForm.jsx
+++ b/client/src/components/user/LoginForm.jsx
@@ -18,13 +18,7 @@ function LoginForm({ onLogin }) {
     <form className="login-form" onSubmit={handleSubmit}>
       <InputField name="email" label="Email" value={form.email} onChange={handleChange} placeholder="you@example.com" />
       <InputField name="password" label="Password" type="password" value={form.password} onChange={handleChange} placeholder="••••••" />
-      {/* <div className="form-row">
-        <label className="input-label">Role</label>
-        <select name="role" value={form.role} onChange={handleChange} className="input-field">
-          <option value="user">User</option>
-          <option value="admin">Admin</option>
-        </select>
-      </div> */}
+
       <Button type="submit">Log in</Button>
     </form>
   );
diff --git a/client/src/context/AuthContext.jsx b/client/src/context/AuthContext.jsx
index 8591905..6baf26d 100755
--- a/client/src/context/AuthContext.jsx
+++ b/client/src/context/AuthContext.jsx
@@ -8,8 +8,8 @@ export function AuthProvider({ children }) {
 
   const [user, setUser] = React.useState(() => {
     try {
-      const raw = localStorage.getItem("fa_user");
-      return raw ? JSON.parse(raw) : null;
+      const stored = localStorage.getItem("fa_user");
+      return stored ? JSON.parse(stored) : null;
     } catch (e) {
       console.log(e)
       return null;
@@ -18,7 +18,7 @@ export function AuthProvider({ children }) {
 
   const [token, setToken] = React.useState(() => {
     try {
-      return localStorage.getItem("fa_token");
+      return localStorage.getItem("fa_token") || null;
     } catch (e) {
       console.log(e)
       return null;
@@ -62,7 +62,7 @@ export function AuthProvider({ children }) {
   async function ownerLogin(credentials) {
     try {
       const res = await axios.post(
-        "http://localhost:3000/api/RestaurantOwners/login",
+        "http://localhost:3000/api/owners/login",
         credentials
       );
       const decoded = jwtDecode(res.data.token);
@@ -84,23 +84,11 @@ export function AuthProvider({ children }) {
     setToken(null);
   }
 
-  async function signup(details) {
-    try {
-      const res = await axios.post("http://localhost:3000/api/users/register", details);//removed /register here
-      setUser(res.data.user);
-      setToken(res.data.token);
-      return res.data;
-    } catch (err) {
-      console.error("Signup failed", err);
-      throw err.response?.data?.message || "Signup failed";
-    }
-  }
-
   const isAdmin = () => user?.role === "admin";
   const isOwner = () => user?.role === "restaurant_owner" || !!user?.managedRestaurantId;
 
   return (
-    <AuthContext.Provider value={{ user, token, login, logout, signup, isAdmin, isOwner, ownerLogin }}>
+    <AuthContext.Provider value={{ user, token, login, logout, /*signup,*/ isAdmin, isOwner, ownerLogin }}>
       {children}
     </AuthContext.Provider>
   );
diff --git a/client/src/context/RestaurantsContext.jsx b/client/src/context/RestaurantsContext.jsx
index f4734ef..844d8db 100755
--- a/client/src/context/RestaurantsContext.jsx
+++ b/client/src/context/RestaurantsContext.jsx
@@ -1,21 +1,19 @@
 import React from "react";
 import axios from "axios";
 import SAMPLE_RESTAURANTS from "../data/restaurants";
-
+import AuthContext from "./AuthContext";
 const RestaurantsContext = React.createContext();
 
 export function RestaurantsProvider({ children }) {
+  const { token } = React.useContext(AuthContext);
   const [restaurants, setRestaurants] = React.useState([]);
 
   React.useEffect(() => {
     axios.get("http://localhost:3000/api/restaurants")
       .then((res) => {
         if (res.data.length === 0) {
-          // console.log("no resturant data ... ")
-          // Fallback or handle initial seed
           setRestaurants([]);
         } else {
-          //  console.log("yes resturant data ... ", res.data)
           setRestaurants(res.data);
         }
       })
@@ -26,44 +24,63 @@ export function RestaurantsProvider({ children }) {
       });
   }, []);
 
-  const [favorites, setFavorites] = React.useState(() => {
-    try {
-      const raw = localStorage.getItem("fa_favorites");
-      return raw ? JSON.parse(raw) : [];
-    } catch (e) {
-      console.log(e)
-      return [];
-    }
-  });
+
+  const [favorites, setFavorites] = React.useState([]);
 
   React.useEffect(() => {
-    try {
-      localStorage.setItem("fa_favorites", JSON.stringify(favorites));
-    } catch (e) {
-      console.log(e)
+    if (!token) {
+      setFavorites([])
+      return
     }
-  }, [favorites]);
+    axios.get("http://localhost:3000/api/users/favorites", {
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    })
+      .then((res) => {
+        if (res.data) {
+          const allUserFavorites = res.data.map(r => r._id)
+          setFavorites(allUserFavorites)
+        }
+      })
+      .catch((err) => {
+        console.error("Failed to fetch user's favoture", err);
+      });
+  }, [token]);
 
-  function addReview(restaurantId, review) {
-    return axios.post(`http://localhost:3000/api/restaurants/${restaurantId}/reviews`, review)
+  async function addReview(restaurantId, review) {
+    return axios.post(`http://localhost:3000/api/restaurants/${restaurantId}/reviews`, review,
+      {
+        headers: {
+          Authorization: ` Bearer ${token}`
+        }
+      }
+    )
       .then((res) => {
-        // Optimistically update or re-fetch. Let's update state manually to save a fetch.
-        // res.data contains the new review with ID
-        const newReview = res.data;
+        // Server responds with { rating, reviews } — pick the newly added review
+        const data = res.data;
+        const createdReview = (data.reviews && data.reviews.length) ? data.reviews[data.reviews.length - 1] : null;
+
         setRestaurants((prev) =>
-          prev.map((r) => (r.id === restaurantId ? { ...r, reviews: [...(r.reviews || []), newReview] } : r))
+          prev.map((r) =>
+            r._id === restaurantId
+              ? { ...r, rating: data.rating ?? r.rating, reviews: [...(r.reviews || []), ...(createdReview ? [createdReview] : [])] }
+              : r
+          )
         );
       })
-      .catch((err) => console.error("Error adding review", err));
+      .catch(() => {
+        alert('you already reviewed this restaurant.')
+      });
   }
 
-  function editReview(restaurantId, reviewId, updated) {
+  async function editReview(restaurantId, reviewId, updated) {
     axios.put(`http://localhost:3000/api/restaurants/${restaurantId}/reviews/${reviewId}`, updated)
       .then((res) => {
         console.log(res)
         setRestaurants((prev) =>
           prev.map((r) =>
-            r.id === restaurantId
+            r._id === restaurantId
               ? { ...r, reviews: (r.reviews || []).map((rv) => (rv.id === reviewId || rv._id === reviewId ? { ...rv, ...updated } : rv)) }
               : r
           )
@@ -72,28 +89,76 @@ export function RestaurantsProvider({ children }) {
       .catch((err) => console.error("Error editing review", err));
   }
 
-  function deleteReview(restaurantId, reviewId) {
+  async function deleteReview(restaurantId, reviewId) {
     axios.delete(`http://localhost:3000/api/restaurants/${restaurantId}/reviews/${reviewId}`)
       .then(() => {
         setRestaurants((prev) =>
-          prev.map((r) => (r.id === restaurantId ? { ...r, reviews: (r.reviews || []).filter((rv) => rv.id !== reviewId && rv._id !== reviewId) } : r))
+          prev.map((r) => (r._id === restaurantId ? { ...r, reviews: (r.reviews || []).filter((rv) => rv.id !== reviewId && rv._id !== reviewId) } : r))
         );
       })
       .catch((err) => console.error("Error deleting review", err));
   }
 
   function addRestaurant(newR) {
+    // add to localstate
     setRestaurants((prev) => [newR, ...prev]);
   }
 
+  async function deleteRestaurant(restaurantId) {
+    // remove from DB
+    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')
+      })
+      .catch((err) => console.error("Error deleting review", err));
+  }
+
   function updateRestaurantImage(restaurantId, dataUrl) {
     setRestaurants((prev) =>
-      prev.map((r) => (r.id === restaurantId ? { ...r, images: [dataUrl, ...(r.images || []).slice(1)] } : r))
+      prev.map((r) => (r._id === restaurantId ? { ...r, images: [dataUrl, ...(r.images || []).slice(1)] } : r))
     );
   }
 
   function toggleFavorite(restaurantId) {
+    // decide if to add to favorite or remove. 
+    const isFavoriteToAdd = !favorites.includes(restaurantId)
+    // maintain local state
     setFavorites((prev) => (prev.includes(restaurantId) ? prev.filter((id) => id !== restaurantId) : [...prev, restaurantId]));
+
+    // add or remove user favorite list from db by calling rest api. 
+    if (isFavoriteToAdd) {
+      return axios.post(`http://localhost:3000/api/users/favorites/${restaurantId}`,
+        null, // no payload needed
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        })
+        .then((res) => {
+          console.log(res)
+          // just added to db, not need to use the response.
+        })
+        .catch((err) => console.error("Error adding user's favorite", err));
+    } else {
+      return axios.delete(`http://localhost:3000/api/users/favorites/${restaurantId}`,
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        })
+        .then((res) => {
+          console.log(res)
+          // just deleted to db, not need to use the response.
+        })
+        .catch((err) => console.error("Error removing user's favorite", err));
+    }
+
   }
 
   function isFavorite(restaurantId) {
@@ -108,6 +173,7 @@ export function RestaurantsProvider({ children }) {
         editReview,
         deleteReview,
         addRestaurant,
+        deleteRestaurant,
         updateRestaurantImage,
         favorites,
         toggleFavorite,
diff --git a/client/src/pages/Favorites.jsx b/client/src/pages/Favorites.jsx
index eb7f732..8522f4c 100755
--- a/client/src/pages/Favorites.jsx
+++ b/client/src/pages/Favorites.jsx
@@ -1,45 +1,21 @@
-import React, { useContext, useState, useEffect } from "react";
-import AuthContext from "../context/AuthContext";
+import React, { useContext } from "react";
 import RestaurantsContext from "../context/RestaurantsContext";
 import RestaurantList from "../components/restaurant/RestaurantList";
 
 function Favorites() {
-  const { user } = useContext(AuthContext);
-  const [favorites, setFavorites] = useState([]);
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-    if (!user) return;
-    const id = user._id
-    const fetchFavorites = async () => {
-      try {
-        const res = await fetch(`http://localhost:3000/api/users/favorites/${id}`);
-        if (!res.ok) throw new Error("Failed to fetch favorites");
-        const data = await res.json();
-        setFavorites(data.favorites);
-      } catch (err) {
-        console.error(err);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchFavorites();
-  }, [user]);
-
-  if (loading) return <p>Loading favorites...</p>;
+  const { restaurants, favorites } = useContext(RestaurantsContext);
+  const favRestaurants = restaurants.filter((r) => favorites.includes(r._id));
 
   return (
     <div className="favorites-page container">
       <h1 className="page-title">Favorites</h1>
-      {favorites.length === 0 ? (
+      {favRestaurants.length === 0 ? (
         <p className="muted">You haven't saved any restaurants yet.</p>
       ) : (
-        <RestaurantList restaurants={favorites} />
+        <RestaurantList restaurants={favRestaurants} />
       )}
     </div>
   );
 }
 
-
 export default Favorites;
diff --git a/client/src/pages/OwnerDashboard.jsx b/client/src/pages/OwnerDashboard.jsx
new file mode 100644
index 0000000..c685168
--- /dev/null
+++ b/client/src/pages/OwnerDashboard.jsx
@@ -0,0 +1,73 @@
+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";
+import OwnerRestaurantRegistrationForm from "../components/owner/OwnerAddRestaurantForm";
+import axios from "axios";
+
+function OwnerDashboard() {
+    const { user, token } = useContext(AuthContext);
+    const { setRestaurants } = useContext(RestaurantsContext); // update global context
+    const [ownerRestaurants, setOwnerRestaurants] = useState([]); // local state for this dashboard
+    const [showForm, setShowForm] = useState(false);
+    const navigate = useNavigate();
+
+    // Fetch owned restaurants on mount
+    useEffect(() => {
+        const fetchOwnedRestaurants = async () => {
+            try {
+                const res = await axios.get("http://localhost:3000/api/owners/restaurants", {
+                    headers: { Authorization: `Bearer ${token}` },
+                });
+                setOwnerRestaurants(res.data); // res.data is an array of restaurant objec
+            } catch (err) {
+                console.error("Failed to fetch owned restaurants:", err);
+            }
+        };
+        if (token) fetchOwnedRestaurants();
+    }, [token])
+
+    return (
+        <main className="dashboard-page container">
+            <h1>Welcome, {user.name}</h1>
+
+            <section className="dashboard-actions">
+                <button
+                    className="button button-primary"
+                    onClick={() => setShowForm(!showForm)} // show form on click
+                >
+                    + Add New Restaurant
+                </button>
+            </section>
+
+            {/* Show form when toggled */}
+            {showForm && (
+                <OwnerRestaurantRegistrationForm
+                    ownerId={user._id}
+                    onSuccess={(newRestaurant) => {
+                        setOwnerRestaurants([...ownerRestaurants, newRestaurant]); // update local state
+                        setRestaurants((prev) => [...prev, newRestaurant]); // update global context
+                        setShowForm(false); // hide form
+                        navigate(`/owner/restaurants/${newRestaurant._id}/edit`);
+                    }}
+                />
+            )}
+
+            <section className="owner-restaurants">
+                <h2>Your Restaurants</h2>
+                {ownerRestaurants.length === 0 ? (
+                    <p>No restaurants yet</p>
+                ) : (
+                    <div className="featured-row">
+                        {ownerRestaurants.map((r) => (
+                            <FeaturedCard key={r._id} restaurant={r} showDeleteButton={true} />
+                        ))}
+                    </div>
+                )}
+            </section>
+        </main>
+    );
+}
+
+export default OwnerDashboard;
diff --git a/client/src/pages/OwnerLoginPage.jsx b/client/src/pages/OwnerLoginPage.jsx
index b9dc724..4553a22 100755
--- a/client/src/pages/OwnerLoginPage.jsx
+++ b/client/src/pages/OwnerLoginPage.jsx
@@ -6,12 +6,12 @@ import { useNavigate } from "react-router-dom";
 
 function OwnerLoginPage() {
   const { ownerLogin } = useContext(AuthContext);
-  const navigate = useNavigate();
+  const navigate = useNavigate('/addRestaurant');
 
   async function handleLogin(credentials) {
     try {
       await ownerLogin(credentials);
-      navigate("/");
+      navigate("/OwnerDashBoard");
     } catch (e) {
       alert(e);
     }
diff --git a/client/src/pages/RestaurantDetailsPage.jsx b/client/src/pages/RestaurantDetailsPage.jsx
index aad88a7..615a5ea 100755
--- a/client/src/pages/RestaurantDetailsPage.jsx
+++ b/client/src/pages/RestaurantDetailsPage.jsx
@@ -6,10 +6,11 @@ import MenuSection from "../components/restaurant/MenuSection";
 import ReviewCard from "../components/restaurant/Reviewcard";
 import StarRating from "../components/common/StarRating";
 import MapSection from "../components/common/MapSection";
-
+import AuthContext from "../context/AuthContext";
 
 
 function RestaurantDetailsPage() {
+  const { user } = React.useContext(AuthContext);
   const { id } = useParams();
   const navigate = useNavigate();
   const { restaurants } = useContext(RestaurantsContext);
@@ -41,10 +42,10 @@ function RestaurantDetailsPage() {
             <h3>Reviews</h3>
             {r.reviews && r.reviews.length === 0 && <div>No reviews yet—be the first.</div>}
             <div className="reviews-list">
-              {r.reviews.map((rev) => <ReviewCard key={rev.id} review={rev} restaurantId={r.id} />)}
+              {r.reviews.map((rev) => <ReviewCard key={rev.id} review={rev} username={user.name} restaurantId={r._id} />)}
             </div>
             <div className="write-review-actions">
-              <button className="button button-primary" onClick={() => navigate(`/write-review?restaurant=${r.id}`)}>Write a review</button>
+              <button className="button button-primary" onClick={() => navigate(`/write-review?restaurant=${r._id}`)}>Write a review</button>
             </div>
           </section>
         </div>
diff --git a/client/src/pages/RestaurantListPage.jsx b/client/src/pages/RestaurantListPage.jsx
index b58e9fd..19b053e 100755
--- a/client/src/pages/RestaurantListPage.jsx
+++ b/client/src/pages/RestaurantListPage.jsx
@@ -9,7 +9,6 @@ import RestaurantsContext from "../context/RestaurantsContext";
 function RestaurantListPage() {
   const { restaurants } = useContext(RestaurantsContext);
   const [filters, setFilters] = useState({ category: "", minRating: 0 });
-console.log("RestaurantListPage",restaurants)
   const filtered = useMemo(() => {
     return restaurants.filter((r) => (!filters.category || r.category === filters.category) && r.rating >= filters.minRating);
   }, [restaurants, filters]);
diff --git a/client/src/pages/UserProfilePage.jsx b/client/src/pages/UserProfilePage.jsx
index cba8219..56a229b 100755
--- a/client/src/pages/UserProfilePage.jsx
+++ b/client/src/pages/UserProfilePage.jsx
@@ -3,6 +3,8 @@ import { useContext } from "react";
 import UserProfile from "../components/user/UserProfile";
 import AuthContext from "../context/AuthContext";
 import axios from "axios";
+import { useNavigate } from "react-router-dom";
+import Button from "../components/common/Button";
 
 function UserProfilePage() {
   const { user, isAdmin, isOwner, logout } = useContext(AuthContext);
@@ -13,19 +15,18 @@ function UserProfilePage() {
   const [formData, setFormData] = React.useState({ name: '', description: '', menu: '' });
   const [msg, setMsg] = React.useState(null);
 
-  function fetchRequests() {
-    axios.get('http://localhost:3000/api/requests')
-      .then(res => setRequests(res.data))
-      .catch(err => console.error("Failed to fetch requests", err));
-  }
   // Admin: Fetch pending requests
-  React.useEffect(() => {
+  /* React.useEffect(() => {
     if (isAdmin()) {
       fetchRequests();
     }
-  }, [user]);
-
+  }, [user]); */
 
+  function fetchRequests() {
+    axios.get('http://localhost:3000/api/requests')
+      .then(res => setRequests(res.data))
+      .catch(err => console.error("Failed to fetch requests", err));
+  }
 
   function handleApprove(id) {
     axios.post(`http://localhost:3000/api/requests/${id}/approve`)
@@ -63,16 +64,25 @@ function UserProfilePage() {
       })
       .catch(err => setMsg("Error submitting request: " + err.message));
   }
-
+  const navigate = useNavigate();
   if (!user) return <div className="container"><h2>Please log in to view your profile.</h2></div>;
 
   return (
     <div className="profile-page container">
       <div className="profile-header" style={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '2rem' }}>
-        <h1 className="page-title">Dashboard</h1>
+        <h1 className="title">Profile</h1>
+        {
+          user.role === "owner" &&
+          <div>
+            <Button onClick={() => navigate("/OwnerDashBoard")}>Go to your dashboard</Button>
+          </div>
+        }
         <button className="button button-outline" onClick={logout}>Log Out</button>
+
+
       </div>
 
+
       <UserProfile user={user} />
 
       {msg && <div className="alert-box" style={{ padding: '1rem', background: '#e0f7fa', color: '#006064', marginBottom: '1rem', borderRadius: '4px' }}>{msg}</div>}
diff --git a/client/src/pages/WriteReviewPage.jsx b/client/src/pages/WriteReviewPage.jsx
index 266ae91..1c255ac 100755
--- a/client/src/pages/WriteReviewPage.jsx
+++ b/client/src/pages/WriteReviewPage.jsx
@@ -11,13 +11,19 @@ function WriteReviewPage() {
   const { addReview } = useContext(RestaurantsContext);
   const q = useQuery();
   const restaurantId = q.get("restaurant") || "";
-  const [form, setForm] = React.useState({ user: "", rating: 5, text: "" });
+  const [form, setForm] = React.useState({ rating: 5, text: "" });
   const navigate = useNavigate();
 
   async function submit(e) {
     e.preventDefault();
+    console.log("restaurantId:", restaurantId)
     if (!restaurantId) return;
-    const review = { id: `rv${Date.now()}`, user: form.user || "Anonymous", rating: Number(form.rating), text: form.text, date: new Date().toISOString().slice(0, 10) };
+
+    const review = {
+      rating: Number(form.rating),
+      text: form.text
+    };
+
     await addReview(restaurantId, review);
     navigate(`/restaurants/${restaurantId}`);
   }
@@ -26,11 +32,9 @@ function WriteReviewPage() {
     <div className="write-review container">
       <h1 className="page-title">Write a review</h1>
       <form className="review-form" onSubmit={submit}>
-        <label className="input-label">Your name</label>
-        <input className="input-field" name="user" value={form.user} onChange={(e) => setForm({ ...form, user: e.target.value })} placeholder="Your name" />
         <label className="input-label">Rating</label>
         <select className="input-field" value={form.rating} onChange={(e) => setForm({ ...form, rating: e.target.value })}>
-          {[5, 4, 3, 2, 1].map((r) => <option key={r} value={r}>{r} stars</option>)}
+          {[5, 4.5, 4, 3.5, 3, 2.5, 2, 1.5, 1].map((r) => <option key={r} value={r}>{r} stars</option>)}
         </select>
         <label className="input-label">Review</label>
         <textarea className="input-field" value={form.text} onChange={(e) => setForm({ ...form, text: e.target.value })} rows="6" placeholder="Write your experience..."></textarea>
diff --git a/package-lock.json b/package-lock.json
index 91dbfe3..9083190 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -68,7 +68,6 @@
       "integrity": "sha512-H3mcG6ZDLTlYfaSNi0iOKkigqMFvkTKlGUYlD8GW7nNOYRrevuA46iTypPyv+06V3fEmvvazfntkBU34L0azAw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@babel/code-frame": "^7.28.6",
         "@babel/generator": "^7.28.6",
@@ -1474,7 +1473,6 @@
       "integrity": "sha512-WPigyYuGhgZ/cTPRXB2EwUw+XvsRA3GqHlsP4qteqrnnjDrApbS7MxcGr/hke5iUoeB7E/gQtrs9I37zAJ0Vjw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "csstype": "^3.2.2"
       }
@@ -1544,7 +1542,6 @@
       "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -1769,7 +1766,6 @@
         }
       ],
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "baseline-browser-mapping": "^2.9.0",
         "caniuse-lite": "^1.0.30001759",
@@ -2333,7 +2329,6 @@
       "integrity": "sha512-LEyamqS7W5HB3ujJyvi0HQK/dtVINZvd5mAAp9eT5S/ujByGjiZLCzPcHVzuXbpJDJF/cxwHlfceVUDZ2lnSTw==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.8.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -3248,8 +3243,7 @@
       "version": "1.9.4",
       "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
       "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==",
-      "license": "BSD-2-Clause",
-      "peer": true
+      "license": "BSD-2-Clause"
     },
     "node_modules/levn": {
       "version": "0.4.1",
@@ -3926,7 +3920,6 @@
       "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz",
       "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==",
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3936,7 +3929,6 @@
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz",
       "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==",
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "scheduler": "^0.27.0"
       },
@@ -4492,7 +4484,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -4673,7 +4664,6 @@
       "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "dependencies": {
         "esbuild": "^0.27.0",
         "fdir": "^6.5.0",
@@ -4767,7 +4757,6 @@
       "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "engines": {
         "node": ">=12"
       },
@@ -4912,7 +4901,6 @@
       "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==",
       "dev": true,
       "license": "MIT",
-      "peer": true,
       "funding": {
         "url": "https://github.com/sponsors/colinhacks"
       }
diff --git a/package.json b/package.json
index f705364..10e288a 100644
--- a/package.json
+++ b/package.json
@@ -14,4 +14,4 @@
   "devDependencies": {
     "concurrently": "^9.2.1"
   }
-}
+}
\ No newline at end of file
diff --git a/server/README.md b/server/README.md
new file mode 100644
index 0000000..5d61d1f
--- /dev/null
+++ b/server/README.md
@@ -0,0 +1,368 @@
+# Server (Express + MongoDB) — find-addis
+
+**Purpose:** Backend API for find-addis. Implements authentication (users & owners), restaurant CRUD, reviews and favorites. The server runs on `http://localhost:3000` by default.
+
+---
+
+## 🔧 Technical Overview
+
+- Node + Express
+- MongoDB + Mongoose
+- JWT-based authentication for users & owners
+- Nodemailer used for sending verification emails
+
+---
+
+## ✅ Getting started
+
+Prerequisites
+
+- Node 18+ and npm
+- MongoDB (local or Atlas)
+
+Install
+
+```bash
+cd server
+npm install
+```
+
+Environmental variables
+Create a `.env` file in `server/` (see `.env.example` below). Required vars:
+
+- `PORT` (optional, default 3000)
+- `MONGO_URI` (mongodb connection string)
+- `JWT_SECRET` (secret for signing tokens)
+- `EXPIRESIN` (token expiry, e.g. `1d`)
+- `EMAIL` (sender Gmail address for verification emails)
+- `EMAILPASS` (Gmail app password)
+
+Example `.env` (server)
+
+```
+PORT=3000
+MONGO_URI=mongodb://localhost:27017/findaddis
+JWT_SECRET=supersecretkey
+EXPIRESIN=1d
+EMAIL=your.email@gmail.com
+EMAILPASS=your-app-password
+```
+
+Run server (dev)
+
+```bash
+npm run dev
+# uses nodemon to restart on changes
+```
+
+Run server (production)
+
+```bash
+npm start
+```
+
+---
+
+## 📦 Models & Example Payloads
+
+User (signup)
+
+```json
+{
+  "name": "Jane Doe",
+  "email": "jane@example.com",
+  "password": "password123"
+}
+```
+
+Restaurant (owner add)
+
+```json
+{
+  "name": "Cafe Roma",
+  "category": "Italian",
+  "address": "123 Main St",
+  "price": "$$",
+  "images": ["base64string"],
+  "hours": "9:00-21:00",
+  "description": "Cozy italian cafe",
+  "menu": ["pizza", "pasta"],
+  "location": { "lat": 9.0, "lng": 38.7 }
+}
+```
+
+Review (user)
+
+```json
+{ "rating": 4, "text": "Great food!" }
+```
+
+---
+
+## �️ Collections & Data Model
+
+Below is an overview of how documents are organized, sample schemas and example documents. The current implementation uses small embedded review objects inside `restaurants.reviews`, but below we show both the embedded (current) and a normalized approach (recommended when reviews grow large).
+
+### Users (collection: `users`)
+
+- Fields: `_id`, `name`, `email` (unique), `password` (hashed), `isVerified`, `token`, `emailVerificationExpiry`, `favorites` (array of ObjectId]
+
+Mongoose (example):
+
+```js
+const userSchema = new mongoose.Schema({
+  name: String,
+  email: { type: String, unique: true },
+  password: String,
+  isVerified: Boolean,
+  token: String,
+  emailVerificationExpiry: Date,
+  favorites: [{ type: mongoose.Schema.Types.ObjectId, ref: "restaurants" }],
+});
+```
+
+Example document:
+
+```json
+{
+  "_id": "64b...",
+  "name": "Jane Doe",
+  "email": "jane@example.com",
+  "favorites": ["64a...", "64b..."]
+}
+```
+
+---
+
+### Owners (collection: `owners`)
+
+- Fields: `_id`, `name`, `email`(unique), `password`, `phoneNumber` (array), `isVerified`, `restaurantsOwned` (array of ObjectId)
+
+Example document:
+
+```json
+{
+  "_id": "64o...",
+  "name": "Alice Owner",
+  "email": "owner@example.com",
+  "restaurantsOwned": ["64r..."]
+}
+```
+
+---
+
+### Restaurants (collection: `restaurants`)
+
+- Fields: `_id`, `name`, `category`, `rating`, `price`, `address`, `images`, `hours`, `description`, `menu`, `location` (lat/lng)
+- Two design options for reviews:
+  1. Embedded (current): `reviews` is an array of small subdocuments stored inside the restaurant document.
+  2. Normalized (recommended at scale): `reviews` are stored in their own `reviews` collection and referenced by `restaurantId` (and optionally by the restaurant as an array of review ids or via query/populate).
+
+Mongoose (embedded example):
+
+```js
+const reviewSchema = new mongoose.Schema({
+  userId: String,
+  rating: Number,
+  text: String,
+  date: Date,
+});
+const restaurantSchema = new mongoose.Schema({
+  name: String,
+  category: String,
+  rating: Number,
+  reviews: [reviewSchema],
+  location: { lat: Number, lng: Number },
+});
+```
+
+Example document (embedded):
+
+```json
+{
+  "_id": "64r...",
+  "name": "Cafe Roma",
+  "reviews": [{ "userId": "64u...", "rating": 4, "text": "Great" }]
+}
+```
+
+Mongoose (normalized review model):
+
+```js
+const Review = mongoose.model(
+  "reviews",
+  new mongoose.Schema({
+    restaurantId: { type: mongoose.Schema.Types.ObjectId, ref: "restaurants" },
+    userId: { type: mongoose.Schema.Types.ObjectId, ref: "users" },
+    rating: Number,
+    text: String,
+    date: Date,
+  }),
+);
+```
+
+Example review document (normalized):
+
+```json
+{
+  "_id": "64rev...",
+  "restaurantId": "64r...",
+  "userId": "64u...",
+  "rating": 4,
+  "text": "Great food!",
+  "date": "2024-01-01T12:00:00Z"
+}
+```
+
+To fetch a restaurant with its normalized reviews you can run a query like:
+
+```js
+// Option A: get restaurant then query reviews
+const restaurant = await Restaurant.findById(id);
+const reviews = await Review.find({ restaurantId: id });
+
+// Option B: aggregate with $lookup
+const result = await Restaurant.aggregate([
+  { $match: { _id: ObjectId(id) } },
+  {
+    $lookup: {
+      from: "reviews",
+      localField: "_id",
+      foreignField: "restaurantId",
+      as: "reviews",
+    },
+  },
+]);
+```
+
+---
+
+### Favorites
+
+- Implementation: `users.favorites` is an array of ObjectId referencing `restaurants`.
+- This allows quick retrieval of a user's favorite restaurants via `User.findById(userId).populate('favorites')`.
+
+---
+
+### Indexes & Performance
+
+- Ensure indexing on frequently queried fields:
+  - `users.email` (unique)
+  - `restaurants.category` and `restaurants.rating` for filtered queries
+  - `reviews.restaurantId` when reviews are normalized
+- If using embedded reviews, watch document sizes (MongoDB max document size is 16MB).
+
+---
+
+## �🔐 Authentication
+
+- Authenticated endpoints expect a header:
+  Authorization: Bearer <token>
+- Tokens are issued on successful login for both users and owners.
+
+---
+
+## 🧭 Endpoints (full list with examples)
+
+Base URL: `http://localhost:3000/api`
+
+Users
+
+- GET `/users` — Get all users (no auth)
+  - Example: `GET /api/users`
+  - Response: `{ users: [...] }`
+
+- POST `/users` — Register a new user
+  - Body: `{ name, email, password }`
+  - Example cURL:
+    ```bash
+    curl -X POST http://localhost:3000/api/users -H "Content-Type: application/json" -d '{"name":"Jane","email":"jane@example.com","password":"pass123"}'
+    ```
+  - Response: 201 on success, sends a verification email
+
+- GET `/users/verify?token=...&email=...` — Verify user email
+  - Example: `GET /api/users/verify?token=abc&email=jane@example.com`
+  - Response: 200 and message on success
+
+- POST `/users/login` — Login user
+  - Body: `{ email, password }`
+  - Response: `{ token: "<JWT>", expiresIn: "<EXPIRESIN>" }`
+
+- POST `/users/favorites/:restaurantId` — Add restaurant to user's favorites (requires user auth)
+  - Header: `Authorization: Bearer <token>`
+  - Response: 200 and updated list of favorite restaurant objects
+  - Example cURL:
+    ```bash
+    curl -X POST http://localhost:3000/api/users/favorites/64b123... -H "Authorization: Bearer $TOKEN"
+    ```
+
+- GET `/users/favorites` — Get user's favorites (requires user auth)
+  - Header: `Authorization: Bearer <token>`
+
+- DELETE `/users/favorites/:restaurantId` — Remove from favorites (requires user auth)
+  - Header: `Authorization: Bearer <token>`
+
+Restaurant Owners
+
+- POST `/owners` — Register owner
+  - Body: `{ name, email, password, phoneNumber }` (phoneNumber is an array)
+  - Sends verification email
+
+- GET `/owners/verify?token=...&email=...` — Verify owner email
+
+- POST `/owners/login` — Owner login
+  - Response: `{ token, expiresIn }` (token includes role: 'owner')
+
+- GET `/owners/restaurants` — Get restaurants owned by the authenticated owner (requires owner auth)
+  - Header: `Authorization: Bearer <token>`
+  - Example response: `[{...}, {...}]`
+
+Restaurants
+
+- POST `/restaurants` — Create a new restaurant (requires owner auth)
+  - Body: Restaurant object (see model example above)
+  - Header: `Authorization: Bearer <owner-token>`
+  - Example cURL:
+    ```bash
+    curl -X POST http://localhost:3000/api/restaurants -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" -d '{"name":"Cafe","category":"Cafe","address":".."}'
+    ```
+  - Response: 201 with created restaurant object
+
+- POST `/restaurants/:id/reviews` — Add a review to a restaurant (requires user auth)
+  - Header: `Authorization: Bearer <user-token>`
+  - Body: `{ rating: Number, text: String }`
+  - Response: 201 with `{ rating, reviews }
+
+- GET `/restaurants` — List restaurants (supports queries)
+  - Query params: `?category=Italian&rating=4`
+  - Response: 200 with an array of restaurants
+
+- PATCH `/restaurants/:id` — Update restaurant (requires owner auth)
+  - Body: partial restaurant fields to update
+  - Header: `Authorization: Bearer <owner-token>`
+
+- DELETE `/restaurants/:id` — Delete restaurant (requires owner auth)
+  - Header: `Authorization: Bearer <owner-token>`
+  - Response: 200 on success
+
+---
+
+## 💥 Error cases & status codes (common)
+
+- 400 — Bad request or operation not allowed (e.g., non-owner attempting owner-only ops)
+- 401 — No token provided or Invalid token
+- 403 — Forbidden (role mismatch)
+- 404 — Resource not found
+- 409 — Conflict (e.g., duplicate email, duplicate review by same user)
+
+---
+
+## 🔧 Troubleshooting & Tips
+
+- If emails fail, check `EMAIL` and `EMAILPASS` in `.env` and ensure Gmail app passwords are set or use a robust transactional email service.
+- If images fail, make sure JSON payload sizes are within the `5mb` limit set by the server.
+- Run `npm run dev` to get helpful nodemon restarts during development.
+
+---
+
+If you'd like, I can add an OpenAPI / Swagger spec (auto-generated) for these endpoints and add a Postman collection to the repo.
diff --git a/server/models/Restaurant.js b/server/models/Restaurant.js
index 5b161bd..af0b587 100644
--- a/server/models/Restaurant.js
+++ b/server/models/Restaurant.js
@@ -12,7 +12,7 @@ const restaurantSchema = mongoose.Schema({
     name: { type: String, required: true },
     category: { type: String, required: true },
     rating: { type: Number, required: true, default: 0 },
-    price: { type: String, required: true },
+    price: { type: String },
     address: { type: String, required: true },
     images: [String], // will store base64 strings
     hours: String,
diff --git a/server/models/RestaurantOwner.js b/server/models/RestaurantOwner.js
index 9a2aff4..eade8fe 100644
--- a/server/models/RestaurantOwner.js
+++ b/server/models/RestaurantOwner.js
@@ -10,7 +10,7 @@ const restaurantOwnerSchema = mongoose.Schema({
     isVerified: { type: Boolean, default: false },
     emailVerificationExpiry: { type: Date },
     token: { type: String },
-    restaurantsOwned: [{ type: mongoose.Schema.Types.ObjectId, ref: "Restaurant" }]
+    restaurantsOwned: [{ type: mongoose.Schema.Types.ObjectId, ref: "restaurants" }]
 }, { timestamps: true });
 
 
diff --git a/server/models/User.js b/server/models/User.js
index 89000ff..50a00cb 100644
--- a/server/models/User.js
+++ b/server/models/User.js
@@ -15,7 +15,7 @@ const userSchema = mongoose.Schema({
     isVerified: { type: Boolean, default: false },
     token: { type: String },
     emailVerificationExpiry: { type: Date },
-    favorites: [{ type: mongoose.Schema.Types.ObjectId, ref: "Restaurant" }]
+    favorites: [{ type: mongoose.Schema.Types.ObjectId, ref: "restaurants" }]
 }, { timestamps: true });
 
 const User = mongoose.model('users', userSchema);
diff --git a/server/routes/RestaurantApp.js b/server/routes/RestaurantApp.js
index 0bf6d17..8c7f112 100644
--- a/server/routes/RestaurantApp.js
+++ b/server/routes/RestaurantApp.js
@@ -4,59 +4,66 @@ import mongoose from 'mongoose';
 import RestaurantOwners from '../models/RestaurantOwner.js';
 import userAuthMiddleware from '../middleware/UserAuthMiddleware.js'
 import ownerAuthMiddleware from '../middleware/ownerAuthMiddleware.js';
+import { calculateAverageRating } from '../utils/rating.js'
 const route = Router();
 
 route.post('/', ownerAuthMiddleware, async (req, res) => {
    if (req.owner.role != 'owner') {
-
       return res.status(400).send({ msg: 'Operation not allowed' })
    }
    try {
+      // first add the restaurant
       const newRestaurant = new Restaurant(req.body);
       await newRestaurant.save();
-      //register restaurant id for the owner
+
+      //register restaurant's id for the owner
       const ownerId = req.owner.id;
-      console.log(ownerId, newRestaurant._id)
       await RestaurantOwners.findByIdAndUpdate(ownerId, { $push: { restaurantsOwned: newRestaurant._id } })
-      res.status(201).json({ id: newRestaurant._id });
+      res.status(201).json(newRestaurant);
 
    } catch (err) {
       res.status(400).json({ error: err.message });
    }
 })
 
+
+
 route.post('/:id/reviews', userAuthMiddleware, async (req, res) => {
-   if (req.user.role != 'user') {
-      return res.status(400).send({ msg: 'Operation not allowed' })
+   if (req.user.role !== 'user') {
+      return res.status(403).json({ msg: "Operation not allowed" });
    }
+
    const restaurantId = req.params.id;
+
    try {
-      const newReview = {
+      const restaurant = await Restaurant.findById(restaurantId);
+      if (!restaurant) return res.status(404).json({ msg: "Restaurant not found" });
+
+      // Prevent duplicate review
+      if (restaurant.reviews.some(r => r.userId === req.user.id)) {
+         return res.status(409).json({ msg: "Review already exists for this user" });
+      }
+
+      // Add review
+      restaurant.reviews.push({
          userId: req.user.id,
          rating: req.body.rating,
          text: req.body.text,
          date: new Date()
-      }
-      //
-      const review = new mongoose.Types.Subdocument(newReview, reviewSchema);
-
-      const existingReview = await Restaurant.findOne({
-         _id: restaurantId,
-         'reviews.userId': newReview.userId
-      })
-      if (existingReview) {
-         res.status(409).json({ msg: 'review already exist with this user account' })
-         return;
-      }
+      });
+
+      // Recalculate rating
+      restaurant.rating = calculateAverageRating(restaurant.reviews);
+      await restaurant.save();
+
+      res.status(201).json({
+         rating: restaurant.rating,
+         reviews: restaurant.reviews
+      });
 
-      await Restaurant.updateOne(
-         { _id: restaurantId }, { $push: { reviews: review } }
-      )
-      res.send({ id: review._id })
    } catch (err) {
       res.status(400).json({ error: err.message });
    }
-
 })
 
 //get all restaurants or filtered
@@ -134,4 +141,6 @@ route.patch('/:id', ownerAuthMiddleware, async (req, res) => {
    }
 });
 
+
+
 export default route;
\ No newline at end of file
diff --git a/server/routes/RestaurantOwnersApp.js b/server/routes/RestaurantOwnersApp.js
index 310e0cd..0069f8c 100644
--- a/server/routes/RestaurantOwnersApp.js
+++ b/server/routes/RestaurantOwnersApp.js
@@ -3,6 +3,7 @@ import bcrypt from "bcryptjs"
 import crypto from "crypto"
 import SendEmail from '../utils/Mailer.js';
 import RestaurantOwners from '../models/RestaurantOwner.js'
+import ownerAuthMiddleware from '../middleware/ownerAuthMiddleware.js';
 import jwt from 'jsonwebtoken'
 const router = Router();
 
@@ -24,7 +25,7 @@ router.post('/', async (req, res) => {
         const newOwner = new RestaurantOwners({ name, email, password: hashedPassword, phoneNumber, token: hashedToken, emailVerificationExpiry: verificationExpiry });
         await newOwner.save();
 
-        const verificationLink = "http://localhost:3000/api/RestaurantOwners/verify?token=" + token + "&email=" + email;
+        const verificationLink = "http://localhost:3000/api/owners/verify?token=" + token + "&email=" + email;
         try {
             SendEmail(process.env.EMAIL, newOwner.email, 'verify findAddis account', verificationLink)
             res.status(201).json({ message: "Restaurant Owner registered successfully. Please verify your email using the link sent to your account" });
@@ -60,8 +61,6 @@ router.get('/verify', async (req, res) => {
     }
     const tokenToverify = unverifiedOwner.token;
     const hashedToken = crypto.createHash("sha256").update(token).digest("hex");
-    console.log("tokento verify", tokenToverify)
-    console.log("hashed token", hashedToken)
     if (tokenToverify != hashedToken) {
         res.status(400).json({ msg: 'invalid token requested' })
         return;
@@ -101,4 +100,21 @@ router.post('/login', async (req, res) => {
 
 })
 
+// get owner's restaurant
+router.get("/restaurants", ownerAuthMiddleware, async (req, res) => {
+    try {
+        if (req.owner.role !== "owner") {
+            return res.status(400).send({ msg: "Operation not allowed" });
+        }
+
+        // Get owner Restaurant
+        const ownerRestaurants = await RestaurantOwners.findById(req.owner.id).populate('restaurantsOwned')
+        // Return restaurantsOwned array or empty array if none
+        res.status(200).json(ownerRestaurants?.restaurantsOwned || []);
+    } catch (err) {
+        res.status(500).json({ error: err.message });
+    }
+});
+
+
 export default router;
\ No newline at end of file
diff --git a/server/routes/UserApp.js b/server/routes/UserApp.js
index 5458666..5db5472 100644
--- a/server/routes/UserApp.js
+++ b/server/routes/UserApp.js
@@ -40,7 +40,7 @@ router.post('/', async (req, res) => {
         const verificationLink = "http://localhost:3000/api/users/verify?token=" + token + "&email=" + email;
         try {
             SendEmail(process.env.EMAIL, newUser.email, 'verify findAddis account', verificationLink)
-            res.status(201).json({ message: "User registered successfully. Please verify your email using the link sent to your account" });
+            res.status(201).json({ msg: "User registered successfully. Please verify your email using the link sent to your account" });
         } catch (err) {
             res.status(500).send({ msg: 'Unable to send verification email to user' })
         }
@@ -110,34 +110,6 @@ router.post('/login', async (req, res) => {
 
 })
 
-// router.post('/login', async (req, res) => {
-//     const { email, password } = req.body;
-//     const user = await User.findOne({ email })
-//     if (!user) return res.status(404).json({ msg: 'user not found' });
-
-//     const isMatch = await bcrypt.compare(password, user.password)
-//     if (!isMatch) return res.status(400).json({ msg: 'incorrect email or password' });
-//     if (!user.isVerified) return res.status(400).json({ msg: 'please verify your email' });
-
-//     const token = jwt.sign(
-//         { id: user._id, name: user.name, email: user.email, role: "user" },
-//         process.env.JWT_SECRET,
-//         { expiresIn: process.env.EXPIRESIN }
-//     );
-
-//     res.status(200).json({
-//         user: {
-//             id: user._id,
-//             name: user.name,
-//             email: user.email,
-//             role: "user"
-//         },
-//         token,
-//         expiresIn: process.env.EXPIRESIN
-//     });
-// });
-
-
 router.post("/favorites/:restaurantId", userAuthmiddleware, async (req, res) => {
     try {
         const userId = req.user.id;
@@ -148,7 +120,7 @@ router.post("/favorites/:restaurantId", userAuthmiddleware, async (req, res) =>
             { $addToSet: { favorites: restaurantId } },
             { new: true }
         ).populate("favorites");
-
+        // returns all resturant object favotired by the the user
         res.status(200).json(user.favorites);
     } catch (err) {
         console.error(err);
@@ -157,6 +129,31 @@ router.post("/favorites/:restaurantId", userAuthmiddleware, async (req, res) =>
 });
 
 
+router.get("/favorites", userAuthmiddleware, async (req, res) => {
+    try {
+        const userId = req.user.id;
+        const user = await User.findById(userId).populate("favorites");
+        res.status(200).json(user?.favorites);
+    } catch (err) {
+        console.error(err);
+        res.status(500).json({ msg: "Server error" });
+    }
+});
 
+router.delete("/favorites/:restaurantId", userAuthmiddleware, async (req, res) => {
+    try {
+        const userId = req.user.id;
+        const restaurantId = req.params.restaurantId;
+        const user = await User.findByIdAndUpdate(
+            userId,
+            { $pull: { favorites: restaurantId } },
+            { new: true }
+        ).populate("favorites");
+        res.status(200).json(user.favorites);
+    } catch (err) {
+        console.error(err);
+        res.status(500).json({ msg: "Server error" });
+    }
+});
 
 export default router;
\ No newline at end of file
diff --git a/server/server.js b/server/server.js
index 845a0d8..834b1cf 100644
--- a/server/server.js
+++ b/server/server.js
@@ -24,7 +24,7 @@ connectdb();
 
 app.use('/api/restaurants', restaurantRoute);
 app.use('/api/users', UserRoute);
-app.use('/api/RestaurantOwners', RestaurantOwnersRoute)
+app.use('/api/owners', RestaurantOwnersRoute)
 
 app.get('/', (req, res) => {
     res.send('server is running')
diff --git a/server/utils/rating.js b/server/utils/rating.js
new file mode 100644
index 0000000..25a7270
--- /dev/null
+++ b/server/utils/rating.js
@@ -0,0 +1,6 @@
+export function calculateAverageRating(reviews) {
+    if (!reviews || reviews.length === 0) return 0;
+
+    const sum = reviews.reduce((acc, r) => acc + r.rating, 0);
+    return Number((sum / reviews.length).toFixed(1));
+}
\ No newline at end of file