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
320150f1
Verified
Commit
320150f1
authored
Jun 21, 2019
by
Jelle Besseling
Committed by
Sébastiaan Versteeg
Jun 21, 2019
Browse files
Fix rebase issues
parent
fbefc59e
Changes
6
Hide whitespace changes
Inline
Side-by-side
app/reducers/photos.js
View file @
320150f1
import
*
as
photosActions
from
'
../actions/photos
'
;
import
{
PHOTO_SHOWING
}
from
'
../actions/photos
'
;
export
const
STATUS_INITIAL
=
'
initial
'
;
export
const
STATUS_SUCCESS
=
'
success
'
;
...
...
app/ui/screens/photos/AlbumDetailScreenContainer.js
View file @
320150f1
import
{
connect
}
from
'
react-redux
'
;
import
{
t
ranslat
e
}
from
'
react-i18next
'
;
import
{
withT
ranslat
ion
}
from
'
react-i18next
'
;
import
AlbumDetailScreen
from
'
./AlbumDetailScreen
'
;
import
{
tokenSelector
}
from
'
../../../utils/url
'
;
...
...
@@ -10,4 +10,4 @@ const mapStateToProps = state => ({
token
:
tokenSelector
(
state
),
});
export
default
connect
(
mapStateToProps
)(
t
ranslat
e
([
'
screens/photos/AlbumDetail
'
])(
AlbumDetailScreen
));
export
default
connect
(
mapStateToProps
)(
withT
ranslat
ion
([
'
screens/photos/AlbumDetail
'
])(
AlbumDetailScreen
));
app/ui/screens/photos/AlbumsOverviewScreen.js
View file @
320150f1
...
...
@@ -10,7 +10,8 @@ import AlbumListItemContainer from './AlbumListItemContainer';
import
{
withStandardHeader
}
from
'
../../components/standardHeader/StandardHeader
'
;
const
windowWidth
=
Dimensions
.
get
(
'
window
'
).
width
;
export
const
albumSize
=
(
windowWidth
-
48
)
/
3
;
const
numColumns
=
2
;
export
const
albumSize
=
(
windowWidth
-
48
)
/
numColumns
;
const
AlbumsOverviewScreen
=
(
props
)
=>
{
const
{
t
,
fetching
,
status
}
=
props
;
...
...
@@ -37,7 +38,7 @@ const AlbumsOverviewScreen = (props) => {
)
}
keyExtractor
=
{
item
=>
item
.
pk
}
numColumns
=
{
3
}
numColumns
=
{
numColumns
}
/
>
<
/View>
)
;
};
...
...
app/ui/screens/photos/AlbumsOverviewScreenContainer.js
View file @
320150f1
import
{
connect
}
from
'
react-redux
'
;
import
{
t
ranslat
e
}
from
'
react-i18next
'
;
import
{
withT
ranslat
ion
}
from
'
react-i18next
'
;
import
AlbumsOverview
from
'
./AlbumsOverviewScreen
'
;
const
mapStateToProps
=
state
=>
({
...
...
@@ -8,4 +8,4 @@ const mapStateToProps = state => ({
fetching
:
state
.
photos
.
albums
.
fetching
,
});
export
default
connect
(
mapStateToProps
,
()
=>
({}))(
t
ranslat
e
([
'
screens/photos/AlbumsOverview
'
])(
AlbumsOverview
));
export
default
connect
(
mapStateToProps
,
()
=>
({}))(
withT
ranslat
ion
([
'
screens/photos/AlbumsOverview
'
])(
AlbumsOverview
));
app/utils/url.js
View file @
320150f1
...
...
@@ -10,6 +10,7 @@ export const url = server;
export
const
apiUrl
=
`
${
server
}
/api/v1`
;
export
const
defaultProfileImage
=
`
${
server
}
/static/members/images/default-avatar.jpg`
;
export
const
termsAndConditionsUrl
=
`
${
server
}
/event-registration-terms/`
;
export
const
tokenSelector
=
state
=>
state
.
session
.
token
;
export
class
ServerError
extends
Error
{
constructor
(
message
,
response
)
{
...
...
yarn.lock
View file @
320150f1
...
...
@@ -6805,7 +6805,7 @@ prompts@^2.0.1:
kleur "^3.0.2"
sisteransi "^1.0.0"
prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
prop-types@15.7.2, prop-types@^15.5.10, prop-types@^15.5.8,
prop-types@^15.6.0,
prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
version "15.7.2"
resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
...
...
@@ -6952,6 +6952,14 @@ react-lifecycles-compat@^3.0.4:
resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362"
integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
react-mixin@^3.0.5:
version "3.1.1"
resolved "https://registry.yarnpkg.com/react-mixin/-/react-mixin-3.1.1.tgz#68749756bfe32699e561372a4aeecb926db72b7f"
integrity sha512-z9fZ0aCRDjlgxLdMeWkJ9TwhmVLhQ09r8RFpin/cEPA2T6jsb7YHNWcIe0Oii+hhJNyMymdy91CSya5mRkuCkg==
dependencies:
object-assign "^4.0.1"
smart-mixin "^2.0.0"
react-native-device-info@2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-2.1.2.tgz#5c553498e8930410aa65796b83f8f8c8fb9893b4"
...
...
@@ -7020,15 +7028,17 @@ react-native-image-gallery@^2.1.5:
react-mixin "^3.0.5"
react-timer-mixin "^0.13.3"
react-native-image-pan-zoom@^2.1.8:
version "2.1.8"
resolved "https://registry.yarnpkg.com/react-native-image-pan-zoom/-/react-native-image-pan-zoom-2.1.8.tgz#2f8d8459a6f56b897b53222649e1225d8fc6e5ee"
react-native-image-pan-zoom@^2.1.9:
version "2.1.11"
resolved "https://registry.yarnpkg.com/react-native-image-pan-zoom/-/react-native-image-pan-zoom-2.1.11.tgz#61bcb69219d95e76a9797d23e4a2e8e0bd654ae9"
integrity sha512-ZCisGUFpPchHXsjT7ZI0anlSLPgcTmjRKXqpVnPu3RDWFXfKjuL4zpY57DX4Y8YgGZCpbf9fApN7KjVYody2Mw==
react-native-image-zoom-viewer@^2.2.15:
version "2.2.15"
resolved "https://registry.yarnpkg.com/react-native-image-zoom-viewer/-/react-native-image-zoom-viewer-2.2.15.tgz#186734ea25473fd1c15202a157adf53fb8fa8fb6"
version "2.2.26"
resolved "https://registry.yarnpkg.com/react-native-image-zoom-viewer/-/react-native-image-zoom-viewer-2.2.26.tgz#c6f070abb094cfbe1b3b7d8a38ad979a5facbdc5"
integrity sha512-Mh4+CJQCDcAumLFXLlDk8nQ5iMxNnupc9HwktsZ3I/v4HULcFPmTLDQ0HGAxjLa5foZRPnKDN06iKGsEb9raoA==
dependencies:
react-native-image-pan-zoom "^2.1.
8
"
react-native-image-pan-zoom "^2.1.
9
"
react-native-linear-gradient@2.5.4:
version "2.5.4"
...
...
@@ -7215,6 +7225,11 @@ react-test-renderer@16.8.6:
react-is "^16.8.6"
scheduler "^0.13.6"
react-timer-mixin@^0.13.3:
version "0.13.4"
resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.4.tgz#75a00c3c94c13abe29b43d63b4c65a88fc8264d3"
integrity sha512-4+ow23tp/Tv7hBM5Az5/Be/eKKF7DIvJ09voz5LyHGQaqqz9WV8YMs31eFvcYQs7d451LSg7kDJV70XYN/Ug/Q==
react-transform-hmr@^1.0.4:
version "1.0.4"
resolved "https://registry.yarnpkg.com/react-transform-hmr/-/react-transform-hmr-1.0.4.tgz#e1a40bd0aaefc72e8dfd7a7cda09af85066397bb"
...
...
@@ -7917,6 +7932,11 @@ slide@^1.1.5:
resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
smart-mixin@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/smart-mixin/-/smart-mixin-2.0.0.tgz#a34a1055e32a75b30d2b4e3ca323dc99cb53f437"
integrity sha1-o0oQVeMqdbMNK048oyPcmctT9Dc=
snapdragon-node@^2.0.1:
version "2.1.1"
resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
...
...
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