Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Schema.js
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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()
});
72 changes: 72 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
if (process.env.Node_ENV != "production") {
require('dotenv').config();
if (process.env.NODE_ENV !== "production") {
require("dotenv").config();
}
Expand All @@ -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");
Expand Down Expand Up @@ -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,
Expand All @@ -71,13 +102,30 @@ store.on("error", () => {

const sessionOptions = {
store,
secret: process.env.SESSION_SECRET,
secret: process.env.SESSION_SECRET || "fallback_secret",
resave: false,
saveUninitialized: false,
cookie: {
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
}
},
};

Expand All @@ -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 =================
Expand All @@ -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"));
});
Expand Down
5 changes: 5 additions & 0 deletions controllers/bookings.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
47 changes: 47 additions & 0 deletions controllers/users.js
Original file line number Diff line number Diff line change
@@ -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) => {
Expand All @@ -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);

Expand Down
42 changes: 42 additions & 0 deletions models/listing.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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,
Expand Down
24 changes: 13 additions & 11 deletions routes/user.js
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -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");
Expand Down Expand Up @@ -89,4 +91,4 @@ module.exports.resetPassword = async (req, res) => {
res.redirect("/login");
};

module.exports =router;
module.exports = router;
1 change: 1 addition & 0 deletions views/includes/navbar.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Loading