From 4ff33889b343554c4264cad9c6b0c0a6833a4018 Mon Sep 17 00:00:00 2001 From: Ernest Phillips Date: Mon, 10 Dec 2018 15:44:38 -0800 Subject: [PATCH 1/3] updated travis --- .travis.yml | 4 ++ app/workout/workout.model.js | 78 ++++++++++++++---------------------- 2 files changed, 34 insertions(+), 48 deletions(-) diff --git a/.travis.yml b/.travis.yml index e69de29..11042e0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -0,0 +1,4 @@ +language: node_js +node_js: + - "iojs" + - "7" diff --git a/app/workout/workout.model.js b/app/workout/workout.model.js index 23467b7..daa93c5 100644 --- a/app/workout/workout.model.js +++ b/app/workout/workout.model.js @@ -5,65 +5,47 @@ // 4. at least one set entered //5. a note that can be left blank //6. the amount of weight used in the set - +// https://en.wikipedia.org/wiki/List_of_weight_training_exercises const mongoose = require("mongoose"); const Joi = require("joi"); const workoutSchema = new mongoose.Schema({ - user: { - type: mongoose.Schema.Types.ObjectId, - ref: "user" - }, - exercise: { - type: String, - required: true - }, - set: { - type: Number, - required: true - }, - reps: { - type: Number, - required: true - }, - weight: { - type: Number - }, - date: { - type: Date - } + user: { type: mongoose.Schema.Types.ObjectId, ref: "user" }, + exercise: { type: String, required: true }, + set: { type: Number, required: true }, + reps: { type: Number, required: true }, + weight: { type: Number }, + date: { type: Date } }); workoutSchema.methods.serialize = function() { - let user; - if (typeof this.user.serialize === "function") { - user = this.user.serialize(); - } else { - user = this.user; - } - return { - id: this._id, - user: user, - exercise: this.exercise, - reps: this.reps, - weight: this.weight, - date: this.date - }; + let user; + if (typeof this.user.serialize === "function") { + user = this.user.serialize(); + } else { + user = this.user; + } + return { + id: this._id, + user: user, + exercise: this.exercise, + reps: this.reps, + weight: this.weight, + date: this.date + }; }; const Workout = mongoose.model("workout", workoutSchema); const WorkoutJoiSchema = Joi.object().keys({ - user: Joi.string().optional(), - exercise: Joi.string() - .min(1) - .required(), - reps: Joi.number() - .min(1) - .required(), - weight: Joi.number().min(1) + user: Joi.string().optional(), + exercise: Joi.string() + .min(1) + .required(), + reps: Joi.number() + .min(1) + .required(), + weight: Joi.number().min(1) }); -module.exports = { - Workout -}; \ No newline at end of file +module.exports = { Workout }; From 07451c880cefc7602c18e7cadddd986d7709b1e4 Mon Sep 17 00:00:00 2001 From: erndevelops <53534010+erndevelops@users.noreply.github.com> Date: Fri, 27 Sep 2019 13:35:55 -0700 Subject: [PATCH 2/3] update redame collaborators --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index fe7f22a..b517bf6 100644 --- a/README.md +++ b/README.md @@ -49,6 +49,7 @@ Not seeking contribution at this time. ## Authors - **Ernest Phillips** - +Collaborated with @erndevelops ## License From 505261a4e72eafc2913acd7c7d0420c08e506471 Mon Sep 17 00:00:00 2001 From: erndevelops <53534010+erndevelops@users.noreply.github.com> Date: Fri, 27 Sep 2019 14:00:07 -0700 Subject: [PATCH 3/3] Update start.js --- start.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/start.js b/start.js index f2a1d02..36f0d18 100644 --- a/start.js +++ b/start.js @@ -2,4 +2,6 @@ const { startServer } = require('./app/server'); -startServer(); \ No newline at end of file +startServer(); + +//HEre is a comment from @erndevelops