Skip to content

Commit 9f1b018

Browse files
committed
Fix Spacing
1 parent 4a2d9a1 commit 9f1b018

File tree

3 files changed

+57
-49
lines changed

3 files changed

+57
-49
lines changed

frontend/components/LocationMapFilter.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,14 +351,14 @@ export default function LocationMapFilter({
351351
</View>
352352

353353
{/* Action Buttons */}
354-
<View style={styles.actionButtonsContainer}>
354+
{/* <View style={styles.actionButtonsContainer}>
355355
<Pressable style={styles.clearButton} onPress={handleClear}>
356356
<Text style={styles.buttonText}>Clear</Text>
357357
</Pressable>
358358
<Pressable style={styles.applyButton} onPress={handleApply}>
359359
<Text style={styles.buttonText}>Apply</Text>
360360
</Pressable>
361-
</View>
361+
</View> */}
362362
</View>
363363
);
364364
}
@@ -435,7 +435,7 @@ const styles = StyleSheet.create({
435435
height: 40,
436436
},
437437
customRadiusContainer: {
438-
marginBottom: 24,
438+
marginBottom: 10,
439439
},
440440
customRadiusContent: {
441441
flexDirection: 'row',

frontend/services/eventService.ts

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,19 @@ async function getAllEvents(
2929
Object.assign(params, filters);
3030
}
3131

32-
if ((filters?.sort_by === 'been_before' || filters?.sort_by === 'recommendations') && volunteerId) {
32+
if (
33+
(filters?.sort_by === 'been_before' ||
34+
filters?.sort_by === 'recommendations') &&
35+
volunteerId
36+
) {
3337
params.volunteer_id = volunteerId;
3438
}
3539

36-
if ((params?.sort_by === 'been_before' || params?.sort_by === 'recommendations') && volunteerId) {
40+
if (
41+
(params?.sort_by === 'been_before' ||
42+
params?.sort_by === 'recommendations') &&
43+
volunteerId
44+
) {
3745
params.volunteer_id = volunteerId;
3846
}
3947

frontend/subtabs/eventsTab.tsx

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -47,36 +47,36 @@ export default function EventsScreen() {
4747
const searchDebounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
4848

4949
const loadEvents = useCallback(
50-
async (searchQuery?: string, filters?: EventFilters) => {
51-
try {
52-
setLoading(true);
53-
const volunteerId = volunteer?.id;
50+
async (searchQuery?: string, filters?: EventFilters) => {
51+
try {
52+
setLoading(true);
53+
const volunteerId = volunteer?.id;
5454

55-
let adjustedFilters = filters;
56-
if ((filters?.sort_by === 'recommendations' && !volunteerId)) {
57-
adjustedFilters = { ...filters, sort_by: undefined };
58-
setFilters(adjustedFilters);
55+
let adjustedFilters = filters;
56+
if (filters?.sort_by === 'recommendations' && !volunteerId) {
57+
adjustedFilters = { ...filters, sort_by: undefined };
58+
setFilters(adjustedFilters);
59+
}
60+
61+
const fetchedEvents = await eventService.getAllEvents(
62+
searchQuery,
63+
adjustedFilters,
64+
locationFilter,
65+
volunteerId
66+
);
67+
const futureEvents = fetchedEvents.filter(
68+
event => new Date(event.startDateTime).getTime() > Date.now()
69+
);
70+
setEvents(futureEvents);
71+
} catch (error) {
72+
console.error('Error loading events:', error);
73+
Alert.alert('Error', 'Failed to load events. Please try again.');
74+
} finally {
75+
setLoading(false);
5976
}
60-
61-
const fetchedEvents = await eventService.getAllEvents(
62-
searchQuery,
63-
adjustedFilters,
64-
locationFilter,
65-
volunteerId
66-
);
67-
const futureEvents = fetchedEvents.filter(
68-
event => new Date(event.startDateTime).getTime() > Date.now()
69-
);
70-
setEvents(futureEvents);
71-
} catch (error) {
72-
console.error('Error loading events:', error);
73-
Alert.alert('Error', 'Failed to load events. Please try again.');
74-
} finally {
75-
setLoading(false);
76-
}
77-
},
78-
[locationFilter, volunteer]
79-
);
77+
},
78+
[locationFilter, volunteer]
79+
);
8080

8181
const handleRefresh = useCallback(async () => {
8282
setRefreshing(true);
@@ -231,23 +231,23 @@ export default function EventsScreen() {
231231
return true;
232232
}).map(sortOption => {
233233
const isSelected = filters.sort_by === sortOption;
234-
return (
235-
<Pressable
236-
key={sortOption}
237-
onPress={() => handleSortPress(sortOption)}
238-
style={[styles.sortPill, isSelected && styles.sortPillSelected]}
239-
>
240-
<Text
241-
style={[
242-
styles.sortPillText,
243-
isSelected && styles.sortPillTextSelected,
244-
]}
234+
return (
235+
<Pressable
236+
key={sortOption}
237+
onPress={() => handleSortPress(sortOption)}
238+
style={[styles.sortPill, isSelected && styles.sortPillSelected]}
245239
>
246-
{SORT_LABELS[sortOption]}
247-
</Text>
248-
</Pressable>
249-
);
250-
})}
240+
<Text
241+
style={[
242+
styles.sortPillText,
243+
isSelected && styles.sortPillTextSelected,
244+
]}
245+
>
246+
{SORT_LABELS[sortOption]}
247+
</Text>
248+
</Pressable>
249+
);
250+
})}
251251
</ScrollView>
252252
</View>
253253

0 commit comments

Comments
 (0)