Skip to content

Carets -- Guillermina #29

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

Carets -- Guillermina #29

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
5ad5dad
created trip model and trip list collection, imported into app js
murog Nov 28, 2017
86d8d14
import triplist
murog Nov 28, 2017
ef2bd0f
updated styling to include previous trek css
murog Nov 29, 2017
b9ba39b
add templates to html
murog Nov 29, 2017
27174a1
updated trip list to just return response
murog Nov 29, 2017
7be62d6
renders list of trip
murog Nov 29, 2017
b5380e6
changed click to focus
murog Dec 1, 2017
78be813
added gulp
murog Dec 1, 2017
7a3b9be
first attempt at refactor
murog Dec 2, 2017
b4cfb6f
everything works
murog Dec 2, 2017
8b56950
trip appends
murog Dec 2, 2017
b1ac0cb
updated styling for info to render on right
murog Dec 2, 2017
a312108
updated styling to be scrollable
murog 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
84 changes: 81 additions & 3 deletions dist/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,97 @@
<html>
<head>
<meta charset="utf-8">
<title>My JavaScript App</title>
<title>trekback</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
</head>
<body>
<header>
<img src="https://cybernetics.social/assets/arrow-gif-slower.gif" alt="clear" id="lil-guy" class="float-right"/>

<h1>Welcome to Backbone Trek</h1>

</header>
<main>
<main class="clearfix">
<section id="status-messages">
<button class="clear float-right">
</button>
<ul>
</ul>
</section>
</main>
<button id="load-trips" class="dropdown button small-12">Load Trips</button>
<section class="row information">
<table id="trip-list" class="small-11 columns">
</table>
<section class="small-6 columns" id="trip-details">

</section>
</section>


</main>
<footer>

</footer>
<script type="text/template" id="trip-list-template">
<tr id='<%-id %>'>
<td>
<%- id %>
</td>
<td>
<%- continent %>
</td>
<td>
<%- cost %>
</td>
<td>
<%- category %>
</td>
</tr>
</script>
<script type="text/template" id="trip-info-template">
<!-- <section class="row"><section id= class="panel small-10 small-centered columns"> -->
<p class="float-right" id="hide-trip-details">
[x]
</p>
<p>
ID: <%- id %>
</p>
<p>
CONTINENT: <%- continent %>
</p>
<p>
COST: <%- cost %>
</p>
<p>
CATEGORY: <%- category %>
</p>
<p>
WEEKS: <%- weeks %>
</p>
<p>
ABOUT: <%- about %>
</p>
<!-- <form action="https:https://ada-backtrek-api.herokuapp.com/trips/id/reservations" method="post" id="form-tripid">
<section>
<label>Name</label>
<input type="text" id="name" placeholder="identification required"/>
</section>
<section>
<label>Email</label>
<input type="text" id="email" placeholder="electronic document transmission"/>
</section>
<section>
<label>Age</label>
<input type="text" id="email" placeholder="age in relation to orbital period of Earth around solar body"/>
</section>
<section>
<button type="submit" class="button round">Reserve a Spot for ${trip.name}</button>
</section>
</form> -->
<!-- </section>

</section> -->
</script>
<script src="app.bundle.js" type="text/javascript"></script>
</body>
</html>
Loading