Skip to content

Commit

Permalink
Merge pull request #38 from andela/ft-validate-user-input-165412912
Browse files Browse the repository at this point in the history
#165412912 validate user input on signup
  • Loading branch information
Denis Niwemugisha authored and luc-tuyishime committed May 16, 2019
2 parents 3892b33 + 1503305 commit 75ce816
Show file tree
Hide file tree
Showing 30 changed files with 733 additions and 110 deletions.
2 changes: 2 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,5 @@ TWITTER_CONSUMER_KEY=TwitterKey
TWITTER_CONSUMER_SECRET=TwitterKey
GOOGLE_CONSUMER_KEY=ToogleKey
GOOGLE_CONSUMER_SECRET=GoogleSecret

SENDGRID_API_KEY=sendgridAPIKEY
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ script:
after_script:
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
after_success:
- npm run coveralls
- npm run coveralls
258 changes: 206 additions & 52 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "A Social platform for the creative at heart",
"main": "src/index.js",
"scripts": {
"test": "NODE_ENV=test npm run db:migrate && NODE_ENV=test nyc mocha --require @babel/register --timeout 30000 src/tests/index.js",
"test": "NODE_ENV=test sequelize db:migrate:undo:all && NODE_ENV=test npm run db:migrate && NODE_ENV=test nyc mocha --require @babel/register --timeout 30000 src/tests/index.js",
"cover": "npm test && nyc report --reporter=text-lcov | coveralls",
"coveralls": "cat coverage/lcov.info | coveralls",
"start": "babel-node src/index.js",
Expand All @@ -21,6 +21,7 @@
"@babel/preset-env": "^7.4.3",
"@babel/register": "^7.4.0",
"@hapi/joi": "^15.0.0",
"@sendgrid/mail": "^6.4.0",
"D": "^1.0.0",
"bcrypt": "^3.0.6",
"body-parser": "^1.18.3",
Expand Down
3 changes: 2 additions & 1 deletion src/config/status.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ export default {
NOT_FOUND: 404,
TIMEOUT: 408,
EXIST: 409,
SERVER_ERROR: 500
SERVER_ERROR: 500,
NOT_MODIFIED: 304
};
Loading

0 comments on commit 75ce816

Please sign in to comment.