Skip to content

Commit

Permalink
pulled from master
Browse files Browse the repository at this point in the history
  • Loading branch information
amanriquez committed Apr 15, 2019
2 parents 1605dc6 + 728dd9a commit 517f541
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 36 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,3 @@ typings/

# configuration
config.js
client/dist/bundle.js
4 changes: 2 additions & 2 deletions client/dist/bundle.js

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions client/src/components/DashBody.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@ uploadContact(contact){
this.props.auth.fetch2(`/api/users/${this.props.userId}/upload`, options)
.then((response)=>{
this.props.getUserPoints();
this.setState({
currentLead: contact,
contactView: 'access'
})
})
.catch((err)=>{
console.error(err);
Expand Down
2 changes: 1 addition & 1 deletion client/src/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ loginUser(username, password){
})

}).catch((err) => {
alert(err.message);
alert('The username and password you entered did not match our records. Please double-check and try again.');
});
}

Expand Down
4 changes: 2 additions & 2 deletions handlers/auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ exports.signin = async function(req, res, next) {
});
} else{
return next({
status: 400,
status: 401,
message: 'Invalid username/password'
})
}
} catch(err){
return next({status: 400, message: 'Invalid username/password'});
return next({status: 401, message: 'Invalid username/password'});
}


Expand Down
41 changes: 11 additions & 30 deletions package-lock.json

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

0 comments on commit 517f541

Please sign in to comment.