replaced module.exports with exports.

for consistency
relates #37

src/controllers/home.js

@@ -3,12 +3,13 @@ const { getItemsWithUsernames } = require('../models/queries/item.js');
 const list = require('../models/queries/list');
 const { formatData } = require('../helpers');
 
-module.exports = (req, res, next) => {
+exports.home = (req, res, next) => {
   const { token } = req.cookies;
   if (token === undefined) res.redirect('/login');
   else {
     try {
       const { username, userId } = verify(token, process.env.KEY);
+      // isnt a falsy value: 0 or undefined
       if (userId)
         Promise.all([list.selectAll(), getItemsWithUsernames()])
           .then(result => [result[0].rows, result[1].rows])
@@ -18,6 +19,5 @@ module.exports = (req, res, next) => {
     } catch (err) {
       next(err);
     }
-    // isnt a falsy value, 0 or undefined
   }
 };

src/controllers/index.js

@@ -1,6 +1,6 @@
 const router = require('express').Router();
 
-const home = require('./home');
+const { home } = require('./home');
 const login = require('./login');
 const logout = require('./logout');
 const signup = require('./signup');

src/controllers/login.js

@@ -2,10 +2,10 @@ const { compare } = require('bcrypt');
 const { sign } = require('jsonwebtoken');
 const { find } = require('../models/queries/user');
 
-const get = (req, res, next) => {
+exports.get = (req, res) => {
   res.render('login', { title: 'Login' });
 };
-const post = (req, res, next) => {
+exports.post = (req, res, next) => {
   const { username, password } = req.body;
   const key = process.env.KEY;
   let id;
@@ -25,4 +25,3 @@ const post = (req, res, next) => {
     })
     .catch(next);
 };
-module.exports = { get, post };

src/controllers/postData.js

@@ -25,11 +25,14 @@ exports.addItem = (req, res, next) => {
         .then(() => res.redirect('/'))
         .catch(next);
     } catch (err) {
-      console.log(err.message);
+      next(err);
     }
   }
 };
 exports.markAsDone = (req, res, next) => {
   const { id } = req.body;
-  item.markAsDone(id).then(() => res.redirect('/'));
+  item
+    .markAsDone(id)
+    .then(() => res.redirect('/'))
+    .catch(next);
 };

src/controllers/signup.js

@@ -2,10 +2,11 @@ const { hash } = require('bcrypt');
 const { signupValidate, errmsg } = require('../validation');
 const user = require('../models/queries/user');
 
-const get = (req, res, next) => {
+exports.get = (req, res) => {
   res.render('signup', { title: 'Sign Up' });
 };
-const post = (req, res, next) => {
+
+exports.post = (req, res, next) => {
   const { email, username, password, confirmPassword } = req.body;
   signupValidate({ email, username, password, confirmPassword })
     // make sure username is unique errmsg
@@ -22,4 +23,3 @@ const post = (req, res, next) => {
       else next(err);
     });
 };
-module.exports = { get, post };

src/helpers/formatData.js

@@ -1,9 +1,7 @@
-const formatData = (listsArray, itemsArray) => {
+exports.formatData = (listsArray, itemsArray) => {
   listsArray.forEach(list => {
     list.item = itemsArray.filter(e => e.list_id === list.id);
     return list;
   });
   return listsArray;
 };
-
-module.exports = formatData;

src/helpers/index.js

@@ -1,3 +1 @@
-const formatData = require('./formatData');
-
-module.exports = { formatData };
+exports.formatData = require('./formatData');

src/models/config/build.js

@@ -3,7 +3,7 @@ const { readFileSync } = require('fs');
 
 const connection = require('./connection');
 
-const dbBuild = () => {
+exports.dbBuild = () => {
   const sql = readFileSync(join(__dirname, 'db_build.sql')).toString();
   const insert = readFileSync(join(__dirname, 'insert_fake_data.sql')).toString();
 
@@ -12,4 +12,3 @@ const dbBuild = () => {
     return result;
   });
 };
-module.exports = { dbBuild };

src/models/queries/index.js

@@ -1,9 +1,3 @@
-const item = require('./item');
-const list = require('./list');
-const user = require('./user');
-
-module.exports = {
-  item,
-  list,
-  user
-};
+exports.item = require('./item');
+exports.list = require('./list');
+exports.user = require('./user');

src/models/queries/item.js

@@ -1,6 +1,6 @@
 const connection = require('../config/connection');
 
-const insert = itemData => {
+exports.insert = itemData => {
   const { content, isDone, listId, userId } = itemData;
   const sql = {
     text: 'INSERT INTO baraka_item (content, is_done, list_id, user_id) VALUES ($1, $2, $3, $4);',
@@ -9,21 +9,20 @@ const insert = itemData => {
   return connection.query(sql);
 };
 
-const selectAll = () => {
+exports.selectAll = () => {
   const sql = `SELECT * FROM baraka_item;`;
   return connection.query(sql);
 };
-const markAsDone = id => {
+exports.markAsDone = id => {
   const sql = {
     text: 'update baraka_item set is_done = true where id = $1',
     values: [id]
   };
   return connection.query(sql);
 };
 // required for formatting data
-const getItemsWithUsernames = () => {
+exports.getItemsWithUsernames = () => {
   const sql = `SELECT baraka_item.id, content, is_done, list_id, baraka_user.username from baraka_item inner join baraka_user ON baraka_user
   .id = baraka_item.user_id;`;
   return connection.query(sql);
 };
-module.exports = { insert, selectAll, getItemsWithUsernames, markAsDone };

src/models/queries/list.js

@@ -1,6 +1,6 @@
 const connection = require('../config/connection');
 
-const insert = listData => {
+exports.insert = listData => {
   const { name } = listData;
   const sql = {
     text: 'INSERT INTO baraka_list (name) VALUES ($1);',
@@ -9,9 +9,7 @@ const insert = listData => {
   return connection.query(sql);
 };
 
-const selectAll = () => {
+exports.selectAll = () => {
   const sql = `SELECT * FROM baraka_list;`;
   return connection.query(sql);
 };
-
-module.exports = { insert, selectAll };

src/models/queries/user.js

@@ -1,6 +1,6 @@
 const connection = require('../config/connection');
 
-const insert = userData => {
+exports.insert = userData => {
   const { username, password, email } = userData;
   const sql = {
     text: 'INSERT INTO baraka_user (username, password, email) VALUES ($1, $2, $3);',
@@ -9,17 +9,15 @@ const insert = userData => {
   return connection.query(sql);
 };
 
-const selectAll = () => {
+exports.selectAll = () => {
   const sql = 'SELECT * from baraka_user ;';
   return connection.query(sql);
 };
 
-const find = username => {
+exports.find = username => {
   const sql = {
     text: 'SELECT * FROM baraka_user WHERE baraka_user.username LIKE $1;',
     values: [username]
   };
   return connection.query(sql);
 };
-
-module.exports = { insert, selectAll, find };

src/validation/index.js

@@ -1,9 +1,3 @@
-const { signupValidate } = require('./signup');
-const { loginValidate } = require('./login');
-const errmsg = require('./UserErrorFeedbackHandling');
-
-module.exports = {
-  signupValidate,
-  loginValidate,
-  errmsg
-};
+exports.signupValidate = require('./signup');
+exports.loginValidate = require('./login');
+exports.errmsg = require('./UserErrorFeedbackHandling');

src/validation/login.js

@@ -11,4 +11,4 @@ const loginSchema = Joi.object().keys({
     .required()
 });
 
-module.exports = { loginValidate: loginData => Joi.validate(loginData, loginSchema) };
+exports.loginValidate = loginData => Joi.validate(loginData, loginSchema);

src/validation/signup.js

@@ -15,4 +15,4 @@ const signupSchema = Joi.object().keys({
     .required()
 });
 
-module.exports = { signupValidate: loginData => Joi.validate(loginData, signupSchema) };
+exports.signupValidate = loginData => Joi.validate(loginData, signupSchema);