Skip to content
GitLab
Menu
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
58193eb0
Commit
58193eb0
authored
May 27, 2017
by
Sébastiaan Versteeg
Browse files
Fix registration networking and styling on iOS
parent
892baf25
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/actions/actionTypes.js
View file @
58193eb0
...
...
@@ -8,4 +8,4 @@ export const OPENDRAWER = 'OPENDRAWER';
export
const
CALENDARRETREIVED
=
'
CALENDARRETREIVED
'
;
export
const
CALENDARERROR
=
'
CALENDARERROR
'
;
export
const
LOADEVENTSUCCESS
=
'
LOADEVENTSUCCESS
'
;
export
const
LOADEVENTFAILURE
=
'
LOADEVENTFAILURE
'
;
\ No newline at end of file
export
const
LOADEVENTFAILURE
=
'
LOADEVENTFAILURE
'
;
app/actions/events.js
View file @
58193eb0
...
...
@@ -25,13 +25,10 @@ function loadRegistrations(id, token) {
Authorization
:
`Token
${
token
}
`
,
},
};
return
fetch
(
`
${
url
}
/api/events/
${
id
}
/registrations`
,
data
)
return
fetch
(
`
${
url
}
/api/events/
${
id
}
/registrations
/
`
,
data
)
.
then
(
response
=>
response
.
json
(),
)
.
then
(
response
=>
response
,
)
.
catch
(
()
=>
[],
);
...
...
app/actions/login.js
View file @
58193eb0
...
...
@@ -75,8 +75,8 @@ export function login(user, pass) {
'
Content-Type
'
:
'
application/json
'
,
},
body
:
JSON
.
stringify
({
username
:
'
se
bastiaan
'
,
password
:
'
Cerberus1q2w3e!
'
,
username
:
u
se
r
,
password
:
pass
,
}),
};
return
fetch
(
`
${
url
}
/api/token-auth/`
,
data
)
...
...
app/components/style/event.js
View file @
58193eb0
...
...
@@ -18,7 +18,7 @@ const styles = create({
fontFamily
:
'
sans-serif-medium
'
,
},
ios
:
{
fontFamily
:
'
S
an Fransisco
'
,
fontFamily
:
'
S
ystem
'
,
fontWeight
:
'
500
'
,
},
fontSize
:
20
,
...
...
@@ -30,7 +30,7 @@ const styles = create({
fontFamily
:
'
sans-serif-medium
'
,
},
ios
:
{
fontFamily
:
'
S
an Fransisco
'
,
fontFamily
:
'
S
ystem
'
,
fontWeight
:
'
500
'
,
},
fontSize
:
14
,
...
...
@@ -58,7 +58,7 @@ const styles = create({
fontFamily
:
'
sans-serif-medium
'
,
},
ios
:
{
fontFamily
:
'
S
an Fransisco
'
,
fontFamily
:
'
S
ystem
'
,
fontWeight
:
'
500
'
,
},
fontSize
:
14
,
...
...
app/components/style/memberView.js
View file @
58193eb0
...
...
@@ -9,6 +9,7 @@ const styles = StyleSheet.create({
left
:
6
,
bottom
:
4
,
right
:
6
,
backgroundColor
:
colors
.
transparent
,
},
image
:
{
flex
:
1
,
...
...
app/style.js
View file @
58193eb0
...
...
@@ -10,6 +10,7 @@ export const colors = {
darkGrey
:
'
#373737
'
,
dividerGrey
:
'
rgba(0, 0, 0, 0.12)
'
,
background
:
'
#FAFAFA
'
,
transparent
:
'
transparent
'
,
};
export
function
create
(
styles
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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