Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
ThaliApp
Commits
1f74cccc
Commit
1f74cccc
authored
Oct 10, 2018
by
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/reducers/event.js
View file @
1f74cccc
...
...
@@ -14,6 +14,7 @@ const initialState = {
registration_allowed
:
false
,
has_fields
:
false
,
is_pizza_event
:
false
,
google_maps_url
:
''
,
},
registrations
:
[],
status
:
'
initial
'
,
...
...
app/ui/screens/events/EventScreen.js
View file @
1f74cccc
...
...
@@ -410,7 +410,7 @@ Pizza:
>
<
Image
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
>
<
Text
style
=
{
styles
.
titleText
}
>
...
...
@@ -481,6 +481,7 @@ EventScreen.propTypes = {
}),
no_registration_message
:
PropTypes
.
string
,
is_pizza_event
:
PropTypes
.
bool
.
isRequired
,
google_maps_url
:
PropTypes
.
string
.
isRequired
,
}).
isRequired
,
registrations
:
PropTypes
.
arrayOf
(
PropTypes
.
shape
({
pk
:
PropTypes
.
number
.
isRequired
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment