Merge pull request #43 from codeplaysoftware/homepage-event-fix

Fixed Missing Events on Home Page
codeplaysoftware · Oct 3, 2024 · 1d1bb38 · 1d1bb38
2 parents d1d5697 + d95a522
commit 1d1bb38
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/app/pages/home/home.component.ts b/src/app/pages/home/home.component.ts
@@ -99,6 +99,7 @@ export class HomeComponent implements SearchablePage, OnInit, OnDestroy {
 
   protected readonly Layout = NewsWidgetLayout;
   protected readonly CommunityUpdateModelType = ImplementationActivityType;
+  protected readonly environment = environment;
 
   /**
    * Constructor
@@ -217,6 +218,4 @@ export class HomeComponent implements SearchablePage, OnInit, OnDestroy {
   getDefaultRoutePath() {
     return '/';
   }
-
-  protected readonly environment = environment;
 }
diff --git a/src/app/shared/services/models/event.service.ts b/src/app/shared/services/models/event.service.ts
@@ -109,8 +109,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 => events.sort((a, b) => (a.starts > b.starts) ? 1 : -1))
+      map(events => events.sort((a, b) => (a.starts > b.starts) ? 1 : -1)),
+      map(events => limit ? events.slice(offset, limit) : events.slice(offset))
     );
   }