syntax clean up

config/hasher.js

@@ -1,35 +1,34 @@
-let bcrypt = require('bcrypt-nodejs');
+let bcrypt = require("bcrypt-nodejs");
 let SALT_WORK_FACTOR = 10;
 
 module.exports = {
-
-  hash: function(user){
-    return new Promise((resolve, reject)=>{
+  hash: function(user) {
+    return new Promise((resolve, reject) => {
       bcrypt.genSalt(SALT_WORK_FACTOR, function(err, salt) {
-          if (err) reject(err);
+        if (err) reject(err);
 
-          // hash the password using our new salt
-          bcrypt.hash(user.password, salt, null, function(err, hash) {    //null?
-              if (err) reject(err);
+        // hash the password using our new salt
+        bcrypt.hash(user.password, salt, null, function(err, hash) {
+          //null?
+          if (err) reject(err);
 
-              // override the cleartext password with the hashed one
-              user.password = hash;
-              resolve(user);
-          });
+          // override the cleartext password with the hashed one
+          user.password = hash;
+          resolve(user);
+        });
       });
     });
-
   },
 
-  check: function(encryptedUser, user){
-    return new Promise((resolve, reject)=>{
-      bcrypt.compare(user.password, encryptedUser.password, function(err, isMatch) {
-          if (err) reject(err);
-          resolve(isMatch);
+  check: function(encryptedUser, user) {
+    return new Promise((resolve, reject) => {
+      bcrypt.compare(user.password, encryptedUser.password, function(
+        err,
+        isMatch
+      ) {
+        if (err) reject(err);
+        resolve(isMatch);
       });
     });
-
   }
-
-
 };

config/routes.js

@@ -1,61 +1,60 @@
-const users  = require("../controllers/users_controller.js");
-const modes  = require("../controllers/modes_controller.js");
-const votes  = require("../controllers/votes_controller.js");
-const favorites  = require("../controllers/favorites_controller.js");
+const users = require("../controllers/users_controller.js");
+const modes = require("../controllers/modes_controller.js");
+const votes = require("../controllers/votes_controller.js");
+const favorites = require("../controllers/favorites_controller.js");
 
-module.exports = function(app){
+module.exports = function(app) {
   app.use(createMessageArr);
 
   //ANALYTICS ROUTES
-  app.post('/draftcount', users.draftcount);
+  app.post("/draftcount", users.draftcount);
 
   //USER ROUTES
-  app.get('/', users.index);
-  app.post('/register', users.register);
-  app.post('/login', users.login);
-  app.get('/logout', users.logout);
-  app.get('/forgotpassword', users.forgotpassword);
-  app.post('/sendemail', users.sendemail);
+  app.get("/", users.index);
+  app.post("/register", users.register);
+  app.post("/login", users.login);
+  app.get("/logout", users.logout);
+  app.get("/forgotpassword", users.forgotpassword);
+  app.post("/sendemail", users.sendemail);
 
-  app.get('/setup/relative', users.setupRelative);
-  app.get('/setup/absolute', users.setupAbsolute);
-  app.get('/draft', users.draft);
-  app.get('/export', users.export);
-  app.post('/export', users.encode);
+  app.get("/setup/relative", users.setupRelative);
+  app.get("/setup/absolute", users.setupAbsolute);
+  app.get("/draft", users.draft);
+  app.get("/export", users.export);
+  app.post("/export", users.encode);
 
   //MODES ROUTES
 
-  app.get('/modes/:tab/:subtab', modes.browse);
+  app.get("/modes/:tab/:subtab", modes.browse);
 
   app.use(authenticateUser);
-  app.get('/user', users.account);
-  app.post('/user/delete', users.delete);
-  app.post('/user/resetpassword', users.password);
-  app.post('/modes', modes.create);
-  app.post('/modes/publish/:id', modes.publish);
-  app.post('/modes/publish_existing/:id', modes.publishExisting);
-  app.post('/modes/delete/:id', modes.delete);
+  app.get("/user", users.account);
+  app.post("/user/delete", users.delete);
+  app.post("/user/resetpassword", users.password);
+  app.post("/modes", modes.create);
+  app.post("/modes/publish/:id", modes.publish);
+  app.post("/modes/publish_existing/:id", modes.publishExisting);
+  app.post("/modes/delete/:id", modes.delete);
 
   //VOTES ROUTES
 
-  app.post('/modes/vote/:id/:tab/:subtab', votes.modeVote); //COMPLETE
+  app.post("/modes/vote/:id/:tab/:subtab", votes.modeVote); //COMPLETE
 
   //FAVORITES ROUTES
 
-  app.post('/modes/favorite/:id/:tab/:subtab', favorites.modeFavorite); //COMPLETE
-
+  app.post("/modes/favorite/:id/:tab/:subtab", favorites.modeFavorite); //COMPLETE
 };
 
 function authenticateUser(req, res, next) {
   if (!req.session.user_id) {
-    res.redirect('/');
+    res.redirect("/");
   } else {
     next();
   }
 }
 
-function createMessageArr(req, res, next){
-  if(!req.session.messages){
+function createMessageArr(req, res, next) {
+  if (!req.session.messages) {
     req.session.messages = {
       loginErrors: [],
       registerErrors: [],

config/sessions.js

@@ -1,21 +1,22 @@
-const session = require('express-session');
-const KnexSessionStore = require('connect-session-knex')(session);
-var knex = require('../db/knex.js');
+const session = require("express-session");
+const KnexSessionStore = require("connect-session-knex")(session);
+var knex = require("../db/knex.js");
 
-module.exports = function(app){
+module.exports = function(app) {
   const store = new KnexSessionStore({
-      knex: knex,
-      tablename: 'sessions' // optional. Defaults to 'sessions'
+    knex: knex,
+    tablename: "sessions" // optional. Defaults to 'sessions'
   });
 
-
-  app.use(session({
-      secret: 'keyboard cat',
+  app.use(
+    session({
+      secret: "keyboard cat",
       cookie: {
-          maxAge: 259200000000// 30 days
+        maxAge: 259200000000 // 30 days
       },
       resave: false,
       saveUninitialized: false,
       store: store
-  }));
-}
+    })
+  );
+};

controllers/favorites_controller.js

@@ -1,29 +1,29 @@
 const knex = require("../db/knex.js");
 
 module.exports = {
-  modeFavorite: (req,res) => {
+  modeFavorite: (req, res) => {
     //Delete if favorited
-    knex('favorites')
-      .where({user_id: req.session.user_id, mode_id: req.params.id})
-    .then((results) => {
-      if (results.length) {
-        knex('favorites')
-          .delete()
-          .where({user_id: req.session.user_id, mode_id: req.params.id})
-        .then(() => {
-          res.redirect(`/modes/${req.params.tab}/${req.params.subtab}`);
-        });
-      } else {
-        //Update if not favorited
-        knex('favorites')
-          .insert({
-            user_id: req.session.user_id,
-            mode_id: req.params.id
-          })
-        .then(() => {
-            res.redirect(`/modes/${req.params.tab}/${req.params.subtab}`);
-        });
-      }
-    });
+    knex("favorites")
+      .where({ user_id: req.session.user_id, mode_id: req.params.id })
+      .then(results => {
+        if (results.length) {
+          knex("favorites")
+            .delete()
+            .where({ user_id: req.session.user_id, mode_id: req.params.id })
+            .then(() => {
+              res.redirect(`/modes/${req.params.tab}/${req.params.subtab}`);
+            });
+        } else {
+          //Update if not favorited
+          knex("favorites")
+            .insert({
+              user_id: req.session.user_id,
+              mode_id: req.params.id
+            })
+            .then(() => {
+              res.redirect(`/modes/${req.params.tab}/${req.params.subtab}`);
+            });
+        }
+      });
   }
 };