From 02ee397d954ff2d1bade3ec3d64961c64b8a4f11 Mon Sep 17 00:00:00 2001 From: nklhrstv Date: Thu, 26 Mar 2020 17:27:40 +0200 Subject: [PATCH] redirects from ContinueWatching implemented --- src/routes/Board/Board.js | 7 +++++-- src/routes/Board/useContinueWatching.js | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js index c3eab2e76..d2186d83f 100644 --- a/src/routes/Board/Board.js +++ b/src/routes/Board/Board.js @@ -19,9 +19,12 @@ const Board = () => { const onSelect = (event) => { switch (event.value) { case 'play': { + // TODO check streams storage + window.location = `#/metadetails/${encodeURIComponent(event.dataset.type)}/${encodeURIComponent(event.dataset.id)}${event.dataset.videoId !== null ? `/${encodeURIComponent(event.dataset.videoId)}` : ''}`; break; } case 'details': { + window.location = `#/metadetails/${encodeURIComponent(event.dataset.type)}/${encodeURIComponent(event.dataset.id)}${event.dataset.videoId !== null ? `/${encodeURIComponent(event.dataset.videoId)}` : ''}`; break; } case 'dismiss': { @@ -36,9 +39,9 @@ const Board = () => { } } }; - return continueWatching.lib_items.map(({ id, ...libItem }) => ({ + return continueWatching.lib_items.map(({ id, videoId, ...libItem }) => ({ ...libItem, - dataset: { id }, + dataset: { id, videoId, type: libItem.type }, options: CONTINUE_WATCHING_OPTIONS, optionOnSelect: onSelect })); diff --git a/src/routes/Board/useContinueWatching.js b/src/routes/Board/useContinueWatching.js index 5c1980a2b..784e60a91 100644 --- a/src/routes/Board/useContinueWatching.js +++ b/src/routes/Board/useContinueWatching.js @@ -11,6 +11,7 @@ const mapContinueWatchingState = (continue_watching) => { name: lib_item.name, poster: lib_item.poster, posterShape: lib_item.posterShape, + videoId: lib_item.state.video_id, progress: lib_item.state.timeOffset > 0 && lib_item.state.duration > 0 ? lib_item.state.timeOffset / lib_item.state.duration :