From a67aec064912986b6a4ea9c9c9c88a13bb13d0e5 Mon Sep 17 00:00:00 2001 From: NikolaBorislavovHristov Date: Thu, 14 Nov 2019 14:07:21 +0200 Subject: [PATCH] Detail route renamed to MetaDetails --- src/App/routerViewsConfig.js | 4 ++-- src/common/routesRegexp.js | 4 ++-- src/routes/Detail/index.js | 3 --- .../{Detail/Detail.js => MetaDetails/MetaDetails.js} | 8 ++++---- .../{Detail => MetaDetails}/StreamsList/Stream/Stream.js | 0 .../{Detail => MetaDetails}/StreamsList/Stream/index.js | 0 .../StreamsList/Stream/styles.less | 0 .../StreamsList/StreamPlaceholder/StreamPlaceholder.js | 0 .../StreamsList/StreamPlaceholder/index.js | 0 .../StreamsList/StreamPlaceholder/styles.less | 0 .../{Detail => MetaDetails}/StreamsList/StreamsList.js | 0 src/routes/{Detail => MetaDetails}/StreamsList/index.js | 0 .../{Detail => MetaDetails}/StreamsList/styles.less | 0 .../VideosList/SeasonsBar/SeasonsBar.js | 0 .../SeasonsBarPlaceholder/SeasonsBarPlaceholder.js | 0 .../VideosList/SeasonsBar/SeasonsBarPlaceholder/index.js | 0 .../SeasonsBar/SeasonsBarPlaceholder/styles.less | 0 .../VideosList/SeasonsBar/index.js | 0 .../VideosList/SeasonsBar/styles.less | 0 .../{Detail => MetaDetails}/VideosList/Video/Video.js | 0 .../VideosList/Video/VideoPlaceholder/VideoPlaceholder.js | 0 .../VideosList/Video/VideoPlaceholder/index.js | 0 .../VideosList/Video/VideoPlaceholder/styles.less | 0 .../{Detail => MetaDetails}/VideosList/Video/index.js | 0 .../{Detail => MetaDetails}/VideosList/Video/styles.less | 0 .../{Detail => MetaDetails}/VideosList/VideosList.js | 0 src/routes/{Detail => MetaDetails}/VideosList/index.js | 0 src/routes/{Detail => MetaDetails}/VideosList/styles.less | 0 .../VideosList/useSelectableSeasons.js | 0 src/routes/MetaDetails/index.js | 3 +++ src/routes/{Detail => MetaDetails}/styles.less | 4 ++-- src/routes/{Detail => MetaDetails}/useInLibrary.js | 0 src/routes/{Detail => MetaDetails}/useMetaDetails.js | 0 src/routes/{Detail => MetaDetails}/useSelectableGroups.js | 0 src/routes/index.js | 4 ++-- .../SeasonsBar/SampleSeasonsBar/SampleSeasonsBar.js | 2 +- .../SeasonsBarPlaceholder/SeasonsBarPlaceholder.js | 2 +- 37 files changed, 17 insertions(+), 17 deletions(-) delete mode 100644 src/routes/Detail/index.js rename src/routes/{Detail/Detail.js => MetaDetails/MetaDetails.js} (95%) rename src/routes/{Detail => MetaDetails}/StreamsList/Stream/Stream.js (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/Stream/index.js (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/Stream/styles.less (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/StreamPlaceholder/StreamPlaceholder.js (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/StreamPlaceholder/index.js (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/StreamPlaceholder/styles.less (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/StreamsList.js (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/index.js (100%) rename src/routes/{Detail => MetaDetails}/StreamsList/styles.less (100%) rename src/routes/{Detail => MetaDetails}/VideosList/SeasonsBar/SeasonsBar.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/SeasonsBar/SeasonsBarPlaceholder/index.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/SeasonsBar/SeasonsBarPlaceholder/styles.less (100%) rename src/routes/{Detail => MetaDetails}/VideosList/SeasonsBar/index.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/SeasonsBar/styles.less (100%) rename src/routes/{Detail => MetaDetails}/VideosList/Video/Video.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/Video/VideoPlaceholder/VideoPlaceholder.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/Video/VideoPlaceholder/index.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/Video/VideoPlaceholder/styles.less (100%) rename src/routes/{Detail => MetaDetails}/VideosList/Video/index.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/Video/styles.less (100%) rename src/routes/{Detail => MetaDetails}/VideosList/VideosList.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/index.js (100%) rename src/routes/{Detail => MetaDetails}/VideosList/styles.less (100%) rename src/routes/{Detail => MetaDetails}/VideosList/useSelectableSeasons.js (100%) create mode 100644 src/routes/MetaDetails/index.js rename src/routes/{Detail => MetaDetails}/styles.less (95%) rename src/routes/{Detail => MetaDetails}/useInLibrary.js (100%) rename src/routes/{Detail => MetaDetails}/useMetaDetails.js (100%) rename src/routes/{Detail => MetaDetails}/useSelectableGroups.js (100%) diff --git a/src/App/routerViewsConfig.js b/src/App/routerViewsConfig.js index 29453fd26..b53ee54fb 100644 --- a/src/App/routerViewsConfig.js +++ b/src/App/routerViewsConfig.js @@ -26,8 +26,8 @@ const routerViewsConfig = [ ], [ { - ...routesRegexp.detail, - component: routes.Detail + ...routesRegexp.metadetails, + component: routes.MetaDetails }, { ...routesRegexp.addons, diff --git a/src/common/routesRegexp.js b/src/common/routesRegexp.js index 5e8eae4d1..e21c84f17 100644 --- a/src/common/routesRegexp.js +++ b/src/common/routesRegexp.js @@ -19,8 +19,8 @@ const routesRegexp = { regexp: /^\/search\/?$/i, urlParamsNames: [] }, - detail: { - regexp: /^\/detail\/(?:([^\/]+?))\/(?:([^\/]+?))(?:\/([^\/]*?))?\/?$/i, + metadetails: { + regexp: /^\/metadetails\/(?:([^\/]+?))\/(?:([^\/]+?))(?:\/([^\/]*?))?\/?$/i, urlParamsNames: ['type', 'id', 'videoId'] }, addons: { diff --git a/src/routes/Detail/index.js b/src/routes/Detail/index.js deleted file mode 100644 index 89fc1aead..000000000 --- a/src/routes/Detail/index.js +++ /dev/null @@ -1,3 +0,0 @@ -const Detail = require('./Detail'); - -module.exports = Detail; diff --git a/src/routes/Detail/Detail.js b/src/routes/MetaDetails/MetaDetails.js similarity index 95% rename from src/routes/Detail/Detail.js rename to src/routes/MetaDetails/MetaDetails.js index 84fb46bc0..a2ef2fb3d 100644 --- a/src/routes/Detail/Detail.js +++ b/src/routes/MetaDetails/MetaDetails.js @@ -6,18 +6,18 @@ const useMetaDetails = require('./useMetaDetails'); const useSelectableGroups = require('./useSelectableGroups'); const styles = require('./styles'); -const Detail = ({ urlParams }) => { +const MetaDetails = ({ urlParams }) => { const [meta, streams] = useMetaDetails(urlParams); const [metaResourceRef, metaGroups, selectedMetaGroup] = useSelectableGroups(meta.resourceRef, meta.groups); const { resourceRef: streamsResourceRef, groups: streamsGroups } = streams; return ( -
+
-
+
{ metaResourceRef !== null ? selectedMetaGroup !== null ? @@ -80,4 +80,4 @@ const Detail = ({ urlParams }) => { ); }; -module.exports = Detail; +module.exports = MetaDetails; diff --git a/src/routes/Detail/StreamsList/Stream/Stream.js b/src/routes/MetaDetails/StreamsList/Stream/Stream.js similarity index 100% rename from src/routes/Detail/StreamsList/Stream/Stream.js rename to src/routes/MetaDetails/StreamsList/Stream/Stream.js diff --git a/src/routes/Detail/StreamsList/Stream/index.js b/src/routes/MetaDetails/StreamsList/Stream/index.js similarity index 100% rename from src/routes/Detail/StreamsList/Stream/index.js rename to src/routes/MetaDetails/StreamsList/Stream/index.js diff --git a/src/routes/Detail/StreamsList/Stream/styles.less b/src/routes/MetaDetails/StreamsList/Stream/styles.less similarity index 100% rename from src/routes/Detail/StreamsList/Stream/styles.less rename to src/routes/MetaDetails/StreamsList/Stream/styles.less diff --git a/src/routes/Detail/StreamsList/StreamPlaceholder/StreamPlaceholder.js b/src/routes/MetaDetails/StreamsList/StreamPlaceholder/StreamPlaceholder.js similarity index 100% rename from src/routes/Detail/StreamsList/StreamPlaceholder/StreamPlaceholder.js rename to src/routes/MetaDetails/StreamsList/StreamPlaceholder/StreamPlaceholder.js diff --git a/src/routes/Detail/StreamsList/StreamPlaceholder/index.js b/src/routes/MetaDetails/StreamsList/StreamPlaceholder/index.js similarity index 100% rename from src/routes/Detail/StreamsList/StreamPlaceholder/index.js rename to src/routes/MetaDetails/StreamsList/StreamPlaceholder/index.js diff --git a/src/routes/Detail/StreamsList/StreamPlaceholder/styles.less b/src/routes/MetaDetails/StreamsList/StreamPlaceholder/styles.less similarity index 100% rename from src/routes/Detail/StreamsList/StreamPlaceholder/styles.less rename to src/routes/MetaDetails/StreamsList/StreamPlaceholder/styles.less diff --git a/src/routes/Detail/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js similarity index 100% rename from src/routes/Detail/StreamsList/StreamsList.js rename to src/routes/MetaDetails/StreamsList/StreamsList.js diff --git a/src/routes/Detail/StreamsList/index.js b/src/routes/MetaDetails/StreamsList/index.js similarity index 100% rename from src/routes/Detail/StreamsList/index.js rename to src/routes/MetaDetails/StreamsList/index.js diff --git a/src/routes/Detail/StreamsList/styles.less b/src/routes/MetaDetails/StreamsList/styles.less similarity index 100% rename from src/routes/Detail/StreamsList/styles.less rename to src/routes/MetaDetails/StreamsList/styles.less diff --git a/src/routes/Detail/VideosList/SeasonsBar/SeasonsBar.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js similarity index 100% rename from src/routes/Detail/VideosList/SeasonsBar/SeasonsBar.js rename to src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js diff --git a/src/routes/Detail/VideosList/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js similarity index 100% rename from src/routes/Detail/VideosList/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js rename to src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js diff --git a/src/routes/Detail/VideosList/SeasonsBar/SeasonsBarPlaceholder/index.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBarPlaceholder/index.js similarity index 100% rename from src/routes/Detail/VideosList/SeasonsBar/SeasonsBarPlaceholder/index.js rename to src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBarPlaceholder/index.js diff --git a/src/routes/Detail/VideosList/SeasonsBar/SeasonsBarPlaceholder/styles.less b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBarPlaceholder/styles.less similarity index 100% rename from src/routes/Detail/VideosList/SeasonsBar/SeasonsBarPlaceholder/styles.less rename to src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBarPlaceholder/styles.less diff --git a/src/routes/Detail/VideosList/SeasonsBar/index.js b/src/routes/MetaDetails/VideosList/SeasonsBar/index.js similarity index 100% rename from src/routes/Detail/VideosList/SeasonsBar/index.js rename to src/routes/MetaDetails/VideosList/SeasonsBar/index.js diff --git a/src/routes/Detail/VideosList/SeasonsBar/styles.less b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less similarity index 100% rename from src/routes/Detail/VideosList/SeasonsBar/styles.less rename to src/routes/MetaDetails/VideosList/SeasonsBar/styles.less diff --git a/src/routes/Detail/VideosList/Video/Video.js b/src/routes/MetaDetails/VideosList/Video/Video.js similarity index 100% rename from src/routes/Detail/VideosList/Video/Video.js rename to src/routes/MetaDetails/VideosList/Video/Video.js diff --git a/src/routes/Detail/VideosList/Video/VideoPlaceholder/VideoPlaceholder.js b/src/routes/MetaDetails/VideosList/Video/VideoPlaceholder/VideoPlaceholder.js similarity index 100% rename from src/routes/Detail/VideosList/Video/VideoPlaceholder/VideoPlaceholder.js rename to src/routes/MetaDetails/VideosList/Video/VideoPlaceholder/VideoPlaceholder.js diff --git a/src/routes/Detail/VideosList/Video/VideoPlaceholder/index.js b/src/routes/MetaDetails/VideosList/Video/VideoPlaceholder/index.js similarity index 100% rename from src/routes/Detail/VideosList/Video/VideoPlaceholder/index.js rename to src/routes/MetaDetails/VideosList/Video/VideoPlaceholder/index.js diff --git a/src/routes/Detail/VideosList/Video/VideoPlaceholder/styles.less b/src/routes/MetaDetails/VideosList/Video/VideoPlaceholder/styles.less similarity index 100% rename from src/routes/Detail/VideosList/Video/VideoPlaceholder/styles.less rename to src/routes/MetaDetails/VideosList/Video/VideoPlaceholder/styles.less diff --git a/src/routes/Detail/VideosList/Video/index.js b/src/routes/MetaDetails/VideosList/Video/index.js similarity index 100% rename from src/routes/Detail/VideosList/Video/index.js rename to src/routes/MetaDetails/VideosList/Video/index.js diff --git a/src/routes/Detail/VideosList/Video/styles.less b/src/routes/MetaDetails/VideosList/Video/styles.less similarity index 100% rename from src/routes/Detail/VideosList/Video/styles.less rename to src/routes/MetaDetails/VideosList/Video/styles.less diff --git a/src/routes/Detail/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js similarity index 100% rename from src/routes/Detail/VideosList/VideosList.js rename to src/routes/MetaDetails/VideosList/VideosList.js diff --git a/src/routes/Detail/VideosList/index.js b/src/routes/MetaDetails/VideosList/index.js similarity index 100% rename from src/routes/Detail/VideosList/index.js rename to src/routes/MetaDetails/VideosList/index.js diff --git a/src/routes/Detail/VideosList/styles.less b/src/routes/MetaDetails/VideosList/styles.less similarity index 100% rename from src/routes/Detail/VideosList/styles.less rename to src/routes/MetaDetails/VideosList/styles.less diff --git a/src/routes/Detail/VideosList/useSelectableSeasons.js b/src/routes/MetaDetails/VideosList/useSelectableSeasons.js similarity index 100% rename from src/routes/Detail/VideosList/useSelectableSeasons.js rename to src/routes/MetaDetails/VideosList/useSelectableSeasons.js diff --git a/src/routes/MetaDetails/index.js b/src/routes/MetaDetails/index.js new file mode 100644 index 000000000..e92f5c8cf --- /dev/null +++ b/src/routes/MetaDetails/index.js @@ -0,0 +1,3 @@ +const MetaDetails = require('./MetaDetails'); + +module.exports = MetaDetails; diff --git a/src/routes/Detail/styles.less b/src/routes/MetaDetails/styles.less similarity index 95% rename from src/routes/Detail/styles.less rename to src/routes/MetaDetails/styles.less index 4cce3adb1..4bdea39ca 100644 --- a/src/routes/Detail/styles.less +++ b/src/routes/MetaDetails/styles.less @@ -1,4 +1,4 @@ -.detail-container { +.metadetails-container { display: flex; flex-direction: column; width: 100%; @@ -10,7 +10,7 @@ align-self: stretch; } - .detail-content { + .metadetails-content { flex: 1; align-self: stretch; position: relative; diff --git a/src/routes/Detail/useInLibrary.js b/src/routes/MetaDetails/useInLibrary.js similarity index 100% rename from src/routes/Detail/useInLibrary.js rename to src/routes/MetaDetails/useInLibrary.js diff --git a/src/routes/Detail/useMetaDetails.js b/src/routes/MetaDetails/useMetaDetails.js similarity index 100% rename from src/routes/Detail/useMetaDetails.js rename to src/routes/MetaDetails/useMetaDetails.js diff --git a/src/routes/Detail/useSelectableGroups.js b/src/routes/MetaDetails/useSelectableGroups.js similarity index 100% rename from src/routes/Detail/useSelectableGroups.js rename to src/routes/MetaDetails/useSelectableGroups.js diff --git a/src/routes/index.js b/src/routes/index.js index f9f19e314..e819535bb 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -2,10 +2,10 @@ const Addons = require('./Addons'); const Board = require('./Board'); const Discover = require('./Discover'); const Library = require('./Library'); +const MetaDetails = require('./MetaDetails'); const Search = require('./Search'); const Settings = require('./Settings'); const Player = require('./Player'); -const Detail = require('./Detail'); const Intro = require('./Intro'); module.exports = { @@ -13,9 +13,9 @@ module.exports = { Board, Discover, Library, + MetaDetails, Search, Settings, Player, - Detail, Intro }; diff --git a/storybook/stories/SeasonsBar/SampleSeasonsBar/SampleSeasonsBar.js b/storybook/stories/SeasonsBar/SampleSeasonsBar/SampleSeasonsBar.js index f7a25a33c..354079577 100644 --- a/storybook/stories/SeasonsBar/SampleSeasonsBar/SampleSeasonsBar.js +++ b/storybook/stories/SeasonsBar/SampleSeasonsBar/SampleSeasonsBar.js @@ -1,7 +1,7 @@ const React = require('react'); const { storiesOf } = require('@storybook/react'); const { action } = require('@storybook/addon-actions'); -const SeasonsBar = require('stremio/routes/Detail/VideosList/SeasonsBar'); +const SeasonsBar = require('stremio/routes/MetaDetails/VideosList/SeasonsBar'); const styles = require('./styles'); storiesOf('SeasonsBar', module).add('SampleSeasonsBar', () => { diff --git a/storybook/stories/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js b/storybook/stories/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js index e04109b34..e8067f79f 100644 --- a/storybook/stories/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js +++ b/storybook/stories/SeasonsBar/SeasonsBarPlaceholder/SeasonsBarPlaceholder.js @@ -1,6 +1,6 @@ const React = require('react'); const { storiesOf } = require('@storybook/react'); -const SeasonsBar = require('stremio/routes/Detail/VideosList/SeasonsBar'); +const SeasonsBar = require('stremio/routes/MetaDetails/VideosList/SeasonsBar'); const styles = require('./styles'); storiesOf('SeasonsBar', module).add('SeasonsBarPlaceholder', () => {