diff options
| -rw-r--r-- | node_simple.js | 14 | ||||
| -rw-r--r-- | routes/admin.js | 1 | ||||
| -rw-r--r-- | views/signup.hbs | 2 |
3 files changed, 10 insertions, 7 deletions
diff --git a/node_simple.js b/node_simple.js index f735b82..cd6d06f 100644 --- a/node_simple.js +++ b/node_simple.js @@ -112,11 +112,11 @@ exports.add_user = function (fields, callbackUser) { }; // find out if this user already exists by checking their email - exports.find_user( fields[0] ,callbackUser, function (result, callbackUser) { + exports.find_user( fields[0], function (result) { if (result == false) { // find out if the user_name is taken - exports.find_user_name( fields[1], callbackUser, function (docs) { + exports.find_user_name( fields[1], function (docs) { if (docs == false) { // if not ... // continue console.log("user name is valid"); @@ -599,7 +599,7 @@ exports.find_exam = function (fields, serverCallback, callback) { * Params: course_code - an string of format "CSC309" * title - the course description * */ -exports.add_course = function (course_code, title) { +exports.add_course = function (course_code, title, serverCallback) { var courseData = { course_code: course_code, @@ -609,6 +609,7 @@ exports.add_course = function (course_code, title) { exports.find_course(course_code, function (result) { if (result == true){ + serverCallback(false, "Course already exists"); console.log("course already exists"); } else if (result == false) { // add it @@ -621,7 +622,8 @@ exports.add_course = function (course_code, title) { courses.insert(courseData, function(err) { if (err) throw err; else { - console.log("couse added"); + console.log("course added"); + serverCallback(true, "Course added successfully."); db.close(function (err) { // close the connection when done if (err) throw err; }); @@ -656,8 +658,8 @@ exports.find_course = function (course_code, callback) { { course_code: course_code } ).toArray(function (err, docs) { if (err) throw err; - - if (docs.length == 0) { // if this course doesnt exist.... add it + // if this course doesnt exist.... add it (via add_course call) + if (docs.length == 0) { callback(false); } else { // course was found diff --git a/routes/admin.js b/routes/admin.js index c5cbcb4..9952218 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -1,3 +1,4 @@ +var dbFile = require("../node_simple.js"); var express = require('express'); var router = express.Router(); var csrf = require('csurf'); // Cross-Site Request Forgery prevention diff --git a/views/signup.hbs b/views/signup.hbs index 463e347..571363b 100644 --- a/views/signup.hbs +++ b/views/signup.hbs @@ -27,7 +27,7 @@ - <h2><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h2> + <h3><i class="fa fa-user-plus" aria-hidden="true"></i> Sign Up</h3> <form action="/user/signup" method="post"> <div class="form-group"> <input type="text" class="form-control" placeholder="First Name" name="fname"> |