Update front end with new backend features

.eslintignore

@@ -1,2 +1,2 @@
 models/index.js
-node_modules
+node_modules

.eslintrc.json

@@ -1,46 +1,45 @@
-// {
-//   "env": {
-//       "browser": true,
-//       "commonjs": true,
-//       "node": true,
-//       "es6": true
-//   },
-//   "rules": {
-//       "no-duplicate-case":"error",
-//       "no-empty":"error",
-//       "no-extra-semi":"error",
-//       "no-func-assign": "error",
-//       "no-irregular-whitespace":"error",
-//       "no-unreachable": "error",
-//       "curly": "error",
-//       "dot-notation": "error",
-//       "eqeqeq": "error",
-//       "no-empty-function": "error",
-//       "no-multi-spaces": "error",
-//       "no-mixed-spaces-and-tabs": "error",
-//       "no-trailing-spaces": "error",
-//       "default-case": "error",
-//       "no-fallthrough": "error",
-//       "no-unused-vars": "error",
-//       "no-use-before-define": "error",
-//       "no-redeclare": "error",
-//       "camelcase": "error",
-//       "brace-style": "error",
-//       "indent": [
-//           "error",
-//           2
-//       ],
-//       "linebreak-style": [
-//           "error",
-//           "windows"
-//       ],
-//       "quotes": [
-//           "error",
-//           "double"
-//       ],
-//       "semi": [
-//           "error",
-//           "always"
-//       ]
-//   }
-// }
+{
+  "env": {
+      "browser": true,
+      "commonjs": true,
+      "node": true,
+      "es6": true
+  },
+  "rules": {
+      "no-duplicate-case":"error",
+      "no-empty":"error",
+      "no-extra-semi":"error",
+      "no-func-assign": "error",
+      "no-irregular-whitespace":"error",
+      "no-unreachable": "error",
+      "curly": "error",
+      "dot-notation": "error",
+      "eqeqeq": "error",
+      "no-empty-function": "error",
+      "no-multi-spaces": "error",
+      "no-mixed-spaces-and-tabs": "error",
+      "no-trailing-spaces": "error",
+      "default-case": "error",
+      "no-fallthrough": "error",
+      "no-use-before-define": "error",
+      "no-redeclare": "error",
+      "camelcase": "error",
+      "brace-style": "error",
+      "indent": [
+          "error",
+          2
+      ],
+    //   "linebreak-style": [
+    //       "error",
+    //       "windows"
+    //   ],
+      "quotes": [
+          "error",
+          "double"
+      ],
+      "semi": [
+          "error",
+          "always"
+      ]
+  }
+}

.gitignore

@@ -1 +1,2 @@
-node_modules
+node_modules
+.vscode

.travis.yml

@@ -9,4 +9,4 @@ cache:
 services:
   - mysql
 before_install:
-  - mysql -e 'CREATE DATABASE IF NOT EXISTS blog_machine;'
+  - mysql -e 'CREATE DATABASE IF NOT EXISTS blog_machine;'

config/middleware/isAuthenticated.js

@@ -1,4 +1,4 @@
-module.exports = function(req, res, next) {
+module.exports = function (req, res, next) {
   // If the user is logged in, continue with the request to the restricted route
   if (req.user) {
     return next();

config/middleware/isBlogOwner.js

@@ -0,0 +1,27 @@
+const db = require("../../models");
+
+// This is a middleware function that determines if the signed in user is the blog owner and if they are allowed to edit/delete a blog.
+// Only blog owners are allowed to edit and delete their own blogs.
+// A potential added feature would be to make certain users site admins.
+// Then we could also allow site admins here for viewing the blogs.
+module.exports = function (req, res, next) {
+  let blogId;
+
+  // Determines ing blog ID is query or parameter
+  if (req.query.blog_id) {
+    blogId = req.query.blog_id;
+  } else if (req.params.id) {
+    blogId = req.params.id;
+  }
+
+  // If user is blog owner, return next callback. Else if user is not blog owner, redirect them to the index page because they are not allowed to be there
+  db.Blog.findOne({
+    where: { id: blogId }
+  }).then(function (blog) {
+    if (blog.UserId === req.user.id) {
+      return next();
+    } else {
+      res.redirect("/");
+    }
+  });
+};

config/multer.js

@@ -1,29 +1,32 @@
 const multer = require("multer");
 
+// Storage defines the directory that the profile pictures are stared, in this case the uploads directory in the public layer.
 const storage = multer.diskStorage({
   destination: function(req, file, cb) {
-    cb(null, "./public/upload/")
+    cb(null, "./public/upload/");
   },
   filename: function(req, file, cb) {
-    console.log(new Date().toISOString())
-    cb(null, new Date().toISOString().replace(/:/g, "c") + file.originalname)
+    console.log(new Date().toISOString());
+    cb(null, new Date().toISOString().replace(/:/g, "c") + file.originalname);
   }
 });
 
+// Filters files to make sure only images or gifs are uploaded
 const fileFilter = (req, file, cb) => {
   if (file.mimetype === "image/jpeg" || file.mimetype === "image/png" || file.mimetype === "image/gif") {
     cb(null, true);
   } else {
     cb(null, false);
   }
-}
+};
 
+// Upload multer function uses the storage function and fileFilter function seen above and determins the filesize to be 5 MB
 const upload = multer({
   storage: storage,
   limits: {
     fileSize: 5000000
   },
   fileFilter: fileFilter
-})
+});
 
 module.exports = upload;

config/passport.js

@@ -7,18 +7,17 @@ passport.use(new LocalStrategy(
   {
     usernameField: "email"
   },
-  function(email, password, done) {
+  function (email, password, done) {
     db.User.findOne({
       where: {
         email: email
       }
-    }).then(function(dbUser) {
+    }).then(function (dbUser) {
       if (!dbUser) {
         return done(null, false, {
           message: "Incorrect email."
         });
-      }
-      else if (!dbUser.validPassword(password)) {
+      } else if (!dbUser.validPassword(password)) {
         return done(null, false, {
           message: "Incorrect password."
         });
@@ -28,11 +27,11 @@ passport.use(new LocalStrategy(
   }
 ));
 
-passport.serializeUser(function(user, cb) {
+passport.serializeUser(function (user, cb) {
   cb(null, user);
 });
 
-passport.deserializeUser(function(obj, cb) {
+passport.deserializeUser(function (obj, cb) {
   cb(null, obj);
 });
 

models/blog.js

@@ -1,17 +1,18 @@
-module.exports = function(sequelize, DataTypes) {
+module.exports = function (sequelize, DataTypes) {
+  // Defines Blog table with title, body, and mood strings
   var Blog = sequelize.define("Blog", {
     title: {
       type: DataTypes.STRING,
       allowNull: false,
       validate: {
-        len: [0, 50]
+        len: [1, 50]
       }
     },
     body: {
       type: DataTypes.TEXT,
       allowNull: false,
       validate: {
-        len: [0, 100000]
+        len: [1, 100000]
       }
     },
     mood: {
@@ -23,18 +24,23 @@ module.exports = function(sequelize, DataTypes) {
     }
   });
 
-  Blog.associate = function(models) {
+  // Associates blogs with Users and Categories, creates CategoryId and UserId foreign key rows.
+  Blog.associate = function (models) {
+    // If user is deleted, all of their blogs are deleted
     Blog.belongsTo(models.User, {
+      onDelete: "CASCADE"
+    }, {
       foreignKey: {
         allowNull: false
       }
     });
+    // Cannot deleted category that has blogs assigned to it, they are protected.
     Blog.belongsTo(models.Category, {
       foreignKey: {
         allowNull: false
       }
     });
-  }
+  };
 
   return Blog;
 };

models/category.js

@@ -1,14 +1,16 @@
-module.exports = function(sequelize, DataTypes) {
-    var Category = sequelize.define("Category", {
-      name: {
-        type: DataTypes.STRING,
-        allowNull: false
-      }
-    });
-
-    Category.associate = function(models) {
-        Category.hasMany(models.Blog);
-    };
+module.exports = function (sequelize, DataTypes) {
+  // Created Category table with a name string row
+  var Category = sequelize.define("Category", {
+    name: {
+      type: DataTypes.STRING,
+      allowNull: false
+    }
+  });
 
-    return Category;
-  };
+  // Associates category with the many blogs assigned to 1 category
+  Category.associate = function (models) {
+    Category.hasMany(models.Blog);
+  };
+
+  return Category;
+};

models/user.js

@@ -1,6 +1,7 @@
 const bcrypt = require("bcryptjs");
 
-module.exports = function(sequelize, DataTypes) {
+module.exports = function (sequelize, DataTypes) {
+  // Defines the user table with all user information
   const User = sequelize.define("User", {
     email: {
       type: DataTypes.STRING,
@@ -21,6 +22,8 @@ module.exports = function(sequelize, DataTypes) {
       type: DataTypes.STRING,
       allowNull: false
     },
+    // Pictures are locally stored in the public/uploads/ directory instead of stored as a blob on the database.
+    // An additional feature could be to store pictures in database as blob row instead of as string of the file path.
     picture: {
       type: DataTypes.STRING,
       allowNull: true
@@ -62,17 +65,18 @@ module.exports = function(sequelize, DataTypes) {
     }
   });
 
-  User.associate = function(models) {
-    User.hasMany(models.Blog, {
-      onDelete: "cascade"
-    });
+  // Associates users with the many blogs they own
+  User.associate = function (models) {
+    User.hasMany(models.Blog);
   };
 
-  User.prototype.validPassword = function(password) {
+  // Makes sure hashed password can be compared to unhashed password
+  User.prototype.validPassword = function (password) {
     return bcrypt.compareSync(password, this.password);
   };
 
-  User.addHook("beforeCreate", function(user) {
+  // Creates a hook that makes sure password is hashed before added to the database.
+  User.addHook("beforeCreate", function (user) {
     user.password = bcrypt.hashSync(user.password, bcrypt.genSaltSync(10), null);
   });
   return User;