Merge pull request #16 from codeplaysoftware/tweaked-event-listings

Tweaked Event Listing Ordering
codeplaysoftware · Jul 26, 2024 · af43c78 · af43c78
2 parents fc2a4fc + b8f3265
commit af43c78
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
@@ -136,7 +136,7 @@ export class HomeComponent implements SearchablePage {
       this.communityUpdateService.all(6), { initialValue: [] });
 
     this.events = toSignal(
-      this.eventService.all(4), { initialValue: [] });
+      this.eventService.getUpcomingEvents(4), { initialValue: [] });
 
     this.yearlyEventCount = toSignal(
       this.eventService.getYearlyEventCount(new Date().getFullYear()), { initialValue: 0 } );
@@ -155,7 +155,7 @@ export class HomeComponent implements SearchablePage {
       { initialValue: PlaygroundSampleService.getDefaultSample() });
 
     this.projectCount = toSignal(
-      this.eventService.count(), { initialValue: 0 });
+      this.projectService.count(), { initialValue: 0 });
 
     this.videoCount = toSignal(
       this.videoService.count(), { initialValue: 0 });

diff --git a/src/app/shared/services/models/event.service.ts b/src/app/shared/services/models/event.service.ts
@@ -108,7 +108,8 @@ export class EventService extends JsonFeedService {
       map(events => events.filter((event) => {
         return event.starts > currentDateTime ? event : null;
       })),
-      map(events => limit ? events.slice(offset, limit) : events.slice(offset))
+      map(events => limit ? events.slice(offset, limit) : events.slice(offset)),
+      map(events => events.sort((a, b) => (a.starts > b.starts) ? 1 : -1))
     );
   }