From 1d4d920b83f87c55a6bbbed7b2b8803d6f24a6d2 Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 25 Aug 2025 14:45:44 -0400 Subject: [PATCH 1/3] maybe reverse order for history in rideboard --- src/api/v1/event/mod.rs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/api/v1/event/mod.rs b/src/api/v1/event/mod.rs index babb7a7..d784929 100644 --- a/src/api/v1/event/mod.rs +++ b/src/api/v1/event/mod.rs @@ -119,7 +119,15 @@ async fn get_all_events( let result = crate::db::event::Event::select_all(past, &data.db).await; match result { - Ok(events) => HttpResponse::Ok().json(events), + Ok(events) => { + if past { + let reversed : Vec<&Event> = events.iter().rev().collect(); + + return HttpResponse::Ok().json(reversed); + } + + HttpResponse::Ok().json(events) + }, Err(e) => { error!("{}", e); HttpResponse::InternalServerError() From 28a1129414a3fac6468b1d3f0ed1e6059a4547e8 Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 25 Aug 2025 21:09:32 -0400 Subject: [PATCH 2/3] Ride history sorts newest to oldest --- src/frontend/src/components/CreateEventModal.vue | 1 + src/frontend/src/stores/events.ts | 7 ++++++- src/frontend/src/views/HomeView.vue | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/frontend/src/components/CreateEventModal.vue b/src/frontend/src/components/CreateEventModal.vue index 6b81cc8..b5c50fd 100644 --- a/src/frontend/src/components/CreateEventModal.vue +++ b/src/frontend/src/components/CreateEventModal.vue @@ -136,6 +136,7 @@ export default defineComponent({ needsRide: [] }; eventStore.addEvent(newEvent); + eventStore.sortEvents(false); eventStore.selectEvent(newEvent); popupStore.addPopup(PopupType.Success, 'Event Created!'); diff --git a/src/frontend/src/stores/events.ts b/src/frontend/src/stores/events.ts index 4998dde..0b8a735 100644 --- a/src/frontend/src/stores/events.ts +++ b/src/frontend/src/stores/events.ts @@ -16,11 +16,16 @@ export const useEventStore = defineStore('events', { actions: { addEvent(event: Event) { this.events.push(event); - this.events.sort(sortByStartDate); }, setEvents(events: Event[]) { this.events = events; + }, + sortEvents(past: Boolean) { this.events.sort(sortByStartDate); + + if (past) { + this.events.reverse(); + } }, removeEvent(event: Event | null) { if (event == null) { diff --git a/src/frontend/src/views/HomeView.vue b/src/frontend/src/views/HomeView.vue index f9f1a46..c705d08 100644 --- a/src/frontend/src/views/HomeView.vue +++ b/src/frontend/src/views/HomeView.vue @@ -88,6 +88,7 @@ export default defineComponent({ const data = await response.json(); const eventStore = useEventStore(); eventStore.setEvents(data); + eventStore.sortEvents(this.showPast); eventStore.selectedEvent = null; this.loading = false; } catch (error) { From 6606dba69614a115a345ab808b00824efc646da7 Mon Sep 17 00:00:00 2001 From: Noah Date: Mon, 25 Aug 2025 22:18:12 -0400 Subject: [PATCH 3/3] Revert "maybe reverse order for history in rideboard" This reverts commit 1d4d920b83f87c55a6bbbed7b2b8803d6f24a6d2. --- src/api/v1/event/mod.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/api/v1/event/mod.rs b/src/api/v1/event/mod.rs index d784929..babb7a7 100644 --- a/src/api/v1/event/mod.rs +++ b/src/api/v1/event/mod.rs @@ -119,15 +119,7 @@ async fn get_all_events( let result = crate::db::event::Event::select_all(past, &data.db).await; match result { - Ok(events) => { - if past { - let reversed : Vec<&Event> = events.iter().rev().collect(); - - return HttpResponse::Ok().json(reversed); - } - - HttpResponse::Ok().json(events) - }, + Ok(events) => HttpResponse::Ok().json(events), Err(e) => { error!("{}", e); HttpResponse::InternalServerError()