Skip to content

Commit 6e35a52

Browse files
potentially fix category issue
1 parent 8f4827e commit 6e35a52

File tree

3 files changed

+10
-26
lines changed

3 files changed

+10
-26
lines changed

javascripts/data.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ NH.data = NH.data || {};
1616

1717
var healthyMarkets = [];
1818

19-
19+
data.setCategory = function(category){
20+
yelpCategories = [];
21+
yelpCategories.push(category);
22+
23+
}
24+
2025
var showHealthyMarketSearchResults = function(){
2126

2227

javascripts/search.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ var updatedDirections = function(){
5959
var t_lon = Math.max(resultLeg.start_location.B, resultLeg.end_location.B);
6060
var b_lon = Math.min(resultLeg.start_location.B, resultLeg.end_location.B);
6161

62+
var category = NH.data.setCategory$('#category_filter').val();
63+
64+
6265
var def = NH.data.getHealthyMarkets(t_lat, b_lat, t_lon, b_lon);
6366
}
6467

search.html

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
Category:
5555
</span>
5656
<div class="styled-select">
57-
<select>
57+
<select id="category_filter">
5858
<option value="disabled">Select Category</option>
5959
<optgroup label="Food">
6060
<option value="food">All</option>
@@ -145,21 +145,11 @@
145145
<option value="trinidadian">Trinidadian</option>
146146
<option value="catalan">Catalan</option>
147147
<option value="cheesesteaks">Cheesesteaks</option>
148-
<<<<<<< HEAD
149148
<option value="chicken_wings">Chicken Wings</option>
150149
<option value="chinese">Chinese</option>
151150
<option value="cantonese">Cantonese</option>
152151
<option value="dimsum">Dim Sum</option>
153152
<option value="shanghainese">Shanghainese</option>
154-
=======
155-
156-
<!--
157-
<option value="Chicken Wings", "chicken_wings"</option>
158-
<option value="Chinese", "chinese"</option>
159-
<option value="Cantonese", "cantonese"</option>
160-
<option value="Dim Sum", "dimsum"</option>
161-
<option value="Shanghainese", "shanghainese"</option>
162-
>>>>>>> FETCH_HEAD
163153
<option value="Szechuan", "szechuan"</option>
164154
<option value="Comfort Food", "comfortfood"</option>
165155
<option value="Creperies", "creperies"</option>
@@ -231,7 +221,6 @@
231221
<option value="Steakhouses", "steak"</option>
232222
<option value="Sushi Bars", "sushi"</option>
233223
<option value="Taiwanese", "taiwanese"</option>
234-
<<<<<<< HEAD
235224
<option value="tapas"</option>
236225
<option value="tapasmallplates">Tapas/Small Plates</option>
237226
<option value="tex-mex">Tex-Mex</option>
@@ -242,19 +231,6 @@
242231
<option value="vegan">Vegan</option>
243232
<option value="vegetarian">Vegetarian</option>
244233
<option value="vietnamese">Vietnamese</option>
245-
=======
246-
<option value="Tapas Bars", "tapas"</option>
247-
<option value="Tapas/Small Plates", "tapasmallplates"</option>
248-
<option value="Tex-Mex", "tex-mex"</option>
249-
<option value="Thai", "thai"</option>
250-
<option value="Turkish", "turkish"</option>
251-
<option value="Ukrainian", "ukrainian"</option>
252-
<option value="Uzbek", "uzbek"</option>
253-
<option value="Vegan", "vegan"</option>
254-
<option value="Vegetarian", "vegetarian"</option>
255-
<option value="Vietnamese", "vietnamese"</option>
256-
// -->
257-
>>>>>>> FETCH_HEAD
258234
</optgroup>
259235
</select>
260236
</div>

0 commit comments

Comments
 (0)