Merge branch 'main' into prod-business

GenerateNU · Jun 17, 2024 · 0fb3f96 · 0fb3f96
2 parents 6a744b7 + ab2b9e2
commit 0fb3f96
Show file tree

Hide file tree

Showing 44 changed files with 1,307 additions and 496 deletions.
diff --git a/backend/entities/clubs/events/transactions.go b/backend/entities/clubs/events/transactions.go
@@ -14,7 +14,7 @@ func GetClubEvents(db *gorm.DB, clubID uuid.UUID, pageInfo fiberpaginate.PageInf
 	db = cache.SetUseCache(db, true)
 
 	var events []models.Event
-	if err := db.Where("club_id = ?", clubID).Scopes(utilities.IntoScope(pageInfo, db)).Find(&events).Error; err != nil {
+	if err := db.Where("host = ?", clubID).Scopes(utilities.IntoScope(pageInfo, db)).Find(&events).Error; err != nil {
 		return nil, err
 	}
 

diff --git a/frontend/lib/package.json b/frontend/lib/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@generatesac/lib",
-  "version": "0.0.170",
+  "version": "0.0.171",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/frontend/lib/src/types/index.ts b/frontend/lib/src/types/index.ts
@@ -10,3 +10,4 @@ export * from "./event";
 export * from "./file";
 export * from "./pointOfContact";
 export * from "./verification";
+export * from "./recruitment";
diff --git a/frontend/mobile/package.json b/frontend/mobile/package.json
@@ -25,7 +25,7 @@
         "@fortawesome/free-solid-svg-icons": "^6.5.2",
         "@fortawesome/react-fontawesome": "^0.2.2",
         "@fortawesome/react-native-fontawesome": "^0.3.2",
-        "@generatesac/lib": "0.0.170",
+        "@generatesac/lib": "0.0.171",
         "@gorhom/bottom-sheet": "^4.6.3",
         "@hookform/resolvers": "^3.4.2",
         "@react-native-async-storage/async-storage": "^1.23.1",

diff --git a/frontend/mobile/src/app/(app)/(tabs)/_layout.tsx b/frontend/mobile/src/app/(app)/(tabs)/_layout.tsx
@@ -35,54 +35,56 @@ const TabBarIcon: React.FC<TabBarIconProps> = ({ focused, icon }) => (
 
 const Layout = () => {
     return (
-        <Tabs
-            screenOptions={{
-                tabBarShowLabel: false,
-                tabBarStyle: {
-                    borderTopWidth: 1,
-                    borderTopColor: 'gray',
-                    height: 85
-                }
-            }}
-            sceneContainerStyle={{
-                backgroundColor: 'white'
-            }}
-        >
-            <Tabs.Screen
-                name="index"
-                options={{
-                    title: 'Home',
-                    headerShown: false,
-                    tabBarLabel: ({ focused }) =>
-                        TabBarLabel({ focused, title: 'Home' }),
-                    tabBarIcon: ({ focused }) =>
-                        TabBarIcon({ focused, icon: faHouse })
+        <>
+            <Tabs
+                screenOptions={{
+                    tabBarShowLabel: false,
+                    tabBarStyle: {
+                        borderTopWidth: 1,
+                        borderTopColor: 'gray',
+                        height: 85
+                    }
                 }}
-            />
-            <Tabs.Screen
-                name="calendar"
-                options={{
-                    title: 'Calendar',
-                    headerShown: false,
-                    tabBarLabel: ({ focused }) =>
-                        TabBarLabel({ focused, title: 'Calendar' }),
-                    tabBarIcon: ({ focused }) =>
-                        TabBarIcon({ focused, icon: faCalendarDays })
+                sceneContainerStyle={{
+                    backgroundColor: 'white'
                 }}
-            />
-            <Tabs.Screen
-                name="profile"
-                options={{
-                    title: 'Profile',
-                    headerShown: true,
-                    headerTransparent: true,
-                    tabBarLabel: ({ focused }) =>
-                        TabBarLabel({ focused, title: 'Profile' }),
-                    tabBarIcon: ({ focused }) =>
-                        TabBarIcon({ focused, icon: faUser })
-                }}
-            />
-        </Tabs>
+            >
+                <Tabs.Screen
+                    name="index"
+                    options={{
+                        title: 'Home',
+                        headerShown: false,
+                        tabBarLabel: ({ focused }) =>
+                            TabBarLabel({ focused, title: 'Home' }),
+                        tabBarIcon: ({ focused }) =>
+                            TabBarIcon({ focused, icon: faHouse })
+                    }}
+                />
+                <Tabs.Screen
+                    name="calendar"
+                    options={{
+                        title: 'Calendar',
+                        headerShown: false,
+                        tabBarLabel: ({ focused }) =>
+                            TabBarLabel({ focused, title: 'Calendar' }),
+                        tabBarIcon: ({ focused }) =>
+                            TabBarIcon({ focused, icon: faCalendarDays })
+                    }}
+                />
+                <Tabs.Screen
+                    name="profile"
+                    options={{
+                        title: 'Profile',
+                        headerShown: true,
+                        headerTransparent: true,
+                        tabBarLabel: ({ focused }) =>
+                            TabBarLabel({ focused, title: 'Profile' }),
+                        tabBarIcon: ({ focused }) =>
+                            TabBarIcon({ focused, icon: faUser })
+                    }}
+                />
+            </Tabs>
+        </>
     );
 };
 

diff --git a/frontend/mobile/src/app/(app)/(tabs)/index.tsx b/frontend/mobile/src/app/(app)/(tabs)/index.tsx
@@ -1,47 +1,7 @@
 import React from 'react';
-import { Pressable, StyleSheet } from 'react-native';
-
-import { router } from 'expo-router';
-
-import { Box, Text } from '@/src/app/(design-system)';
-import { EventCard } from '@/src/app/(design-system)/components/EventCard';
 
 const HomePage = () => {
-    const item = {
-        name: 'Your Event Name',
-        host: 'Your Club Name',
-        start_time: new Date(),
-        end_time: new Date()
-    };
-
-    return (
-        <Box style={styles.container}>
-            <Text variant="body-1">Home</Text>
-            <Pressable onPress={() => router.push(`/event/1`)}>
-                <EventCard
-                    variant="small"
-                    event={item.name}
-                    club={item.host}
-                    eventId="1"
-                    startTime={item.start_time}
-                    endTime={item.end_time}
-                    image="https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcSLF3ord7lnV_5Je-pC2AUgUiesHNPcZlpI7A&s"
-                />
-            </Pressable>
-        </Box>
-    );
+    return <></>;
 };
 
-const styles = StyleSheet.create({
-    container: {
-        flex: 1,
-        alignItems: 'center',
-        justifyContent: 'center'
-    },
-    contentContainer: {
-        flex: 1,
-        alignItems: 'center'
-    }
-});
-
 export default HomePage;
diff --git a/frontend/mobile/src/app/(app)/_layout.tsx b/frontend/mobile/src/app/(app)/_layout.tsx
@@ -17,6 +17,17 @@ const Layout = () => {
                     }
                 }}
             />
+            <Stack.Screen
+                name="club"
+                options={{
+                    headerTitle: '',
+                    headerTransparent: true,
+                    headerShown: false,
+                    headerTitleStyle: {
+                        color: 'white'
+                    }
+                }}
+            />
             <Stack.Screen
                 name="user"
                 options={{