Merge main

GenerateNU · Jun 15, 2024 · 916fa85 · 916fa85
2 parents a160ce7 + 8be0c09
commit 916fa85
Show file tree

Hide file tree

Showing 7 changed files with 32,444 additions and 4,630 deletions.
diff --git a/backend/entities/events/previews/transactions.go b/backend/entities/events/previews/transactions.go
@@ -71,7 +71,7 @@ func processEventStubs(db *gorm.DB, events []EventStub) ([]EventPreview, error)
 	}
 
 	var hosts []models.Club
-	if err := db.Where("id IN ?", eventIDs).Find(&hosts).Error; err != nil {
+	if err := db.Joins("JOIN events ON events.host = clubs.id").Where("events.id IN ?", eventIDs).Find(&hosts).Error; err != nil {
 		return nil, err
 	}
 

diff --git a/frontend/mobile/src/app/(app)/event/[id].tsx b/frontend/mobile/src/app/(app)/event/[id].tsx
@@ -132,26 +132,21 @@ const EventPage = () => {
                     },
                     headerLeft: () => (
                         <Animated.View style={headerAnimatedStyle}>
-                            <Arrow
-                                color={
-                                    eventError || clubError ? 'black' : 'white'
-                                }
-                            />
+                            <Arrow color={apiError ? 'black' : 'white'} />
                         </Animated.View>
                     ),
-                    headerRight:
-                        !eventError || clubError
-                            ? () => (
-                                  <Animated.View style={headerAnimatedStyle}>
-                                      <KebabMenu
-                                          onPress={() =>
-                                              shareEvent.current?.snapToIndex(0)
-                                          }
-                                          color="white"
-                                      />
-                                  </Animated.View>
-                              )
-                            : () => <></>
+                    headerRight: !apiError
+                        ? () => (
+                              <Animated.View style={headerAnimatedStyle}>
+                                  <KebabMenu
+                                      onPress={() =>
+                                          shareEvent.current?.snapToIndex(0)
+                                      }
+                                      color="white"
+                                  />
+                              </Animated.View>
+                          )
+                        : () => <></>
                 }}
             />
             <Animated.ScrollView
@@ -182,7 +177,7 @@ const EventPage = () => {
                                     <Box gap="l">
                                         <Overview
                                             clubId={event.host}
-                                            logo={MockEvent.logo}
+                                            logo={club.logo ?? ''}
                                             eventName={event.name}
                                             color={MockEvent.color}
                                             club={club?.name}

diff --git a/frontend/mobile/src/app/(app)/event/components/register.tsx b/frontend/mobile/src/app/(app)/event/components/register.tsx
@@ -117,7 +117,6 @@ const Register: React.FC<RegisterProps> = ({ setSheet, eventType }) => {
             } else {
                 setSheet('save');
             }
-            console.log(data);
         } catch (error) {
             if (error instanceof ZodError) {
                 Alert.alert('Validation Error', error.errors[0].message);

diff --git a/frontend/mobile/src/app/(design-system)/components/Calendar/DayTimeSection.tsx b/frontend/mobile/src/app/(design-system)/components/Calendar/DayTimeSection.tsx
@@ -19,7 +19,8 @@ export type EventCalendarPreview = {
     title: string;
     startTime: string;
     endTime: string;
-    host: string;
+    host_name: string;
+    host_logo: string;
     image: string;
     tags: Tag[];
 };
@@ -91,11 +92,11 @@ export default function DayTimeSection({ time, data }: DayTimeSectionProps) {
                                 event={event.title}
                                 variant="calendar"
                                 tags={event.tags}
-                                club={event.host}
+                                club={event.host_name}
+                                logo={event.host_logo}
                                 eventId={event.id}
                                 startTime={new Date(event.startTime)}
                                 endTime={new Date(event.endTime)}
-                                logo="https://www.iconpacks.net/icons/2/free-user-icon-3296-thumb.png"
                                 image={event.image}
                             />
                         </Box>

diff --git a/frontend/mobile/src/app/(design-system)/components/Calendar/parser/calendarParser.ts b/frontend/mobile/src/app/(design-system)/components/Calendar/parser/calendarParser.ts
@@ -75,7 +75,10 @@ export function parseData(start: number, end: number, data?: EventPreview[]) {
                 image: eventPreviewImages[
                     Math.floor(Math.random() * eventPreviewImages.length)
                 ],
-                host: event.host_name,
+                host_name: event.host_name,
+                host_logo:
+                    event.host_logo ??
+                    'https://www.iconpacks.net/icons/2/free-user-icon-3296-thumb.png',
                 tags: event.tags
             };