Fix completed events loading issue after refactoring

Clubs-Council-IIITH · Oct 31, 2024 · bb5c89c · bb5c89c
1 parent e586dd1
commit bb5c89c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 12 deletions.
diff --git a/src/components/events/EventCards.jsx b/src/components/events/EventCards.jsx
@@ -5,7 +5,6 @@ export function EventCards({
   events,
   loading,
   noEventsMessage,
-  loadingIndicator = true,
 }) {
   if (loading) {
     return (
@@ -16,7 +15,7 @@ export function EventCards({
         height="100%"
         mt={3}
       >
-        {loadingIndicator ? <CircularProgress /> : null}
+        <CircularProgress />
       </Box>
     );
   }

diff --git a/src/components/events/PaginatedEventGrid.jsx b/src/components/events/PaginatedEventGrid.jsx
@@ -1,10 +1,7 @@
 "use client";
 
 import { useEffect, useState, useCallback, useRef } from "react";
-import {
-  Typography,
-  Divider,
-} from "@mui/material";
+import { Typography, Divider } from "@mui/material";
 import { EventCards, LoadingIndicator } from "./EventCards";
 
 export default function PaginatedEventGrid({
@@ -221,12 +218,21 @@ export default function PaginatedEventGrid({
               Completed Events
             </Typography>
           </Divider>
-          <EventCards
-            events={completedevents}
-            loading={loadingPast}
-            loadingIndicator={false}
-            noEventsMessage="No events found."
-          />
+          {!loadingPast && !completedevents.length ? (
+            <Typography
+              variant="h4"
+              color="text.secondary"
+              sx={{ flexGrow: 1, textAlign: "center", mt: 5 }}
+            >
+              No events found.
+            </Typography>
+          ) : (
+            <EventCards
+              events={completedevents}
+              loading={false}
+              noEventsMessage=""
+            />
+          )}
         </>
       )}