Skip to content

Isabel Suchanek -- Carets #35

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

Isabel Suchanek -- Carets #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c1ccf8b
get tripList and trip details using API
isabeldepapel Nov 29, 2017
9ba1aae
replace old foundation (rows/cols) with new version (xy grid)
isabeldepapel Nov 29, 2017
7d0c9f2
get trip using fetch instead of get request; add modal form
isabeldepapel Nov 29, 2017
76cb413
add trip validations to trip model, add check for is valid when addin…
isabeldepapel Nov 29, 2017
15b14db
add reservation model with validations
isabeldepapel Nov 30, 2017
02d4478
add functionality to reserve a trip; refactored code by adding readFo…
isabeldepapel Nov 30, 2017
cd52039
add highlighting to selected trip, change on click to on mouseover to…
isabeldepapel Nov 30, 2017
1f37cbf
add sort and styling for sort when clicking on table headings
isabeldepapel Nov 30, 2017
b342b08
add filtering
isabeldepapel Dec 1, 2017
2f78089
add responsive tables css/js--SLOW
isabeldepapel Dec 2, 2017
5c65280
add background image and landing page
isabeldepapel Dec 2, 2017
2a269ea
add image and search/filter to header
isabeldepapel Dec 2, 2017
5f52bef
add favicon and fix overflow issues with table
isabeldepapel 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
161 changes: 156 additions & 5 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,168 @@
<meta charset="utf-8">
<title>My JavaScript App</title>
<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"
<link href="https://fonts.googleapis.com/css?family=Kanit:300|Roboto" rel="stylesheet">
<!-- <script type="text/javascript" src="responsive-tables.js"></script> -->
<script src="app.bundle.js" type="text/javascript"></script>
<link rel="shortcut icon" href="favicon.png" />
</head>
<body>
<header>
<body class="init">
<div class="grid-x grid-margin-x align-center init">
<button class="button start">Take a Trek</button>
</div>

<header hidden="true">
<div class="wrapper-left small-12 large-3 cell grid-x">
<h1 class="small-12 cell align-self-left">BackTREK</h1>
<button class="button small-12 large-6 cell">All Trips</button>
<a class="button small-12 large-6 cell" href="#add-trip-form" rel="modal:open">Add Trip</a>
</div>

<form id="filter" class="small-12 large-6 cell grid-x align-self-bottom">
<select name="filter-by" id="filter-by" class="small-12 large-4 cell">
<option value="" disabled selected hidden>Select Field</option>
<option value="name">Name</option>
<option value="category">Category</option>
<option value="continent">Continent</option>
<option value="cost">Cost</option>
<option value="weeks">Weeks</option>
</select>

<input type="text" placeholder="Search" name="search" id="search" class="small-12 large-8 cell"/>
</form>
</header>

<main hidden="true">
<h2 class="small-12 cell">Trips</h2>


<section class="status-messages small-12 cell">

</section>

<section class="all-trips small-12 medium-7 large-6 cell">
<table>
<thead>
<tr>
<!-- <th class="sort id current-sort-field">ID</th> -->
<th class="sort name">Name</th>
<th class="sort continent">Continent</th>
<th class="sort category">Category</th>
<th class="sort weeks">Weeks</th>
<th class="sort cost">Cost</th>
</tr>
</thead>
<tbody id="trip-list">
</tbody>
</table>
</section>

<section id="trip-detail" class="small-12 medium-5 large-6 cell">
<section class="detail status-messages">

</section>
</section>

<form class="modal" id="add-trip-form" action="https://ada-backtrek-api.herokuapp.com/trips" method="post">

<div class="name grid-x">
<label class="small-6 cell">Name</label>
<input type="text" id="trip-name" name="name" class="small-11 cell"/>
</div>

</header>
<main>
<div class="about grid-x">
<label class="small-6 cell">Description</label>
<textarea id="about" name="about" maxlength="500" placeholder="Description" rows="5" class="small-11 cell"></textarea>
</div>

<div class="continent grid-x">
<label class="small-6 cell">Continent</label>
<select id="continent" name="continent" class="small-11 cell">
<option value="Africa">Africa</option>
<option value="Antarctica">Antarctica</option>
<option value="Asia">Asia</option>
<option value="Australasia">Australasia</option>
<option value="Europe">Europe</option>
<option value="North America">North America</option>
<option value="South America">South America</option>
</select>
</div>

<div class="category grid-x">
<label class="small-6 cell">Category</label>
<input type="text" id="category" name="category" class="small-11 cell" />
</div>

<div class="weeks grid-x">
<label class="small-6 cell">Weeks</label>
<input type="number" id="weeks" name="weeks" min="1"/>
</div>

<div class="cost grid-x">
<label class="small-6 cell">Cost</label>
<input type="number" step="0.01" id="cost" name="cost" min="0.01"/>
</div>

<button class="button confirm" type="submit" id="add-trip">Add this Trip</button>
<a class="button cancel" href="#" rel="modal:close">Don't Add</a>
</form>
</main>
<footer>

</footer>
<script src="app.bundle.js" type="text/javascript"></script>

<script type="text/template" id="trip-list-template">
<tr class="trip" id=<%- id %>>
<!-- <td>
<%- id %>
</td> -->
<td>
<a><%- name %></a>
</td>
<td>
<%- continent %>
</td>
<td>
<%- category %>
</td>
<td>
<%- weeks %>
</td>
<td>
<%- cost.toLocaleString('en-US', { style: 'currency', currency: 'USD', maximumFractionDigits: 2, minimumFractionDigits: 2, }) %>
</td>
</tr>
</script>

<script type="text/template" id="trip-template">

<h3><%- name %></h3>
<p>
<%- about %>
</p>
<p>
<%- continent %>
</p>
<p>
<%- category %>
</p>
<p>
<% formatWeeks = weeks === 1 ? `${weeks} week` : `${weeks} weeks` %>
<%- formatWeeks %>
</p>
<p>
<%- cost.toLocaleString('en-US', { style: 'currency', currency: 'USD', maximumFractionDigits: 2, minimumFractionDigits: 2, }) %>
</p>

<button class="button" id="get-res-form" data-id=<%-id %>>Interested?</button>

<section class="reservation">
<section class="status-messages">

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

</body>
</html>
5 changes: 5 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
"dependencies": {
"backbone": "^1.3.3",
"jquery": "^3.2.1",
"jquery-modal": "^0.9.1",
"underscore": "^1.8.3"
}
}
Loading