Skip to content

Michelle - Edges - TREK #32

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

Michelle - Edges - TREK #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
77ab1b2
made basic html, js, css files to start
kangazoom Nov 21, 2018
09c3061
added npm install
kangazoom Nov 21, 2018
20fb413
installed jquery, axios --> necessary?
kangazoom Nov 21, 2018
811a8a5
file reorg
kangazoom Nov 24, 2018
cd8ac60
can load trips; very basic
kangazoom Nov 25, 2018
d060919
fiddled around with bootstrap to show trips + added links to individu…
kangazoom Nov 25, 2018
415aff1
added feature to view selected trip
kangazoom Nov 25, 2018
578f845
began structure for reservation form
kangazoom Nov 25, 2018
35ab0d1
added headings to each section
kangazoom Nov 25, 2018
7d137b2
added form to reserve trip; fixed some bootstrap grid-related styling
kangazoom Nov 25, 2018
112e155
fixed form placeholders and currency formatting
kangazoom Nov 25, 2018
f9984b2
got post functionality working
kangazoom Nov 26, 2018
61d9c54
moved some code around and fixed multiple posts and hide form after s…
kangazoom Nov 26, 2018
ca5a8d4
givin my site that ~lewk~
kangazoom Nov 26, 2018
e0c83e4
playing around with css stylez
kangazoom Nov 27, 2018
925ca03
added some jquery after form is submitted
kangazoom Nov 27, 2018
f0d574f
fixed a bug wherein could not submit correct info after hitting a 400
kangazoom Nov 27, 2018
101bc25
fixed code so reservation submission matches trip id
kangazoom Nov 27, 2018
5a95bda
made a note for myself for future
kangazoom Nov 27, 2018
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
63 changes: 63 additions & 0 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<!DOCTYPE html>
<html lang="en" dir="ltr">
<head>
<meta charset="utf-8">
<title>Trek (Not Shrek) Travel</title>

<script src="https://code.jquery.com/jquery-3.3.1.js"></script>
<script src="https://unpkg.com/axios/dist/axios.min.js"></script>
<script type="text/javascript" src="script.js"></script>

<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="stylesheet" href="style.css">
</head>
<body>
<header class="col-md-12">
<h1>TREK</h1>
<nav>
<button class="trip-button float-left btn btn-default btn-lg btn-block">View All Trips</button>

</nav>
<div class="status-message"></div>
</header>

<main>


<div class='row-fluid'>

<section class="col-md-6 trip-list btn-group-vertical btn-group-lg" role="group">

</section>
<section class="col-md-6 trip-details"></section>
</div><div class='row-fluid'>
<section class="col-md-6 pull-right reserve-trip">

<form class="trip-form">
<h3>Reserve A Trip</h3>
<div>
<label for="name">Your Name: </label>
<input type="text" name="name"/>
</div>

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

<div>
<label for="tripName">Trip Name: </label>
<input type="text" name="tripName" />
</div>

<input type="submit" name="submit-trip" value="Reserve Trip" />
</form>
</section>
</div>
</main>

<footer>
</footer>

</body>
</html>
245 changes: 245 additions & 0 deletions node_modules/axios/CHANGELOG.md
View file
Open in desktop

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

19 changes: 19 additions & 0 deletions node_modules/axios/LICENSE
View file
Open in desktop

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

Loading