Skip to content

Jan Edrozo | Carets #26

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

Jan Edrozo | Carets #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
133f20b
W1:A user can click a link to see a list of trips requirement complete
JNEdrozo Nov 29, 2017
5d2f3bf
Updated Trip Model to include urlRoot and idAttribute; Added event li…
JNEdrozo Nov 29, 2017
5471fd7
Added reservation form
JNEdrozo Nov 30, 2017
3d0450c
Cleaned up Trip Model comments and added reservation model
JNEdrozo Dec 1, 2017
7ba998a
Added status-messages section, new trip button, and new trip section
JNEdrozo Dec 1, 2017
08d2030
Added New-Trip form
JNEdrozo Dec 1, 2017
f6bd622
Added Foundation Reveal modal
JNEdrozo Dec 1, 2017
1a51554
Added reservation model validations and appended errors to error mess…
JNEdrozo Dec 1, 2017
708e05e
Update: makeTripReservation FUNCTION (added code to retrieve info fro…
JNEdrozo Dec 1, 2017
5ea9223
Added trek_icon.png
JNEdrozo Dec 1, 2017
37a9358
Modified: Triplist so upon parsing it trims name info (removes traili…
JNEdrozo Dec 1, 2017
ef05973
Added hover class to All-Trips Table
JNEdrozo Dec 1, 2017
f2132cb
Modified: makeTripReservation function so it displays each error in a…
JNEdrozo Dec 1, 2017
9d74f72
W2: Completed basic Trip Reservation features
JNEdrozo Dec 1, 2017
e3360a6
W2: Add Trip Functionality (Validations and error modal message added)
JNEdrozo Dec 2, 2017
b48ca14
Modified AddTrip feature: temporarily removed tripList variable from …
JNEdrozo Dec 2, 2017
72a7ea8
Added back reservation success and fail messages modal to confirm tha…
JNEdrozo Dec 2, 2017
ab1edca
Added trip model validation to ensure input cannot be a trip name tha…
JNEdrozo Dec 2, 2017
9e88541
W3: Added Trips Table Sorting functionality
JNEdrozo Dec 3, 2017
02520a8
Styling: Modified the Add NNew Trip form so continent input is a drop…
JNEdrozo 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
142 changes: 142 additions & 0 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,159 @@
<meta charset="utf-8">
<title>My JavaScript App</title>
<meta name="viewport" content="width=device-width, initial-scale=1">

<!-- StyleSheets -->
<link href="https://fonts.googleapis.com/css?family=Bahiana" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Reenie+Beanie" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Jura" rel="stylesheet">

<link rel="shortcut icon" href="favicon.ico" type="image/x-icon">
</head>
<body>
<header>
<h2>BackTREK</h2>
<nav>
<button href="index.html" class="button">HOME</button>
<button id="all-trips" class="button">ALL TRIPS</button>
<button data-open="newTripModal" class="button">NEW TRIP</button>
</nav>

</header>

<main>
<div id="newTripModal" class="reveal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
<h2 id="modalTitle">Add A New Trip</h2>
<form id="new-trip-form">
<label for="name">Name</label>
<input type="text" name="name" class="user-input"></input>

<label for="continent">Continent</label>
<!-- <input type="text" name="continent" class="user-input"></input> -->
<select name="continent">
<option value="" disabled selected>Select a Continent</option>
<option value="Africa">Africa</option>
<option value="Antartica">Antartica</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>

<label for="about">About</label>
<input type="text" name="about" class="user-input"></input>

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

<label for="weeks">Weeks</label>
<input type="number" name="weeks" min="0" class="user-input"></input>

<label for="cost">Cost</label>
<input type="number" name="cost" min="0" step="0.01" class="user-input"></input>

<input type="submit" value="ADD TRIP" class="button new-trip-button"></input>
</form>

<button class="close-button" data-close aria-label="Close modal" type="button">
<span aria-hidden="true">&times;</span>
</button>
</div>

<div id="statusMessageModal" class="reveal" data-reveal aria-labelledby="modalTitle" aria-hidden="true" role="dialog">
<h2 id="modalTitle"></h2>
<p></p>
<ul>

</ul>

<button class="close-button" data-close aria-label="Close modal" type="button">
<span aria-hidden="true">&times;</span>
</button>
</div>

<section id="all-trips-table" class="columns large-7 small-12">
<h2>Trips</h2>
<table class="hover">
<thead>
<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>
</thead>
<tbody id="trip-list">
</tbody>
</table>
</section>

<aside class="columns large-5 small-12" id="single-trip-details">

</aside>

</main>

<footer>

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

<script type="text/template" id="single-trip-template">
<h2><%- name %></h2>
<h6>ID: <%- id %></h6>

<h6>Name: <%- name %></h6>

<h6>Continent: <%- continent %></h6>

<h6>Category: <%- category %></h6>

<h6>Weeks: <%- weeks %></h6>

<h6>Cost: <%- cost %></h6>

<h5>About:</h5>
<p><%- about %></p>

<button id="reserve-trip-button" class="button expanded"><strong>MAKE A RESERVATION</strong></button>

<section id="reservation-form">
<form id="reservation" data-id="<%- id %>">

<label for="name">Name:</label>
<input type="text" name="name" class="user-input" placeholder="Firstname Lastname"></input>

<label for="age">Age:</label>
<input type="number" name="age" class="user-input"></input>

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

<button class="button expanded" type="submit"><strong>RESERVE TRIP</strong></button>
</form>
</section>

</script>

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

</body>
</html>
Binary file added images/sunset.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/trek_icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
36 changes: 36 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.

2 changes: 2 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,14 @@
"jasmine-console-reporter": "^2.0.1",
"jasmine-expect": "^3.8.1",
"module-resolver": "^1.0.0",
"script-loader": "^0.7.2",
"style-loader": "^0.19.0",
"webpack": "^3.8.1",
"webpack-dev-server": "^2.9.4"
},
"dependencies": {
"backbone": "^1.3.3",
"foundation-sites": "6.2.4",
"jquery": "^3.2.1",
"underscore": "^1.8.3"
}
Expand Down
Loading