Merge branch 'master' of http://github.com/shaunph/CourseProject into InitFix

Author: turiyag

src/dynamic/UserProfile.js

@@ -3,7 +3,7 @@ require('pagemaker');
 exports.getReq = function(req, res) {
 
 
-    var page = new StandardPage();
+    var page = new StandardPage(req);
     page.setContent("<h1>Not yet implemented</h1>");
     page.standardMenus();
 

src/dynamic/checkCredentials.js

@@ -0,0 +1,66 @@
+var db = require('SQLiteHelper');
+var qs = require('querystring');
+var upops = require('uploadOps');
+var pagemaker = require('pagemaker');
+
+module.exports.postReq = function(request, response, dataBuffer) {
+
+    try {
+        
+        var parsed = upops.parseMultipartFormdata(dataBuffer);
+        
+        db.userExists(parsed["Email"].toString(), function(codes) {
+            if(codes.status == 0 && codes.exists == true) {
+                db.getUser(parsed["Email"].toString(), function(codes) {
+        
+                    //right here we need to make sure the passwords match before success screen
+                    if(parsed["Password"].toString() == codes.rows[0].password) {
+                        //success
+                        response.writeHead(200, {   'content-type':'text/html', 
+                                                    'set-cookie':   'Email='+codes.rows[0].email + ' ; ; ' +
+                                                                    'Nickname='+codes.rows[0].nickname
+                                            });
+                        var page = new StandardPage(request);
+                        page.setTitle("Login Successful");
+                        page.setContent("<h1>User found</h1>");
+                        page.standardMenus();
+                        response.end(page.toHTML());
+                    }
+                    else {
+                        //failure
+                        response.writeHead(200, { 'content-type':'text/html' });
+                        var page = new StandardPage(request);
+                        page.setTitle("Login Denied");
+                        page.setContent("<h1> Denied </h1>");
+                        page.addContent("<h2> Username and password don't match </h2>");
+                        page.addContent("<p><a href=\"/login.html\">Try again</a></p>");
+                        page.standardMenus();
+                        response.end(page.toHTML());
+                    }
+              });
+            }
+            else if(codes.status == 0 && codes.exists == false) {
+                response.writeHead(200, {'content-type':'text/html'});
+                var page = new StandardPage(request);
+                page.setTitle("Login");
+                page.setContent("<h1>User not found</h1>");
+                page.addContent("<p><a href=\"/login.html\">Try again</a></p>");
+                page.standardMenus();
+                response.end(page.toHTML());
+            }
+            else {
+                response.writeHead(200, {'content-type':'text/html'});
+                var page = new StandardPage(request);
+                page.setTitle("Login - Error");
+                page.setContent("<h1>There was a server error</h1>"); 
+                page.addContent("<p><a href=\"/login.html\">Try again</a></p>");
+                page.standardMenus();
+                response.end(page.toHTML());               
+            }
+        });
+
+    } catch(err) {
+        console.log(err);
+    }
+}
+

src/dynamic/comments.js

@@ -1,22 +1,36 @@
-var pagemaker = require('./../js/pagemaker');
-var slh = require("./../js/SQLiteHelper.js");
+var pagemaker = require('pagemaker');
+var slh = require('SQLiteHelper');
 var url = require('url');
+var upops = require('uploadOps');
 
 exports.getReq = function (request,response) {
-    send(response,url.parse(request.url,true).query["taskid"]);
+    send(response,request,url.parse(request.url,true).query["taskid"]);
 }
 
-exports.postReq = function (request,response) {
-    //TODO: Read incoming post data and store in in the database
-    send(response,url.parse(request.url,true).query["taskid"]);
+exports.postReq = function (request,response, dataBuffer) {
+    var parsed = upops.parseMultipartFormdata(dataBuffer);
+    
+    //Add comment to the database (truncated to 500 characters)
+    slh.addComment(parsed["thecomment"].toString().substring(0,1024), parsed["taskid"].toString(),
+    parsed["email"].toString(), function(obj) {
+        if(obj.status != 0) {
+            //TODO: Send a 500 error page
+            console.log("Error saving comment: " + obj.detail);
+            return;
+        }
+        else {
+            // Once comment has been added, display the comments for the task
+            send(response, request, url.parse(request.url,true).query["taskid"]);
+        }
+    });
 }
 
-send = function (response, taskId) {
+send = function (response,request, taskId) {
     response.writeHead(200, {'Content-Type': 'text/html'});
 
     // If taskid isn't set, return an error
     if (taskId == undefined) {
-        var page = new StandardPage();
+        var page = new StandardPage(request);
 
         page.addContent("<div><span>Error: No Task ID defined.</span></div>" +
                             "<br />");
@@ -34,46 +48,70 @@ send = function (response, taskId) {
                 return;
             }
 
-            var page = new StandardPage();
+            var page = new StandardPage(request);
             page.setTitle("Comments for task " + taskId);
-            
-            // Add comment form
-            page.addContent("<div><span>Enter a comment:</span></div>" +
-                            "<br />");
-            
-            page.addContent("<form action='comments.js' method='post'>" + 
-                "<textarea name='thecomment' rows='4' cols='50'></textarea><br />" +
-                "<input type='hidden' name='taskid' value=" + taskId + ">" + 
-                "<input type='submit' value='Save'>" +
-                "</form>");
-            
+
+            var cookies = upops.parseCookies(request.headers);
+           
+            // Show add comement box if user is logged in 
+            if(cookies.Email) {
+                // Add comment form
+                page.addContent("<div><span>Enter a comment:</span></div>" +
+                        "<br />");
+                        
+                page.addContent("<script type='text/javascript'>" +
+                    "function validate(form) {" +
+                        "var c = document.getElementById('thecomment');" +
+                        "if(!/\\S/.test(c.value)){" +
+                            "window.alert('Please enter a comment');" +
+                            "return;" +
+                        "}" +
+                        "else if(c.value.length > '1024'){" +
+                            "window.alert('This comment exceeds the maximum length of 500 characters.');" +
+                            "return;" +
+                        "}" +
+                        "form.form.submit();" +
+                    "}" +
+                    "</script>");
+
+                page.addContent("<form action='comments?taskid=" + taskId + "' method='post' enctype='multipart/form-data'>" + 
+                        "<textarea name='thecomment' id='thecomment' rows='4' cols='50'></textarea><br />" +
+                        "<input type='hidden' name='taskid' value='" + taskId + "'>" + 
+                        "<input type='hidden' name='email' value='"+cookies.Email+"'>" + 
+                        "<button type='button' class='rounded' id='enter' onclick='validate(this)'>" +
+                        "<span>Save</span>" +
+                        "</button>" +
+                        "</form>");
+            }
+            else {
+                page.addContent("<div><span style='font-weight:bold'>Login to add a comment.</span></div>" + 
+                    "<br />");
+            }
+
             var numComments = obj.rows.length;
 
             // If there are no comments for the task, say so
             if (numComments == 0) {
                 page.addContent("<div><span>There are currently no comments for this task.</span></div>" +
                             "<br />");
             }
-            // Otherwise, display all comments
+            // Otherwise, display all comments (newest on top)
             else {
-                for (i = 0; i < numComments; i++) {
-                    page.addContent("<div>" +
+                for (i = numComments-1; i >= 0; i--) {
+                    page.addContent("<div class='commentBox'>" +
                             "<span>" + obj.rows[i].email + " says: </span>" +
                             "<br />" +
+                            "<span class='timeStamp'>" + obj.rows[i].created + "</span>" +
+                            "<br /><br />" +
                             "<span>" + obj.rows[i].thecomment + "</span>" +
                             "</div>" +
-                            "<br />");
+                            "<br /><br />");
                 }
             }
 
             page.standardMenus();
-
             response.write(page.toHTML());
-            
             response.end();
-            
         });
-    
     }
-    
-}
+}

src/dynamic/cookiesExample/example.js

@@ -41,7 +41,7 @@ exports.getReq = function (request,response) {
         //If the user is logged in
         } else if (cookies.user!=undefined) {
             //Begin dynamic page generation
-            page1 = new StandardPage();
+            page1 = new StandardPage(request);
             //Set the title
             page1.setTitle("Cookies Game");
             //Set the initial content

src/dynamic/error_pages/errorPage.js

@@ -25,7 +25,7 @@ exports.getReq = function(request, response, code) {
 
 function respond404(request, response) {
 
-    var page404 = new StandardPage();
+    var page404 = new StandardPage(request);
     page404.standardMenus();
     page404.setTitle("404 Page not found");
     page404.setContent("<h3>I swear it was here before...</h3>");
@@ -37,7 +37,7 @@ function respond404(request, response) {
 
 function respond500(request, response) {
 
-    var page500 = new StandardPage();
+    var page500 = new StandardPage(request);
     page500.standardMenus();
     page500.setTitle("500 Server error");
     page500.setContent("<h3>Don't worry, we've got a great warranty...</h3>");
@@ -57,4 +57,4 @@ function respondOther(request, response, code) {
     pageError.addContent("<h1>500</h1>")
     response.write(pageError.toHTML());
     response.end();
-}
+}

src/dynamic/example.js

@@ -9,7 +9,7 @@ exports.getReq = function (request,response) {
 send = function (response, parameters) {
     response.writeHead(200, {'Content-Type': 'text/html'});
 
-    page1 = new StandardPage();
+    page1 = new StandardPage(request);
     page1.setTitle("Test Page");
     page1.setContent("This is a dynamically generated test page <br />");
     page1.addContent("Here are the parameters passed to this page: <br />");

src/dynamic/feedGen.js

@@ -13,6 +13,7 @@ var pagemake = require('pagemaker');
  */
 exports.getReq = function (request,response) {
     response.writeHead(200, {'Content-Type': 'text/html'});
+    response.write("<h1>Feeds</h1>");
 
     db.getRecentActivity(function (error){
         if (error.status != 0){

src/dynamic/formPostExample/example.js

@@ -17,7 +17,7 @@ write the actual file, once one can determine the current user
 exports.postReq = function (request, response, dataBuffer) {
     //Extract the file from the data Buffer.
     try {
-        page1 = new StandardPage();
+        page1 = new StandardPage(request);
         page1.setTitle("Test Page");
         page1.setContent("This is a dynamically generated test page <br />");
         page1.standardMenus();

src/dynamic/logout.js

@@ -0,0 +1,19 @@
+var upops = require('uploadOps');
+
+module.exports.getReq = function(req, res) {
+
+    try {
+        var cookies = upops.parseCookies(req.headers);
+        var page = new StandardPage();
+        page.standardMenus();
+        page.setTitle("Logout");
+        page.setContent("<h1>Logout successful</h1>");
+
+        res.writeHead(200, {    'Content-Type': 'text/html', 
+                                'Set-Cookie':   'Email=' + cookies.Email + '; expires=Thu, 01-Jan-1970 00:00:01 GMT;' + ';' +
+                                                'Nickname=' + cookies.Nickname + '; expires=Thu, 01-Jan-1970 00:00:01 GMT;'});
+        res.end(page.toHTML());
+    } catch(err) {
+        console.log("There was an error: " + err);
+    } 
+}

src/dynamic/menu2example.js

@@ -0,0 +1,21 @@
+var pagemaker = require('pagemaker');
+
+exports.getReq = function (request, response) {
+    response.writeHead(200, {'Content-Type': 'text/html'});
+    
+    var page1 = new StandardPage();
+    page1.setTitle("onClick Menu Demo");
+    page1.setContent("<h1> Try the menu!</h1>");
+
+    page1.standardMenus();
+
+    page1.addOnClickItem("Big Feed", "pullGenFeedsTo('column2')");
+    page1.addOnClickItem("Nest this Page", "pullURLTo('/menu2example','column2')");
+    page1.addOnClickItem("Alert", "alertfunc();");
+    page1.addContent("<script type='text/javascript'>function alertfunc() { alert('This menu item works properly') }</script>");
+
+    response.write(page1.toHTML());
+    
+    response.end();
+    
+}