From 4bf1607f1da14953a0e0ee2f1c3ad2125a238a0e Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 13:39:15 -0800 Subject: [PATCH 1/7] use findOneAndUpdate convenience method --- server.js | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/server.js b/server.js index ee62ca2..67958d0 100644 --- a/server.js +++ b/server.js @@ -103,14 +103,9 @@ app.get('/api/list/:_id', function getListData (req, res) { }); app.put('/api/list/:_id', function updateListData (req, res) { - db.List.findById(req.params._id, function (err, foundList) { - var updatedList = foundList; - updatedList.name = req.body.name; - updatedList.description = req.body.description; - updatedList.verbs = req.body.verbs; - updatedList.save(function (err, savedList) { - res.send(updatedList); - }); + // http://mongoosejs.com/docs/api.html#query_Query-findOneAndUpdate + db.List.findOneAndUpdate({_id: req.params._id}, req.body, function (err, updatedList) { + res.send(updatedList); }); }); From eaedf5a49bcf1705b056b8fc6437b34dd479b6a1 Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 13:45:00 -0800 Subject: [PATCH 2/7] handle db errors in route gracefully: 404 + error message --- server.js | 51 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/server.js b/server.js index 67958d0..3a23ddb 100644 --- a/server.js +++ b/server.js @@ -37,14 +37,20 @@ app.get('/lists', function homepage (req, res) { app.get('/api/verbs', function verbList (req, res) { db.Verb.find({}, function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); app.post('/api/verbs', function newVerb (req, res) { db.Verb.create(req.body, function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); @@ -53,7 +59,10 @@ app.post('/api/verbs', function newVerb (req, res) { // searching by infinitive app.get('/api/verbname/:infinitive', function verbList (req, res) { db.Verb.find(req.params, function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); @@ -61,14 +70,20 @@ app.get('/api/verbname/:infinitive', function verbList (req, res) { //searching by infinitive ID app.get('/api/verbid/:_id', function verbList (req, res) { db.Verb.findById(req.params, function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); app.put('/api/verbid/:_id', function updateVerb (req, res) { db.Verb.findById(req.params, function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } var selectedTense = req.body.tense; var updatedVerb = success; //Checks to see whether anything has actually been changed. If there is a difference, it will save it. @@ -90,14 +105,20 @@ app.put('/api/verbid/:_id', function updateVerb (req, res) { app.get('/api/list', function listsList (req, res) { db.List.find({}).populate('verbs').exec(function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); app.get('/api/list/:_id', function getListData (req, res) { db.List.findById(req.params._id).populate('verbs').exec(function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); @@ -105,23 +126,33 @@ app.get('/api/list/:_id', function getListData (req, res) { app.put('/api/list/:_id', function updateListData (req, res) { // http://mongoosejs.com/docs/api.html#query_Query-findOneAndUpdate db.List.findOneAndUpdate({_id: req.params._id}, req.body, function (err, updatedList) { + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(updatedList); }); }); app.post('/api/list', function newList (req, res) { db.List.create(req.body, function (err, success) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send(success); }); }); app.delete('/api/list/:_id', function removeList (req, res) { db.List.remove(req.params, function (err) { - if (err) { return console.log(err); } + if (err) { + console.log(err) + return res.status(404).json({errors: ["Bad Thing", err.message]}) + } res.send("List deleted."); }); }); // listen on port 3000 -app.listen(process.env.PORT || 3000); \ No newline at end of file +app.listen(process.env.PORT || 3000); From 1f31844274aa4660dde879f1e1863ab8835b1d7e Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 13:48:25 -0800 Subject: [PATCH 3/7] whitespace --- public/app.js | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/public/app.js b/public/app.js index e240649..66f3a06 100644 --- a/public/app.js +++ b/public/app.js @@ -1,7 +1,7 @@ //GLOBAL VARIABLES //Functions are at the bottom. -var editListModalButtonHtml = +var editListModalButtonHtml = '
' + ' ' + '
'; @@ -265,7 +265,7 @@ $(document).ready(function() { $("span.new-verb.vous").html(vous); $("span.new-verb.ils").html(ils); }); - + $(".next-tense").click(function (event) { $(".save-tense").show(); $(".next-tense").hide(); @@ -347,7 +347,7 @@ $(document).ready(function() { //Gets all of the list information on page load getLists(); - + $("#newList").submit(function (event) { event.preventDefault(); @@ -407,7 +407,7 @@ $(document).ready(function() { }); $("#editListModal").on("click", "#addVerb", function () { - //Removes the #addVerb button. It will be re-added to + //Removes the #addVerb button. It will be re-added to //the bottom of the modal once a new verb has been added. $(".addVerb").remove(); //Calls a function that adds a dropdown that is populated with the verbs @@ -486,7 +486,7 @@ function renderConjugation(verb) { if ($(".verb-conjugation")) { $(".verb-conjugation").empty(); } - var conjugationGridHtml = + var conjugationGridHtml = '
' + '
' + '
' + @@ -498,7 +498,7 @@ function renderConjugation(verb) { ' ' + verb.tense.present.nous + '' + '
' + '
' + - '

Tu

' + + '

Tu

' + ' ' + verb.tense.present.tu + '' + '
' + '
' + @@ -560,7 +560,7 @@ function conjugateVerb(infinitive, tense) { $("input.new-verb.nous").val(stem + "ons"); $("input.new-verb.vous").val(stem + "ez"); $("input.new-verb.ils").val(stem + "ent"); - + } else if (family === "re") { $("input.new-verb.je").val(stem + "s"); $("input.new-verb.tu").val(stem + "s"); @@ -568,7 +568,7 @@ function conjugateVerb(infinitive, tense) { $("input.new-verb.nous").val(stem + "ons"); $("input.new-verb.vous").val(stem + "ez"); $("input.new-verb.ils").val(stem + "ent"); - + } else if (family === "ir") { $("input.new-verb.je").val(stem + "is"); $("input.new-verb.tu").val(stem + "is"); @@ -594,7 +594,7 @@ function conjugateVerb(infinitive, tense) { $("input.new-verb.nous").val(stem + "ions"); $("input.new-verb.vous").val(stem + "iez"); $("input.new-verb.ils").val(stem + "aient"); - + } else if (family === "re") { $("input.new-verb.je").val(stem + "ais"); $("input.new-verb.tu").val(stem + "ais"); @@ -602,7 +602,7 @@ function conjugateVerb(infinitive, tense) { $("input.new-verb.nous").val(stem + "ions"); $("input.new-verb.vous").val(stem + "iez"); $("input.new-verb.ils").val(stem + "aient"); - + } else if (family === "ir") { $("input.new-verb.je").val(stem + "issais"); $("input.new-verb.tu").val(stem + "issais"); @@ -626,7 +626,7 @@ function newVerbButtonCheck(tenseCount) { } function renderListData(list) { - var listHtml = + var listHtml = "
" + "
" + "
" + @@ -652,7 +652,7 @@ function renderListData(list) { " " + " " + " " + - "
" + + "
" + "
" + "
" + "
"; @@ -674,7 +674,7 @@ function listOfVerbsToEdit(verb) { } function renderVerbDropDownMenu() { - var dropDownMenuHtml = + var dropDownMenuHtml = '
' + ' ' + '
' + From 15b826230cffb4436703240d646314916bb8dd2b Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 13:49:02 -0800 Subject: [PATCH 4/7] refactor to return once --- public/app.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/public/app.js b/public/app.js index 66f3a06..cdce91d 100644 --- a/public/app.js +++ b/public/app.js @@ -539,13 +539,11 @@ function renderConjugation(verb) { function tenseChecker(tenseCount) { if (tenseCount === 1) { tense = "present"; - $(".current-tense").text(tense); - return tense; } else if (tenseCount === 2) { tense = "imparfait"; - $(".current-tense").text(tense); - return tense; - } + } + $(".current-tense").text(tense); + return tense; } //This function will need to be updated as more tenses are added. From bec7c9ded36db0b9059329def50c31746bc67338 Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 13:57:27 -0800 Subject: [PATCH 5/7] select elements _once_ using jQuery, store value in variable --- public/app.js | 61 ++++++++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/public/app.js b/public/app.js index cdce91d..e628cae 100644 --- a/public/app.js +++ b/public/app.js @@ -47,6 +47,17 @@ $(document).ready(function() { * j. Saving the updated list data */ + // selected jQuery elements + var $je = $(".je") + var $tu = $(".tu") + var $il = $(".il") + var $nous = $(".nous") + var $vous = $(".vous") + var $ils = $(".ils") + var $tense = $(".tense") + var $tense = $(".tense") + var $present = $(".present") + // 1. MAIN PAGE JS: if ($("#main-page").length >= 1) { $("input.verb-search").keydown(function handler(event) { @@ -96,15 +107,15 @@ $(document).ready(function() { success: function (data) { // console.log(data); tense = "present"; - $(".je").text(data.tense.present.je); - $(".tu").text(data.tense.present.tu); - $(".il").text(data.tense.present.il); - $(".nous").text(data.tense.present.nous); - $(".vous").text(data.tense.present.vous); - $(".ils").text(data.tense.present.ils); - $(".tense").removeClass("btn-success"); - $(".tense").addClass("btn-primary"); - $(".present").addClass("btn-success"); + $je.text(data.tense.present.je); + $tu.text(data.tense.present.tu); + $il.text(data.tense.present.il); + $nous.text(data.tense.present.nous); + $vous.text(data.tense.present.vous); + $ils.text(data.tense.present.ils); + $tense.removeClass("btn-success"); + $tense.addClass("btn-primary"); + $present.addClass("btn-success"); }, error: function (error) { console.log("Present tense error: ", error); @@ -122,14 +133,14 @@ $(document).ready(function() { success: function (data) { // console.log(data); tense = "imparfait"; - $(".je").text(data.tense.imparfait.je); - $(".tu").text(data.tense.imparfait.tu); - $(".il").text(data.tense.imparfait.il); - $(".nous").text(data.tense.imparfait.nous); - $(".vous").text(data.tense.imparfait.vous); - $(".ils").text(data.tense.imparfait.ils); - $(".tense").removeClass("btn-success"); - $(".tense").addClass("btn-primary"); + $je.text(data.tense.imparfait.je); + $tu.text(data.tense.imparfait.tu); + $il.text(data.tense.imparfait.il); + $nous.text(data.tense.imparfait.nous); + $vous.text(data.tense.imparfait.vous); + $ils.text(data.tense.imparfait.ils); + $tense.removeClass("btn-success"); + $tense.addClass("btn-primary"); $(".imparfait").addClass("btn-success"); }, error: function (error) { @@ -143,7 +154,7 @@ $(document).ready(function() { $(".edit-tense.save").show(); $(".edit-tense.edit").hide(); $(".imparfait").hide(); - $(".present").hide(); + $present.hide(); tenseChangePrevent = 1; var je = $("span.conjugation.je").text(); var tu = $("span.conjugation.tu").text(); @@ -151,17 +162,17 @@ $(document).ready(function() { var nous = $("span.conjugation.nous").text(); var vous = $("span.conjugation.vous").text(); var ils = $("span.conjugation.ils").text(); - $(".je").html(""); + $je.html(""); $("input.je").val(je); - $(".tu").html(""); + $tu.html(""); $("input.tu").val(tu); - $(".il").html(""); + $il.html(""); $("input.il").val(il); - $(".nous").html(""); + $nous.html(""); $("input.nous").val(nous); - $(".vous").html(""); + $vous.html(""); $("input.vous").val(vous); - $(".ils").html(""); + $ils.html(""); $("input.ils").val(ils); }); @@ -170,7 +181,7 @@ $(document).ready(function() { $(".edit-tense.edit").show(); $(".edit-tense.save").hide(); $(".imparfait").show(); - $(".present").show(); + $present.show(); tenseChangePrevent = 0; id = $(".row.verb-conjugation").attr('id'); var je = $("input.je").val(); From 43089a064cf999cbddbbc668afbe49bcbbe92f1d Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 13:58:12 -0800 Subject: [PATCH 6/7] example of how we might track application state by using a hash for routing --- public/app.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/app.js b/public/app.js index e628cae..b53d8d0 100644 --- a/public/app.js +++ b/public/app.js @@ -67,6 +67,10 @@ $(document).ready(function() { var family = infinitive.slice(infinitive.length-2, infinitive.length); if (family === "er" || family === "re" || family === "ir") { var url = "/api/verbname/" + infinitive; + // for kicks, let's display the current search in the URL Hash + // this one way of doing "front-end routing" + // bonus: make it bookmarkable / execute the search on pageload! + location.hash = "/verbs/search/" + infinitive; // e.g. http://example.com/#/verbs/search/aimer $.ajax({ method: "GET", url: url, From 0f8791c3ababb56601e6f74908033432d594fea3 Mon Sep 17 00:00:00 2001 From: nathanallen Date: Thu, 17 Dec 2015 14:11:08 -0800 Subject: [PATCH 7/7] remove vertical border from verb grid below 991px --- public/styles.css | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/styles.css b/public/styles.css index 670e3f1..c4131fa 100644 --- a/public/styles.css +++ b/public/styles.css @@ -72,4 +72,10 @@ span input { #quiz { text-align: center; -} \ No newline at end of file +} + +@media all and (max-width: 991px){ + .center { + border-right: 0px; /* remove vertical borders from verb grid */ + } +}