small changes to ES6 syntax

app.js

@@ -1,24 +1,24 @@
-var express     = require("express"),
-    app         = express(),
-    bodyParser  = require("body-parser"),
-    mongoose    = require("mongoose"),
-    passport    = require("passport"),
-    cookieParser = require("cookie-parser"),
-    LocalStrategy = require("passport-local"),
-    flash        = require("connect-flash"),
-    Campground  = require("./models/campground"),
-    Comment     = require("./models/comment"),
-    User        = require("./models/user"),
-    session = require("express-session"),
-    seedDB      = require("./seeds"),
-    methodOverride = require("method-override");
+const express        = require("express");
+const app            = express();
+const bodyParser     = require("body-parser");
+const mongoose       = require("mongoose");
+const passport       = require("passport");
+const cookieParser   = require("cookie-parser");
+const LocalStrategy  = require("passport-local");
+const flash          = require("connect-flash");
+const Campground     = require("./models/campground");
+const Comment        = require("./models/comment");
+const User           = require("./models/user");
+const session        = require("express-session");
+const seedDB         = require("./seeds");
+const methodOverride = require("method-override");
 // configure dotenv
 require('dotenv').load();
 
 //requiring routes
-var commentRoutes    = require("./routes/comments"),
-    campgroundRoutes = require("./routes/campgrounds"),
-    indexRoutes      = require("./routes/index")
+const commentRoutes    = require("./routes/comments");
+const campgroundRoutes = require("./routes/campgrounds");
+const indexRoutes      = require("./routes/index");
 
 // assign mongoose promise library and connect to database
 mongoose.Promise = global.Promise;
@@ -52,7 +52,7 @@ passport.use(new LocalStrategy(User.authenticate()));
 passport.serializeUser(User.serializeUser());
 passport.deserializeUser(User.deserializeUser());
 
-app.use(function(req, res, next){
+app.use((req, res, next) => {
    res.locals.currentUser = req.user;
    res.locals.success = req.flash('success');
    res.locals.error = req.flash('error');
@@ -64,6 +64,6 @@ app.use("/", indexRoutes);
 app.use("/campgrounds", campgroundRoutes);
 app.use("/campgrounds/:id/comments", commentRoutes);
 
-app.listen(process.env.PORT, process.env.IP, function(){
+app.listen(process.env.PORT, process.env.IP, () => {
    console.log("The YelpCamp Server Has Started!");
 });

middleware/index.js

@@ -1,5 +1,5 @@
-var Comment = require('../models/comment');
-var Campground = require('../models/campground');
+let Comment = require('../models/comment');
+let Campground = require('../models/campground');
 module.exports = {
   isLoggedIn: function(req, res, next){
       if(req.isAuthenticated()){

routes/campgrounds.js

@@ -1,10 +1,10 @@
-var express = require("express");
-var router  = express.Router();
-var Campground = require("../models/campground");
-var Comment = require("../models/comment");
-var middleware = require("../middleware");
-var geocoder = require('geocoder');
-var { isLoggedIn, checkUserCampground, checkUserComment, isAdmin, isSafe } = middleware; // destructuring assignment
+const express = require("express");
+const router  = express.Router();
+const Campground = require("../models/campground");
+const Comment = require("../models/comment");
+const middleware = require("../middleware");
+const geocoder = require('geocoder');
+let { isLoggedIn, checkUserCampground, checkUserComment, isAdmin, isSafe } = middleware; // destructuring assignment
 
 // Define escapeRegex function for search feature
 function escapeRegex(text) {
@@ -42,23 +42,23 @@ router.get("/", function(req, res){
 //CREATE - add new campground to DB
 router.post("/", isLoggedIn, isSafe, function(req, res){
   // get data from form and add to campgrounds array
-  var name = req.body.name;
-  var image = req.body.image;
-  var desc = req.body.description;
-  var author = {
+  let name = req.body.name;
+  let image = req.body.image;
+  let desc = req.body.description;
+  let author = {
       id: req.user._id,
       username: req.user.username
   }
-  var cost = req.body.cost;
+  let cost = req.body.cost;
   geocoder.geocode(req.body.location, function (err, data) {
     if (err || data.status === 'ZERO_RESULTS') {
       req.flash('error', 'Invalid address');
       return res.redirect('back');
     }
-    var lat = data.results[0].geometry.location.lat;
-    var lng = data.results[0].geometry.location.lng;
-    var location = data.results[0].formatted_address;
-    var newCampground = {name: name, image: image, description: desc, cost: cost, author:author, location: location, lat: lat, lng: lng};
+    let lat = data.results[0].geometry.location.lat;
+    let lng = data.results[0].geometry.location.lng;
+    let location = data.results[0].formatted_address;
+    let newCampground = {name: name, image: image, description: desc, cost: cost, author:author, location: location, lat: lat, lng: lng};
     // Create a new campground and save to DB
     Campground.create(newCampground, function(err, newlyCreated){
         if(err){
@@ -101,17 +101,17 @@ router.get("/:id/edit", isLoggedIn, checkUserCampground, function(req, res){
 // PUT - updates campground in the database
 router.put("/:id", isSafe, function(req, res){
   geocoder.geocode(req.body.location, function (err, data) {
-    var lat = data.results[0].geometry.location.lat;
-    var lng = data.results[0].geometry.location.lng;
-    var location = data.results[0].formatted_address;
-    var newData = {name: req.body.name, image: req.body.image, description: req.body.description, cost: req.body.cost, location: location, lat: lat, lng: lng};
+    let lat = data.results[0].geometry.location.lat;
+    let lng = data.results[0].geometry.location.lng;
+    let location = data.results[0].formatted_address;
+    let newData = {name: req.body.name, image: req.body.image, description: req.body.description, cost: req.body.cost, location: location, lat: lat, lng: lng};
     Campground.findByIdAndUpdate(req.params.id, {$set: newData}, function(err, campground){
         if(err){
             req.flash("error", err.message);
             res.redirect("back");
         } else {
             req.flash("success","Successfully Updated!");
-            res.redirect("/campgrounds/" + campground._id);
+            res.redirect(`/campgrounds/${campground._id}`);
         }
     });
   });

routes/comments.js

@@ -56,7 +56,7 @@ router.put("/:commentId", isAdmin, function(req, res){
           console.log(err);
            res.render("edit");
        } else {
-           res.redirect("/campgrounds/" + req.params.id);
+           res.redirect(`/campgrounds/${req.params.id}`);
        }
    }); 
 });
@@ -79,7 +79,7 @@ router.delete("/:commentId", isLoggedIn, checkUserComment, function(req, res){
             return res.redirect('/');
           }
           req.flash('error', 'Comment deleted!');
-          res.redirect("/campgrounds/" + req.params.id);
+          res.redirect(`/campgrounds/${req.params.id}`);
         });
     }
   });

routes/index.js

@@ -1,7 +1,7 @@
-var express = require("express");
-var router  = express.Router();
-var passport = require("passport");
-var User = require("../models/user");
+const express = require("express");
+const router  = express.Router();
+const passport = require("passport");
+const User = require("../models/user");
 
 //root route
 router.get("/", function(req, res){
@@ -15,7 +15,7 @@ router.get("/register", function(req, res){
 
 //handle sign up logic
 router.post("/register", function(req, res){
-    var newUser = new User({username: req.body.username});
+    let newUser = new User({username: req.body.username});
     if(req.body.adminCode === process.env.ADMIN_CODE) {
       newUser.isAdmin = true;
     }
@@ -25,7 +25,7 @@ router.post("/register", function(req, res){
             return res.render("register", {error: err.message});
         }
         passport.authenticate("local")(req, res, function(){
-           req.flash("success", "Successfully Signed Up! Nice to meet you " + req.body.username);
+           req.flash("success", `Successfully Signed Up! Nice to meet you ${req.body.username}`);
            res.redirect("/campgrounds"); 
         });
     });
@@ -53,5 +53,4 @@ router.get("/logout", function(req, res){
    res.redirect("/campgrounds");
 });
 
-
 module.exports = router;