Skip to content

Commit 2e38371

Browse files
committed
finish filtering system, now begin to add location search
1 parent 2c822c8 commit 2e38371

File tree

2 files changed

+42
-24
lines changed

2 files changed

+42
-24
lines changed

views/index.hbs

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<option value="Field" name="field">Field</option>
2828
<option value="Park" name="park">Park</option>
2929
<option value="Forest" name="forest">Forest</option>
30-
<option value="Parking Lot" name="parkingLotOut">Parking Lot (Outdoor)</option>
30+
<option value="Parking Lot (Outdoor)" name="parkingLotOut">Parking Lot (Outdoor)</option>
3131
<option value="Parking Lot (Indoor)" name="parkingLotIn">Parking Lot (Indoor)</option>
3232
<option value="Building(s)" name="buildings">Building(s)</option>
3333
<option value="Other" name="other">Other</option>
@@ -82,21 +82,6 @@
8282
</div>
8383
</div>
8484

85-
<select id="type" onchange="filterMarkers(this.value);">
86-
<option value="">Please select category</option>
87-
<option value="Everything">Everything</option>
88-
<option value="Freestyle">Freestyle</option>
89-
<option value="third">third</option>
90-
</select>
91-
92-
93-
<select id="type" onchange="filterMarkersType(this.value);">
94-
<option value="">Please select category</option>
95-
<option value="Field">Field</option>
96-
<option value="Forest">Forest</option>
97-
<option value="Building(s)">Building(s)</option>
98-
</select>
99-
10085
</body>
10186

10287
<script type="text/javascript">
@@ -198,7 +183,7 @@ function addMarker(coords, address, id, points, type, goodFor, hasOutlet) {
198183
199184
}
200185
201-
function filterMarkers(goodFor) {
186+
function filterMarkersStyle(goodFor) {
202187
console.log(goodFor);
203188
for (i = 0; i < spots.length; i++) {
204189
marker = allMarkers[i];

views/layout.hbs

Lines changed: 40 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,52 @@
1818
<nav class="deep-purple darken-1">
1919
<div class="nav-container">
2020
<div class="nav-wrapper">
21-
<a href="#" data-activates="slide-out" id='button-collapse' class="brand-logo"><i class="material-icons">menu</i>BandoMap</a>
21+
<a href="#" data-activates="slide-out" id='button-collapse' class="brand-logo"><i class="material-icons">menu</i></a><!--
2222
<ul id="nav-mobile" class="right hide-on-med-and-down">
2323
<li><a href="sass.html">Add a spot</a></li>
2424
<li><a href="badges.html">Filter spots</a></li>
2525
<li><a href="collapsible.html">About</a></li>
26-
</ul>
26+
</ul> -->
2727
</div>
2828
</div>
2929
</nav>
3030

31-
<ul id="slide-out" class="side-nav">
32-
<li><div class="user-view">
33-
<h4>BandoMap</h4>
34-
</div></li>
31+
<ul id="slide-out" class="side-nav fixed">
32+
<nav class="deep-purple darken-1">
33+
<div class="nav-container">
34+
<div class="nav-wrapper">
35+
<a href="/" class="brand-logo" style="padding-left: 30px;">BandoMap</a>
36+
</div>
37+
</div>
38+
</nav>
39+
<br>
3540
<li><a class="modal-trigger" href="#modal1"><i class="material-icons">add</i>Add a spot</a></li>
36-
<li><a href="#!"><i class="material-icons">search</i>Filter spots</a></li>
41+
<li><a href="#!"><i class="material-icons">search</i>Search location</a></li>
42+
<li><div class="divider"></div></li>
43+
<li><a class="subheader">Filter Spots</a></li>
44+
45+
<div class="container">
46+
<select class='select' id="type" onchange="filterMarkersStyle(this.value);">
47+
<option value="">Flying style</option>
48+
<option value="Freestyle">Freestyle</option>
49+
<option value="Racing">Racing</option>
50+
<option value="Longrange">Long range</option>
51+
<option value="Everything">Everything</option>
52+
</select>
53+
54+
<select id="type" onchange="filterMarkersType(this.value);">
55+
<option value="">Spot type</option>
56+
<option value="Field">Field</option>
57+
<option value="Park">Park</option>
58+
<option value="Forest">Forest</option>
59+
<option value="Parking Lot (Outdoor)">Parking Lot (Outdoor)</option>
60+
<option value="Parking Lot (Indoor)">Parking Lot (Indoor)</option>
61+
<option value="Building(s)">Building(s)</option>
62+
<option value="Other">Other</option>
63+
<option value="Building(s)">Building(s)</option>
64+
</select>
65+
</div>
66+
3767
<li><div class="divider"></div></li>
3868
<li><a class="subheader">More</a></li>
3969
<li><a class="modal-trigger" href="#modalAbout"><i class="material-icons">info</i>About</a></li>
@@ -45,6 +75,9 @@
4575
<script type="text/javascript" src="https://code.jquery.com/jquery-3.2.1.min.js"></script>
4676
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
4777
<script type="text/javascript">
78+
$(document).ready(function(){
79+
$('.collapsible').collapsible();
80+
});
4881
4982
$(document).ready(function() {
5083
$('select').material_select();

0 commit comments

Comments
 (0)