Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: event & club preview components #1034

Merged
merged 12 commits into from
Jun 17, 2024
Merged

feat: event & club preview components #1034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
899e624
rich text editor
in-mai-space Jun 11, 2024
b6f4f2f
Merge remote-tracking branch 'origin'
in-mai-space Jun 11, 2024
4da44a7
Merge branch 'main' of https://github.com/GenerateNU/sac
in-mai-space Jun 12, 2024
96fd92b
Merge branch 'main' of https://github.com/GenerateNU/sac
in-mai-space Jun 16, 2024
2600593
feat: event and club preview component
in-mai-space Jun 16, 2024
73120cd
linting and formatting
in-mai-space Jun 16, 2024
d54cf03
minor change
in-mai-space Jun 16, 2024
a4996fa
more minor fixes
in-mai-space Jun 16, 2024
596dcac
linting
in-mai-space Jun 16, 2024
0126d8b
delete package-lock.json
in-mai-space Jun 16, 2024
f99766b
Connecting Club + Preview
Jun 16, 2024
7c80adc
Lots o updates
Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion backend/entities/clubs/events/transactions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
1 change: 1 addition & 0 deletions frontend/lib/src/types/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,4 @@ export * from "./event";
export * from "./file";
export * from "./pointOfContact";
export * from "./verification";
export * from "./recruitment";
2 changes: 1 addition & 1 deletion frontend/mobile/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
94 changes: 48 additions & 46 deletions frontend/mobile/src/app/(app)/(tabs)/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
</>
);
};

Expand Down
42 changes: 1 addition & 41 deletions frontend/mobile/src/app/(app)/(tabs)/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
11 changes: 11 additions & 0 deletions frontend/mobile/src/app/(app)/_layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,17 @@ const Layout = () => {
}
}}
/>
<Stack.Screen
name="club"
options={{
headerTitle: '',
headerTransparent: true,
headerShown: false,
headerTitleStyle: {
color: 'white'
}
}}
/>
<Stack.Screen
name="user"
options={{
Expand Down
Loading
Loading