Merge pull request #536 from TAMUSHPE/event-ui-update

Event UI update
TAMUSHPE · Sep 16, 2024 · f1d065d · f1d065d
2 parents f6a8018 + 77dc819
commit f1d065d
Show file tree

Hide file tree

Showing 5 changed files with 235 additions and 294 deletions.
diff --git a/src/api/firebaseUtils.ts b/src/api/firebaseUtils.ts
@@ -528,6 +528,29 @@ export const getUpcomingEvents = async () => {
     return events;
 };
 
+export const getWeekPastEvents = async (): Promise<SHPEEvent[]> => {
+    const currentTime = new Date();
+    const twoWeeksAgo = new Date(currentTime);
+    twoWeeksAgo.setDate(currentTime.getDate() - 8);
+
+    const eventsRef = collection(db, "events");
+    const q = query(
+        eventsRef,
+        where("endTime", "<", currentTime),
+        where("endTime", ">", twoWeeksAgo),
+        orderBy("endTime", "desc")
+    );
+
+    const querySnapshot = await getDocs(q);
+    const events: SHPEEvent[] = [];
+
+    querySnapshot.forEach(doc => {
+        events.push({ id: doc.id, ...doc.data() } as SHPEEvent);
+    });
+
+    return events;
+};
+
 export const getPastEvents = async (numLimit: number, startAfterDoc: any, setEndOfData?: (endOfData: boolean) => void) => {
     const currentTime = new Date();
     const eventsRef = collection(db, "events");

diff --git a/src/components/MOTMCard.tsx b/src/components/MOTMCard.tsx
@@ -68,6 +68,9 @@ const MOTMCard: React.FC<MemberCardProp> = ({ navigation }) => {
         }, [currentUser])
     );
 
+    if (!MOTM) {
+        return null;
+    }
 
     return (
         <View className="mx-4">

diff --git a/src/screens/committees/CommitteeInfo.tsx b/src/screens/committees/CommitteeInfo.tsx
@@ -348,12 +348,6 @@ const CommitteeInfo: React.FC<CommitteeInfoScreenRouteProps> = ({ route, navigat
                     <View className='mt-10'>
                         <View className='flex-row justify-between items-center mb-4'>
                             <Text className={`text-2xl font-bold ${darkMode ? "text-white" : "text-black"}`}>Upcoming Events</Text>
-                            <TouchableOpacity
-                                className='px-4'
-                                onPress={() => navigation.getParent()?.navigate('EventsTab', { screen: 'EventsScreen', params: { filter: EventType.COMMITTEE_MEETING, committee: firebaseDocName } })}
-                            >
-                                <Text className='text-lg text-primary-blue font-semibold'>View all</Text>
-                            </TouchableOpacity>
                         </View>
 
                         <View