From bf57bf993a6d389e453249bd12df62273aedb9ac Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Mon, 16 Mar 2020 15:19:12 +0200 Subject: [PATCH 01/56] not needed renderMultiselectLabelContent func removed; prev/next label added --- src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js index d830d710d..5fdd455da 100644 --- a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js +++ b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js @@ -16,9 +16,6 @@ const SeasonsBar = ({ className, seasons, season, onSelect }) => { const selected = React.useMemo(() => { return [String(season)]; }, [season]); - const renderMultiselectLabelContent = React.useMemo(() => () => ( -
Season {season}
- ), [season]); const prevNextButtonOnClick = React.useCallback((event) => { if (typeof onSelect === 'function') { const seasonIndex = seasons.indexOf(season); @@ -50,6 +47,7 @@ const SeasonsBar = ({ className, seasons, season, onSelect }) => {
{ options={options} selected={selected} disabled={false} - renderLabelContent={renderMultiselectLabelContent} onSelect={seasonOnSelect} />
From 658362154b2f78e1c580660d3deb9c2059002225 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Mon, 16 Mar 2020 15:27:46 +0200 Subject: [PATCH 02/56] SeasonsBar styles adapted to design changes --- .../VideosList/SeasonsBar/styles.less | 73 ++++++++++++++----- 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less index b70da1d3f..0281736d1 100644 --- a/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less +++ b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less @@ -1,24 +1,54 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + +:import('~stremio/common/Multiselect/styles.less') { + season-label: label; + season-icon: icon; +} + .seasons-bar-container { display: flex; flex-direction: row; overflow: visible; + background: @color-background-dark3-80; .prev-season-button, .next-season-button { flex: none; - width: 4rem; - height: 4rem; - padding: 1rem; - background-color: var(--color-surfacedarker60); + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + width: 6.5rem; + padding: 0.5rem; - &:hover, &:focus { - background-color: var(--color-surfacedarker); + &:hover { + .label { + color: @color-surface-dark1; + } + + .icon { + fill: @color-surface-dark3; + } + } + + &:focus { + outline: none; + background-color: @color-surface-light5-10; + } + + &>:first-child { + margin-right: 1rem; + } + + .label { + max-height: 1.2em; + color: @color-surface-dark3-90; } .icon { display: block; - width: 100%; - height: 100%; - fill: var(--color-surfacelighter); + width: 1.5rem; + height: 1.5rem; + fill: @color-surface-dark5; } } @@ -28,26 +58,29 @@ display: flex; align-items: center; justify-content: center; - margin: 0 1rem; - background-color: var(--color-surfacedarker60); + margin: 0 2rem; + background-color: unset; overflow: visible; &:hover, &:focus { - background-color: var(--color-surfacedarker); + background-color: @color-background-dark1; + + .season-icon { + fill: @color-surface-dark3; + } } &:global(.active) { - background-color: var(--color-surfacedark); + background-color: @color-background; } .season-label { - flex-grow: 0; - flex-shrink: 1; - flex-basis: auto; - max-height: 3.6em; - padding: 0 0.2rem; - font-size: 1.1rem; - color: var(--color-surfacelighter); + flex: none; + color: @color-surface-light5-90; + } + + .season-icon { + fill: @color-surface-dark5; } } } \ No newline at end of file From c3f7d78aeaa1561ee47f89a5e7fa325c8c73e799 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Tue, 17 Mar 2020 15:04:16 +0200 Subject: [PATCH 03/56] Stream uses PlayIconCircleCentered component; addonName removed from info-container --- .../MetaDetails/StreamsList/Stream/Stream.js | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/routes/MetaDetails/StreamsList/Stream/Stream.js b/src/routes/MetaDetails/StreamsList/Stream/Stream.js index 13cf4f04b..63acbfe14 100644 --- a/src/routes/MetaDetails/StreamsList/Stream/Stream.js +++ b/src/routes/MetaDetails/StreamsList/Stream/Stream.js @@ -2,7 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Button, Image } = require('stremio/common'); +const { Button, Image, PlayIconCircleCentered } = require('stremio/common'); const StreamPlaceholder = require('./StreamPlaceholder'); const styles = require('./styles'); @@ -11,7 +11,7 @@ const Stream = ({ className, addonName, title, thumbnail, progress, ...props }) ); diff --git a/src/routes/MetaDetails/StreamsList/styles.less b/src/routes/MetaDetails/StreamsList/styles.less index f6cc71c59..88c4389a3 100644 --- a/src/routes/MetaDetails/StreamsList/styles.less +++ b/src/routes/MetaDetails/StreamsList/styles.less @@ -1,7 +1,8 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .streams-list-container { display: flex; flex-direction: column; - background: var(--color-backgrounddark80); .streams-scroll-container { flex-grow: 0; @@ -14,20 +15,11 @@ padding: 2rem 0; font-size: 2rem; text-align: center; - color: var(--color-surfacelighter); + color: @color-surface-light5; } .stream { width: var(--item-size); - margin: 1rem 2rem; - - &:first-child { - margin-top: 2rem; - } - - &:last-child { - margin-bottom: 0; - } } } @@ -38,30 +30,28 @@ flex-direction: row; align-items: center; justify-content: center; - width: var(--item-size); - margin: 1rem 2rem 2rem 2rem; - padding: 1rem; - background-color: var(--color-signal5); + padding: 1.3rem; + background-color: @color-accent3; &:hover, &:focus { - filter: brightness(1.2); + background-color: @color-accent3-light2; } .icon { flex: none; - width: 3rem; - height: 3rem; + width: 2rem; + height: 2rem; margin-right: 1rem; - fill: var(--color-surfacelighter); + fill: @color-surface-light5; } .label { flex-grow: 0; flex-shrink: 1; flex-basis: auto; - font-size: 1.5rem; + font-size: 1.4rem; max-height: 3.6em; - color: var(--color-surfacelighter); + color: @color-surface-light5; } } } \ No newline at end of file From 07c9bfa445a7e675ddb70231a151e30fc9891a5e Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Tue, 17 Mar 2020 18:51:25 +0200 Subject: [PATCH 06/56] new color theme applied to ActionButton --- src/common/MetaPreview/ActionButton/styles.less | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/common/MetaPreview/ActionButton/styles.less b/src/common/MetaPreview/ActionButton/styles.less index 748b3a39d..c301df320 100644 --- a/src/common/MetaPreview/ActionButton/styles.less +++ b/src/common/MetaPreview/ActionButton/styles.less @@ -1,10 +1,13 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .action-button-container { display: flex; flex-direction: column; justify-content: center; + background-color: @color-surface-light5-20; &:hover, &:focus { - background-color: var(--color-surfacedarker60); + background-color: @color-accent3; } .icon-container { @@ -21,7 +24,7 @@ display: block; width: 100%; height: 100%; - fill: var(--color-surfacelighter); + fill: @color-surface-light5; } } @@ -38,7 +41,7 @@ padding: 0 0.2rem; max-height: 2.4em; text-align: center; - color: var(--color-surfacelighter); + color: @color-surface-light5-90; } } } \ No newline at end of file From 8e92119618d225a205c0315e52c337ad3c91c3bd Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Wed, 18 Mar 2020 19:31:58 +0200 Subject: [PATCH 07/56] MetaLinks focus allowed --- src/common/MetaPreview/MetaLinks/MetaLinks.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/common/MetaPreview/MetaLinks/MetaLinks.js b/src/common/MetaPreview/MetaLinks/MetaLinks.js index 0ddb3d096..586606393 100644 --- a/src/common/MetaPreview/MetaLinks/MetaLinks.js +++ b/src/common/MetaPreview/MetaLinks/MetaLinks.js @@ -9,7 +9,7 @@ const MetaLinks = ({ className, label, links }) => {
{ typeof label === 'string' && label.length > 0 ? -
{label}:
+
{label}
: null } @@ -17,9 +17,8 @@ const MetaLinks = ({ className, label, links }) => { Array.isArray(links) && links.length > 0 ?
{links.map(({ label, href }, index) => ( - ))}
From 304e640a3c1491a9aee5c09f3c9ef08aa6c11924 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Wed, 18 Mar 2020 19:32:40 +0200 Subject: [PATCH 08/56] MetaLinks styles adapted to design changes --- src/common/MetaPreview/MetaLinks/styles.less | 21 +++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/common/MetaPreview/MetaLinks/styles.less b/src/common/MetaPreview/MetaLinks/styles.less index 1a9ded8ba..5d1c7b25c 100644 --- a/src/common/MetaPreview/MetaLinks/styles.less +++ b/src/common/MetaPreview/MetaLinks/styles.less @@ -1,8 +1,10 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .meta-links-container { .label-container { margin-bottom: 0.2rem; - font-size: 1.2rem; - color: var(--color-surfacelighter); + text-transform: uppercase; + color: @color-surface-dark3-90; } .links-container { @@ -16,12 +18,21 @@ flex-basis: auto; margin-right: 0.5rem; margin-bottom: 0.2rem; + padding: 0.3rem 0.5rem; white-space: nowrap; text-overflow: ellipsis; - color: var(--color-surfacelighter); + border-radius: 2rem; + border: var(--focus-outline-size) solid transparent; + color: @color-surface-light2-90; + background-color: @color-surface-light5-20; - &:hover { - text-decoration: underline; + &:hover, &:focus { + background-color: @color-surface-light5-30; + } + + &:focus { + outline: none; + border-color: @color-surface-light5; } } } From e08fe92336c51059714679d82a08023eb0cbc6bc Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Fri, 20 Mar 2020 11:21:40 +0200 Subject: [PATCH 09/56] Video styles adapted to design changes --- .../MetaDetails/VideosList/Video/Video.js | 43 +++--- .../MetaDetails/VideosList/Video/styles.less | 122 +++++++++--------- 2 files changed, 86 insertions(+), 79 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/Video/Video.js b/src/routes/MetaDetails/VideosList/Video/Video.js index 4b13e30e6..db9af6e97 100644 --- a/src/routes/MetaDetails/VideosList/Video/Video.js +++ b/src/routes/MetaDetails/VideosList/Video/Video.js @@ -34,31 +34,32 @@ const Video = ({ className, id, title, thumbnail, episode, released, upcoming, w
{ released instanceof Date && !isNaN(released.getTime()) ? -
- {released.toLocaleString(undefined, { year: '2-digit', month: 'short', day: 'numeric' })} +
+
+ {released.toLocaleString(undefined, { year: '2-digit', month: 'short', day: 'numeric' })} +
+
+ { + upcoming ? +
+
Upcoming
+
+ : + null + } + { + watched ? +
+
Watched
+
+ : + null + } +
: null } - { - upcoming ? -
-
Upcoming
-
- : - null - } - { - watched ? -
-
Watched
-
- : - null - } -
-
-
{ progress !== null && !isNaN(progress) && progress > 0 ? diff --git a/src/routes/MetaDetails/VideosList/Video/styles.less b/src/routes/MetaDetails/VideosList/Video/styles.less index 8d9e5b855..a190a03cb 100644 --- a/src/routes/MetaDetails/VideosList/Video/styles.less +++ b/src/routes/MetaDetails/VideosList/Video/styles.less @@ -1,11 +1,13 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .video-container { display: flex; flex-direction: row; flex-wrap: wrap; - background-color: var(--color-surfacedarker60); + background-color: @color-background-dark3-80; &:hover, &:focus { - background-color: var(--color-surfacedarker); + background-color: @color-background; } .thumbnail-container { @@ -16,7 +18,7 @@ .thumbnail { display: block; width: 5rem; - max-height: 10rem; + height: 5rem; object-fit: contain; object-position: center; } @@ -25,7 +27,7 @@ display: block; width: 5rem; height: 5rem; - fill: var(--color-surfacelight20); + fill: @color-secondaryvariant1-light3; } } @@ -33,69 +35,73 @@ flex: 1; align-self: stretch; display: flex; - flex-direction: row; - flex-wrap: wrap; - align-content: flex-start; + flex-direction: column; + justify-content: space-between; padding: 0.5rem; &:first-child { - align-content: center; - } + height: 4rem; - .title-container { - flex-grow: 0; - flex-shrink: 0; - flex-basis: 100%; - max-height: 4.8em; - color: var(--color-surfacelighter); - } - - .released-container { - flex-grow: 0; - flex-shrink: 0; - flex-basis: 100%; - margin-top: 0.5rem; - font-size: 0.8rem; - max-height: 2.4em; - color: var(--color-surfacelight); - } - - .watched-container, .upcoming-container { - flex: none; - max-width: 100%; - margin-top: 0.5rem; - margin-right: 0.5rem; - padding: 0.2rem 0.4rem; - - .flag-label { - max-height: 2.4em; - font-size: 0.8rem; - font-weight: 700; - text-transform: uppercase; - color: var(--color-surfacelighter); - text-shadow: 1px 1px var(--color-surfacedarker60); + .title-container { + max-height: 1.2em; } } - .upcoming-container { - background-color: var(--color-signal5); + .title-container { + max-height: 2.4em; + color: @color-surface-light5-90; } - .watched-container { - background-color: var(--color-primarylight); - } - } + .released-info-container { + display: flex; + flex-direction: row; + align-items: center; + margin-top: 0.5rem; - .next-icon-container { - flex: none; - align-self: center; - padding: 0.5rem; + .released-container { + flex: 1; + margin-right: 0.5rem; + font-size: 0.8rem; + white-space: nowrap; + text-overflow: ellipsis; + text-transform: uppercase; + color: @color-surface-dark5; + } - .next-icon { - display: block; - width: 1rem; - height: 1.5rem; - fill: var(--color-surfacelighter); + .upcoming-watched-container { + display: flex; + flex-direction: row; + + &>:nth-child(2) { + margin-left: 0.5rem; + } + + .upcoming-container, .watched-container { + padding: 0.2rem 0.4rem; + max-width: 10rem; + + &:not(:only-child) { + max-width: 5rem; + } + + .flag-label { + font-size: 0.8rem; + font-weight: 500; + white-space: nowrap; + text-overflow: ellipsis; + text-transform: uppercase; + color: @color-background; + } + } + + .upcoming-container { + background-color: @color-accent4; + } + + .watched-container { + background-color: @color-accent5; + } + } } } @@ -103,11 +109,11 @@ flex-grow: 0; flex-shrink: 0; flex-basis: 100%; - background-color: var(--color-backgroundlighter); + background-color: @color-background-light2; .progress-bar { height: 0.5rem; - background-color: var(--color-primary); + background-color: @color-primaryvariant1; } } } \ No newline at end of file From 43718197e4eef5b6e46492d31796ef25aa587977 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Mon, 23 Mar 2020 13:17:22 +0200 Subject: [PATCH 10/56] search added to VideosList --- .../MetaDetails/VideosList/VideosList.js | 40 +++++++++++++++---- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index d7e04b78a..88990d005 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -1,6 +1,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); +const Icon = require('stremio-icons/dom'); +const TextInput = require('stremio/common/TextInput'); const SeasonsBar = require('./SeasonsBar'); const Video = require('./Video'); const useSelectableSeasons = require('./useSelectableSeasons'); @@ -17,6 +19,10 @@ const VideosList = ({ className, metaResource }) => { const seasonOnSelect = React.useCallback((event) => { selectSeason(event.value); }, []); + const [search, setSearch] = React.useState(''); + const searchInputOnChange = React.useCallback((event) => { + setSearch(event.currentTarget.value); + }, []); return (
{ @@ -49,14 +55,34 @@ const VideosList = ({ className, metaResource }) => { : null } -
- {videosForSeason.map((video, index) => ( -
+
+ {videosForSeason + .filter((video) => { + return search.length === 0 || + ( + (typeof video.title === 'string' && video.title.toLowerCase().includes(search.toLowerCase())) || + (video.released.toLocaleString(undefined, { year: '2-digit', month: 'short', day: 'numeric' }).toLowerCase().includes(search.toLowerCase())) + ); + }) + .map((video, index) => ( +
} From 65d584d4dc4d81fb544854caebab6a1ca2eaa885 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Mon, 23 Mar 2020 13:17:57 +0200 Subject: [PATCH 11/56] VideosList styles adapted to design changes --- src/routes/MetaDetails/VideosList/styles.less | 75 ++++++++++++++----- 1 file changed, 55 insertions(+), 20 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/styles.less b/src/routes/MetaDetails/VideosList/styles.less index 6311956c7..b337e5477 100644 --- a/src/routes/MetaDetails/VideosList/styles.less +++ b/src/routes/MetaDetails/VideosList/styles.less @@ -1,18 +1,70 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .videos-list-container { display: flex; flex-direction: column; - background: var(--color-backgrounddark80); .seasons-bar, .message-label { flex: none; width: var(--item-size); - margin: 2rem 2rem 1rem 2rem; + padding: 1rem 0; } .message-label { font-size: 1.4rem; text-align: center; - color: var(--color-surfacelighter); + color: @color-surface-light5; + } + + .search-container { + padding: 0 1.5rem 1rem 1.5rem; + background-color: @color-background-dark3-80; + + &:first-child { + padding-top: 1rem; + } + + .search-bar-container { + display: flex; + flex-direction: row; + align-items: center; + width: calc(var(--item-size) - 3rem); + height: 3.5rem; + padding: 0 1rem; + border-radius: 2.3rem; + border: var(--focus-outline-size) solid transparent; + background-color: @color-background-dark1; + cursor: text; + + &:hover, &:focus-within { + background-color: @color-background; + } + + &:focus-within { + border: var(--focus-outline-size) solid @color-surface-light5; + } + + .search-input { + flex: 1; + margin-right: 1rem; + font-size: 1.1rem; + color: @color-surface-light5; + + &::placeholder { + max-height: 1.2em; + opacity: 1; + color: @color-secondaryvariant1-light1-90; + } + } + + .icon { + flex: none; + width: 1.5rem; + height: 1.5rem; + fill: @color-secondaryvariant1; + } + + } } .videos-scroll-container { @@ -20,25 +72,8 @@ align-self: stretch; overflow-y: auto; - &:first-child { - .video { - &:first-child { - margin-top: 2rem; - } - } - } - .video { width: var(--item-size); - margin: 1rem 2rem; - - &:first-child { - margin-top: 0; - } - - &:last-child { - margin-bottom: 2rem; - } } } } \ No newline at end of file From e1aafa149a13fd4b43fb378ef15743f88ad97feb Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Mon, 23 Mar 2020 13:18:22 +0200 Subject: [PATCH 12/56] SeasonsBar prev/next button focus fixed --- src/routes/MetaDetails/VideosList/SeasonsBar/styles.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less index 0281736d1..f765e4c42 100644 --- a/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less +++ b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less @@ -20,7 +20,7 @@ width: 6.5rem; padding: 0.5rem; - &:hover { + &:hover, &:focus { .label { color: @color-surface-dark1; } From 32090b4f5ee97a643a602baf27c0575bb187439c Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Tue, 24 Mar 2020 10:46:08 +0200 Subject: [PATCH 13/56] MetaDetails styles adapted to design changes --- src/routes/MetaDetails/styles.less | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/routes/MetaDetails/styles.less b/src/routes/MetaDetails/styles.less index 4bdea39ca..481af6738 100644 --- a/src/routes/MetaDetails/styles.less +++ b/src/routes/MetaDetails/styles.less @@ -1,9 +1,11 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .metadetails-container { display: flex; flex-direction: column; width: 100%; height: 100%; - background-color: var(--color-background); + background-color: @color-background-dark2; .nav-bar { flex: none; @@ -30,9 +32,9 @@ display: block; width: 100%; height: 100%; + opacity: 0.2; object-fit: cover; object-position: top left; - filter: brightness(50%); } } @@ -42,7 +44,7 @@ } .videos-list, .streams-list { - --item-size: 28rem; + --item-size: 26.5rem; flex-grow: 0; flex-shrink: 0; flex-basis: auto; From 8b5f5804428041624b339dee3a4a7770c4baf82f Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Tue, 24 Mar 2020 13:29:49 +0200 Subject: [PATCH 14/56] MetaPreview imdb button uses Button component instead of ActionButton --- src/common/MetaPreview/MetaPreview.js | 34 +++++++++++++++------------ 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/src/common/MetaPreview/MetaPreview.js b/src/common/MetaPreview/MetaPreview.js index 0aca83e9a..2b2d5851b 100644 --- a/src/common/MetaPreview/MetaPreview.js +++ b/src/common/MetaPreview/MetaPreview.js @@ -3,6 +3,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const UrlUtils = require('url'); const Icon = require('stremio-icons/dom'); +const Button = require('stremio/common/Button'); const Image = require('stremio/common/Image'); const ModalDialog = require('stremio/common/ModalDialog'); const SharePrompt = require('stremio/common/SharePrompt'); @@ -102,8 +103,14 @@ const MetaPreview = ({ className, compact, name, logo, background, runtime, rele null } { - (typeof releaseInfo === 'string' && releaseInfo.length > 0) || (released instanceof Date && !isNaN(released.getTime())) || (typeof runtime === 'string' && runtime.length > 0) ? + (typeof releaseInfo === 'string' && releaseInfo.length > 0) || (released instanceof Date && !isNaN(released.getTime())) || (typeof runtime === 'string' && runtime.length > 0) || typeof linksGroups[IMDB_LINK_CATEGORY] === 'object' ?
+ { + typeof runtime === 'string' && runtime.length > 0 ? +
{runtime}
+ : + null + } { typeof releaseInfo === 'string' && releaseInfo.length > 0 ?
{releaseInfo}
@@ -114,8 +121,17 @@ const MetaPreview = ({ className, compact, name, logo, background, runtime, rele null } { - typeof runtime === 'string' && runtime.length > 0 ? -
{runtime}
+ typeof linksGroups[IMDB_LINK_CATEGORY] === 'object' ? + : null } @@ -178,18 +194,6 @@ const MetaPreview = ({ className, compact, name, logo, background, runtime, rele : null } - { - typeof linksGroups[IMDB_LINK_CATEGORY] === 'object' ? - - : - null - } { !compact && typeof linksGroups[SHARE_LINK_CATEGORY] === 'object' ? From 18413fbaa850e09264ee36a2fb7453a7c3ff6988 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Tue, 24 Mar 2020 14:12:24 +0200 Subject: [PATCH 15/56] MetaPreview styles adapted to design changes --- src/common/MetaPreview/styles.less | 67 +++++++++++++++++++++++++----- 1 file changed, 57 insertions(+), 10 deletions(-) diff --git a/src/common/MetaPreview/styles.less b/src/common/MetaPreview/styles.less index c17afc0cc..f1756c05b 100644 --- a/src/common/MetaPreview/styles.less +++ b/src/common/MetaPreview/styles.less @@ -1,3 +1,5 @@ +@import (reference) '~stremio-colors/dist/less/stremio-colors.less'; + .meta-preview-container { position: relative; z-index: 0; @@ -50,7 +52,8 @@ .meta-info-container { flex: 1; align-self: stretch; - padding: 0 1rem; + width: 32.5rem; + padding: 0 2rem; overflow-y: auto; .logo, .logo-placeholder-icon { @@ -74,6 +77,7 @@ .runtime-release-info-container { display: flex; flex-direction: row; + align-items: center; flex-wrap: wrap; margin-top: 1rem; @@ -81,22 +85,61 @@ flex-grow: 0; flex-shrink: 1; flex-basis: auto; - margin: 1rem 1rem 1rem 0; - font-size: 1.2rem; - text-align: center; - color: var(--color-surfacelighter); + margin-right: 2rem; + margin-bottom: 0.5rem; + font-size: 1.4rem; + color: @color-surface-light5-90; + } + + .imdb-button-container { + display: flex; + flex-direction: row; + align-items: center; + margin-bottom: 0.5rem; + padding: 0.3rem 1rem; + border-radius: 2.3rem; + border: var(--focus-outline-size) solid transparent; + background-color: @color-surface-light5-20; + + &:hover, &:focus-within { + background-color: @color-surface-light5-30; + } + + &:focus-within { + outline: none; + border: var(--focus-outline-size) solid @color-surface-light5; + } + + .icon { + flex: none; + width: 3rem; + margin-right: 1rem; + fill: @color-surface-dark2; + } + + .label { + flex-grow: 0; + flex-shrink: 1; + flex-basis: auto; + max-height: 1.2em; + font-size: 1.6rem; + font-weight: 500; + color: @color-surface-light5-90; + } } } .name-container { margin-top: 1rem; - font-size: 1.4rem; - color: var(--color-surfacelighter); + font-size: 1.7rem; + color: @color-surface-light5-90; } .description-container { + max-height: 6.8em; margin-top: 1rem; - color: var(--color-surfacelighter); + line-height: 1.7em; + color: @color-surface-light5-90; } .meta-links { @@ -110,13 +153,17 @@ display: flex; flex-direction: row; flex-wrap: wrap; - padding: 0 1rem; + padding: 0 2rem; .action-button { flex: none; width: 6rem; height: 6rem; - margin: 1rem 0; + margin: 2rem 0; + + &:not(:last-child) { + margin-right: 1.5rem; + } } } } From d993db6127948d170bad39dec1cb9542c8f822b5 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Wed, 25 Mar 2020 14:39:29 +0200 Subject: [PATCH 16/56] meta_details_cat image added --- images/meta_details_cat.png | Bin 0 -> 10018 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 images/meta_details_cat.png diff --git a/images/meta_details_cat.png b/images/meta_details_cat.png new file mode 100644 index 0000000000000000000000000000000000000000..f16d1a43b09422fdefb535b6db8e3cb8bab217e4 GIT binary patch literal 10018 zcmV+-C*9bIP)%M?_FjP%G-Kkf5#A z_TOF?z*elqrB)K$Z?*Q;lE7`>so4)lUXHp_Y&^n#`r z1F|{L3mVxh>ut~rnqCaZ=0GoKWV5WdK`&@}F(8`*y`YiJvfc*0py|bcY!38-MmEcO z8}x#v7Xz|6&S^-q=+7W^eHGw!BN zpZe>;ERD)^Mi7K?4=x;A-A!b~WLQOlrlhRqZ=9okSyBE2F`1tO6Q4tCqJ!n`*lo}GdkmXy|1f?)!Y#2u=Omo3iSqagBRk)lk{ zl-0Zq;76QuBNK4>(nSUPWX(!pl~kMf7ze;z)y0|D~#lj z4|6*WsJ(yU&WKrJLj4|F*80(_*t+%-9sA+El z12Q~m=L`$r;I}fc+NDML_xGfEDF!sewBoXw55UsrA2uk^dtrs zm)4XshMB%Ja}F>DSfT0jaN(G9J!wvg0u3>)q_p~V4&*V$asx23MXkog_y0KmNKat$ zvt@e**df#fqLuV416sk^i;OuAE-5T1>j`rr8Wjhcm9HJhVQNb`1I7eoBF6zkd!I{J z{4B?)bS4*<);!7>9t%zq*c zfkv+4`48Pu5YX5R*FIjKuloBpeYmx~L2Ca!ZCgQkpjll#g$Z~EU|CX_&VgOa3iHK1 z9i^1w(wbi|hX0XD4+oxJR+#@Asr9?Np5j153@ItAp)G?{>CEB#I7cG@fiWfkTmWYR zXJFu5aQ!>ySOU9~%_rKKeij5BH?7EZ0j{}ca9O-r*6A2r;PoRUmi z8x))t`v90uI-P-Qa^U!~!u*gnT(o1vvb|D4(`DNQ4QCo)G#FttnDEV4Ux(!F1zCNN zGoU{P4H=At#DrL`1KBoLEL~LKxv3f3{$tqNe>`Z2mzH)5Hf`7ltJM~iwW(=om^^)Q z?7`A8BIo>>Wkm%`Vz{<(>q>E;dHSuxX)2SUDQ+_k(DC7K55Z!wp-=V&s6Bcd$B!O& z*HUXVqIA*elQ8(gK}bqYiVJByNku6RG@(N8aak>&PD$!~w)ImqH+5!WOrJFa=^5#9 zAD%gc%a$x2TNU?#q8vbRpjoxLW;7QN+PH{v(o&j#z3%`HA3Ow`)rvk@eK2{(6e-Q3 ztiwu{7UnIBvXi(sR~%?ouGu?Y;9S`ZOZCS^jGoQcf7!-F!K4CR)lW=Y1csqH+>hDMyPKkV+W`CKPWo`a-h?rflB~0gjKueO(A3Cy!L2{`h{F4bf*y5^!>cPeAs-T=!yzqk%qe zZ9It+hbmEDyH5m6v_+kmRADu@mfG$1^%WHrU25A&rCo8LDK6VPmx2E)*aVEN=Wt-x zKhaPZJZ+f1#p;B>;S-z1BrbHYqSk2fgYok*a75^Mq19r-fvWW)aD(@ih?LBMK|eRO zo`cyK7#E!LCV;Kjym`|LQWvwU>M0L2rPa4H#{M3N0VG|jK6)88tJ(c=_Mlv3_8kEN zN@l+iviL>-BqOtz47nn%u&^-V(Vhzz79 zB_K690WED79IS1|{zHvuw>l(&dRO_Yx1T-v?XMX_0X5*9uiL!2{6{aq+apvZM-u<(f%@ke%uI1$K^b@OTThRGoB#hm7j&A3Q4p zhYaOuH!b%f6~{SL+Y)wJIq;ih zh51j3Mu4@1UGmCUvo z6Z+%QF?~YTZ@1X-an&j8KkPJQ>kd_6|Bg4rzbDMP*9)M#EB=ZzwfjLTY36NDiFHzw zG$_1&BoY%;Vd>gleFodB>%-LJpD!&exPmIpoH=U`NgU2`bo1s-L&FZx1r?MBnzEYL z7;vZO-1mO=I!+$hB}$o@xB3a8pll*laqH}1lGsSVDf`z!x5U}F)`?qEgCh!NyZhMs z?vtVv8a#Rm#!L{8W{G3aSW=4bIKkSe1$EB-3okl#<(0FF1Ocm^_4thP^70BP##}rZ*i>@Dqv}8@Vs_xHgPaE*&N6wt}@;4ra&C)K$ zPw2;0>JC+cj$b*!GzYoEGjPqM;2u(-!AV7}+j1--M6sL+x1kF|eUi!!N?e_iFhvLbIL8+KOLw>fwpWitkN}EsD7sJpJSdDPb zF`~c;8Y${85S^>m>`RBOlM}hO- z-`scvwe^Oe^l`vqH22A%Qx`L5Ue(ALO9y&E6OduWrPU`GV>zB5Zhmt)Y!t;a?G4G zMz$KHAm2-`?+-TxGJVf3S(KkWYu43bRIt|&4#2XKvc35L_q$rm1)7Y$!*SWwKbOF4 zXYAzen@3Bk>#9TsFi8NH;q6jEo}JK6_O|z&ZvW^B^N@GxOcdTQDxiuAHn_A{jkERf zgWGTZdgnXuIRCHL<@Vz#9hBqT@uBYrhpIQ?aLq?Z$ryl%bEV&?Cf67yJEOX~+8s#D z{o!o^H!fY#X_tzk;30WYQc6RkS(Ii{OYOm(Yroq0_Cl&}vss5$R8$<5+BRPG6y-gw zDyuH!V1A+U`r~`uHioad2*;RU-i>d&FTOsDEmf!Biuls!S1x!W;NF&}ikfis&&7Nk zDXupGX2Ykopx;uPQ4-!?QZ;_*tJllGJ zcx!q2rs)#aH11Ut1)Acrnim=H%RsYs*%@-8!k+!mLXI7gi9!9G;eHC|Qv`V5q4VzD zXP50npHG?pF!U+G4|yJ{{t$<2oJX}Uo?axTMYsyZZL%|U&?cyG=DaCnJSNl%JHh#6 zM=A)vzr4Ks`M4uO!T^c_O-WhJI&ePEbt>MI{;#Xni5?9lNs-s$N|lr_M@dyYRiG3v z%~RTtZ8LH1gU|#?{E|dKfJ!G0S7G0F=f=~j(F`y|~Q=P;e>@Z{K8;HrCszXk^ zM#_Rw-#b2dR{TcOrs&l9(m?5H+vE(JfV@e8leVPL5K6jc4IE>Az4XNxpU#VvDg}Us zE;2l3+*icGe;*7muIahdM=Yfc<f>EDM|g*iUqlr$d@}dExT3Hl$7ngk#omN#@I;rbUN-83np!LY=G(;VD8AF&SNOP zw9u)`5u-Zuk!g`DH~x?4O;Mrr&mm(XJ10eHq`SBL)u}2qiI{rRZ~bf~4sK&$&!}`6 zk3Fzpkn_w=7nUvuP4U|5OJHYjGlqcKQ6U74n=P)SEcypZ$;_L0tE}`-XD;xY?xQaR z7}{fUfsYQ#d0qzKyynb#8>g#Gnm!p>*`2qc_yUJ)98y{U;b@c-sT?(4w)nAQdf^{ti^Nwzb*MYFfo%ei%|Jry0hia3$${9Xh zJhv3gRVELK7RK{18>uAP$@Y|1hBgDXY}z88uB74%8oE7VN`MoWzQ7^d>%xnsiOFNG z#B<-7QF0m4MV^xDltm|Cyf*tgXyFZvu|oj9h61oyA3qOtM~VVV0)f{ z-RfeT6x9?6MU)7B{J^%5hu}QHl09&&pL7Y-F9D}w(-t>q(lbH>#-nKwaPAvJB^A-yOr3m0vNk9)E(cA?>V3Cy!M>J(sl$_}j2dL$WMyY# zY(bz))Zb9fNyU1M?gveW z3l}1O1W4*#L?vLE>ou7S3Ti zygNx=0=EOgEtHHNPrBj`nw6`ouMilvfidZ)*5Wy1iG6Ee!p4m|(9+y_jhaTI#%;Gu zL#s{3ZM71|3tLSRXaF%<%rJZDqJpq@{Dd7dNQJn9hIX#uU|&nQvK|td66r+cw9`0R zk*+i1f7fpJYqn?sJxQg;Idgj4Zu$&FYbaybw?4i7sZyyX#w$`BU(l4*{29PcD<+F)^t-Ug`DXEN4UW`;6^n;T&n=ZWlemHA znX)~j>|FR-svW~Y*NMlC9Et1zHom_RCZn{cqbN4nQrix`a4;^p>{6-KyQN+{UaE-;Xq+39wr>OJT7cDnp`C$i z0d{$}a5BiCzPsDuXbZM+8LnNVpNpIA9dBQXe{y^T#$I9$_&xc<84?)y0Du{m7UlUr zyc#JH@k;kBDXV#$b6gGqm5iefjGttJ`tXB4zUXUuiK2LQ^&AN7RR#=>g7%mlO6$krOSLD`o z8EC{HpTH>a(Pd*wUj2@Wl;*i%z4T|lFP?A-h76T|agtoR{A|OZOyqV3_4Fl$xt~Tm zMyU2(vVh@&e6bcZ$w>)F(su@+`(|}sO5|dOUav;7-v3mH`1X@A_+>-X-e54}#K}es z9X=E)Rp;f5^$nf&sMYGg`KI`!?}qj?`C0Bz=Pg^Ddpcgg=_=3!wPWPE+I_Q}CnQ}! z$nN8OUmz(-0|JW@OPj$0L&tr^XU;lfKrVnaHk)Cw(3L#$3q8fiIIrfw0I<#%?ikpX zrGB&gXYy&cWGJ@6LyfB&4DkNL)b0|>>DfWm#Kh&hMP-L5HMU4AtPOj z1PNEJM#qlsX-%MMY%-(GXo1ma6D3qrvl#@oP=#~sTvn9-!>*<}?w|=ap^~!dH2_;k zK*;Wsgv@juNNRka!6A2XU0@>V6c9+9TMb9^wcq>9y++Q{%?8XrQrq}y)&=?mC8-qd zaKO=VcFDECf+i76P)UW8xIn&0+*%{_J zz~?hyTr>m+YRm05IBd@2CJv9sHaPto?@XU1KoBruSqM-BEO%i7n7Y#l7c|bBKLxc0 zOcnbKSF^=-RF|MBRdKA(PG);zIk#Ya#SJv4O#DL5F^_Xz6fIC(5`a5wAb_~Q5DyT< zo9S%^1EA7?2`Xr`Itb!#JrZ#;A{l~4S|P1M1T^(q;-0S5tMaIU@!F7v6x?r zA2ZMpSh$`44h)iSYZ4`h#nb^33+(OjiEBi_@VGUhD`_njc^5xulT$?iCF+xrn3O6{ zB5_nO6?-g};E5VEWY`*wj_0IG76JwVgZTPX!~+}zv@YsYclNXa7UlbDQRn}L365&7jecro|N(D0~xF~Q!DJomj7s= zcyfj$3`v@J6#`IFMi!DYv!PD#@aTL7WSlMTpX`5&s#Lln0!=8uh+t`J5&_d&yg3kw zJrgMplQXiAlGQ&bc%lK0Y|x0Vw1fM-5n(vfV7J@R*ckmo@6qs=?4ACj3j8Ea zPLd!S1F{-?x%2Ry{qlys=1DxMBWr8di`{4#*p+R`V`^$@0s*JHOKNrw(y}|BRwR1V zoLww;`#~0Hc7D8X-QdeFn%4^&>C4}pYRQ+%K%hCib>F5b*XCa>eMT};FAr`wn0Uh4 z*fi>@@m_E5^{S`f?54;sc}z+u!PL{Pzi&0%@Y5Oosf{6smMm$uuB*HijJ?q}cL-AZ zd%tr{_KdaZOs^sA!RUC$WaI#mBFGs7hx!@94Tn$T$o2zBNKs9@?#I)%N$pcQXx59* zsokK_CE~(KWBvN?b-6oPVlWtBGAUypEtJc>=e?b1Z!;r7tKN29(bQ=%1x@wF>ZB%< zr4bBbqDWd!A7oz?I1B$jIk-o$7*ap2e|UheR7DP@yySX$jEJSUe-_eKz4i^UtdLI7isC z*Ccf^hW3X(BSrETt|um8QIL+nA~%srGE)Lnj3x=I<#ZEH>^&Axy7&&I(`i=DDV*}_ zaI}U6&DQmml>n3c77c+XrGKVm$>U2PC1z2Yr_$0rNexk&X0!=Zp%%n5-BX>Y6;nSW zP4^^s`s|TTPDgS-N)U=T z&sFT%GqD_YJ7|NHP8q~Iv7A&70fnSWtZWt+FetH{03m2J;)^S>NGvxrwuwM#Jl+sg z4TS$TtE~Jz2-LWu)mBP+-QcC z+?EX4mii{N);FWEt^v08*v5oZ8db{;cTG!+2sB&Xs~jf?Y`5guL|BnPq{~P}Lb4XR zj1(j$>%+S65f0VknvsiaJl}?v`bHR=jA*TIj5$aGF-4c8zI4vQsX;I532M_+tgk9& zz|!vEG^sOy@ZgZ@#u@ z>Q%w|3J#iem9>nqfw3SWmVJT`uGk4nD z(CEw)q#Z=5X|EDv8-rEuoG!^TGg1VxvOH#SU zN+e*ZybtlaBv>T$xFmvSTW)uty|r^2fh302yA&{&L36)xlhYCQO$PAe&-@<8>W+y$cuJE%fO_pWSv3#*OK`#I*KQEou%_eL2jrh!bQ;NbgAnY zWApy-ND0Q}l9uWj#aHF%b$Yz?)bk>6mOcKkTTQuUb8q3@UeYJpSyC>!#b`m{1B<=7 z8rW|jmf!32+V*_C2d}=-ndI*asAy@3cYCYdf}*9jf^)|@lc`mF+=@VxuGgoD>FJ|K zjKOnHycBObV%C2k<95-4JCLN)=9WRsk000KfNkl&{KqpSuVL<qt+oSVW+3LX#OJn@ZyO9)zPR6M}drAli8?v&*{{;Iz0W#V>o-B zk{kjSZZtLvAwlD6_T%|Qm^1Zy2#}|mn82V?F$gM>M)WtSHzrCZA&xJbEPd=@96#X< z@C7OZ`VPdsx8D=-A_lTkp1ki#>^ZQ<3rw!D$@pC~zfiFf#?Ec{%bPD_TjiFp-*Ka{ znFUo(zO8AI7vFL>ri`BfjVd-TxCtsIX4DDf#4!#g{w708{Hx<{`o#iDEiy<+jX1;~ z2e{q&x39-SU6E=aX+Yn6&lpNrE(NF%sDF|sJ9h8z@|1j=&YeCN*Ugw4$&hhrW3igC zdFMv_ZCx4YnzwL;bGkvLSx<)W3V{7CTm#R~XHA)d>t@VHpY*;uqMMA* z!uf>}OBP?=P_T}qjk&$^*z?2pEXUg)zUAjB`L^{`Wpa2PySf}_8c*Y$58uS6RrJ<| zbQ^+m$5xZ6b$Ul|FYPE}kp1kdHZc)5UvoPqT{;zMNylfoYzQps2e9JK=x7JH_jmV%?1Jp7NA7(jW@^%NFq^}QlV|Gi#lA{>v~2@gd`^lw zZ5DabrK5i@z<7bCqe8k)m$oiY+$LIv4jwoZ^er1bEEm}q^n+HTi?&O}wGRfG%=Apr z04GB@78{lv90pS>PMtl81Bdrx^JgES;oKQNeh^Stba9U+hok*^iUNCf9?%NX=~C}w zjID@9T}fHd3Hg^JcT_%x4IYlH%zjALCHH8FKjgmVQ)k#$g@w*xnsR+gVJ}fP^NRbUY~j&!0wATczlVPG=2((4Hq&q~u-4a-~nM|$p_C?S@mz3_)b-L6d0#76!R=CN^`8+|BfMJ72 zV%VTz$mu%}WPB&-lcCeuF(DBeO#%|s38KV`QZ&mU&CAeqa1N{83ahmp=5`ZW zjV)+18PMEv9*s>+XgFVwGiOiZWc^8;YYG~Dl`uXB=guXJ0w}ZrYXcmgg#(L=ASs}6 z6R+2&%;%gHQSOa|87ZPlR%SNnCp9GJvJp-I-hiuwtK;oi{_L4Z~8_ed` zpU9zA7HB*=PSK$e^+WA`tP5-1=wL((G_%i%pAr|RKHIpZzp8{+w z!1}ok-Z|aBh_s>-Ry8UbeCHl3^%97v4v;he{BygVzu^kVMKuAR#xVztFL7F}b~0n? z1%NP_F*dZr6Z0C^n~A;~XK^Pn3VsHr)is}Zg2RL8CeHbHobxXMYpHKcC5p)fZQ3m> zLO=r4(-~t|0c;e&QhMr9;CL)b5D7w8OEdxeTL3#aw|>wS00~4(w}2)Xqn%PoH69Qs zlQ4q-#TcW|G3|*diq<%Qg~V1f=bXSnz-R;Mn2un`4h!h)z(^bcBwBeJr&@ z?YZWtB!G!P@NjX@0{n#Y{~h9k>UKLj6%V^34xn~-*`q)c2_tm65*0cKY8dXg}($F$^ZZW07*qoM6N<$f|lN7e*gdg literal 0 HcmV?d00001 From 521146e72234aec8cbdc7861ad88811208fdbd6c Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Wed, 25 Mar 2020 15:34:44 +0200 Subject: [PATCH 17/56] VideosList message container styled --- .../MetaDetails/VideosList/VideosList.js | 6 +++-- src/routes/MetaDetails/VideosList/styles.less | 27 +++++++++++++++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index 88990d005..6db7c5ee3 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -2,6 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); +const Image = require('stremio/common/Image'); const TextInput = require('stremio/common/TextInput'); const SeasonsBar = require('./SeasonsBar'); const Video = require('./Video'); @@ -39,8 +40,9 @@ const VideosList = ({ className, metaResource }) => { : metaResource.content.type === 'Err' || videosForSeason.length === 0 ? -
- No videos found for this meta +
+ +
No videos found for this meta
: diff --git a/src/routes/MetaDetails/VideosList/styles.less b/src/routes/MetaDetails/VideosList/styles.less index b337e5477..dc637da58 100644 --- a/src/routes/MetaDetails/VideosList/styles.less +++ b/src/routes/MetaDetails/VideosList/styles.less @@ -4,16 +4,33 @@ display: flex; flex-direction: column; - .seasons-bar, .message-label { + .seasons-bar, .message-container { flex: none; width: var(--item-size); + } + + .seasons-bar { padding: 1rem 0; } - .message-label { - font-size: 1.4rem; - text-align: center; - color: @color-surface-light5; + .message-container { + display: flex; + flex-direction: column; + align-items: center; + height: 100%; + padding: 2rem; + background-color: @color-background-dark3-80; + + .image { + flex: none; + margin-bottom: 1rem; + } + + .label { + font-size: 1.4rem; + text-align: center; + color: @color-surface-light5; + } } .search-container { From 17aca739900f90461c11f03242cb52a0c3bf9e31 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Wed, 25 Mar 2020 18:12:34 +0200 Subject: [PATCH 18/56] StreamsList message container styled --- .../MetaDetails/StreamsList/StreamsList.js | 15 +++++--- .../MetaDetails/StreamsList/styles.less | 35 ++++++++++++++++--- 2 files changed, 41 insertions(+), 9 deletions(-) diff --git a/src/routes/MetaDetails/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js index 3d10a9518..d3610db33 100644 --- a/src/routes/MetaDetails/StreamsList/StreamsList.js +++ b/src/routes/MetaDetails/StreamsList/StreamsList.js @@ -2,7 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const Icon = require('stremio-icons/dom'); -const { Button } = require('stremio/common'); +const { Button, Image } = require('stremio/common'); const Stream = require('./Stream'); const styles = require('./styles'); @@ -14,14 +14,21 @@ const StreamsList = ({ className, streamsResources }) => { .flat(1); }, [streamsResources]); return ( -
+
streamsResource.content.type === 'Err') })}>
{ streamsResources.length === 0 ? -
No addons ware requested for streams
+
+ +
No addons were requested for streams
+
: streamsResources.every((streamsResource) => streamsResource.content.type === 'Err') ? -
No streams were found
+
+ +
No streams were found!
+
Please install some addons to find more streams
+
: streams.length > 0 ? streams.map((stream, index) => ( diff --git a/src/routes/MetaDetails/StreamsList/styles.less b/src/routes/MetaDetails/StreamsList/styles.less index 88c4389a3..a85963eaf 100644 --- a/src/routes/MetaDetails/StreamsList/styles.less +++ b/src/routes/MetaDetails/StreamsList/styles.less @@ -4,6 +4,10 @@ display: flex; flex-direction: column; + &:global(.streams-list-message) { + background-color: @color-background-dark3-80; + } + .streams-scroll-container { flex-grow: 0; flex-shrink: 1; @@ -11,11 +15,32 @@ align-self: stretch; overflow-y: auto; - .message-label { - padding: 2rem 0; - font-size: 2rem; - text-align: center; - color: @color-surface-light5; + .message-container { + display: flex; + flex-direction: column; + align-items: center; + width: var(--item-size); + height: 100%; + padding: 2rem; + + &>:not(:last-child) { + margin-bottom: 1rem; + } + + .image, .label, .description { + flex: none; + } + + .label { + font-size: 1.4rem; + text-align: center; + color: @color-surface-light5; + } + + .description { + text-align: center; + color: @color-surface-dark1; + } } .stream { From 7329d1ab0413dcd4781e0477fdb47aafade4951a Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 11:50:28 +0200 Subject: [PATCH 19/56] meta_details_cat image renamed to empty --- images/{meta_details_cat.png => empty.png} | Bin src/routes/MetaDetails/StreamsList/StreamsList.js | 4 ++-- src/routes/MetaDetails/VideosList/VideosList.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename images/{meta_details_cat.png => empty.png} (100%) diff --git a/images/meta_details_cat.png b/images/empty.png similarity index 100% rename from images/meta_details_cat.png rename to images/empty.png diff --git a/src/routes/MetaDetails/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js index d3610db33..01ca619b2 100644 --- a/src/routes/MetaDetails/StreamsList/StreamsList.js +++ b/src/routes/MetaDetails/StreamsList/StreamsList.js @@ -19,13 +19,13 @@ const StreamsList = ({ className, streamsResources }) => { { streamsResources.length === 0 ?
- +
No addons were requested for streams
: streamsResources.every((streamsResource) => streamsResource.content.type === 'Err') ?
- +
No streams were found!
Please install some addons to find more streams
diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index 6db7c5ee3..95bbf300b 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -41,7 +41,7 @@ const VideosList = ({ className, metaResource }) => { : metaResource.content.type === 'Err' || videosForSeason.length === 0 ?
- +
No videos found for this meta
: From a65848127546fc56e323b4790b8a45ad184c4737 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 12:19:53 +0200 Subject: [PATCH 20/56] MetaPreview compact class width added --- src/common/MetaPreview/styles.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/MetaPreview/styles.less b/src/common/MetaPreview/styles.less index f1756c05b..f3f8ef276 100644 --- a/src/common/MetaPreview/styles.less +++ b/src/common/MetaPreview/styles.less @@ -8,6 +8,8 @@ &.compact { .meta-info-container { + width: 100%; + .logo, .logo-placeholder-icon { width: 100%; } From 5e187c59311ea4344ace2437fa9cc31d6e8576ab Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 13:02:03 +0200 Subject: [PATCH 21/56] meta info width defined in MetaDetails --- src/common/MetaPreview/styles.less | 1 - src/routes/MetaDetails/styles.less | 8 ++++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/common/MetaPreview/styles.less b/src/common/MetaPreview/styles.less index f3f8ef276..4816018da 100644 --- a/src/common/MetaPreview/styles.less +++ b/src/common/MetaPreview/styles.less @@ -54,7 +54,6 @@ .meta-info-container { flex: 1; align-self: stretch; - width: 32.5rem; padding: 0 2rem; overflow-y: auto; diff --git a/src/routes/MetaDetails/styles.less b/src/routes/MetaDetails/styles.less index 481af6738..db7fba7ae 100644 --- a/src/routes/MetaDetails/styles.less +++ b/src/routes/MetaDetails/styles.less @@ -1,5 +1,9 @@ @import (reference) '~stremio-colors/dist/less/stremio-colors.less'; +:import('~stremio/common/MetaPreview/styles.less') { + meta-info-container: meta-info-container; +} + .metadetails-container { display: flex; flex-direction: column; @@ -41,6 +45,10 @@ .meta-preview { flex: 1; align-self: stretch; + + .meta-info-container { + width: 32.5rem; + } } .videos-list, .streams-list { From 34dfc9b5723c8c65b6c20964598ce626cf6b667d Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 13:05:35 +0200 Subject: [PATCH 22/56] MetaPreview action buttons margin increased --- src/common/MetaPreview/styles.less | 2 +- src/routes/MetaDetails/styles.less | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/MetaPreview/styles.less b/src/common/MetaPreview/styles.less index 4816018da..54e6717b9 100644 --- a/src/common/MetaPreview/styles.less +++ b/src/common/MetaPreview/styles.less @@ -163,7 +163,7 @@ margin: 2rem 0; &:not(:last-child) { - margin-right: 1.5rem; + margin-right: 2rem; } } } diff --git a/src/routes/MetaDetails/styles.less b/src/routes/MetaDetails/styles.less index db7fba7ae..eee627253 100644 --- a/src/routes/MetaDetails/styles.less +++ b/src/routes/MetaDetails/styles.less @@ -47,7 +47,7 @@ align-self: stretch; .meta-info-container { - width: 32.5rem; + width: 34rem; } } From d783f4ccea723a487064f68ab88eddbd3a016a93 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 13:52:53 +0200 Subject: [PATCH 23/56] MetaPreview imdb button flex none added --- src/common/MetaPreview/styles.less | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/MetaPreview/styles.less b/src/common/MetaPreview/styles.less index 54e6717b9..0ff8ba48a 100644 --- a/src/common/MetaPreview/styles.less +++ b/src/common/MetaPreview/styles.less @@ -93,6 +93,7 @@ } .imdb-button-container { + flex: none; display: flex; flex-direction: row; align-items: center; From a1c36e84193226a187a520bfa527c6484bebd51b Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 14:05:50 +0200 Subject: [PATCH 24/56] MetaPreview imdb button focus instead of focus-within --- src/common/MetaPreview/styles.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/MetaPreview/styles.less b/src/common/MetaPreview/styles.less index 0ff8ba48a..dab12336e 100644 --- a/src/common/MetaPreview/styles.less +++ b/src/common/MetaPreview/styles.less @@ -103,11 +103,11 @@ border: var(--focus-outline-size) solid transparent; background-color: @color-surface-light5-20; - &:hover, &:focus-within { + &:hover, &:focus { background-color: @color-surface-light5-30; } - &:focus-within { + &:focus { outline: none; border: var(--focus-outline-size) solid @color-surface-light5; } From eb3b4386d177612b01f806cfb47acfc2c5400d70 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 14:07:22 +0200 Subject: [PATCH 25/56] VideosList search placeholder fixed --- src/routes/MetaDetails/VideosList/VideosList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index 95bbf300b..685fab14e 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -62,7 +62,7 @@ const VideosList = ({ className, metaResource }) => { From 1c17437847d056c8ecc4f8a766023b5ce1ccc157 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Thu, 26 Mar 2020 15:50:58 +0200 Subject: [PATCH 26/56] VideosList search: search only by title --- src/routes/MetaDetails/VideosList/VideosList.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index 685fab14e..23685b490 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -72,11 +72,7 @@ const VideosList = ({ className, metaResource }) => {
{videosForSeason .filter((video) => { - return search.length === 0 || - ( - (typeof video.title === 'string' && video.title.toLowerCase().includes(search.toLowerCase())) || - (video.released.toLocaleString(undefined, { year: '2-digit', month: 'short', day: 'numeric' }).toLowerCase().includes(search.toLowerCase())) - ); + return search.length === 0 || (typeof video.title === 'string' && video.title.toLowerCase().includes(search.toLowerCase())); }) .map((video, index) => (
- { - released instanceof Date && !isNaN(released.getTime()) ? -
+
+ { + released instanceof Date && !isNaN(released.getTime()) ?
{released.toLocaleString(undefined, { year: '2-digit', month: 'short', day: 'numeric' })}
-
- { - upcoming ? -
-
Upcoming
-
- : - null - } - { - watched ? -
-
Watched
-
- : - null - } -
-
- : - null - } + : + null + } +
+ { + upcoming ? +
+
Upcoming
+
+ : + null + } + { + watched ? +
+
Watched
+
+ : + null + } +
+
{ progress !== null && !isNaN(progress) && progress > 0 ? diff --git a/src/routes/MetaDetails/VideosList/Video/styles.less b/src/routes/MetaDetails/VideosList/Video/styles.less index 8ffbd075d..115b1bae2 100644 --- a/src/routes/MetaDetails/VideosList/Video/styles.less +++ b/src/routes/MetaDetails/VideosList/Video/styles.less @@ -52,10 +52,11 @@ color: @color-surface-light5-90; } - .released-info-container { + .flex-row-container { display: flex; flex-direction: row; align-items: center; + justify-content: flex-end; .released-container { flex: 1; From 95ceb4425521c453f948448c27ac122c51288592 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Fri, 27 Mar 2020 11:46:10 +0200 Subject: [PATCH 40/56] VideosList elemets width fixed --- src/routes/MetaDetails/VideosList/styles.less | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/routes/MetaDetails/VideosList/styles.less b/src/routes/MetaDetails/VideosList/styles.less index 0ea3737a8..c913fb87a 100644 --- a/src/routes/MetaDetails/VideosList/styles.less +++ b/src/routes/MetaDetails/VideosList/styles.less @@ -5,12 +5,9 @@ flex-direction: column; background-color: @color-background-dark3-80; - .seasons-bar, .message-container { - flex: none; - width: var(--item-size); - } - .seasons-bar { + flex: none; + align-self: stretch; padding: 1rem 0; } @@ -19,6 +16,7 @@ display: flex; flex-direction: column; align-items: center; + width: var(--item-size); padding: 2rem; background-color: @color-background-dark3-80; @@ -36,6 +34,8 @@ } .search-container { + flex: none; + align-self: stretch; padding: 0 1.5rem 1rem 1.5rem; background-color: @color-background-dark3-80; From 809db2ed528bbd5fbd7f497caef3f5a894641fa9 Mon Sep 17 00:00:00 2001 From: svetlagasheva Date: Fri, 27 Mar 2020 11:48:54 +0200 Subject: [PATCH 41/56] VideosList search: search by title and released --- src/routes/MetaDetails/VideosList/VideosList.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index dba5e5f00..f45d93299 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -73,7 +73,11 @@ const VideosList = ({ className, metaResource }) => {
{videosForSeason .filter((video) => { - return search.length === 0 || (typeof video.title === 'string' && video.title.toLowerCase().includes(search.toLowerCase())); + return search.length === 0 || + ( + (typeof video.title === 'string' && video.title.toLowerCase().includes(search.toLowerCase())) || + (video.released.toLocaleString(undefined, { year: '2-digit', month: 'short', day: 'numeric' }).toLowerCase().includes(search.toLowerCase())) + ); }) .map((video, index) => (