Commit 1f74cccc authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg
Browse files

Merge branch 'fix/google-maps-url' into 'master'

Fixed Google Maps url in the event detail

Closes #80

See merge request !205
parents f8ea18e3 ec2bbcdf
...@@ -14,6 +14,7 @@ const initialState = { ...@@ -14,6 +14,7 @@ const initialState = {
registration_allowed: false, registration_allowed: false,
has_fields: false, has_fields: false,
is_pizza_event: false, is_pizza_event: false,
google_maps_url: '',
}, },
registrations: [], registrations: [],
status: 'initial', status: 'initial',
......
...@@ -410,7 +410,7 @@ Pizza: ...@@ -410,7 +410,7 @@ Pizza:
> >
<Image <Image
style={styles.locationImage} style={styles.locationImage}
source={{ uri: `https://maps.googleapis.com/maps/api/staticmap?center=${data.map_location}&zoom=13&size=450x250&markers=${data.map_location}` }} source={{ uri: data.google_maps_url }}
/> />
</TouchableHighlight> </TouchableHighlight>
<Text style={styles.titleText}> <Text style={styles.titleText}>
...@@ -481,6 +481,7 @@ EventScreen.propTypes = { ...@@ -481,6 +481,7 @@ EventScreen.propTypes = {
}), }),
no_registration_message: PropTypes.string, no_registration_message: PropTypes.string,
is_pizza_event: PropTypes.bool.isRequired, is_pizza_event: PropTypes.bool.isRequired,
google_maps_url: PropTypes.string.isRequired,
}).isRequired, }).isRequired,
registrations: PropTypes.arrayOf(PropTypes.shape({ registrations: PropTypes.arrayOf(PropTypes.shape({
pk: PropTypes.number.isRequired, pk: PropTypes.number.isRequired,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment