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
96809f1e
Commit
96809f1e
authored
Jun 14, 2017
by
Wietse Kuipers
Browse files
Merge branch 'fix/welcome-screen-events' into 'master'
Fixed which events are loaded on the welcome screen. See merge request
!39
parents
84bbf99b
faf0c845
Changes
1
Hide whitespace changes
Inline
Side-by-side
app/components/Welcome.js
View file @
96809f1e
...
...
@@ -32,12 +32,13 @@ const eventListToSections = (eventList) => {
eventIndex
+=
1
;
const
list
=
[];
let
next
=
first
;
while
(
Moment
(
first
.
start
).
isSame
(
next
.
start
)
&&
eventIndex
<
eventList
.
length
)
{
while
(
Moment
(
first
.
start
).
isSame
(
next
.
start
,
'
day
'
)
&&
eventIndex
<
eventList
.
length
)
{
list
.
push
(
next
);
next
=
eventList
[
eventIndex
];
eventIndex
+=
1
;
}
eventLists
.
push
(
list
);
eventIndex
-=
1
;
}
return
eventLists
.
map
(
list
=>
({
...
...
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