Skip to content

Carets- Julia Meier #41

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

Carets- Julia Meier #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a8bec5d
created table and show details for wave 1
julmeier Dec 1, 2017
ddcaf8f
added reservation form to html and added foundation styling to put be…
julmeier Dec 1, 2017
566aa9d
created form to Add a Trip. Displays on click
julmeier Dec 1, 2017
41fa4ec
created model validation and was able to successfully create new Trip…
julmeier Dec 1, 2017
896010a
fixed bug with displaying errors in submitting a new Trip. Learned ab…
julmeier Dec 2, 2017
5f7b5d6
created reservation model and addReservation event
julmeier Dec 2, 2017
4ef0ea9
fixed error messages for failed saves to the trips collection. still …
julmeier Dec 2, 2017
b042dfb
completed sort. get a 'category not defined' error
julmeier Dec 2, 2017
9d41ce5
abandoned Reservation model to make post request for reservation and …
julmeier Dec 3, 2017
2793bc0
added modal
julmeier Dec 4, 2017
022a754
still having issue with modal- cannot get it to close after successfu…
julmeier Dec 4, 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
139 changes: 134 additions & 5 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,148 @@
<html>
<head>
<meta charset="utf-8">
<title>My JavaScript App</title>
<title>BackTREK</title>
<script src="app.bundle.js" type="text/javascript"></script>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery-modal/0.9.1/jquery.modal.min.css" />
</head>
<body>
<header>

<span>
<h1 class="title">World Trek</h1>
</span>
<button id="load-trips" class="button float-center">See All Trips</button>
<button id="add-new-trip" class="button float-right">Add a Trip</button>
<!-- <div class="globe-large"><img src="http://www.issaquahhighlands.com/wp-content/uploads/2015/06/Travel-Night-globe.png" alt="globe"></div> -->
</header>

<main>

<section id="status-messages">
<button class="clear float-right">
<img src="http://www.pvhc.net/img223/xeiwtpbbgpmyhtcnjvwt.png" alt="Clear">
</button>
<ul>
</ul>
</section>

<!-- <div id="overlay">
<div id = "blanket">
</div>
</div> -->

<section id="add-a-trip-form-container">
<form id="add-trip-form">
<span class="close">&times;</span>
<h2 class="new-trip-title">Add a Trip</h2>
<label for="name">Name</label>
<input type="text" name="name"></input>

<label for="category">Category</label>
<input type="text" name="category"></input>

<label for="continent">Continent</label>
<input type="text" name="continent"></input>

<label for="weeks">Weeks</label>
<input type="number" name="weeks"></input>

<label for="cost">Number of Trip Cost</label>
<input type="number" name="cost"></input>

<label for="about">Description</label>
<input type="text" name="about"></input>

<input id="submit-new-trip-button" href="#" type="submit" value="Add Trip!" class="button"></input>
</form>
</section>

<section id="trips-table-container" class="columns large-7 small-12 float-left">
<h2>Trips:</h2>
<table>
<thead>
<th class="sort name">Name</th>
<th class="sort category">Category</th>
<th class="sort continent">Continent</th>
<th class="sort cost">Cost</th>
<th class="sort weeks">Weeks</th>
</thead>
<tbody id="trips-list">
</tbody>
</table>
</section>

<section id="trip-details-container" class="columns large-5 small-12 float-right">
</section>

<section id="reservation-form-container" class="columns large-5 small-12 float-right" >
<h2>Reserve Your Spot</h2>
<form id="add-reservation-form" >
<label for="name">Name:</label>
<input type="text" name="name"></input>

<label for="age">Age:</label>
<input type="text" name="age"></input>

<label for="email">Email:</label>
<input type="text" name="email"></input>

<input type="submit" value="Submit Reservation" class="button" id="submit-reservation"></input>
</form>
</section>

</main>
<footer>

</footer>
<script src="app.bundle.js" type="text/javascript"></script>
<!-- <footer>
<h4>Footer Holding Text</h4>
</footer> -->

<script type="text/template" id="trips-template">
<tr class="trips-row" data-id=<%- id %>>
<td>
<%- name %>
</td>
<td>
<%- category %>
</td>
<td>
<%- continent %>
</td>
<td>
<%- cost %>
</td>
<td>
<%- weeks %>
</td>
</tr>
</script>

<script type="text/template" id="single-trip-template">
<ul class="trip-ul" data-id=<%- id %>>
<li>
<h2><%- name %></h2>
</li>
<li>Category:
<%- category %>
</li>
<li>Continent:
<%- continent %>
</li>
<li>Cost:
<%- cost %>
</li>
<li>Weeks:
<%- weeks %>
</li>
<li>About:
<%- about %>
</li>
</ul>
</script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.2/underscore-min.js"></script>
<!-- jQuery -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
<!-- jQuery Modal -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery-modal/0.9.1/jquery.modal.min.js"></script>
</body>
</html>
Loading