before deploy

Author: ernest-phillips

README.md

@@ -1,13 +1,15 @@
 # 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.
 Create an account.
 Choose from a database of various exercises.
 View your workout history and progress.
 
+![alt text](./public/img/fit_j_thumb.png)
+
 ## Getting Started
 
 These instructions will get you a copy of the project up and running on your local machine for development and testing purposes. See deployment for notes on how to deploy the project on a live system.
@@ -17,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:admin:"W\!nner05"//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.router.js

@@ -25,7 +25,7 @@ exerciseRouter.post('/', (request, response) => {
 
     const validation = Joi.validate(newExercise, ExerciseJoiSchema);
     if (validation.error) {
-        console.log("Validation Error")
+
         return response.status(HTTP_STATUS_CODES.BAD_REQUEST).json({
             error: validation.error
         });
@@ -43,7 +43,7 @@ exerciseRouter.post('/', (request, response) => {
 
 // RETRIEVE Exercises
 exerciseRouter.get('/', (request, response) => {
-    console.log("Retrieving All Exercises");
+
     Exercise.find()
         .then(exercises => {
             return response.status(HTTP_STATUS_CODES.OK).json(
@@ -52,25 +52,20 @@ exerciseRouter.get('/', (request, response) => {
             );
         })
         .catch(error => {
-            // Step 2B: If an error ocurred, return an error HTTP status code and the error in JSON format.
             return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).json(error);
         });
 });
 // RETRIEVE ONE EXERCISE
 exerciseRouter.get('/:id', (request, response) => {
 
-    // Step 1: Attempt to retrieve a specific user using Mongoose.Model.findById()
-    // https://mongoosejs.com/docs/api.html#model_Model.findById
     Exercise.findById(request.params.id)
         .then(exercise => {
-            console.log(exercise)
-                // Step 2A: Return the correct HTTP status code, and the user correctly formatted via serialization.
-                // return response.status(HTTP_STATUS_CODES.OK).json(user.serialize());
+
+
             return response.json(exercise);
 
         })
         .catch(error => {
-            // Step 2B: If an error ocurred, return an error HTTP status code and the error in JSON format.
             return response.status(HTTP_STATUS_CODES.INTERNAL_SERVER_ERROR).json(error);
         });
 });

app/server.js

@@ -34,14 +34,14 @@ 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', {
@@ -91,18 +91,14 @@ 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/sets/sets.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/user/user.model.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/user/user.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());
 
         })