Skip to content

Queues - Cynthia Cob - Trek #40

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
cynthiacd wants to merge 30 commits into
base: master
Choose a base branch
from
Open

Queues - Cynthia Cob - Trek #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f45888e
created html and js files
cynthiacd May 23, 2017
d6db7af
api request for trips working
cynthiacd May 23, 2017
115e8d9
list of trips showing using underscore
cynthiacd May 24, 2017
e4b870f
added error/failure handling for trips list
cynthiacd May 24, 2017
e136ea5
trclick on trip and call js function
cynthiacd May 24, 2017
503c591
api request for one trip working and showing details working
cynthiacd May 24, 2017
165ab2a
working with hide and show functions of jquery
cynthiacd May 24, 2017
006e528
have hide show function working for each item
cynthiacd May 24, 2017
0f6d951
appears to be working - extra information is showing
cynthiacd May 24, 2017
2d15f22
have show and hiding info for trip working
cynthiacd May 24, 2017
a6c1e55
have show and hide buttons for each trip
cynthiacd May 24, 2017
9592969
final version of show/hide
cynthiacd May 24, 2017
5cf7731
posting reservation working and messages working
cynthiacd May 24, 2017
d4e3082
added foundation
cynthiacd May 24, 2017
4a08ef6
more styling - padding/margins
cynthiacd May 25, 2017
adc70ee
figured out how to use slideToggle
cynthiacd May 25, 2017
1b4ee10
found bug with slide function
cynthiacd May 25, 2017
38d9c76
added require to html form
cynthiacd May 26, 2017
b4532e0
notes on turning input form data into string
cynthiacd May 26, 2017
e1de579
validation functions working - alert when input fails
cynthiacd May 26, 2017
7a9348e
hide reservation form if user has already made a reservation for that…
cynthiacd May 26, 2017
9eb9880
tried to create two columns
cynthiacd May 26, 2017
8a9faf4
added buttons to search by continent
cynthiacd May 26, 2017
4408446
budget buttons working
cynthiacd May 26, 2017
2500115
dryed code - using one click handler for all queries
cynthiacd May 26, 2017
1ace87b
edited validation alert messages
cynthiacd May 26, 2017
63e43f6
trying out a block grid
cynthiacd May 26, 2017
59bfb75
cleaned up code - still working on grid
cynthiacd May 27, 2017
5be335c
final version
cynthiacd May 30, 2017
bc10185
added comments for personal understanding
cynthiacd May 30, 2017
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
4,456 changes: 4,456 additions & 0 deletions foundation.css
View file
Open in desktop

Large diffs are not rendered by default.

135 changes: 135 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<title>Trek</title>

<link rel="stylesheet" href="foundation.css">
<link href="main.css" rel="stylesheet" type="text/css">
</head>

<body>
<header>
<h1>Trips</h1>

<div>
<h4>Trips by continent</h4>
<button class="button query" action="/">
All Trips
</button>
<button class="button query" action="/continent?query=Asia">
Asia
</button>
<button class="button query" action="/continent?query=Africa">
Africa
</button>
<button class="button query" action="/continent?query=Europe">
Europe
</button>
<button class="button query" action="/continent?query=North America">
North America
</button>
<button class="button query" action="/continent?query=South America">
South America
</button>
<button class="button query" action="/continent?query=Australia">
Australia
</button>
<button class="button query" action="/continent?query=Antarctica">
Antarctica
</button>

<h4>Trips by Max Budget</h4>
<button class="button query" action="/budget?query=500">
$500
</button>
<button class="button query" action="/budget?query=750">
$750
</button>
<button class="button query" action="/budget?query=1000">
$1000
</button>
<button class="button query" action="/budget?query=1500">
$1500
</button>
<button class="button query" action="/budget?query=2000">
$2000
</button>
<button class="button query" action="/budget?query=3000">
$3000
</button>
<button class="button query" action="/">
Any
</button>
</div>
</header>

<main>
<div id='errors'></div>
<section class="row" id='trips-list'></section>

<script id="trips-template" type="text/template">
<section class="column large-12" id=<%- 'trip-' + trip.id %> >
<h3 class='closed' data-id=<%- trip.id %> id=<%- 'show-hide-id-' + trip.id %> >
<%- trip.name %>
</h3>
<p>
<strong>Location: </strong>
<%- trip.continent %>
</p>
<p>
<strong>Duration: </strong>
<%- trip.weeks %>
weeks
</p>

<div class="slidingInfo" id="tripDetails-<%-trip.id %>" >
<p>
<strong>About:</strong>
<%- trip.about %>
</p>
<p>
<strong>Category: </strong>
<%- trip.category %>
</p>
<p>
<strong>Cost: $</strong>
<%- trip.cost %>
</p>
<p>
<strong>Trip ID: </strong>
<%- trip.id %>
</p>

<div class="reservedMessage"></div>
<form id=<%- 'form' + trip.id %> method="post" action=<%-"https://trektravel.herokuapp.com/trips/" + trip.id + "/reserve" %> >
<section>
<label>Name</label>
<input type="text" id="name" name="name" required></input>
</section>
<section>
<label>Age</label>
<input type="text" id="age" name="age" required></input>
</section>

<section>
<label>Email</label>
<input type="text" id="email" name="email" required></input>
</section>

<section class="button">
<button type="submit">Reserve</button>
</section>
</form>
</div>

</section>
</script>
</main>

<script src="https://code.jquery.com/jquery-2.1.4.min.js" type="text/javascript"></script>
<script src='https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore.js'></script>
<script src="main.js" type="text/javascript"></script>

</body>
</html>
1 change: 1 addition & 0 deletions js/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$(document).foundation()
Loading