From 3d584623d06d5d82588a9df003326dbc0568094e Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 08:49:09 -0800 Subject: [PATCH 01/10] Add functionality to review constructor --- js/scripts.js | 47 ++++++++++++++++++++++++++++++++++++++++++++++- spec/specs.js | 50 ++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 82 insertions(+), 15 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index bfdb5b0..a895a9b 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -58,7 +58,7 @@ allParks.jamison.activities = ["fountain"]; function Park(parkName, parkLocation) { this.parkName = parkName; this.amenities = []; - this.reviews = []; + this.review = []; this.allParks = []; this.parkLocation = parkLocation; } @@ -77,3 +77,48 @@ Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, s } } } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +function Review(name, rating, comment) { + this.name = name; + this.rating = rating; + this.comment = comment; +} diff --git a/spec/specs.js b/spec/specs.js index 102bf66..d967b42 100644 --- a/spec/specs.js +++ b/spec/specs.js @@ -20,17 +20,39 @@ describe('Park', function() { }); }); -// describe('Location', function() { -// it("creates a location object with the given specifications", function() { -// var testLocation = new Location("NE"); -// testPark.north = true; -// expect(testPark.parkName).to.equal("Peninsula Park"); -// expect(testPark.amenities).to.eql([]); -// expect(testPark.reviews).to.eql([]); -// expect(testPark.allParks).to.eql([]); -// expect(testPark.north).to.equal(true); -// expect(testPark.northEast).to.equal(false); -// expect(testPark.southEast).to.equal(false); -// expect(testPark.northWest).to.equal(false); -// expect(testPark.southWest).to.equal(false); -// }); + + + + + + + + + + + + + + + + + + + + + + + + + + + +describe('Review', function() { + it("creates a new park review with the given specifications", function (){ + var testReview = new Review ("Jane", "Excellent", "Great park for kids and dogs."); + expect(testReview.name).to.equal("Jane"); + expect(testReview.rating).to.equal("Excellent"); + expect(testReview.comment).to.be.a("string"); + }); + +}); From 7e89183ceb845eaf2dcf4fc33189680806396a3c Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 09:09:53 -0800 Subject: [PATCH 02/10] add unique ids to forminput fields --- index.html | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/index.html b/index.html index d5a756b..bbacb32 100644 --- a/index.html +++ b/index.html @@ -164,18 +164,20 @@

About This Park:

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

Review:

-
-
-
- -
-
+
+
+
+
+ +
+
+

Jane Doe

From 37a24e09b73284d60a18efc66befcbb1d956de53 Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 09:10:44 -0800 Subject: [PATCH 03/10] begin to work out UI logic for review submissions --- js/scripts.js | 19 +++++++++++++++++++ spec/specs.js | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index a895a9b..833b6c8 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -122,3 +122,22 @@ function Review(name, rating, comment) { this.rating = rating; this.comment = comment; } + + +//User Interface Logic + +$(document).ready(function() { + $("form.form-horizontal").submit(function(event) { + var userName = $("input#reviewName").val(); + var userRating = $("select#reviewRating").val(); + var userCommnet = $("textarea#reviewComment").val(); + var userReview = new Review (userName, userRating, userComment); + newPark.review.push(userReview); + + event.preventDefault(); + }); +}); + + + +}); diff --git a/spec/specs.js b/spec/specs.js index d967b42..7647222 100644 --- a/spec/specs.js +++ b/spec/specs.js @@ -3,7 +3,7 @@ describe('Park', function() { var testPark = new Park("Peninsula Park", "north"); expect(testPark.parkName).to.equal("Peninsula Park"); expect(testPark.amenities).to.eql([]); - expect(testPark.reviews).to.eql([]); + expect(testPark.review).to.eql([]); expect(testPark.allParks).to.eql([]); expect(testPark.parkLocation).to.equal("north"); @@ -54,5 +54,4 @@ describe('Review', function() { expect(testReview.rating).to.equal("Excellent"); expect(testReview.comment).to.be.a("string"); }); - }); From e63bd632698ce2b35acdf2b004ac57ed3f12e4c5 Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 09:44:57 -0800 Subject: [PATCH 04/10] Add a newReview div to modal --- index.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/index.html b/index.html index bbacb32..d8ad09b 100644 --- a/index.html +++ b/index.html @@ -179,6 +179,11 @@

Review:

+
+

+

Rating:

+

+

Jane Doe

Rating: Excellent

From b80e07d55279946c763226743b928cbbfdb56653 Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 09:45:48 -0800 Subject: [PATCH 05/10] add jQuery to UI logic to make review submissions work --- js/scripts.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index 833b6c8..1af0752 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -58,7 +58,6 @@ allParks.jamison.activities = ["fountain"]; function Park(parkName, parkLocation) { this.parkName = parkName; this.amenities = []; - this.review = []; this.allParks = []; this.parkLocation = parkLocation; } @@ -130,14 +129,14 @@ $(document).ready(function() { $("form.form-horizontal").submit(function(event) { var userName = $("input#reviewName").val(); var userRating = $("select#reviewRating").val(); - var userCommnet = $("textarea#reviewComment").val(); - var userReview = new Review (userName, userRating, userComment); - newPark.review.push(userReview); + var userComment = $("textarea#reviewComment").val(); + + + $("div.realUserReivew").show(); + $(".realUserName").text(userName); + $(".realUserRating").text(userRating); + $(".realUserComment").text(userComment); event.preventDefault(); }); }); - - - -}); From eb73169c85fab47d96d6af6d150c541696bd5f8a Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 09:51:31 -0800 Subject: [PATCH 06/10] Add jQuery to clear form fields once form is submitted --- js/scripts.js | 177 +++++++++++++++++++++++++------------------------- 1 file changed, 90 insertions(+), 87 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index 1af0752..38ce31d 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -1,89 +1,89 @@ -var arborLodge = new Park("Arbor Lodge", "north"); -var overlook = new Park("Overlook Park", "north"); -var peninsula = new Park("Peninsula Park", "north"); -var alberta = new Park("Alberta Park", "northEast"); -var buckmanField = new Park("Buckman Field Park", "northEast"); -var grant = new Park("Grant Park", "northEast"); -var laurelhurst = new Park("Laurelhurst Park", "southEast"); -var tabor = new Park("Mt. Tabor Park", "southEast"); -var gabriel = new Park("Gabriel Park", "southWest"); -var tryon = new Park("Tryon Creek State Park", "southWest"); -var forest = new Park("Forest Park", "northWest"); -var jamison = new Park("Jamison Square", "northWest"); - -var allParks = [arborLodge, overlook, peninsula, alberta, buckmanField, grant, laurelhurst, tabor, gabriel, tryon, forest, jamison]; - -// NORTH -allParks.arborLodge.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; -allParks.arborLodge.activities = ["tennis", "baseball", "kickball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; - -allParks.overlook.amenities = ["picnic", "restroom", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; -allParks.overlook.activities = ["baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"] - -allParks.peninsula.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "horseshoePit", "fountain", "paths", "playground", "soccerField", "pool"]; -allParks.peninsula.activities = ["tennis", "baseball", "kickball", "basketball", "horseshoe", "pavedPaths", "soccer", "frisbee", "ballSports", "poolSwimming"]; -// NORTHEAST -allParks.alberta.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; -allParks.alberta.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; - -allParks.buckmanField.amenities = ["picnic", "baseballField", "playground", "soccerField"]; -allParks.buckmanField.activities = ["baseball", "kickball", "soccer", "frisbee", "ballSports"]; - -allParks.grant.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "fountain", "naturalArea", "paths", "playground", "skatepark", "pool"]; -allParks.grant.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "fountain", "pavedPaths", "skateboarding", "poolSwimming"]; -// SOUTHEAST -allParks.laurelhurst.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; -allParks.laurelhurst.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; - -allParks.tabor.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "naturalArea", "paths", "playground"]; -allParks.tabor.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "wildlife", "hikingTrails", "pavedPaths"]; - -// SOUTHWEST -allParks.gabriel.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "skatepark", "soccerField"]; -allParks.gabriel.activities = ["tennis", "baseball", "kickball", "basketball", "fountain", "pavedPaths", "skateboarding", "soccer", "frisbee", "ballSports"]; - -allParks.tryon.amenities = ["picnic", "restroom", "naturalArea", "paths"]; -allParks.tryon.activities = ["wildlife", "hikingTrails", "pavedPaths"]; - -// NORTHWEST -allParks.forest.amenities = ["restroom", "naturalArea", "paths"]; -allParks.forest.activities = ["wildlife", "hikingTrails"]; - -allParks.jamison.amenities = ["restroom", "fountain"]; -allParks.jamison.activities = ["fountain"]; - - - - -function Park(parkName, parkLocation) { - this.parkName = parkName; - this.amenities = []; - this.allParks = []; - this.parkLocation = parkLocation; -} - -Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { - var peninsula = new Park("Peninsula Park"); - peninsula.north = true; - var fernhill = new Park("Fernhill Park"); - peninsula.northEast = true; - var allParks = [peninsula, fernhill]; - var userParks = []; - for (var i = 0; i < allParks.length; i++) { - if (allParks[i].north === true) { - userParks.push(allParks[i]); - console.log(userParks); - } - } -} - - - - - - - - +// var arborLodge = new Park("Arbor Lodge", "north"); +// var overlook = new Park("Overlook Park", "north"); +// var peninsula = new Park("Peninsula Park", "north"); +// var alberta = new Park("Alberta Park", "northEast"); +// var buckmanField = new Park("Buckman Field Park", "northEast"); +// var grant = new Park("Grant Park", "northEast"); +// var laurelhurst = new Park("Laurelhurst Park", "southEast"); +// var tabor = new Park("Mt. Tabor Park", "southEast"); +// var gabriel = new Park("Gabriel Park", "southWest"); +// var tryon = new Park("Tryon Creek State Park", "southWest"); +// var forest = new Park("Forest Park", "northWest"); +// var jamison = new Park("Jamison Square", "northWest"); +// +// var allParks = [arborLodge, overlook, peninsula, alberta, buckmanField, grant, laurelhurst, tabor, gabriel, tryon, forest, jamison]; +// +// // NORTH +// allParks.arborLodge.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; +// allParks.arborLodge.activities = ["tennis", "baseball", "kickball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +// +// allParks.overlook.amenities = ["picnic", "restroom", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; +// allParks.overlook.activities = ["baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"] +// +// allParks.peninsula.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "horseshoePit", "fountain", "paths", "playground", "soccerField", "pool"]; +// allParks.peninsula.activities = ["tennis", "baseball", "kickball", "basketball", "horseshoe", "pavedPaths", "soccer", "frisbee", "ballSports", "poolSwimming"]; +// // NORTHEAST +// allParks.alberta.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; +// allParks.alberta.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +// +// allParks.buckmanField.amenities = ["picnic", "baseballField", "playground", "soccerField"]; +// allParks.buckmanField.activities = ["baseball", "kickball", "soccer", "frisbee", "ballSports"]; +// +// allParks.grant.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "fountain", "naturalArea", "paths", "playground", "skatepark", "pool"]; +// allParks.grant.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "fountain", "pavedPaths", "skateboarding", "poolSwimming"]; +// // SOUTHEAST +// allParks.laurelhurst.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; +// allParks.laurelhurst.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +// +// allParks.tabor.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "naturalArea", "paths", "playground"]; +// allParks.tabor.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "wildlife", "hikingTrails", "pavedPaths"]; +// +// // SOUTHWEST +// allParks.gabriel.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "skatepark", "soccerField"]; +// allParks.gabriel.activities = ["tennis", "baseball", "kickball", "basketball", "fountain", "pavedPaths", "skateboarding", "soccer", "frisbee", "ballSports"]; +// +// allParks.tryon.amenities = ["picnic", "restroom", "naturalArea", "paths"]; +// allParks.tryon.activities = ["wildlife", "hikingTrails", "pavedPaths"]; +// +// // NORTHWEST +// allParks.forest.amenities = ["restroom", "naturalArea", "paths"]; +// allParks.forest.activities = ["wildlife", "hikingTrails"]; +// +// allParks.jamison.amenities = ["restroom", "fountain"]; +// allParks.jamison.activities = ["fountain"]; +// +// +// +// +// function Park(parkName, parkLocation) { +// this.parkName = parkName; +// this.amenities = []; +// this.allParks = []; +// this.parkLocation = parkLocation; +// } +// +// Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { +// var peninsula = new Park("Peninsula Park"); +// peninsula.north = true; +// var fernhill = new Park("Fernhill Park"); +// peninsula.northEast = true; +// var allParks = [peninsula, fernhill]; +// var userParks = []; +// for (var i = 0; i < allParks.length; i++) { +// if (allParks[i].north === true) { +// userParks.push(allParks[i]); +// console.log(userParks); +// } +// } +// } +// +// +// +// +// +// +// +// @@ -130,7 +130,10 @@ $(document).ready(function() { var userName = $("input#reviewName").val(); var userRating = $("select#reviewRating").val(); var userComment = $("textarea#reviewComment").val(); - + + $("input#reviewName").val(""); + $("select#reviewRating").val(""); + $("textarea#reviewComment").val(""); $("div.realUserReivew").show(); $(".realUserName").text(userName); From d0d00d79577b233e46a94b89011454313f1c421d Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 10:54:00 -0800 Subject: [PATCH 07/10] change review submission jQuery to append user review in UI logic --- js/scripts.js | 162 ++++++++++++++++++++++---------------------------- 1 file changed, 72 insertions(+), 90 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index 38ce31d..7212267 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -1,105 +1,81 @@ -// var arborLodge = new Park("Arbor Lodge", "north"); -// var overlook = new Park("Overlook Park", "north"); -// var peninsula = new Park("Peninsula Park", "north"); -// var alberta = new Park("Alberta Park", "northEast"); -// var buckmanField = new Park("Buckman Field Park", "northEast"); -// var grant = new Park("Grant Park", "northEast"); -// var laurelhurst = new Park("Laurelhurst Park", "southEast"); -// var tabor = new Park("Mt. Tabor Park", "southEast"); -// var gabriel = new Park("Gabriel Park", "southWest"); -// var tryon = new Park("Tryon Creek State Park", "southWest"); -// var forest = new Park("Forest Park", "northWest"); -// var jamison = new Park("Jamison Square", "northWest"); -// -// var allParks = [arborLodge, overlook, peninsula, alberta, buckmanField, grant, laurelhurst, tabor, gabriel, tryon, forest, jamison]; -// -// // NORTH -// allParks.arborLodge.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; -// allParks.arborLodge.activities = ["tennis", "baseball", "kickball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; -// -// allParks.overlook.amenities = ["picnic", "restroom", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; -// allParks.overlook.activities = ["baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"] -// -// allParks.peninsula.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "horseshoePit", "fountain", "paths", "playground", "soccerField", "pool"]; -// allParks.peninsula.activities = ["tennis", "baseball", "kickball", "basketball", "horseshoe", "pavedPaths", "soccer", "frisbee", "ballSports", "poolSwimming"]; -// // NORTHEAST -// allParks.alberta.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; -// allParks.alberta.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; -// -// allParks.buckmanField.amenities = ["picnic", "baseballField", "playground", "soccerField"]; -// allParks.buckmanField.activities = ["baseball", "kickball", "soccer", "frisbee", "ballSports"]; -// -// allParks.grant.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "fountain", "naturalArea", "paths", "playground", "skatepark", "pool"]; -// allParks.grant.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "fountain", "pavedPaths", "skateboarding", "poolSwimming"]; -// // SOUTHEAST -// allParks.laurelhurst.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; -// allParks.laurelhurst.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; -// -// allParks.tabor.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "naturalArea", "paths", "playground"]; -// allParks.tabor.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "wildlife", "hikingTrails", "pavedPaths"]; -// -// // SOUTHWEST -// allParks.gabriel.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "skatepark", "soccerField"]; -// allParks.gabriel.activities = ["tennis", "baseball", "kickball", "basketball", "fountain", "pavedPaths", "skateboarding", "soccer", "frisbee", "ballSports"]; -// -// allParks.tryon.amenities = ["picnic", "restroom", "naturalArea", "paths"]; -// allParks.tryon.activities = ["wildlife", "hikingTrails", "pavedPaths"]; -// -// // NORTHWEST -// allParks.forest.amenities = ["restroom", "naturalArea", "paths"]; -// allParks.forest.activities = ["wildlife", "hikingTrails"]; -// -// allParks.jamison.amenities = ["restroom", "fountain"]; -// allParks.jamison.activities = ["fountain"]; -// -// -// -// -// function Park(parkName, parkLocation) { -// this.parkName = parkName; -// this.amenities = []; -// this.allParks = []; -// this.parkLocation = parkLocation; -// } -// -// Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { -// var peninsula = new Park("Peninsula Park"); -// peninsula.north = true; -// var fernhill = new Park("Fernhill Park"); -// peninsula.northEast = true; -// var allParks = [peninsula, fernhill]; -// var userParks = []; -// for (var i = 0; i < allParks.length; i++) { -// if (allParks[i].north === true) { -// userParks.push(allParks[i]); -// console.log(userParks); -// } -// } -// } -// -// -// -// -// -// -// -// +var arborLodge = new Park("Arbor Lodge", "north"); +var overlook = new Park("Overlook Park", "north"); +var peninsula = new Park("Peninsula Park", "north"); +var alberta = new Park("Alberta Park", "northEast"); +var buckmanField = new Park("Buckman Field Park", "northEast"); +var grant = new Park("Grant Park", "northEast"); +var laurelhurst = new Park("Laurelhurst Park", "southEast"); +var tabor = new Park("Mt. Tabor Park", "southEast"); +var gabriel = new Park("Gabriel Park", "southWest"); +var tryon = new Park("Tryon Creek State Park", "southWest"); +var forest = new Park("Forest Park", "northWest"); +var jamison = new Park("Jamison Square", "northWest"); +var allParks = [arborLodge, overlook, peninsula, alberta, buckmanField, grant, laurelhurst, tabor, gabriel, tryon, forest, jamison]; +// NORTH +allParks.arborLodge.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; +allParks.arborLodge.activities = ["tennis", "baseball", "kickball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +allParks.overlook.amenities = ["picnic", "restroom", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; +allParks.overlook.activities = ["baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"] +allParks.peninsula.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "horseshoePit", "fountain", "paths", "playground", "soccerField", "pool"]; +allParks.peninsula.activities = ["tennis", "baseball", "kickball", "basketball", "horseshoe", "pavedPaths", "soccer", "frisbee", "ballSports", "poolSwimming"]; +// NORTHEAST +allParks.alberta.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; +allParks.alberta.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +allParks.buckmanField.amenities = ["picnic", "baseballField", "playground", "soccerField"]; +allParks.buckmanField.activities = ["baseball", "kickball", "soccer", "frisbee", "ballSports"]; +allParks.grant.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "fountain", "naturalArea", "paths", "playground", "skatepark", "pool"]; +allParks.grant.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "fountain", "pavedPaths", "skateboarding", "poolSwimming"]; +// SOUTHEAST +allParks.laurelhurst.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; +allParks.laurelhurst.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +allParks.tabor.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "naturalArea", "paths", "playground"]; +allParks.tabor.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "wildlife", "hikingTrails", "pavedPaths"]; +// SOUTHWEST +allParks.gabriel.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "skatepark", "soccerField"]; +allParks.gabriel.activities = ["tennis", "baseball", "kickball", "basketball", "fountain", "pavedPaths", "skateboarding", "soccer", "frisbee", "ballSports"]; +allParks.tryon.amenities = ["picnic", "restroom", "naturalArea", "paths"]; +allParks.tryon.activities = ["wildlife", "hikingTrails", "pavedPaths"]; +// NORTHWEST +allParks.forest.amenities = ["restroom", "naturalArea", "paths"]; +allParks.forest.activities = ["wildlife", "hikingTrails"]; +allParks.jamison.amenities = ["restroom", "fountain"]; +allParks.jamison.activities = ["fountain"]; +function Park(parkName, parkLocation) { + this.parkName = parkName; + this.amenities = []; + this.review = []; + this.parkLocation = parkLocation; +} +Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { + var peninsula = new Park("Peninsula Park"); + peninsula.north = true; + var fernhill = new Park("Fernhill Park"); + peninsula.northEast = true; + var allParks = [peninsula, fernhill]; + var userParks = []; + for (var i = 0; i < allParks.length; i++) { + if (allParks[i].north === true) { + userParks.push(allParks[i]); + console.log(userParks); + } + } +} @@ -126,19 +102,25 @@ function Review(name, rating, comment) { //User Interface Logic $(document).ready(function() { + + $("form.form-horizontal").submit(function(event) { var userName = $("input#reviewName").val(); var userRating = $("select#reviewRating").val(); var userComment = $("textarea#reviewComment").val(); + var userReview = new Review (userName, userRating, userComment); + + $("div.realUserReview").append("

" + userReview.name + "

"); + $("div.realUserReview").append("

Rating:" + userReview.rating + "

"); + $("div.realUserReview").append("

" + userReview.comment + "

") + $("input#reviewName").val(""); $("select#reviewRating").val(""); $("textarea#reviewComment").val(""); - $("div.realUserReivew").show(); - $(".realUserName").text(userName); - $(".realUserRating").text(userRating); - $(".realUserComment").text(userComment); + + event.preventDefault(); }); From b14da21457b58566253f962eb169f86ffccc4572 Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 10:54:34 -0800 Subject: [PATCH 08/10] delete content of realUserReview div --- index.html | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/index.html b/index.html index d8ad09b..8bdb8a0 100644 --- a/index.html +++ b/index.html @@ -144,7 +144,7 @@

Northwest Portland

- +
-

-

Rating:

-

+

Jane Doe

@@ -216,24 +214,32 @@

About This Park:

Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.

Review:

-
-
-
- -
-
+
+
+
+
+ +
+
+
+
+

+

Rating:

+

+

Jane Doe

Rating: Excellent

-

Cathedral Park is a great little park to take the family on a picnic, watch soccer or other games. It has a great playground with swings a mini climbing wall a big sandbox and other kid-friendly activities.

+

Arbor Lodge Park is a great little park to take the family on a picnic, watch soccer or other games. It has a great playground with swings a mini climbing wall a big sandbox and other kid-friendly activities.

+
From ed3b3857491a523033d7b6bc34fd3d3d7af04c8b Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 11:42:49 -0800 Subject: [PATCH 09/10] Add functionality to fullReview method. --- js/scripts.js | 193 ++++++++++++++++++++++++++++++++------------------ spec/specs.js | 30 ++------ 2 files changed, 129 insertions(+), 94 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index 7212267..d122f33 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -1,81 +1,141 @@ -var arborLodge = new Park("Arbor Lodge", "north"); -var overlook = new Park("Overlook Park", "north"); -var peninsula = new Park("Peninsula Park", "north"); -var alberta = new Park("Alberta Park", "northEast"); -var buckmanField = new Park("Buckman Field Park", "northEast"); -var grant = new Park("Grant Park", "northEast"); -var laurelhurst = new Park("Laurelhurst Park", "southEast"); -var tabor = new Park("Mt. Tabor Park", "southEast"); -var gabriel = new Park("Gabriel Park", "southWest"); -var tryon = new Park("Tryon Creek State Park", "southWest"); -var forest = new Park("Forest Park", "northWest"); -var jamison = new Park("Jamison Square", "northWest"); +// var arborLodge = new Park("Arbor Lodge", "north"); +// var overlook = new Park("Overlook Park", "north"); +// var peninsula = new Park("Peninsula Park", "north"); +// var alberta = new Park("Alberta Park", "northEast"); +// var buckmanField = new Park("Buckman Field Park", "northEast"); +// var grant = new Park("Grant Park", "northEast"); +// var laurelhurst = new Park("Laurelhurst Park", "southEast"); +// var tabor = new Park("Mt. Tabor Park", "southEast"); +// var gabriel = new Park("Gabriel Park", "southWest"); +// var tryon = new Park("Tryon Creek State Park", "southWest"); +// var forest = new Park("Forest Park", "northWest"); +// var jamison = new Park("Jamison Square", "northWest"); +// +// var allParks = [arborLodge, overlook, peninsula, alberta, buckmanField, grant, laurelhurst, tabor, gabriel, tryon, forest, jamison]; +// +// // NORTH +// allParks.arborLodge.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; +// allParks.arborLodge.activities = ["tennis", "baseball", "kickball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +// +// allParks.overlook.amenities = ["picnic", "restroom", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; +// allParks.overlook.activities = ["baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"] +// +// allParks.peninsula.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "horseshoePit", "fountain", "paths", "playground", "soccerField", "pool"]; +// allParks.peninsula.activities = ["tennis", "baseball", "kickball", "basketball", "horseshoe", "pavedPaths", "soccer", "frisbee", "ballSports", "poolSwimming"]; +// // NORTHEAST +// allParks.alberta.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; +// allParks.alberta.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +// +// allParks.buckmanField.amenities = ["picnic", "baseballField", "playground", "soccerField"]; +// allParks.buckmanField.activities = ["baseball", "kickball", "soccer", "frisbee", "ballSports"]; +// +// allParks.grant.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "fountain", "naturalArea", "paths", "playground", "skatepark", "pool"]; +// allParks.grant.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "fountain", "pavedPaths", "skateboarding", "poolSwimming"]; +// // SOUTHEAST +// allParks.laurelhurst.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; +// allParks.laurelhurst.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; +// +// allParks.tabor.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "naturalArea", "paths", "playground"]; +// allParks.tabor.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "wildlife", "hikingTrails", "pavedPaths"]; +// +// // SOUTHWEST +// allParks.gabriel.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "skatepark", "soccerField"]; +// allParks.gabriel.activities = ["tennis", "baseball", "kickball", "basketball", "fountain", "pavedPaths", "skateboarding", "soccer", "frisbee", "ballSports"]; +// +// allParks.tryon.amenities = ["picnic", "restroom", "naturalArea", "paths"]; +// allParks.tryon.activities = ["wildlife", "hikingTrails", "pavedPaths"]; +// +// // NORTHWEST +// allParks.forest.amenities = ["restroom", "naturalArea", "paths"]; +// allParks.forest.activities = ["wildlife", "hikingTrails"]; +// +// allParks.jamison.amenities = ["restroom", "fountain"]; +// allParks.jamison.activities = ["fountain"]; +// +// +// +// +// function Park(parkName, parkLocation) { +// this.parkName = parkName; +// this.amenities = []; +// this.review = []; +// this.parkLocation = parkLocation; +// } +// +// Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { +// var peninsula = new Park("Peninsula Park"); +// peninsula.north = true; +// var fernhill = new Park("Fernhill Park"); +// peninsula.northEast = true; +// var allParks = [peninsula, fernhill]; +// var userParks = []; +// for (var i = 0; i < allParks.length; i++) { +// if (allParks[i].north === true) { +// userParks.push(allParks[i]); +// console.log(userParks); +// } +// } +// } +// +// +// -var allParks = [arborLodge, overlook, peninsula, alberta, buckmanField, grant, laurelhurst, tabor, gabriel, tryon, forest, jamison]; -// NORTH -allParks.arborLodge.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; -allParks.arborLodge.activities = ["tennis", "baseball", "kickball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; -allParks.overlook.amenities = ["picnic", "restroom", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; -allParks.overlook.activities = ["baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"] -allParks.peninsula.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "horseshoePit", "fountain", "paths", "playground", "soccerField", "pool"]; -allParks.peninsula.activities = ["tennis", "baseball", "kickball", "basketball", "horseshoe", "pavedPaths", "soccer", "frisbee", "ballSports", "poolSwimming"]; -// NORTHEAST -allParks.alberta.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "soccerField"]; -allParks.alberta.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; -allParks.buckmanField.amenities = ["picnic", "baseballField", "playground", "soccerField"]; -allParks.buckmanField.activities = ["baseball", "kickball", "soccer", "frisbee", "ballSports"]; -allParks.grant.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "fountain", "naturalArea", "paths", "playground", "skatepark", "pool"]; -allParks.grant.activities = ["tennis", "baseball", "kickball", "basketball", "dogOffLeash", "fountain", "pavedPaths", "skateboarding", "poolSwimming"]; -// SOUTHEAST -allParks.laurelhurst.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "paths", "playground", "soccerField"]; -allParks.laurelhurst.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "pavedPaths", "soccer", "frisbee", "ballSports"]; -allParks.tabor.amenities = ["picnic", "restroom", "tennisCourt", "basketballCourt", "horseshoePit", "dogArea", "naturalArea", "paths", "playground"]; -allParks.tabor.activities = ["tennis", "basketball", "horseshoe", "dogOffLeash", "wildlife", "hikingTrails", "pavedPaths"]; -// SOUTHWEST -allParks.gabriel.amenities = ["picnic", "restroom", "tennisCourt", "baseballField", "basketballCourt", "dogArea", "paths", "playground", "skatepark", "soccerField"]; -allParks.gabriel.activities = ["tennis", "baseball", "kickball", "basketball", "fountain", "pavedPaths", "skateboarding", "soccer", "frisbee", "ballSports"]; -allParks.tryon.amenities = ["picnic", "restroom", "naturalArea", "paths"]; -allParks.tryon.activities = ["wildlife", "hikingTrails", "pavedPaths"]; -// NORTHWEST -allParks.forest.amenities = ["restroom", "naturalArea", "paths"]; -allParks.forest.activities = ["wildlife", "hikingTrails"]; -allParks.jamison.amenities = ["restroom", "fountain"]; -allParks.jamison.activities = ["fountain"]; - - -function Park(parkName, parkLocation) { - this.parkName = parkName; - this.amenities = []; - this.review = []; - this.parkLocation = parkLocation; +function Review(name, rating, comment) { + this.name = name; + this.rating = rating; + this.comment = comment; } -Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { - var peninsula = new Park("Peninsula Park"); - peninsula.north = true; - var fernhill = new Park("Fernhill Park"); - peninsula.northEast = true; - var allParks = [peninsula, fernhill]; - var userParks = []; - for (var i = 0; i < allParks.length; i++) { - if (allParks[i].north === true) { - userParks.push(allParks[i]); - console.log(userParks); - } - } +Review.prototype.fullReview = function () { + return "

" + this.name + "

" + + "

Rating:" + this.rating + "

" + + "

" + this.comment + "

"; } + + + + + +// $("div.realUserReview").append("

" + userReview.name + "

"); +// $("div.realUserReview").append("

Rating:" + userReview.rating + "

"); +// $("div.realUserReview").append("

" + userReview.comment + "

") + +//User Interface Logic + +$(document).ready(function() { + + + + + + + + + + + + + + + + + + + + + @@ -92,16 +152,9 @@ Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, s -function Review(name, rating, comment) { - this.name = name; - this.rating = rating; - this.comment = comment; -} -//User Interface Logic -$(document).ready(function() { $("form.form-horizontal").submit(function(event) { @@ -120,7 +173,7 @@ $(document).ready(function() { $("textarea#reviewComment").val(""); - + event.preventDefault(); }); diff --git a/spec/specs.js b/spec/specs.js index 7647222..a6a4414 100644 --- a/spec/specs.js +++ b/spec/specs.js @@ -24,34 +24,16 @@ describe('Park', function() { - - - - - - - - - - - - - - - - - - - - - - - describe('Review', function() { - it("creates a new park review with the given specifications", function (){ + it("creates a new park review with the given specifications", function() { var testReview = new Review ("Jane", "Excellent", "Great park for kids and dogs."); expect(testReview.name).to.equal("Jane"); expect(testReview.rating).to.equal("Excellent"); expect(testReview.comment).to.be.a("string"); }); + + it("creates the fullReview method to combine and style inputs from the user's review", function() { + var testReview = new Review ("Jane", "Excellent", "Great park for kids and dogs."); + expect(testReview.fullReview()).to.equal("

Jane

Rating:Excellent

Great park for kids and dogs.

"); + }); }); From bc6078ec092654e8a5708bcff662747b44767d5c Mon Sep 17 00:00:00 2001 From: Anna Becker and Jordan Meier Date: Tue, 2 Feb 2016 13:24:54 -0800 Subject: [PATCH 10/10] Start making Park object. --- js/scripts.js | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/js/scripts.js b/js/scripts.js index d122f33..dd715f5 100644 --- a/js/scripts.js +++ b/js/scripts.js @@ -55,11 +55,11 @@ // // // -// function Park(parkName, parkLocation) { -// this.parkName = parkName; -// this.amenities = []; -// this.review = []; -// this.parkLocation = parkLocation; +function Park(parkName, parkLocation) { + this.parkName = parkName; + this.amenities = []; + this.review = []; + this.parkLocation = parkLocation; // } // // Park.prototype.parkCompiler = function(north, northEast, southEast, northWest, southWest) { @@ -98,7 +98,7 @@ function Review(name, rating, comment) { this.comment = comment; } -Review.prototype.fullReview = function () { +Review.prototype.fullReview = function() { return "

" + this.name + "

" + "

Rating:" + this.rating + "

" + "

" + this.comment + "

"; @@ -106,12 +106,6 @@ Review.prototype.fullReview = function () { - - -// $("div.realUserReview").append("

" + userReview.name + "

"); -// $("div.realUserReview").append("

Rating:" + userReview.rating + "

"); -// $("div.realUserReview").append("

" + userReview.comment + "

") - //User Interface Logic $(document).ready(function() { @@ -162,10 +156,17 @@ $(document).ready(function() { var userRating = $("select#reviewRating").val(); var userComment = $("textarea#reviewComment").val(); var userReview = new Review (userName, userRating, userComment); + + + newPark.review.push(userReview); + + $("div.realUserReview").text(userReview.fullReview()); + + - $("div.realUserReview").append("

" + userReview.name + "

"); - $("div.realUserReview").append("

Rating:" + userReview.rating + "

"); - $("div.realUserReview").append("

" + userReview.comment + "

") + // $("div.realUserReview").append("

" + userReview.name + "

"); + // $("div.realUserReview").append("

Rating:" + userReview.rating + "

"); + // $("div.realUserReview").append("

" + userReview.comment + "

") $("input#reviewName").val("");