Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Erndevelops patch #6

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Erndevelops patch #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ff3388
updated travis
ernest-phillips Dec 10, 2018
a31b5e0
workout model
ernest-phillips Dec 21, 2018
41fa1de
workout model
ernest-phillips Jan 9, 2019
07451c8
update redame collaborators
erndevelops Sep 27, 2019
505261a
Update start.js
erndevelops Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ Not seeking contribution at this time.
## Authors

- **Ernest Phillips** -
Collaborated with @erndevelops

## License

Expand Down
16 changes: 16 additions & 0 deletions app/workout/workout.model.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,21 @@ workoutSchema.methods.serialize = function() {
const Workout = mongoose.model("workout", workoutSchema);

const WorkoutJoiSchema = Joi.object().keys({
<<<<<<< HEAD
user: Joi.string().optional(),
exercise: Joi.string()
.min(1)
.required(),
reps: Joi.number()
.min(1)
.required(),
<<<<<<< HEAD
weight: Joi.number().min(1)
=======
weight: Joi.number().min(1),
date: Joi.date()
>>>>>>> c67b88e6bca7463a4270d6b72836ffa09870c8f9
=======
user: Joi.string().required(),
sets: Joi.object({
exercise: Joi.string(),
Expand All @@ -65,6 +80,7 @@ const WorkoutJoiSchema = Joi.object().keys({
weight: Joi.number()
}),
date: Joi.date().min('1-1-1980')
>>>>>>> master
});

module.exports = {
Expand Down
4 changes: 3 additions & 1 deletion start.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ const {
startServer
} = require('./app/server');

startServer();
startServer();

//HEre is a comment from @erndevelops