Merge pull request #8 from ParthPant/master

promise chaniz
istenith · Jan 3, 2020 · a819e2e · a819e2e
2 parents 9165c96 + ddce3a4
commit a819e2e
Showing 1 changed file with 40 additions and 36 deletions.
diff --git a/site/app.js b/site/app.js
@@ -72,14 +72,14 @@ app.post('/regPlayer', (req, res) => {
 
     //////validation code
     User.findOne({ 'email': data.email }, (err, result) => {
-        if(err){
+        if (err) {
             console.log(err);
         }
         else if (result == null) {
             if (req.body.pw == req.body.confpw) {
                 bcrypt.hash(data.pw, 10, (err, hash) => {
-                    if(err){console.log(err)}
-                    else{
+                    if (err) { console.log(err) }
+                    else {
                         data.pw = hash;
                         data.save()
                             .then((item) => {
@@ -124,22 +124,22 @@ app.post('/regTeam', (req, res) => {
         members: []
     }
     User.findOne({ 'email': recieved_data.team_leader_email }, (err, userDoc) => {
-        if(err){
+        if (err) {
             consolse.log(err);
         }
         else if (userDoc == null) {
             res.render('error', { title: "Error", message: "The team leader email is not registered" })
-        } 
+        }
         else {
             bcrypt.compare(recieved_data.leader_pw, userDoc.pw, (err, resp) => {
-                if(err){
+                if (err) {
                     console.log(err);
                 }
                 else if (resp) {
                     Event.findOne({ 'name': recieved_data.event }, (err, doc) => {
                         var participants = doc != null ? doc.participants : [];
                         var participationFlag = participants.includes(userDoc.id);
-                        if(err){
+                        if (err) {
                             console.log(err);
                         }
                         else if (participationFlag == true) {
@@ -149,22 +149,26 @@ app.post('/regTeam', (req, res) => {
                             data.members.push(userDoc._id);
                             var team = new Team(data);
                             var tid;
-                            team.save().then((item) => {
-                                tid = item._id;
-                                res.render('teamRegister', { title: "Team Registration", id: item._id, name: item.name })
-                                email.send({
-                                    template: path.join(__dirname, 'emails', 'team'),
-                                    message: {
-                                        to: userDoc.email
-                                    },
-                                    locals: {
-                                        Tid: tid,
-                                        Tname: data.name,
-                                    }
+                            team.save()
+                                .then((item) => {
+                                    tid = item._id;
+                                    res.render('teamRegister', { title: "Team Registration", id: item._id, name: item.name })
+                                })
+                                .then(() => {
+                                    email.send({
+                                        template: path.join(__dirname, 'emails', 'team'),
+                                        message: {
+                                            to: userDoc.email
+                                        },
+                                        locals: {
+                                            Tid: tid,
+                                            Tname: data.name,
+                                        }
+                                    });
                                 })
                                 .then(() => console.log("email sent"))
                                 .catch(err => console.log(err));
-                            })
+
                             Event.findOneAndUpdate({ 'name': data.event }, { $push: { 'participants': userDoc._id } }, { new: true, upsert: true }, (err, docs) => {
                                 if (err) {
                                     console.log(err);
@@ -178,28 +182,28 @@ app.post('/regTeam', (req, res) => {
                 }
             })
         }
-        
+
     })
 });
 
 app.post('/joinTeam', (req, res) => {
     var recieved_data = req.body;
 
     User.findOne({ 'email': recieved_data.email }, (err, userDoc) => {
-        if(err){
+        if (err) {
             console.log(err);
         }
         else if (userDoc == null) {
             res.render('error', { title: "Error", message: "This email is not registered" })
         }
         else {
             bcrypt.compare(recieved_data.pw, userDoc.pw, (err, resp) => {
-                if(err){
+                if (err) {
                     console.log(err);
                 }
                 else if (resp) {
                     Team.findOne({ '_id': recieved_data.team_id }, (err, teamDoc) => {
-                        if(err){
+                        if (err) {
                             console.log(err);
                         }
                         else if (teamDoc != null) {
@@ -208,7 +212,7 @@ app.post('/joinTeam', (req, res) => {
                             Event.findOne({ 'name': event }, (err, eventDoc) => {
                                 var participants = eventDoc != null ? eventDoc.participants : [];
                                 var participationFlag = participants.includes(userDoc.id);
-                                if(err){
+                                if (err) {
                                     console.log(err)
                                 }
                                 else if (participationFlag == true) {
@@ -220,21 +224,21 @@ app.post('/joinTeam', (req, res) => {
                                         eventDoc.participants.push(userDoc._id);
                                         teamDoc.save();
                                         eventDoc.save();
-                                        res.render('joinTeam', { title: "Done!", team:teamDoc.name });
-                                        User.findOne({'id':teamDoc.members[0].email},(err,lead)=>{
+                                        res.render('joinTeam', { title: "Done!", team: teamDoc.name });
+                                        User.findOne({ 'id': teamDoc.members[0].email }, (err, lead) => {
                                             email.send({
                                                 template: path.join(__dirname, 'emails', 'memberJoin'),
                                                 message: {
                                                     to: lead.email
                                                 },
                                                 locals: {
-                                                    team:teamDoc.name,
-                                                    member:userDoc.name,
-                                                    event:teamDoc.event
+                                                    team: teamDoc.name,
+                                                    member: userDoc.name,
+                                                    event: teamDoc.event
                                                 }
                                             })
-                                            .then(() => console.log("email sent"))
-                                            .catch(err => console.log(err));
+                                                .then(() => console.log("email sent"))
+                                                .catch(err => console.log(err));
                                         })
                                     } else {
                                         res.render('error', { title: "Error", message: "Max number of members reached" });
@@ -257,7 +261,7 @@ app.post('/joinTeam', (req, res) => {
 https.createServer({
     key: fs.readFileSync('server.key'),
     cert: fs.readFileSync('server.cert')
-  }, app)
-  .listen(process.env.PORT || 3000, function () {
-    console.log('Server UP! Go to https://localhost:'+process.env.PORT)
-})
+}, app)
+    .listen(process.env.PORT || 3000, function () {
+        console.log('Server UP! Go to https://localhost:' + process.env.PORT)
+    })