From 14806979b04a831308f3e87b1cb8a598e6d5908a Mon Sep 17 00:00:00 2001 From: Oleh Zasadnyy Date: Tue, 3 Jul 2018 23:09:00 +0300 Subject: [PATCH] Fix sessions to speakers binding --- scripts/redux/actions.js | 8 ++++---- scripts/schedule-webworker.js | 18 +++++++++--------- src/pages/home-page.html | 2 +- src/pages/team-page.html | 1 + 4 files changed, 15 insertions(+), 14 deletions(-) diff --git a/scripts/redux/actions.js b/scripts/redux/actions.js index f787478ea8..0260773b02 100644 --- a/scripts/redux/actions.js +++ b/scripts/redux/actions.js @@ -471,11 +471,11 @@ const scheduleActions = { sessionsList.forEach((session) => { if (Array.isArray(session.speakers)) { - session.speakers.forEach((speakerId) => { - if (Array.isArray(sessionsObjBySpeaker[speakerId])) { - sessionsObjBySpeaker[speakerId].push(session); + session.speakers.forEach((speaker) => { + if (Array.isArray(sessionsObjBySpeaker[speaker.id])) { + sessionsObjBySpeaker[speaker.id].push(session); } else { - sessionsObjBySpeaker[speakerId] = [session]; + sessionsObjBySpeaker[speaker.id] = [session]; } }); } diff --git a/scripts/schedule-webworker.js b/scripts/schedule-webworker.js index 6f5774c644..1baa38a292 100644 --- a/scripts/schedule-webworker.js +++ b/scripts/schedule-webworker.js @@ -66,11 +66,11 @@ self.addEventListener('message', ({ data }) => { const timeslotLen = day.timeslots.length; for (let timeslotsIndex = 0; timeslotsIndex < timeslotLen; timeslotsIndex++) { const timeslot = day.timeslots[timeslotsIndex]; - let innnerSessions = []; + let innerSessions = []; const sessionsLen = timeslot.sessions.length; for (let sessionIndex = 0; sessionIndex < sessionsLen; sessionIndex++) { - let subsessions = []; + let subSessions = []; const subSessionsLen = timeslot.sessions[sessionIndex].items.length; for (let subSessionIndex = 0; subSessionIndex < subSessionsLen; subSessionIndex++) { @@ -98,7 +98,7 @@ self.addEventListener('message', ({ data }) => { } scheduleTags = addTagTo(scheduleTags || [], mainTag); - const finalSubsession = Object.assign({}, subsession, { + const finalSubSession = Object.assign({}, subsession, { mainTag, id: sessionId.toString(), day: dayKey, @@ -114,13 +114,13 @@ self.addEventListener('message', ({ data }) => { })) : [], }); - subsessions.push(finalSubsession); - sessions[sessionId] = finalSubsession; + subSessions.push(finalSubSession); + sessions[sessionId] = finalSubSession; if (subsession.speakers) { speakers = Object.assign( {}, speakers, - updateSpeakersSessions(speakersRaw, subsession.speakers, finalSubsession) + updateSpeakersSessions(speakersRaw, subsession.speakers, finalSubSession) ); } } @@ -135,9 +135,9 @@ self.addEventListener('message', ({ data }) => { extensions[sessionIndex + 1] = timeslot.sessions[sessionIndex].extend; } - innnerSessions = [...innnerSessions, { + innerSessions = [...innerSessions, { gridArea: `${start} / ${end}`, - items: subsessions, + items: subSessions, }]; } @@ -150,7 +150,7 @@ self.addEventListener('message', ({ data }) => { } timeslots.push(Object.assign({}, timeslot, { - sessions: innnerSessions, + sessions: innerSessions, })); } diff --git a/src/pages/home-page.html b/src/pages/home-page.html index 6657e8d10c..687e339087 100644 --- a/src/pages/home-page.html +++ b/src/pages/home-page.html @@ -118,7 +118,7 @@ } .hero-logo { - max-width: unset; + max-width: 320px; } .info-items { diff --git a/src/pages/team-page.html b/src/pages/team-page.html index 775a04ab74..642c355395 100644 --- a/src/pages/team-page.html +++ b/src/pages/team-page.html @@ -59,6 +59,7 @@ .name { padding-left: 6px; + line-height: 1.2; } .activity {