Skip to content

Review specs #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jordan-Meier wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Review specs #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3d58462
Add functionality to review constructor
Jordan-Meier Feb 2, 2016
7e89183
add unique ids to forminput fields
Jordan-Meier Feb 2, 2016
37a24e0
begin to work out UI logic for review submissions
annarbecker Feb 2, 2016
e63bd63
Add a newReview div to modal
Jordan-Meier Feb 2, 2016
b80e07d
add jQuery to UI logic to make review submissions work
annarbecker Feb 2, 2016
eb73169
Add jQuery to clear form fields once form is submitted
annarbecker Feb 2, 2016
d0d00d7
change review submission jQuery to append user review in UI logic
Jordan-Meier Feb 2, 2016
b14da21
delete content of realUserReview div
Jordan-Meier Feb 2, 2016
ed3b385
Add functionality to fullReview method.
annarbecker Feb 2, 2016
bc6078e
Start making Park object.
annarbecker Feb 2, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 39 additions & 26 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ <h3>Northwest Portland</h3>
</ul>



<button type="button" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#cathedralModal">Cathedral Preview</button>
<button type="button" class="btn btn-primary btn-lg" data-toggle="modal" data-target="#arborLodgeModal">Modal Preview</button>

<div id="arborLodgeModal" class="modal fade">
Expand All @@ -164,19 +164,24 @@ <h4>About This Park:</h4>
<p>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.</p>
<hr>
<h4>Review:</h4>
<form class="form-horizontal">
<input type="text" class="form-control" placeholder="Name"><br>
<select class="form-control"><br>
<option>Excellent</option>
<option>Very Good</option>
<option>Average</option>
<option>Poor</option>
<option>Terrible</option>
</select><br>
<textarea class="form-control" placeholder="Review this park" rows="3"></textarea>
<br><button type="submit" class="btn btn-default">Submit</button>
</form>
<div class="newReview">
<form class="form-horizontal">
<input id="reviewName" type="text" class="form-control" placeholder="Name"><br>
<select id="reviewRating" class="form-control"><br>
<option>Excellent</option>
<option>Very Good</option>
<option>Average</option>
<option>Poor</option>
<option>Terrible</option>
</select><br>
<textarea id="reviewComment" class="form-control" placeholder="Review this park" rows="3"></textarea>
<br><button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
<hr>
<div class="realUserReview">

</div>
<div class="fakeReview">
<p><strong>Jane Doe</strong></p>
<p>Rating: Excellent</p>
Expand Down Expand Up @@ -209,24 +214,32 @@ <h4>About This Park:</h4>
<p>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.</p>
<hr>
<h4>Review:</h4>
<form class="form-horizontal">
<input type="text" class="form-control" placeholder="Name"><br>
<select class="form-control"><br>
<option>Excellent</option>
<option>Very Good</option>
<option>Average</option>
<option>Poor</option>
<option>Terrible</option>
</select><br>
<textarea class="form-control" placeholder="Review this park" rows="3"></textarea>
<br><button type="submit" class="btn btn-default">Submit</button>
</form>
<div class="newReview">
<form class="form-horizontal">
<input id="reviewName" type="text" class="form-control" placeholder="Name"><br>
<select id="reviewRating" class="form-control"><br>
<option>Excellent</option>
<option>Very Good</option>
<option>Average</option>
<option>Poor</option>
<option>Terrible</option>
</select><br>
<textarea id="reviewComment" class="form-control" placeholder="Review this park" rows="3"></textarea>
<br><button type="submit" class="btn btn-default">Submit</button>
</form>
</div>
<hr>
<div class="realUserReview">
<p><strong><span class="realUserName"></span></strong></p>
<p>Rating: <span class="realUserRating"></span></p>
<p><span class="realUserComment"></span></p>
</div>
<div class="fakeReview">
<p><strong>Jane Doe</strong></p>
<p>Rating: Excellent</p>
<p>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.</p>
<p>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.</p>
</div>

</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
Expand Down
228 changes: 165 additions & 63 deletions js/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,79 +1,181 @@
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"];
// 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);
// }
// }
// }
//
//
//

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.reviews = [];
this.allParks = [];
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 "<p><strong>" + this.name + "</strong></p>" +
"<p>Rating:" + this.rating + "</p>" +
"<p>" + this.comment + "</p>";
}



//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);


newPark.review.push(userReview);

$("div.realUserReview").text(userReview.fullReview());



// $("div.realUserReview").append("<p><strong>" + userReview.name + "</strong></p>");
// $("div.realUserReview").append("<p>Rating:" + userReview.rating + "</p>");
// $("div.realUserReview").append("<p>" + userReview.comment + "</p>")


$("input#reviewName").val("");
$("select#reviewRating").val("");
$("textarea#reviewComment").val("");




event.preventDefault();
});
});
33 changes: 18 additions & 15 deletions spec/specs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand All @@ -20,17 +20,20 @@ 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");
});

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("<p><strong>Jane</strong></p><p>Rating:Excellent</p><p>Great park for kids and dogs.</p>");
});
});