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.

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

fixed SVGs in events page #26

Merged
merged 2 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 components/EventCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const styles = StyleSheet.create({
position: "absolute",
marginLeft: 15,
marginTop: 30,
maxWidth: Dimensions.get("window").width * 0.8,
maxWidth: 320,
},
name: {
fontSize: 20,
Expand Down
6 changes: 5 additions & 1 deletion components/EventModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,18 +58,22 @@ const styles = StyleSheet.create({
},
eventDetails: {
position: "absolute",
marginLeft: 25,
marginLeft: 20,
width: 300,
marginTop: 50,
// backgroundColor: 'green'
},
name: {
fontSize: 20,
// marginLeft: 20,
paddingRight: 25,
color: "black",
fontFamily: "Kufam_700Bold",
},
info: {
flexDirection: "row",
// justifyContent: "space-evenly",

},
infoItem: {
flexDirection: "row",
Expand Down
2 changes: 1 addition & 1 deletion navigation/DayEvent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ const DayEvent = ({ day, events }) => (
key={event.id}
name={event.name}
time={formatTime(event.startTime)}
location={"location"}
location={event.location}
description={event.description}
points={event.points}
/>
Expand Down
2 changes: 1 addition & 1 deletion redux/state.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { AuthActionTypes, SET_TOKEN, SET_ROLES, SET_ATTENDEE, SET_QRCODE, LOGOUT
const initialState: State = {
user_id: null,
token: null,
roles: null,
roles: [],
attendee: null,
qrCodeURL: null,
isAuthenticated: false,
Expand Down
11 changes: 8 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1210,6 +1210,13 @@ __metadata:
languageName: node
linkType: hard

"@expo-google-fonts/press-start-2p@npm:^0.2.3":
version: 0.2.3
resolution: "@expo-google-fonts/press-start-2p@npm:0.2.3"
checksum: 95431bd3209052754cd3a64fe2b49fd7a4cfcdb44b9e03aa8d1f2efbd363c3ecd89b2c073b846577290f5f7b7e6c681b1252024482e923818e229f0500a9f1fc
languageName: node
linkType: hard

"@expo/bunyan@npm:^4.0.0":
version: 4.0.0
resolution: "@expo/bunyan@npm:4.0.0"
Expand Down Expand Up @@ -10882,9 +10889,6 @@ __metadata:
languageName: node
linkType: hard

"react-native-pager-view@npm:6.3.0":
version: 6.3.0
resolution: "react-native-pager-view@npm:6.3.0"
"react-native-pager-view@npm:6.3.0":
version: 6.3.0
resolution: "react-native-pager-view@npm:6.3.0"
Expand Down Expand Up @@ -11503,6 +11507,7 @@ __metadata:
"@babel/core": ^7.20.0
"@expo-google-fonts/inter": ^0.2.3
"@expo-google-fonts/kufam": ^0.2.3
"@expo-google-fonts/press-start-2p": ^0.2.3
"@expo/ngrok": ^4.1.0
"@gluestack-style/react": ^1.0.52
"@gluestack-ui/config": ^1.1.18
Expand Down
Loading