diff --git a/client/app/components/Admin/SignupForm.js b/client/app/components/Admin/SignupForm.js index 45b1dbf..dca6f1c 100644 --- a/client/app/components/Admin/SignupForm.js +++ b/client/app/components/Admin/SignupForm.js @@ -109,9 +109,10 @@ class SignupForm extends Component { var reader = new FileReader(); reader.onload = function (file) { var data = JSON.parse(file.target.result); + data=data["_default"]; for (var key in data) { // console.log(key + " -> " + data[key]); - var body = "usn=" + key; + var body = "usn=" + data[key].usn; body += "&name=" + data[key].name; body += "&email=" + data[key].email; body += "&rating=" + data[key].rating; diff --git a/server/routes/api/admin.js b/server/routes/api/admin.js index 0868d00..7d9b1f3 100644 --- a/server/routes/api/admin.js +++ b/server/routes/api/admin.js @@ -20,12 +20,14 @@ module.exports = (app) => { var role = req.body.role; if (!firstName) { + console.log("Error: First name cannot be blank"); return res.status(400).send({ success: false, message: 'Error: First name cannot be blank.' }); } if (!usn) { + console.log("Error: usn cannot be blank"); return res.status(400).send({ success: false, message: 'Error: usn cannot be blank.' @@ -46,6 +48,7 @@ module.exports = (app) => { message: 'Error: Server find error' }); } else if (previousUsers.length > 0) { + console.log(`Error: ${usn} already exists`); return res.status(409).send({ success: false, message: 'Error: Account already exists.' @@ -132,6 +135,7 @@ module.exports = (app) => { app.post('/api/admin/createGroup', requireRole('admin'), function (req, res) { if (!req.body.name) { + console.log("Error: Name not recieved"); return res.status(400).send({ success: false, message: "Error: name not recieved" @@ -139,6 +143,7 @@ module.exports = (app) => { } if (!req.body.usn) { + console.log("Error: usn not recieved"); return res.status(400).send({ success: false, message: "Error: usn not recieved" @@ -146,6 +151,7 @@ module.exports = (app) => { } if (!req.body.graduating) { + console.log("Error: graduating year not recieved"); return res.status(400).send({ success: false, message: "Error: graduating year not recieved" @@ -164,6 +170,7 @@ module.exports = (app) => { }); } if (!user) { + console.log(`Error: ${req.body.usn} not found`) return res.status(404).send({ success: false, message: 'Error: User not found' diff --git a/server/routes/api/contests.js b/server/routes/api/contests.js index 1ea3d41..e6dd1dd 100644 --- a/server/routes/api/contests.js +++ b/server/routes/api/contests.js @@ -209,7 +209,6 @@ module.exports = (app) => { var timesPlayed = req.body.timesPlayed; var lastFive = req.body.lastFive; var best = req.body.best; - if (!usn) { return res.status(400).send({ success: false, @@ -254,6 +253,7 @@ module.exports = (app) => { }); } else { + console.log(`Error: ${usn} not found`) return res.status(400).send({ success: false, message: 'Error: User not found.'