diff --git a/components/EventCard.tsx b/components/EventCard.tsx index 772e453..d61c151 100644 --- a/components/EventCard.tsx +++ b/components/EventCard.tsx @@ -105,7 +105,9 @@ const styles = StyleSheet.create({ position: "absolute", marginLeft: 15, marginTop: 30, - maxWidth: Dimensions.get("window").width * 0.8, + maxWidth: 320, + // backgroundColor: 'red', + // alignItems: 'center', }, name: { fontSize: 20, diff --git a/components/EventModal.tsx b/components/EventModal.tsx index 94eac70..6df1342 100644 --- a/components/EventModal.tsx +++ b/components/EventModal.tsx @@ -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", diff --git a/navigation/DayEvent.tsx b/navigation/DayEvent.tsx index 4c46866..425a093 100644 --- a/navigation/DayEvent.tsx +++ b/navigation/DayEvent.tsx @@ -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} /> diff --git a/redux/state.ts b/redux/state.ts index 3dfafd9..21e93ff 100644 --- a/redux/state.ts +++ b/redux/state.ts @@ -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, diff --git a/yarn.lock b/yarn.lock index ff1a71d..8b83348 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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" @@ -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" @@ -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