diff --git a/Schema.js b/Schema.js
index 09e385f..35585dc 100644
--- a/Schema.js
+++ b/Schema.js
@@ -7,6 +7,9 @@ module.exports.listingSchema = Joi.object({
         location: Joi.string().required(),
         country: Joi.string().required(),
         price: Joi.number().required().min(0),
+        image: Joi.string().allow("", null),
+        category: Joi.string().valid('mountains', 'arctic', 'farms', 'rooms', 'trending', 'cities', 'castles', 'pools', 'camping', 'beach').required(),
+        maxGuests: Joi.number().integer().min(1).optional(),
 
         // multiple images
         images: Joi.array().items(
@@ -47,10 +50,18 @@ module.exports.reviewSchema = Joi.object({
     }).required()
 });
 
+module.exports.reviewSchema = Joi.object({
+    review: Joi.object({
+        rating: Joi.number().min(1).max(5).required(),
+        comment: Joi.string().required()
+    }).required()
+})
+
 module.exports.bookingSchema = Joi.object({
     booking: Joi.object({
         checkIn: Joi.date().required(),
         checkOut: Joi.date().greater(Joi.ref("checkIn")).required(),
+        guests: Joi.number().integer().min(1).required(),
         guests: Joi.number().integer().min(1).required()
     }).required()
 });
\ No newline at end of file
diff --git a/app.js b/app.js
index f843b6a..8504ef4 100644
--- a/app.js
+++ b/app.js
@@ -1,3 +1,5 @@
+if (process.env.Node_ENV != "production") {
+  require('dotenv').config();
 if (process.env.NODE_ENV !== "production") {
   require("dotenv").config();
 }
@@ -24,6 +26,16 @@ const passport = require("passport");
 const LocalStrategy = require("passport-local");
 
 const User = require("./models/user.js");
+const listingRouter = require("./routes/listing.js");
+const reviewRouter = require("./routes/review.js")
+const userRouter = require("./routes/user.js");
+const plannerRouter = require("./routes/planner.js");
+const bookingRouter = require("./routes/booking.js");
+const { log } = require('console');
+
+const dbUrl = process.env.ATLASDB_URL;
+
+const i18n = require("i18n");
 
 // Routers
 const listingRouter = require("./routes/listing.js");
@@ -60,6 +72,25 @@ app.use(express.static(path.join(__dirname, "public")));
 const store = MongoStore.create({
   mongoUrl: dbUrl,
   crypto: {
+    secret: process.env.SECRET,
+  },
+  touchAfter: 24 * 3600,
+})
+
+
+store.on("error", () => {
+  console.log("Error in MONGO SESSION STORE");
+
+})
+
+const sessionOptions = {
+  store,
+  secret: process.env.SECRET,
+  resave: false,
+  saveUninitialized: true,
+    secret: process.env.SESSION_SECRET,
+  crypto:{
+    secret: process.env.SESSION_SECRET
     secret: process.env.SESSION_SECRET,
   },
   touchAfter: 24 * 3600,
@@ -71,6 +102,7 @@ store.on("error", () => {
 
 const sessionOptions = {
   store,
+  secret: process.env.SESSION_SECRET,
   secret: process.env.SESSION_SECRET || "fallback_secret",
   resave: false,
   saveUninitialized: false,
@@ -78,6 +110,22 @@ const sessionOptions = {
     expires: Date.now() + 7 * 24 * 60 * 60 * 1000,
     maxAge: 7 * 24 * 60 * 60 * 1000,
     httpOnly: true,
+  }
+}
+
+// app.get("/", (req, res) => {
+//   res.send("hi i am root");
+// });
+
+
+  },
+  resave:false,
+  saveUninitialized:false,
+  cookie:{
+    expires: Date.now() + 7*24*60*60*1000,
+    maxAge: 7*24*60*60*1000,
+    httpOnly:true
+  }
   },
 };
 
@@ -101,6 +149,11 @@ app.use((req, res, next) => {
   res.locals.error = req.flash("error");
   res.locals.currUser = req.user;
   next();
+})
+
+app.use((req, res, next) => {
+  res.locals.currUser = req.user;
+  next();
 });
 
 // ================= ROUTES =================
@@ -113,6 +166,25 @@ app.use("/planner", plannerRouter);
 
 // ================= ERROR HANDLING =================
 
+app.use("/listings", listingRouter);
+app.use("/listings/:id/reviews", reviewRouter);
+app.use("/listings/:id/bookings", bookingRouter);
+app.use("/", userRouter);
+app.use("/planner", plannerRouter);
+
+app.all("*", (req, res, next) => {
+  next(new ExpressError(404, "page not found"));
+})
+
+app.use((err, req, res, next) => {
+  let { statusCode = 400, message = "something went wrong" } = err;
+  //  res.status(statusCode).send(message);
+  res.status(statusCode).render("error.ejs", { message });
+// ================== ERROR HANDLING ==================
+// ================= ERROR HANDLER =================
+
+app.all("*",(req,res,next)=>{
+  next(new ExpressError(404,"Page Not Found"));
 app.all("*", (req, res, next) => {
   next(new ExpressError(404, "Page Not Found"));
 });
diff --git a/controllers/bookings.js b/controllers/bookings.js
index 6f5838f..52a0c8c 100644
--- a/controllers/bookings.js
+++ b/controllers/bookings.js
@@ -12,6 +12,11 @@ module.exports.createBooking = async (req, res) => {
         return res.redirect("/listings");
     }
 
+    if (listing.owner.equals(req.user._id)) {
+        req.flash("error", "You cannot book your own listing.");
+        return res.redirect(`/listings/${id}`);
+    }
+
     const { checkIn, checkOut, guests } = req.body.booking;
 
     const numGuests = parseInt(guests);
diff --git a/controllers/users.js b/controllers/users.js
index 6337d9d..81c8a48 100644
--- a/controllers/users.js
+++ b/controllers/users.js
@@ -1,4 +1,9 @@
 const User = require("../models/user");
+const Booking = require("../models/booking");
+
+module.exports.renderSignUpForm = (req, res) => {
+  res.render("users/signup.ejs")
+}
 
 // --- Signup ---
 module.exports.renderSignUpForm = (req, res) => {
@@ -8,6 +13,48 @@ module.exports.renderSignUpForm = (req, res) => {
 module.exports.signUp = async (req, res, next) => {
   try {
     let { username, email, password } = req.body;
+    const newUSer = new User({ email, username })
+    const registeredUser = await User.register(newUSer, password);
+
+    req.login(registeredUser, (err) => {
+      if (err) {
+        return next(err);
+      }
+      req.flash("success", "Welcome to WanderLust ");
+      res.redirect("/listings");
+    })
+
+  }
+  catch (err) {
+    req.flash("error", err.message)
+    res.redirect("/signup")
+  }
+}
+
+module.exports.renderLoginForm = (req, res) => {
+  res.render("users/login.ejs")
+}
+
+module.exports.login = async (req, res) => {
+  req.flash("success", "welcome back to WanderLust ! ")
+  let redirectUrl = res.locals.redirectUrl || "/listings"
+  res.redirect(redirectUrl);
+}
+
+module.exports.logout = (req, res, next) => {
+  req.logOut((err => {
+    if (err) {
+      next(err);
+    }
+    req.flash("success", "You are logged Out!");
+    res.redirect("/listings");
+  }))
+}
+
+module.exports.renderDashboard = async (req, res) => {
+  // Populate listing to show details on the dashboard
+  const bookings = await Booking.find({ user: req.user._id }).populate("listing");
+  res.render("users/dashboard.ejs", { bookings });
     const newUser = new User({ email, username });
     const registeredUser = await User.register(newUser, password);
 
diff --git a/models/listing.js b/models/listing.js
index 086ea1e..a2abb14 100644
--- a/models/listing.js
+++ b/models/listing.js
@@ -10,6 +10,20 @@ const listingSchema = new Schema({
         required: true,
     },
     description: String,
+    image: {
+        url: String,
+        filename: String,
+    },
+    price: Number,
+    maxGuests: {
+        type: Number,
+        default: 1,
+        min: 1,
+    },
+    location: String,
+    country: String,
+    },
+    description: String,
 
     // main thumbnail
     image: {
@@ -42,6 +56,34 @@ const listingSchema = new Schema({
             ref: "Review",
         }
     ],
+    owner: {
+        type: Schema.Types.ObjectId,
+        ref: "User",
+    },
+    geometry: {
+        type: {
+            type: String, // Don't do `{ location: { type: String } }`
+            enum: ['Point'], // 'location.type' must be 'Point'
+            required: true
+        },
+        coordinates: {
+            type: [Number],
+            required: true
+        }
+
+    },
+    category: {
+        type: String,
+        enum: ["mountains", "arctic", "farms", "rooms", "cities", "castles", "pools", "camping", "beach", "trending"]
+    },
+})
+
+listingSchema.post("findOneAndDelete", async (listing) => {
+    if (listing) {
+        await Review.deleteMany({ _id: { $in: listing.reviews } })
+    }
+
+})
 
     owner: {
         type: Schema.Types.ObjectId,
diff --git a/routes/user.js b/routes/user.js
index 866752b..1926c50 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -1,9 +1,9 @@
 const express = require("express");
-const router = express.Router({mergeParams:true});
+const router = express.Router({ mergeParams: true });
 const User = require("../models/user.js");
 const wrapAsync = require("../utils/wrapAsync");
 const passport = require("passport");
-const {saveRedirectUrl}= require("../middleware.js")
+const { saveRedirectUrl, isLoggedIn } = require("../middleware.js")
 
 const userController = require("../controllers/users.js")
 router.get("/forgot-password", userController.renderForgotPasswordForm);
@@ -12,16 +12,18 @@ router.post("/forgot-password", userController.forgotPassword);
 router.get("/reset-password/:token", userController.renderResetPasswordForm);
 router.post("/reset-password/:token", userController.resetPassword);
 router.route("/signup")
-.get(userController.renderSignUpForm)
-.post(wrapAsync(userController.signUp));
+  .get(userController.renderSignUpForm)
+  .post(wrapAsync(userController.signUp));
 
 router.route("/login")
-.get(userController.renderLoginForm)
-.post(
-  saveRedirectUrl,
-  passport.authenticate("local",{failureRedirect:"/login",failureFlash:true}) ,userController.login);
-router.get("/logout",userController.logout)
-
+  .get(userController.renderLoginForm)
+  .post(
+    saveRedirectUrl,
+    passport.authenticate("local", { failureRedirect: "/login", failureFlash: true }), userController.login);
+router.get("/logout", userController.logout)
+
+router.route("/dashboard")
+  .get(isLoggedIn, wrapAsync(userController.renderDashboard));
 // Render Forgot Password form
 module.exports.renderForgotPasswordForm = (req, res) => {
   res.render("users/forgotPassword.ejs");
@@ -89,4 +91,4 @@ module.exports.resetPassword = async (req, res) => {
   res.redirect("/login");
 };
 
-module.exports =router;
\ No newline at end of file
+module.exports = router;
\ No newline at end of file
diff --git a/views/includes/navbar.ejs b/views/includes/navbar.ejs
index a57c632..0d6ed9f 100644
--- a/views/includes/navbar.ejs
+++ b/views/includes/navbar.ejs
@@ -62,6 +62,7 @@
           <a class="nav-link" href="/login"><b>Login</b></a>
           <% } %>
             <% if( currUser){ %>
+              <a class="nav-link" href="/dashboard"><b>My Bookings</b></a>
               <a class="nav-link" href="/planner/dashboard"><b>My Trips</b></a>
               <a class="nav-link" href="/logout"><b>Logout</b></a>
 
diff --git a/views/listings/edit.ejs b/views/listings/edit.ejs
index fe91250..3472a63 100644
--- a/views/listings/edit.ejs
+++ b/views/listings/edit.ejs
@@ -1,5 +1,29 @@
 <%= layout("/layouts/boilerplate.ejs") %>
 
+  <body>
+    <div class="row">
+      <div class="col-8 offset-2 mt-3">
+        <h3>Edit your listing</h3>
+
+        <form action="/listings/<%= listing._id %>?_method=PUT" method="POST" novalidate class="needs-validation"
+          enctype="multipart/form-data">
+          <div class="mb-3">
+            <label for="title" class="form-label">Title</label>
+
+            <input type="text" name="listing[title]" value="<%= listing.title %>" class="form-control" required />
+            <div class="invalid-feedback">Title is required</div>
+          </div>
+          <div class="mb-3">
+            <label for="description" class="form-label">Description</label>
+            <textarea name="listing[description]" class="form-control" required>
+<%= listing.description %></textarea>
+            <div class="invalid-feedback">Please add a short description</div>
+          </div>
+
+          <div class="mb-3">
+            Original Image <br>
+            <img src="<%= originalImageUrl %>" alt="Listing Image" class="edit-thumbnail" />
+
 <body>
   <div class="row">
     <div class="col-8 offset-2 mt-3">
@@ -67,6 +91,57 @@
         </div>
 
 
+          <div class="mb-3">
+            <label for="image" class="form-label">Upload New Image</label>
+            <input type="file" name="listing[image]" class="form-control" />
+          </div>
+          <div class="row">
+            <div class="mb-3 col-md-4">
+              <label for="price" class="form-label">Price (per night)</label>
+              <input type="number" name="listing[price]" value="<%= listing.price %>" class="form-control" required />
+              <div class="invalid-feedback">Price is required</div>
+            </div>
+
+            <div class="mb-3 col-md-4">
+              <label for="maxGuests" class="form-label">Max Guests</label>
+              <input type="number" name="listing[maxGuests]" value="<%= listing.maxGuests || 1 %>" class="form-control"
+                min="1" required />
+              <div class="invalid-feedback">Max guests is required</div>
+            </div>
+
+            <div class="mb-3 col-md-4">
+              <label for="country" class="form-label">Country</label>
+
+              <input type="text" name="listing[country]" value="<%= listing.country %>" class="form-control" required />
+              <div class="invalid-feedback">Country is required</div>
+            </div>
+          </div>
+
+          <div class="mb-3">
+            <label for="location" class="form-label">Location</label>
+            <input type="text" name="listing[location]" value="<%= listing.location %>" class="form-control" required />
+            <div class="invalid-feedback">Location is required</div>
+          </div>
+          <br /><br />
+
+          <select class="form-select" name="listing[category]" required>
+            <option value="">Select Category</option>
+            <option value="mountains">Mountains</option>
+            <option value="arctic">Arctic</option>
+            <option value="farms">Farms</option>
+            <option value="rooms">Rooms</option>
+            <option value="castles">Castles</option>
+            <option value="cities">Cities</option>
+            <option value="pools">Pools</option>
+            <option value="beach">Beach</option>
+            <option value="camping">Camping</option>
+          </select>
+          <br><br>
+          <button class="btn btn-dark edit-btn mb-3">EDIT</button>
+        </form>
+      </div>
+    </div>
+  </body>
         <!-- NEW IMAGE UPLOAD -->
         <div class="mb-3">
           <label class="form-label">Upload New Images</label>
@@ -213,4 +288,4 @@ fileInput.addEventListener('change',function(){
 
 </script>
 
-</body>
\ No newline at end of file
+</body>
diff --git a/views/listings/new.ejs b/views/listings/new.ejs
index e3fef22..3b5d160 100644
--- a/views/listings/new.ejs
+++ b/views/listings/new.ejs
@@ -1,8 +1,155 @@
 <% layout('/layouts/boilerplate') -%>
 
-<div class="row">
-  <div class="col-8 offset-2 mt-3">
+  <div class="row">
+    <div class="col-8 offset-2 mt-3">
+
+      <h3>Create a New Listing</h3>
+
+      <form action="/listings" method="POST" novalidate class="needs-validation" enctype="multipart/form-data">
+        <div class="mb-3">
+          <label for="title" class="form-label">Title</label>
+          <input type="text" name="listing[title]" placeholder="Enter title" class="form-control" id="title" required>
+          <div class="invalid-feedback">
+            Title is required.
+          </div>
+    <form  action="/listings" method="POST" novalidate class="needs-validation"  enctype="multipart/form-data">
+      <div class="mb-3">
+        <label for="title" class="form-label">Title</label>
+        <input type="text" name="listing[title]" placeholder="Enter title" class="form-control" id="title" required>
+        <div class="invalid-feedback">
+          <%= __("Title is required.") %>
+        </div>
+
+        <div class="mb-3">
+          <label for="description" class="form-label">Description</label>
+          <textarea name="listing[description]" placeholder="Enter description" class="form-control" id="description"
+            required></textarea>
+          <div class="invalid-feedback">
+            Description is required.
+          </div>
+        </div>
+
+
+        <div class="mb-3">
+          <label for="image" class="form-label">Upload Listing Image</label>
+          <input type="file" name="listing[image]" class="form-control" id="image" required>
+        </div>
+
+        <div class="row">
+          <div class="mb-3 col-md-4">
+            <label for="price" class="form-label">Price (per night)</label>
+            <input name="listing[price]" placeholder="Enter price" class="form-control" id="price" required>
+            <div class="invalid-feedback">
+              Price is required.
+            </div>
+          </div>
+
+          <div class="mb-3 col-md-4">
+            <label for="maxGuests" class="form-label">Max Guests</label>
+            <input type="number" name="listing[maxGuests]" placeholder="e.g. 4" class="form-control" id="maxGuests"
+              min="1" value="1" required>
+            <div class="invalid-feedback">
+              Max guests is required.
+            </div>
+          </div>
+
+          <div class="mb-3 col-md-4">
+            <label for="country" class="form-label">Country</label>
+            <input type="text" name="listing[country]" placeholder="Enter country" class="form-control" id="country"
+              required>
+            <div class="invalid-feedback">
+              Country is required.
+            </div>
+      <div class="mb-3">
+        <label for="description" class="form-label">Description</label>
+        <textarea name="listing[description]" placeholder="Enter description" class="form-control" id="description" required></textarea>
+        <div class="invalid-feedback">
+          <%= __("Description is required.") %>
+        </div>
+      </div>
+
+      
+      <div class="mb-3">
+        <label for="image" class="form-label"><%= __("Upload Listing Image") %></label>
+        <input type="file" name="listing[image]" class="form-control" id="image" required>
+      </div>
+
+      <div class="row">
+        <div class="mb-3 col-md-4">
+          <label for="price" class="form-label"><%= __("Price") %></label>
+          <input  name="listing[price]" placeholder="Enter price" class="form-control" id="price" required>
+          <div class="invalid-feedback">
+            <%= __("Price is required.") %>
+          </div>
+        </div>
+
+        <div class="mb-3 col-md-8">
+          <label for="country" class="form-label"><%= __("Country") %></label>
+          <input type="text" name="listing[country]" placeholder="Enter country" class="form-control" id="country" required>
+          <div class="invalid-feedback">
+            <%= __("Country is required.") %> 
+          </div>
+        </div>
+
+        <div class="mb-3">
+          <label for="location" class="form-label">Location</label>
+          <input type="text" name="listing[location]" placeholder="Enter location" class="form-control" id="location"
+            required>
+          <div class="invalid-feedback">
+            Location is required.
+          </div>
+        </div>
+
+        <select class="form-select" name="listing[category]" required>
+          <option value="">Select Category</option>
+          <option value="mountains">Mountains</option>
+          <option value="arctic">Arctic</option>
+          <option value="farms">Farms</option>
+          <option value="rooms">Rooms</option>
+          <option value="castles">Castles</option>
+          <option value="cities">Cities</option>
+          <option value="pools">Pools</option>
+          <option value="beach">Beach</option>
+          <option value="camping">Camping</option>
+        </select>
+
+
+        <button type="submit" class="btn btn-dark add-btn mt-3 mb-3">Add</button>
+      </form>
+
 
+
+    </div>
+  </div>
+      <div class="mb-3">
+        <label for="location" class="form-label"><%= __("Location") %></label>
+        <input type="text" name="listing[location]" placeholder="Enter location" class="form-control" id="location" required>
+        <div class="invalid-feedback">
+          <%= __("Location is required.") %>
+        </div>
+      </div>
+
+      <select class="form-select" name="listing[category]" required>
+  <option value=""><%= __("Select Category") %></option>
+  <option value="mountains"><%= __("Mountains") %></option>
+  <option value="arctic"><%= __("Arctic") %></option>
+  <option value="farms"><%= __("Farms") %></option>
+  <option value="rooms"><%= __("Rooms") %></option>
+  <option value="castles"><%= __("Castles") %></option>
+  <option value="cities"><%= __("Cities") %></option>
+  <option value="pools"><%= __("Pools") %></option>
+  <option value="beach"><%= __("Beach") %></option>
+  <option value="camping"><%= __("Camping") %></option>
+</select>
+
+   
+      <button type="submit" class="btn btn-dark add-btn mt-3 mb-3"><%= __("Add Listing") %></button>
+    </form>
+
+    
+    
+  </div>
+</div>
 ```
 <h3>Create a New Listing</h3>
 
diff --git a/views/listings/show.ejs b/views/listings/show.ejs
index 0d80274..facec71 100644
--- a/views/listings/show.ejs
+++ b/views/listings/show.ejs
@@ -1,5 +1,249 @@
 <% layout('/layouts/boilerplate') -%>
 
+  <div id="listing-data" data-listing='<%- JSON.stringify(listing) %>' data-map-token="<%= process.env.MAP_TOKEN %>"
+    style="display:none;"></div>
+  <script>
+    const mapToken = document.getElementById('listing-data').dataset.mapToken;
+    const listingData = JSON.parse(document.getElementById('listing-data').dataset.listing);
+  </script>
+
+  <div class="row mt-3">
+    <div class="col-8 offset-3">
+      <h3>
+        <%= listing.title %>
+      </h3>
+    </div>
+
+    <div class="card listing-card col-6 offset-3 show-card">
+      <img src="<%= listing.image.url %>" class="card-img-top show-img" alt="Listing_image" />
+      <div class="card-body">
+        <p class="card-text">Owned By:<i>
+            <%= listing.owner ? listing.owner.username : "WanderLust" %>
+          </i></p>
+
+        <p class="card-text">
+          <%= listing.description %> <br />
+        </p>
+        <p class="card-text">
+          &#x20B9; <%= listing.price.toLocaleString("en-IN") %> / night <br />
+        </p>
+        <p class="card-text">
+          <i class="fa-solid fa-users"></i>&nbsp;Max Guests: <strong>
+            <%= listing.maxGuests || 1 %>
+          </strong>
+        </p>
+        <p class="card-text">
+          <%= listing.location %> <br />
+        </p>
+        <p class="card-text">
+          <%= listing.country %>
+        </p>
+
+        <% if(currUser) { %>
+          <hr>
+          <% if (currUser.favorites && currUser.favorites.includes(listing._id.toString())) { %>
+            <form action="/planner/favorites/<%= listing._id %>?_method=DELETE" method="POST">
+              <button class="btn btn-danger btn-sm">
+                <i class="fa-solid fa-heart"></i> Remove from Favorites
+              </button>
+            </form>
+            <% } else { %>
+              <form action="/planner/favorites/<%= listing._id %>" method="POST">
+                <button class="btn btn-outline-danger btn-sm">
+                  <i class="fa-regular fa-heart"></i> Add to Favorites
+                </button>
+              </form>
+              <% } %>
+                <% } %>
+      </div>
+    </div>
+  </div>
+
+  <% if (currUser && listing.owner && currUser._id.equals(listing.owner._id)) {%>
+    <div class="btns">
+      <a href="/listings/<%= listing._id %>/edit" class="btn btn-dark edit-btn offset-3">EDIT</a>
+
+      <form action="/listings/<%= listing._id %>?_method=DELETE" method="POST">
+        <button class="btn btn-dark offset-5">DELETE</button>
+      </form>
+    </div>
+    <% }%>
+
+      <%#==========BOOKING FORM (logged-in, non-owner)==========%>
+        <% if (currUser && listing.owner && !currUser._id.equals(listing.owner._id)) { %>
+          <div class="col-6 offset-3 mt-4 mb-3">
+            <div class="card shadow-sm border-0" style="border-radius:12px; overflow:hidden;">
+              <div class="card-header text-white fw-bold" style="background: linear-gradient(135deg,#2c3e50,#4ca1af);">
+                <i class="fa-solid fa-calendar-check me-2"></i>Book this Listing
+              </div>
+              <div class="card-body" style="background:#f8f9fa;">
+                <form action="/listings/<%= listing._id %>/bookings" method="POST" id="bookingForm" novalidate
+                  class="needs-validation">
+                  <div class="row g-3">
+                    <div class="col-md-6">
+                      <label for="checkIn" class="form-label fw-semibold">Check-in Date</label>
+                      <input type="date" name="booking[checkIn]" id="checkIn" class="form-control" required
+                        min="<%= new Date().toISOString().split('T')[0] %>" />
+                      <div class="invalid-feedback">Please select a check-in date.</div>
+                    </div>
+                    <div class="col-md-6">
+                      <label for="checkOut" class="form-label fw-semibold">Check-out Date</label>
+                      <input type="date" name="booking[checkOut]" id="checkOut" class="form-control" required
+                        min="<%= new Date().toISOString().split('T')[0] %>" />
+                      <div class="invalid-feedback">Please select a check-out date after check-in.</div>
+                    </div>
+                    <div class="col-md-6">
+                      <label for="guests" class="form-label fw-semibold">
+                        Number of Guests
+                        <span class="text-muted fw-normal">(max <strong>
+                            <%= listing.maxGuests || 1 %>
+                          </strong>)</span>
+                      </label>
+                      <input type="number" name="booking[guests]" id="guests" class="form-control" min="1"
+                        max="<%= listing.maxGuests || 1 %>" value="1" required />
+                      <div class="invalid-feedback">Enter a valid guest count (1–<%= listing.maxGuests || 1 %>).</div>
+                    </div>
+                    <div class="col-md-6 d-flex align-items-end">
+                      <div id="pricePreview" class="w-100 p-3 rounded text-center"
+                        style="background:#e8f4f8; border:1px dashed #4ca1af; display:none;">
+                        <div class="text-muted small">Estimated Total</div>
+                        <div class="fw-bold fs-5 text-success" id="totalPriceDisplay">&#x20B9; 0</div>
+                        <div class="text-muted small" id="priceBreakdown"></div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="mt-4">
+                    <button type="submit" class="btn btn-dark w-100 py-2 fw-bold">
+                      <i class="fa-solid fa-bolt me-1"></i> Book Now
+                    </button>
+                  </div>
+                </form>
+              </div>
+            </div>
+          </div>
+
+          <script>
+            // Live price preview using the parsed listingData
+            const basePrice = listingData.price;
+            const maxGuests = listingData.maxGuests || 1;
+            const checkInEl = document.getElementById('checkIn');
+            const checkOutEl = document.getElementById('checkOut');
+            const guestsEl = document.getElementById('guests');
+            const previewEl = document.getElementById('pricePreview');
+            const totalEl = document.getElementById('totalPriceDisplay');
+            const breakdownEl = document.getElementById('priceBreakdown');
+
+            function updatePreview() {
+              const checkIn = new Date(checkInEl.value);
+              const checkOut = new Date(checkOutEl.value);
+              const guests = parseInt(guestsEl.value) || 0;
+
+              if (!checkInEl.value || !checkOutEl.value || checkOut <= checkIn || guests < 1) {
+                previewEl.style.display = 'none';
+                return;
+              }
+
+              const nights = Math.ceil((checkOut - checkIn) / (1000 * 60 * 60 * 24));
+              const total = basePrice * guests * nights;
+              totalEl.textContent = '₹' + total.toLocaleString('en-IN');
+              breakdownEl.textContent = `₹${basePrice.toLocaleString('en-IN')} × ${guests} guest(s) × ${nights} night(s)`;
+              previewEl.style.display = 'block';
+            }
+
+            checkInEl.addEventListener('change', () => {
+              // Ensure checkOut min is at least 1 day after checkIn
+              if (checkInEl.value) {
+                const nextDay = new Date(checkInEl.value);
+                nextDay.setDate(nextDay.getDate() + 1);
+                checkOutEl.min = nextDay.toISOString().split('T')[0];
+              }
+              updatePreview();
+            });
+            checkOutEl.addEventListener('change', updatePreview);
+            guestsEl.addEventListener('input', updatePreview);
+          </script>
+          <% } %>
+
+            <div class="col-6 offset-3 mb-3">
+              <hr />
+              <%if(currUser){%>
+
+                <h4>Leave a review</h4>
+                <form action="/listings/<%= listing._id %>/reviews" method="post" novalidate class="needs-validation">
+                  <div class="col">
+                    <label for="rating" class="form-label">Rating</label>
+                    <fieldset class="starability-slot">
+                      <input type="radio" id="no-rate" class="input-no-rate" name="review[rating]" value="1" checked
+                        aria-label="No rating." />
+                      <input type="radio" id="first-rate1" name="review[rating]" value="1" />
+                      <label for="first-rate1" title="Terrible">1 star</label>
+                      <input type="radio" id="first-rate2" name="review[rating]" value="2" />
+                      <label for="first-rate2" title="Not good">2 stars</label>
+                      <input type="radio" id="first-rate3" name="review[rating]" value="3" />
+                      <label for="first-rate3" title="Average">3 stars</label>
+                      <input type="radio" id="first-rate4" name="review[rating]" value="4" />
+                      <label for="first-rate4" title="Very good">4 stars</label>
+                      <input type="radio" id="first-rate5" name="review[rating]" value="5" />
+                      <label for="first-rate5" title="Amazing">5 stars</label>
+                    </fieldset>
+                  </div>
+
+                  <div class="col">
+                    <label for="comment" class="form-label">Comment:</label>
+                    <textarea name="review[comment]" id="comment" cols="30" rows="5" class="form-control"
+                      required></textarea>
+                    <div class="invalid-feedback">Add you point of review</div>
+                  </div>
+                  <div class="btns col-8 mt-2">
+                    <button type="submit" class="btn btn-outline-dark">Submit</button>
+                  </div>
+                </form>
+                <%}%>
+                  <% if(listing.reviews.length>0) {%>
+                    <div class="row">
+                      <hr />
+                      <p><b>All Reviews</b></p>
+                      <% for(review of listing.reviews){%>
+                        <div class="card col-md-12 col-lg-5 col-sm-12 ms-3 mb-3">
+                          <div class="card-body">
+                            <h5 class="card-text">@<%= review.author.username %>
+                            </h5>
+                            <p class="starability-result" data-rating="<%= review.rating %>">
+                              stars
+                            </p>
+                            <p class="card-text">
+                              <%= review.comment %>
+                            </p>
+
+                          </div>
+                          <% if(currUser && currUser._id.equals(review.author._id)) { %>
+                            <form class="mb-3" method="POST"
+                              action="/listings/<%= listing._id %>/reviews/<%= review._id %>?_method=DELETE">
+                              <button class="btn btn-sm btn-dark">Delete</button>
+                            </form>
+                            <%}%>
+                        </div>
+                        <% } %>
+
+                    </div>
+                    <% } %>
+            </div>
+            <div class="col-6 offset-3 mb-3">
+              <h3>Where you'll be</h3>
+              <div id="map"></div>
+            </div>
+            </div>
+
+            <script src="/js/map.js"></script>
+    const listing = JSON.parse(document.getElementById('listing-data').dataset.listing);
+  </script>
+
+  <div class="row mt-3">
+    <div class="col-8 offset-3">
+      <h3>
+        <%= listing.title %>
+      </h3>
+    </div>
 <div id="listing-data"
      data-listing='<%- JSON.stringify(listing) %>'
      data-map-token="<%= process.env.MAP_TOKEN %>"
@@ -34,6 +278,78 @@ const listingData = JSON.parse(document.getElementById("listing-data").dataset.l
     <div class="carousel-item <%= index===0 ? 'active' : '' %>">
       <img src="<%= img.url %>" class="d-block w-100 show-img">
     </div>
+    <% }%>
+
+      <div class="col-6 offset-3 mb-3">
+        <hr />
+        <%if(currUser){%>
+
+          <h4>Leave a review</h4>
+          <form action="/listings/<%= listing._id %>/reviews" method="post" novalidate class="needs-validation">
+            <div class="col">
+              <label for="rating" class="form-label">Rating</label>
+              <fieldset class="starability-slot">
+                <input type="radio" id="no-rate" class="input-no-rate" name="review[rating]" value="1" checked
+                  aria-label="No rating." />
+                <input type="radio" id="first-rate1" name="review[rating]" value="1" />
+                <label for="first-rate1" title="Terrible">1 star</label>
+                <input type="radio" id="first-rate2" name="review[rating]" value="2" />
+                <label for="first-rate2" title="Not good">2 stars</label>
+                <input type="radio" id="first-rate3" name="review[rating]" value="3" />
+                <label for="first-rate3" title="Average">3 stars</label>
+                <input type="radio" id="first-rate4" name="review[rating]" value="4" />
+                <label for="first-rate4" title="Very good">4 stars</label>
+                <input type="radio" id="first-rate5" name="review[rating]" value="5" />
+                <label for="first-rate5" title="Amazing">5 stars</label>
+              </fieldset>
+            </div>
+
+            <div class="col">
+              <label for="comment" class="form-label">Comment:</label>
+              <textarea name="review[comment]" id="comment" cols="30" rows="5" class="form-control" required></textarea>
+              <div class="invalid-feedback">Add you point of review</div>
+            </div>
+            <div class="btns col-8 mt-2">
+              <button type="submit" class="btn btn-outline-dark">Submit</button>
+            </div>
+          </form>
+          <%}%>
+            <% if(listing.reviews.length>0) {%>
+              <div class="row">
+                <hr />
+                <p><b>All Reviews</b></p>
+                <% for(review of listing.reviews){%>
+                  <div class="card col-md-12 col-lg-5 col-sm-12 ms-3 mb-3">
+                    <div class="card-body">
+                      <h5 class="card-text">@<%= review.author.username %>
+                      </h5>
+                      <p class="starability-result" data-rating="<%= review.rating %>">
+                        stars
+                      </p>
+                      <p class="card-text">
+                        <%= review.comment %>
+                      </p>
+
+                    </div>
+                    <% if(currUser && currUser._id.equals(review.author._id)) { %>
+                      <form class="mb-3" method="POST"
+                        action="/listings/<%= listing._id %>/reviews/<%= review._id %>?_method=DELETE">
+                        <button class="btn btn-sm btn-dark">Delete</button>
+                      </form>
+                      <%}%>
+                  </div>
+                  <% } %>
+
+              </div>
+              <% } %>
+      </div>
+      <div class="col-6 offset-3 mb-3">
+        <h3>Where you'll be</h3>
+        <div id="map"></div>
+      </div>
+      </div>
+
+      <script src="/js/map.js"></script>
 
     <% }) %>
 
diff --git a/views/users/dashboard.ejs b/views/users/dashboard.ejs
new file mode 100644
index 0000000..bed29f9
--- /dev/null
+++ b/views/users/dashboard.ejs
@@ -0,0 +1,56 @@
+<% layout('/layouts/boilerplate') -%>
+
+    <div class="container mt-4 mb-5">
+        <div class="row">
+            <div class="col-12">
+                <h2 class="mb-4"><i class="fa-solid fa-suitcase"></i> My Bookings</h2>
+            </div>
+        </div>
+
+        <% if (bookings && bookings.length> 0) { %>
+            <div class="row row-cols-1 row-cols-md-2 row-cols-lg-3 g-4">
+                <% for (let booking of bookings) { %>
+                    <% if (booking.listing) { %>
+                        <div class="col">
+                            <div class="card h-100 shadow-sm booking-card">
+                                <img src="<%= booking.listing.image.url %>" class="card-img-top" alt="Listing Image"
+                                    style="height: 200px; object-fit: cover;">
+                                <div class="card-body">
+                                    <h5 class="card-title">
+                                        <%= booking.listing.title %>
+                                    </h5>
+                                    <p class="text-muted small mb-2"><i class="fa-solid fa-location-dot"></i>
+                                        <%= booking.listing.location %>, <%= booking.listing.country %>
+                                    </p>
+                                    <hr>
+                                    <p class="mb-1"><strong>Check-in:</strong>
+                                        <%= booking.checkIn.toLocaleDateString() %>
+                                    </p>
+                                    <p class="mb-1"><strong>Check-out:</strong>
+                                        <%= booking.checkOut.toLocaleDateString() %>
+                                    </p>
+                                    <p class="mb-1"><strong>Guests:</strong>
+                                        <%= booking.guests %>
+                                    </p>
+                                    <h6 class="mt-3 text-success fw-bold">Total Paid: &#x20B9; <%=
+                                            booking.totalPrice.toLocaleString("en-IN") %>
+                                    </h6>
+                                </div>
+                                <div class="card-footer bg-white border-top-0">
+                                    <a href="/listings/<%= booking.listing._id %>"
+                                        class="btn btn-outline-dark w-100">View Listing</a>
+                                </div>
+                            </div>
+                        </div>
+                        <% } %>
+                            <% } %>
+            </div>
+            <% } else { %>
+                <div class="alert alert-info text-center p-5" role="alert">
+                    <i class="fa-solid fa-calendar-xmark fa-3x mb-3 text-muted"></i>
+                    <h4>No Bookings Found</h4>
+                    <p>Looks like you haven't booked any trips yet. Start exploring!</p>
+                    <a href="/listings" class="btn btn-dark mt-2">Explore Listings</a>
+                </div>
+                <% } %>
+    </div>
\ No newline at end of file