resolved conflict

1 files changed, 48 insertions, 3 deletions

diff --git a/routes/user.js b/routes/user.js
index 1e5a006..b2864b8 100644
--- a/routes/user.js
+++ b/routes/user.js
@@ -54,7 +54,29 @@ router.get('/user_profile', loggedIn, isUser, function(req, res, next) {
         comments.push(obj);
     }
 
-    res.render('user_profile_alt', {comments : comments});
+    // GET INBOX
+    var inbox = [];
+    dbFile.checkMailbox(req.user.user_name, function(success, error, data, message){
+        if (success) {
+            inbox = data;
+        } else if (error) {
+            // Need to redirect to an error page instead.
+            console.log("Could not retrieve mail.");
+        }
+    });
+
+    // For testing purposes, remove later:
+    if (!inbox.length) {
+        var mail_data = {
+            sender: 'The Dude', receiver: req.user.user_name,
+            message: 'Whoa look at this',
+            date: '2016-04-05'
+        }
+    }
+        inbox.push(mail_data);
+        inbox.push(mail_data);
+
+    res.render('user_profile_alt', {comments : comments, inbox: inbox});
 });
 
 /* Adds a solution into the database, redirect to exam/question/solution page */
@@ -111,7 +133,6 @@ router.get('/add_solution/:examID/:qID', function (req, res, next) {
 
 });
 
-
 router.get('/signup', loggedOut, function(req, res, next) {
     res.render('signup', {csrfToken: req.csrfToken(), success: req.session.success, errors: req.session.errors});
     req.session.errors = null;
@@ -186,6 +207,29 @@ router.post('/signin', loggedOut, function(req, res, next) {
 
 });
 
+router.get('/user_profile/send_message/:id', loggedIn, function(req, res, next) {
+    var date = new Date();
+    var current_date = date.toString().slice(0, 24);
+    var mail_data = {
+        sender: req.user.user_name,
+        receiver: req.body.receiver_username,
+        message: req.body.message,
+        date: current_date
+    }
+
+    dbFile.sendMail(mail_data, function(success, error, message) {
+        if ((!success && !error) || (error)) {
+            res.redirect('/user/user_profile', {error: message});
+            $('#profile-send-message').show();
+        }  else {
+            res.redirect('/user/user_profile', {success: message});
+            $('#profile-send-message').show();
+        }
+    });
+
+    //res.redirect('/user/user_profile');
+});
+
 module.exports = router;
 
 /************** Route protection ********************/
@@ -205,8 +249,9 @@ function loggedOut(req, res, next) {
 }
 
 function isUser(req, res, next) {
-    if (req.user.email) {
+    if (req.user && req.user.email) {
         return next();
     }
     res.redirect('/admin');
 }
+