final commit

Author: ernest-phillips

README.md

@@ -1,6 +1,6 @@
 # Fit-Journal with NodeJS
 
-View project at www.fit-journal.herokuapp.com (currently still in development)
+View project at www.fit-journal.herokuapp.com
 
 Track your workout history whether it be resistance or cardiovascular training, all in one place!
 This project is built on Node and Express using CRUD standard practices.
@@ -19,13 +19,6 @@ These instructions will get you a copy of the project up and running on your loc
 Tests completed with faker.js and Chai
 To supply data for testing and assertions
 
-### Break down into end to end tests
-
-Explain what these tests test and why
-
-```
-Give an example
-```
 
 ### And coding style tests
 

app/config.js

@@ -9,8 +9,8 @@ module.exports = {
     NOT_FOUND: 404,
     INTERNAL_SERVER_ERROR: 500,
   },
-  MONGO_URL: process.env.MONGO_URL || 'mongodb://localhost:27017/fit-journal',
-  // MONGO_URL: process.env.MONGO_URL || 'mongodb://ds237932.mlab.com:37932/fit-journal',
+
+  MONGO_URL: process.env.MONGO_URL || 'mongodb://ds237932.mlab.com:37932/fit-journal',
   TEST_MONGO_URL: process.env.TEST_MONGO_URL || 'mongodb://localhost:27017/test-fit-journal',
   JWT_SECRET: process.env.JWT_SECRET || 'default',
   JWT_EXPIRY: process.env.JWT_EXPIRY || '7d',

app/exercise/exercise.model.js

@@ -34,19 +34,19 @@ passport.use(localStrategy);
 passport.use(jwtStrategy);
 
 //MIDLEWARE
-app.use(morgan('combined')); //allows morgan to intercept and alog all http requests to console
-app.use(express.json()); // Required so AJAX request JSON data payload can be parsed and saved into request.body
+app.use(morgan('combined'));
+app.use(express.json());
 app.use(express.static('./public'));
 app.use(express.urlencoded({ extended: true }));
 
 //ROUTER SETUP
 app.use('/api/auth', authRouter);
-app.use('/api/user', userRouter); //Redirects all calls to /api/user to userRouter
+app.use('/api/user', userRouter);
 app.use('/api/home', workoutRouter);
 app.use('/api/exercises', exerciseRouter);
 app.use(express.static('./public', {
     extensions: ['html', 'htm']
-        // Other options here
+
 }));
 
 
@@ -82,7 +82,6 @@ function startServer(testEnv) {
                         resolve();
                     }).on('error', err => {
                         mongoose.disconnect();
-                        console.error(err);
                         reject(err);
                     });
                 }
@@ -91,21 +90,17 @@ function startServer(testEnv) {
 }
 
 function stopServer() {
-    //Step 1: disconnect from MongoDB database using Mongoose
     return mongoose
         .disconnect()
         .then(() => new Promise((resolve, reject) => {
-            //Step 2: Shut down the ExpressJS sever
             server.close(err => {
                 if (err) {
-                    //Step 3A: if an error occurred while shutting down, print out the error to the console and resolve promise
                     console.error(err);
                     return reject(err);
                 } else {
-                    //Step 3B: If server shutdown correctly, log success message.
-                    console.log('Express sever stopped');
+
                     resolve();
                 }
             });
         }));
-}
+}

app/exercise/exercise.router.js

@@ -26,7 +26,6 @@ setsRouter.post('/', (req, res) => {
     }
     const validation = Joi.validate(newSet, SetJoiSchema);
     if (validation.error) {
-        console.log("Set Validation Error")
         return res.status(HTTP_STATUS_CODES.BAD_REQUEST).json({
             error: validation.error
         });

app/server.js

@@ -1,11 +1,7 @@
-//Connects to mongoDB
 const mongoose = require('mongoose');
-//Validates data
 const Joi = require('joi');
-//Encrypts passwords
 const bcrypt = require('bcryptjs');
 
-// Each Mongoose schema maps to a MongoDB collection and defines the shape of the documents within that collection.
 const userSchema = new mongoose.Schema({
     name: {
         type: String,

app/sets/sets.router.js

@@ -63,7 +63,6 @@ userRouter.post('/', (request, response) => {
 
 // RETRIEVE USERS
 userRouter.get('/', (request, response) => {
-    console.log("Retrieving All Users");
     User.find()
         .then(users => {
 
@@ -82,7 +81,6 @@ userRouter.get('/:userid', (request, response) => {
     User.findById(request.params.userid)
         .then(user => {
 
-            console.log(request.params.userid)
             return response.status(HTTP_STATUS_CODES.OK).json(user.serialize());
 
         })