From 1b55b5b51de731537ac8733b5d9f5f1171bc17f9 Mon Sep 17 00:00:00 2001 From: Koder Joker Date: Wed, 5 Jun 2019 03:45:54 +0530 Subject: [PATCH 1/6] Move components in theatres directory to top level --- packages/ia-components/index.js | 6 +++--- packages/ia-components/index.less | 6 +++--- .../{components => }/audio-player/audio-player-main.jsx | 6 +++--- .../{components => }/audio-player/audio-player.less | 0 .../{components => }/audio-player/audio-player.stories.js | 0 .../{components => }/audio-player/audio-player.test.js | 0 .../players_by_type/archive-audio-jwplayer-wrapper.jsx | 0 .../audio-player/players_by_type/third-party-embed.jsx | 0 .../theatres/{components => }/svgs/ia-logo-white-icon.js | 0 .../theatres/{components => }/svgs/icon-booklet.js | 0 .../theatres/{components => }/svgs/spotify-logo-icon.js | 0 .../theatres/{components => }/svgs/youtube-logo-icon.js | 0 .../theatres/{components => }/track-list/track-list.jsx | 2 +- .../theatres/{components => }/track-list/track-list.less | 6 +++--- .../{components => }/track-list/track-list.stories.js | 0 .../{components => }/track-list/track-list.test.js | 0 .../audio-with-youtube-spotify-main.jsx | 8 ++++---- 17 files changed, 17 insertions(+), 17 deletions(-) rename packages/ia-components/sandbox/theatres/{components => }/audio-player/audio-player-main.jsx (97%) rename packages/ia-components/sandbox/theatres/{components => }/audio-player/audio-player.less (100%) rename packages/ia-components/sandbox/theatres/{components => }/audio-player/audio-player.stories.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/audio-player/audio-player.test.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/audio-player/players_by_type/archive-audio-jwplayer-wrapper.jsx (100%) rename packages/ia-components/sandbox/theatres/{components => }/audio-player/players_by_type/third-party-embed.jsx (100%) rename packages/ia-components/sandbox/theatres/{components => }/svgs/ia-logo-white-icon.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/svgs/icon-booklet.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/svgs/spotify-logo-icon.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/svgs/youtube-logo-icon.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/track-list/track-list.jsx (98%) rename packages/ia-components/sandbox/theatres/{components => }/track-list/track-list.less (96%) rename packages/ia-components/sandbox/theatres/{components => }/track-list/track-list.stories.js (100%) rename packages/ia-components/sandbox/theatres/{components => }/track-list/track-list.test.js (100%) diff --git a/packages/ia-components/index.js b/packages/ia-components/index.js index f62a67687..92383ddb5 100644 --- a/packages/ia-components/index.js +++ b/packages/ia-components/index.js @@ -9,8 +9,8 @@ export { default as IAUXExampleComponent } from './live/example-react-component/ export { default as HorizontalRadioGroup } from './sandbox/selectors/horizontal-radio-group/horizontal-radio-group'; export { default as FlexboxPagination } from './sandbox/pagination/pagination-with-flexbox'; -export { default as TheatreTrackList } from './sandbox/theatres/components/track-list/track-list'; -export { default as TheatreAudioPlayer } from './sandbox/theatres/components/audio-player/audio-player-main'; +export { default as TheatreTrackList } from './sandbox/theatres/track-list/track-list'; +export { default as TheatreAudioPlayer } from './sandbox/theatres/audio-player/audio-player-main'; export { default as AudioPlayerWithYoutubeSpotify } from './sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main'; export { default as AnchorDetails } from './sandbox/AnchorDetails'; // sandbox tiles @@ -24,4 +24,4 @@ export { default as DetailsActionButtons } from './sandbox/details/DetailsAction export { default as DetailsDownloadOptions } from './sandbox/details/DetailsDownloadOptions'; export { default as DetailsFlags } from './sandbox/details/DetailsFlags'; export { AnchorModalGo, ButtonModalGo } from './sandbox/details/ModalGo'; -export { default as Tabby} from './sandbox/details/Tabby'; +export { default as Tabby } from './sandbox/details/Tabby'; diff --git a/packages/ia-components/index.less b/packages/ia-components/index.less index 5b86f7a42..267c194a8 100644 --- a/packages/ia-components/index.less +++ b/packages/ia-components/index.less @@ -3,7 +3,7 @@ @import './live/example-react-component/styles.less'; @import './sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.less'; -@import './sandbox/theatres/components/track-list/track-list.less'; -@import './sandbox/theatres/components/audio-player/audio-player.less'; +@import './sandbox/theatres/track-list/track-list.less'; +@import './sandbox/theatres/audio-player/audio-player.less'; @import './sandbox/selectors/horizontal-radio-group/horizontal-radio-group.less'; -@import './sandbox/pagination/pagination.less'; \ No newline at end of file +@import './sandbox/pagination/pagination.less'; diff --git a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player-main.jsx b/packages/ia-components/sandbox/theatres/audio-player/audio-player-main.jsx similarity index 97% rename from packages/ia-components/sandbox/theatres/components/audio-player/audio-player-main.jsx rename to packages/ia-components/sandbox/theatres/audio-player/audio-player-main.jsx index 067cdbfea..49d147673 100644 --- a/packages/ia-components/sandbox/theatres/components/audio-player/audio-player-main.jsx +++ b/packages/ia-components/sandbox/theatres/audio-player/audio-player-main.jsx @@ -2,8 +2,8 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; import ArchiveAudioPlayer from './players_by_type/archive-audio-jwplayer-wrapper'; import ThirdPartyEmbeddedPlayer from './players_by_type/third-party-embed'; -import { HorizontalRadioGroup } from '../../../../index'; -import BookReaderWrapper from '../../../bookreader-component/bookreader-wrapper-main'; +import { HorizontalRadioGroup } from '../../../index'; +import BookReaderWrapper from '../../bookreader-component/bookreader-wrapper-main'; /** * Draw background photo @@ -124,7 +124,7 @@ export default class TheatreAudioPlayer extends Component { options.push({ value: 'liner-notes', label: customSourceLabels.linerNotes, - });; + }); } return ( Date: Wed, 5 Jun 2019 21:16:35 +0530 Subject: [PATCH 2/6] Track list: Fix styleguide issues --- .../theatres/track-list/track-list.jsx | 2 +- .../theatres/track-list/track-list.stories.js | 23 +++++++++++-------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/packages/ia-components/sandbox/theatres/track-list/track-list.jsx b/packages/ia-components/sandbox/theatres/track-list/track-list.jsx index d73d9ba15..468f61df8 100644 --- a/packages/ia-components/sandbox/theatres/track-list/track-list.jsx +++ b/packages/ia-components/sandbox/theatres/track-list/track-list.jsx @@ -125,7 +125,7 @@ TheatreTrackList.defaultProps = { TheatreTrackList.propTypes = { onSelected: PropTypes.func.isRequired, selectedTrack: PropTypes.number.isRequired, - tracks: PropTypes.array, + tracks: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.number, PropTypes.string])), displayTrackNumbers: PropTypes.bool, creator: PropTypes.string, }; diff --git a/packages/ia-components/sandbox/theatres/track-list/track-list.stories.js b/packages/ia-components/sandbox/theatres/track-list/track-list.stories.js index 6c34012d1..53d8af852 100644 --- a/packages/ia-components/sandbox/theatres/track-list/track-list.stories.js +++ b/packages/ia-components/sandbox/theatres/track-list/track-list.stories.js @@ -1,11 +1,11 @@ -import style from './track-list.less'; import React from 'react'; import { storiesOf } from '@storybook/react'; import { text, number } from '@storybook/addon-knobs'; +import style from './track-list.less'; import TrackList from './track-list'; - storiesOf('Theatres', module) - .addWithJSX('Tract List', () => { +storiesOf('Theatres', module) + .addWithJSX('Track List', () => { const tracks = [ { source: 'derivative', @@ -29,11 +29,14 @@ import TrackList from './track-list'; trackNumber: 1 } ]; - - return {alert('track clicked')}}/> + + return ( + { alert('Track clicked'); }} + /> + ); }) From 3d96a3488d8f69f2d331ab29393a9ded5a3d1f36 Mon Sep 17 00:00:00 2001 From: Koder Joker Date: Wed, 5 Jun 2019 23:07:17 +0530 Subject: [PATCH 3/6] Shift data-for-stories to sandbox --- .../album-private-with-spotify-youtube.js | 0 .../audio-with-youtube-spotify.stories.js | 4 +- .../data-for-stories/theatre-styling.less | 140 ------------------ .../utils/flatten-album-data.test.js | 2 +- 4 files changed, 3 insertions(+), 143 deletions(-) rename packages/ia-components/sandbox/{theatres/with-youtube-spotify/utils => }/data-for-stories/album-private-with-spotify-youtube.js (100%) delete mode 100644 packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/theatre-styling.less diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/album-private-with-spotify-youtube.js b/packages/ia-components/sandbox/data-for-stories/album-private-with-spotify-youtube.js similarity index 100% rename from packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/album-private-with-spotify-youtube.js rename to packages/ia-components/sandbox/data-for-stories/album-private-with-spotify-youtube.js diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js index a5df9dfb6..3be3d7a6f 100644 --- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js +++ b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.stories.js @@ -2,10 +2,10 @@ import React, { Component } from 'react'; import { storiesOf } from '@storybook/react'; import axios from 'axios'; -import albumData from './utils/data-for-stories/album-private-with-spotify-youtube'; +import albumData from '../../data-for-stories/album-private-with-spotify-youtube'; import AudioPlayerWithYoutubeSpotify from './audio-with-youtube-spotify-main'; import style from './audio-with-youtube-spotify.less'; -import styles from './utils/data-for-stories/theatre-styling.less'; +// import styles from '../../../.storybook/theatre-styling.less'; const { itemInfo, jwplayerPlaylist, linerNotes } = albumData; diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/theatre-styling.less b/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/theatre-styling.less deleted file mode 100644 index dc4069bed..000000000 --- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/data-for-stories/theatre-styling.less +++ /dev/null @@ -1,140 +0,0 @@ -.theatre__wrap { - color: #fff; -} - -/* legacy */ -.theatre__wrap { - background-color: black; - position: relative; - min-height: 400px; -} -.theatre__wrap #flag-overlay { - display: none; -} -body.navia .toggle-flag-overlay.glyphicon-remove { - display: none; -} -.theatre__wrap.flagged #theatre-ia { - -webkit-filter: blur(20px); - -moz-filter: blur(20px); - -o-filter: blur(20px); - -ms-filter: blur(20px); - filter: blur(20px); -} -.theatre__wrap.flagged .toggle-flag-overlay.glyphicon-remove { - position: absolute; - top: 10px; - right: 10px; - padding: 10px; - font-size: 200%; - color: #ffffff; - display: block; - z-index: 123456789; -} -.theatre__wrap.flagged #flag-overlay.flagged-solid { - background-color: #be1024; -} -.theatre__wrap.flagged #flag-overlay.flagged-solid .toggle-flag-overlay { - display: none; -} -.theatre__wrap.flagged #flag-overlay { - display: inline-block; - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - width: 100%; - background-color: rgba(232, 15, 40, 0.69); - z-index: 1; - color: #FFFFFF; - text-align: center; -} -.theatre__wrap.flagged #flag-overlay .big-icon { - font-size: 56px; -} -.theatre__wrap.flagged #flag-overlay h1 { - font-size: 24px; - font-weight: bold; - margin: 15px; -} -.theatre__wrap.flagged #flag-overlay .item-flags { - display: inline-block; -} -.theatre__wrap.flagged #flag-overlay h2 { - font-size: 18px; - font-weight: 600; - border: solid #ffffff 3px; - margin: 10px; - padding: 10px 30px; - line-height: 24px; -} -.theatre__wrap.flagged #flag-overlay button.toggle-flag-overlay, -.theatre__wrap.flagged #flag-overlay a.toggle-flag-overlay { - text-decoration: underline; - border: none; - background: inherit; - color: inherit; - margin: 15px; - font-size: 18px; -} -.theatre__wrap.flagged #flag-overlay p { - font-size: 18px; -} -.theatre__wrap.flagged #flag-overlay .no-preview-download a { - color: #ffffff; - text-decoration: underline; -} -.theatre__wrap.flagged #flag-overlay #flag-checkboxes { - text-align: left; - margin: 0 auto; - display: inline-block; -} -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a { - color: #ffffff; - text-decoration: none; -} -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox { - border: 1px #ffffff; - background-color: #ffffff; - border-radius: 2px; - width: 12px; - height: 12px; - display: inline-block; - margin: 0 10px; - vertical-align: middle; - text-align: center; -} -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox .iconochive-x, -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox .iconochive-Done { - visibility: hidden; -} -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox.checked { - background-color: #428bca; -} -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox.checked .iconochive-x, -.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox.checked .iconochive-Done { - display: block; - visibility: visible; - color: #FFFFFF; - font-size: 10px; -} -.theatre__wrap.resized { - max-height: 100vw; - min-height: initial; - overflow: hidden; -} -.theatre__wrap.resized #theatre-ia, -.theatre__wrap.resized #theatre-ia > .row, -.theatre__wrap.resized #theatre-ia > .row > div { - height: 100%; -} -.theatre__wrap.resized #theatre-ia { - padding: 0; - /* children manage own padding */ -} -.theatre__wrap.resized _:-o-prefocus, -.theatre__wrap.resized { - height: auto !important; - max-height: none; -} \ No newline at end of file diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js b/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js index 8bdaef274..77c811b33 100644 --- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js +++ b/packages/ia-components/sandbox/theatres/with-youtube-spotify/utils/flatten-album-data.test.js @@ -1,7 +1,7 @@ import assert from 'assert'; import flattenAlbumData from './flatten-album-data'; -import albumData from './data-for-stories/album-private-with-spotify-youtube'; +import albumData from '../../../data-for-stories/album-private-with-spotify-youtube'; const { itemInfo } = albumData; From fad227b2e77488c69c211e1209ed69da6222b73e Mon Sep 17 00:00:00 2001 From: Koder Joker Date: Wed, 5 Jun 2019 23:08:14 +0530 Subject: [PATCH 4/6] Move theatre-styling.less into .storybook Add into Storybook through config.js --- packages/ia-components/.storybook/config.js | 1 + .../.storybook/theatre-styling.less | 140 ++++++++++++++++++ 2 files changed, 141 insertions(+) create mode 100644 packages/ia-components/.storybook/theatre-styling.less diff --git a/packages/ia-components/.storybook/config.js b/packages/ia-components/.storybook/config.js index 50f78e596..addddd8f4 100644 --- a/packages/ia-components/.storybook/config.js +++ b/packages/ia-components/.storybook/config.js @@ -6,6 +6,7 @@ import { withTests } from '@storybook/addon-jest'; import results from '../jest-test-utils/jest-test-results.json'; import style from './archive-cf7f2eh.less' +import styles from './theatre-styling.less' /** * pick all *.stories.js files within the ia-components directory diff --git a/packages/ia-components/.storybook/theatre-styling.less b/packages/ia-components/.storybook/theatre-styling.less new file mode 100644 index 000000000..dc4069bed --- /dev/null +++ b/packages/ia-components/.storybook/theatre-styling.less @@ -0,0 +1,140 @@ +.theatre__wrap { + color: #fff; +} + +/* legacy */ +.theatre__wrap { + background-color: black; + position: relative; + min-height: 400px; +} +.theatre__wrap #flag-overlay { + display: none; +} +body.navia .toggle-flag-overlay.glyphicon-remove { + display: none; +} +.theatre__wrap.flagged #theatre-ia { + -webkit-filter: blur(20px); + -moz-filter: blur(20px); + -o-filter: blur(20px); + -ms-filter: blur(20px); + filter: blur(20px); +} +.theatre__wrap.flagged .toggle-flag-overlay.glyphicon-remove { + position: absolute; + top: 10px; + right: 10px; + padding: 10px; + font-size: 200%; + color: #ffffff; + display: block; + z-index: 123456789; +} +.theatre__wrap.flagged #flag-overlay.flagged-solid { + background-color: #be1024; +} +.theatre__wrap.flagged #flag-overlay.flagged-solid .toggle-flag-overlay { + display: none; +} +.theatre__wrap.flagged #flag-overlay { + display: inline-block; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + background-color: rgba(232, 15, 40, 0.69); + z-index: 1; + color: #FFFFFF; + text-align: center; +} +.theatre__wrap.flagged #flag-overlay .big-icon { + font-size: 56px; +} +.theatre__wrap.flagged #flag-overlay h1 { + font-size: 24px; + font-weight: bold; + margin: 15px; +} +.theatre__wrap.flagged #flag-overlay .item-flags { + display: inline-block; +} +.theatre__wrap.flagged #flag-overlay h2 { + font-size: 18px; + font-weight: 600; + border: solid #ffffff 3px; + margin: 10px; + padding: 10px 30px; + line-height: 24px; +} +.theatre__wrap.flagged #flag-overlay button.toggle-flag-overlay, +.theatre__wrap.flagged #flag-overlay a.toggle-flag-overlay { + text-decoration: underline; + border: none; + background: inherit; + color: inherit; + margin: 15px; + font-size: 18px; +} +.theatre__wrap.flagged #flag-overlay p { + font-size: 18px; +} +.theatre__wrap.flagged #flag-overlay .no-preview-download a { + color: #ffffff; + text-decoration: underline; +} +.theatre__wrap.flagged #flag-overlay #flag-checkboxes { + text-align: left; + margin: 0 auto; + display: inline-block; +} +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a { + color: #ffffff; + text-decoration: none; +} +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox { + border: 1px #ffffff; + background-color: #ffffff; + border-radius: 2px; + width: 12px; + height: 12px; + display: inline-block; + margin: 0 10px; + vertical-align: middle; + text-align: center; +} +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox .iconochive-x, +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox .iconochive-Done { + visibility: hidden; +} +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox.checked { + background-color: #428bca; +} +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox.checked .iconochive-x, +.theatre__wrap.flagged #flag-overlay #flag-checkboxes a .my-checkbox.checked .iconochive-Done { + display: block; + visibility: visible; + color: #FFFFFF; + font-size: 10px; +} +.theatre__wrap.resized { + max-height: 100vw; + min-height: initial; + overflow: hidden; +} +.theatre__wrap.resized #theatre-ia, +.theatre__wrap.resized #theatre-ia > .row, +.theatre__wrap.resized #theatre-ia > .row > div { + height: 100%; +} +.theatre__wrap.resized #theatre-ia { + padding: 0; + /* children manage own padding */ +} +.theatre__wrap.resized _:-o-prefocus, +.theatre__wrap.resized { + height: auto !important; + max-height: none; +} \ No newline at end of file From d20f0198658a2d27a407f8e858eccdfb1828d78a Mon Sep 17 00:00:00 2001 From: Koder Joker Date: Fri, 7 Jun 2019 03:51:49 +0530 Subject: [PATCH 5/6] Shift track-lists and audio-players to sandbox --- packages/ia-components/index.js | 4 ++-- packages/ia-components/index.less | 4 ++-- .../archive-audio-jwplayer-wrapper.jsx | 0 .../audio-player => audio-players}/audio-player-main.jsx | 8 ++++---- .../audio-player => audio-players}/audio-player.less | 0 .../audio-player.stories.js | 0 .../audio-player => audio-players}/audio-player.test.js | 0 .../third-party-embed.jsx | 0 .../{theatres/track-list => track-lists}/track-list.jsx | 2 +- .../{theatres/track-list => track-lists}/track-list.less | 2 +- .../track-list => track-lists}/track-list.stories.js | 0 .../track-list => track-lists}/track-list.test.js | 0 12 files changed, 10 insertions(+), 10 deletions(-) rename packages/ia-components/sandbox/{theatres/audio-player/players_by_type => audio-players}/archive-audio-jwplayer-wrapper.jsx (100%) rename packages/ia-components/sandbox/{theatres/audio-player => audio-players}/audio-player-main.jsx (94%) rename packages/ia-components/sandbox/{theatres/audio-player => audio-players}/audio-player.less (100%) rename packages/ia-components/sandbox/{theatres/audio-player => audio-players}/audio-player.stories.js (100%) rename packages/ia-components/sandbox/{theatres/audio-player => audio-players}/audio-player.test.js (100%) rename packages/ia-components/sandbox/{theatres/audio-player/players_by_type => audio-players}/third-party-embed.jsx (100%) rename packages/ia-components/sandbox/{theatres/track-list => track-lists}/track-list.jsx (98%) rename packages/ia-components/sandbox/{theatres/track-list => track-lists}/track-list.less (97%) rename packages/ia-components/sandbox/{theatres/track-list => track-lists}/track-list.stories.js (100%) rename packages/ia-components/sandbox/{theatres/track-list => track-lists}/track-list.test.js (100%) diff --git a/packages/ia-components/index.js b/packages/ia-components/index.js index 92383ddb5..bb05a148a 100644 --- a/packages/ia-components/index.js +++ b/packages/ia-components/index.js @@ -9,8 +9,8 @@ export { default as IAUXExampleComponent } from './live/example-react-component/ export { default as HorizontalRadioGroup } from './sandbox/selectors/horizontal-radio-group/horizontal-radio-group'; export { default as FlexboxPagination } from './sandbox/pagination/pagination-with-flexbox'; -export { default as TheatreTrackList } from './sandbox/theatres/track-list/track-list'; -export { default as TheatreAudioPlayer } from './sandbox/theatres/audio-player/audio-player-main'; +export { default as TheatreTrackList } from './sandbox/track-lists/track-list'; +export { default as TheatreAudioPlayer } from './sandbox/audio-players/audio-player-main'; export { default as AudioPlayerWithYoutubeSpotify } from './sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main'; export { default as AnchorDetails } from './sandbox/AnchorDetails'; // sandbox tiles diff --git a/packages/ia-components/index.less b/packages/ia-components/index.less index 267c194a8..de1e35fca 100644 --- a/packages/ia-components/index.less +++ b/packages/ia-components/index.less @@ -3,7 +3,7 @@ @import './live/example-react-component/styles.less'; @import './sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify.less'; -@import './sandbox/theatres/track-list/track-list.less'; -@import './sandbox/theatres/audio-player/audio-player.less'; +@import './sandbox/track-lists/track-list.less'; +@import './sandbox/audio-players/audio-player.less'; @import './sandbox/selectors/horizontal-radio-group/horizontal-radio-group.less'; @import './sandbox/pagination/pagination.less'; diff --git a/packages/ia-components/sandbox/theatres/audio-player/players_by_type/archive-audio-jwplayer-wrapper.jsx b/packages/ia-components/sandbox/audio-players/archive-audio-jwplayer-wrapper.jsx similarity index 100% rename from packages/ia-components/sandbox/theatres/audio-player/players_by_type/archive-audio-jwplayer-wrapper.jsx rename to packages/ia-components/sandbox/audio-players/archive-audio-jwplayer-wrapper.jsx diff --git a/packages/ia-components/sandbox/theatres/audio-player/audio-player-main.jsx b/packages/ia-components/sandbox/audio-players/audio-player-main.jsx similarity index 94% rename from packages/ia-components/sandbox/theatres/audio-player/audio-player-main.jsx rename to packages/ia-components/sandbox/audio-players/audio-player-main.jsx index 49d147673..e7c8089f2 100644 --- a/packages/ia-components/sandbox/theatres/audio-player/audio-player-main.jsx +++ b/packages/ia-components/sandbox/audio-players/audio-player-main.jsx @@ -1,9 +1,9 @@ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import ArchiveAudioPlayer from './players_by_type/archive-audio-jwplayer-wrapper'; -import ThirdPartyEmbeddedPlayer from './players_by_type/third-party-embed'; -import { HorizontalRadioGroup } from '../../../index'; -import BookReaderWrapper from '../../bookreader-component/bookreader-wrapper-main'; +import ArchiveAudioPlayer from './archive-audio-jwplayer-wrapper'; +import ThirdPartyEmbeddedPlayer from './third-party-embed'; +import { HorizontalRadioGroup } from '../../index'; +import BookReaderWrapper from '../bookreader-component/bookreader-wrapper-main'; /** * Draw background photo diff --git a/packages/ia-components/sandbox/theatres/audio-player/audio-player.less b/packages/ia-components/sandbox/audio-players/audio-player.less similarity index 100% rename from packages/ia-components/sandbox/theatres/audio-player/audio-player.less rename to packages/ia-components/sandbox/audio-players/audio-player.less diff --git a/packages/ia-components/sandbox/theatres/audio-player/audio-player.stories.js b/packages/ia-components/sandbox/audio-players/audio-player.stories.js similarity index 100% rename from packages/ia-components/sandbox/theatres/audio-player/audio-player.stories.js rename to packages/ia-components/sandbox/audio-players/audio-player.stories.js diff --git a/packages/ia-components/sandbox/theatres/audio-player/audio-player.test.js b/packages/ia-components/sandbox/audio-players/audio-player.test.js similarity index 100% rename from packages/ia-components/sandbox/theatres/audio-player/audio-player.test.js rename to packages/ia-components/sandbox/audio-players/audio-player.test.js diff --git a/packages/ia-components/sandbox/theatres/audio-player/players_by_type/third-party-embed.jsx b/packages/ia-components/sandbox/audio-players/third-party-embed.jsx similarity index 100% rename from packages/ia-components/sandbox/theatres/audio-player/players_by_type/third-party-embed.jsx rename to packages/ia-components/sandbox/audio-players/third-party-embed.jsx diff --git a/packages/ia-components/sandbox/theatres/track-list/track-list.jsx b/packages/ia-components/sandbox/track-lists/track-list.jsx similarity index 98% rename from packages/ia-components/sandbox/theatres/track-list/track-list.jsx rename to packages/ia-components/sandbox/track-lists/track-list.jsx index 468f61df8..383b5d7f5 100644 --- a/packages/ia-components/sandbox/theatres/track-list/track-list.jsx +++ b/packages/ia-components/sandbox/track-lists/track-list.jsx @@ -1,6 +1,6 @@ import React, { Component, Fragment } from 'react'; import PropTypes from 'prop-types'; -import { FlexboxPagination } from '../../..'; +import { FlexboxPagination } from '../..'; /** * Creates the track title to display based on track object diff --git a/packages/ia-components/sandbox/theatres/track-list/track-list.less b/packages/ia-components/sandbox/track-lists/track-list.less similarity index 97% rename from packages/ia-components/sandbox/theatres/track-list/track-list.less rename to packages/ia-components/sandbox/track-lists/track-list.less index d8a0290c6..3406c4b46 100644 --- a/packages/ia-components/sandbox/theatres/track-list/track-list.less +++ b/packages/ia-components/sandbox/track-lists/track-list.less @@ -1,4 +1,4 @@ -@import '../../../variables.less'; +@import '../../variables.less'; .audio-track-list { position: relative; diff --git a/packages/ia-components/sandbox/theatres/track-list/track-list.stories.js b/packages/ia-components/sandbox/track-lists/track-list.stories.js similarity index 100% rename from packages/ia-components/sandbox/theatres/track-list/track-list.stories.js rename to packages/ia-components/sandbox/track-lists/track-list.stories.js diff --git a/packages/ia-components/sandbox/theatres/track-list/track-list.test.js b/packages/ia-components/sandbox/track-lists/track-list.test.js similarity index 100% rename from packages/ia-components/sandbox/theatres/track-list/track-list.test.js rename to packages/ia-components/sandbox/track-lists/track-list.test.js From 6898aa41db1d8a73cb2a500b430d13e3d275c044 Mon Sep 17 00:00:00 2001 From: Koder Joker Date: Fri, 7 Jun 2019 04:31:58 +0530 Subject: [PATCH 6/6] Shift svgs to sandbox --- .../sandbox/{theatres => }/svgs/ia-logo-white-icon.js | 0 .../sandbox/{theatres => }/svgs/icon-booklet.js | 0 .../sandbox/{theatres => }/svgs/spotify-logo-icon.js | 0 .../sandbox/{theatres => }/svgs/youtube-logo-icon.js | 0 .../audio-with-youtube-spotify-main.jsx | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename packages/ia-components/sandbox/{theatres => }/svgs/ia-logo-white-icon.js (100%) rename packages/ia-components/sandbox/{theatres => }/svgs/icon-booklet.js (100%) rename packages/ia-components/sandbox/{theatres => }/svgs/spotify-logo-icon.js (100%) rename packages/ia-components/sandbox/{theatres => }/svgs/youtube-logo-icon.js (100%) diff --git a/packages/ia-components/sandbox/theatres/svgs/ia-logo-white-icon.js b/packages/ia-components/sandbox/svgs/ia-logo-white-icon.js similarity index 100% rename from packages/ia-components/sandbox/theatres/svgs/ia-logo-white-icon.js rename to packages/ia-components/sandbox/svgs/ia-logo-white-icon.js diff --git a/packages/ia-components/sandbox/theatres/svgs/icon-booklet.js b/packages/ia-components/sandbox/svgs/icon-booklet.js similarity index 100% rename from packages/ia-components/sandbox/theatres/svgs/icon-booklet.js rename to packages/ia-components/sandbox/svgs/icon-booklet.js diff --git a/packages/ia-components/sandbox/theatres/svgs/spotify-logo-icon.js b/packages/ia-components/sandbox/svgs/spotify-logo-icon.js similarity index 100% rename from packages/ia-components/sandbox/theatres/svgs/spotify-logo-icon.js rename to packages/ia-components/sandbox/svgs/spotify-logo-icon.js diff --git a/packages/ia-components/sandbox/theatres/svgs/youtube-logo-icon.js b/packages/ia-components/sandbox/svgs/youtube-logo-icon.js similarity index 100% rename from packages/ia-components/sandbox/theatres/svgs/youtube-logo-icon.js rename to packages/ia-components/sandbox/svgs/youtube-logo-icon.js diff --git a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx index 7b18f0eca..0bc7c490d 100644 --- a/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx +++ b/packages/ia-components/sandbox/theatres/with-youtube-spotify/audio-with-youtube-spotify-main.jsx @@ -5,10 +5,10 @@ import { find, flatten, head } from 'lodash'; import flattenAlbumData from './utils/flatten-album-data'; import getTrackListBySource from './utils/get-track-list-by-source'; -import YoutubeIcon from '../svgs/youtube-logo-icon'; -import SpotifyIcon from '../svgs/spotify-logo-icon'; -import ArchiveIcon from '../svgs/ia-logo-white-icon'; -import BookletIcon from '../svgs/icon-booklet'; +import YoutubeIcon from '../../svgs/youtube-logo-icon'; +import SpotifyIcon from '../../svgs/spotify-logo-icon'; +import ArchiveIcon from '../../svgs/ia-logo-white-icon'; +import BookletIcon from '../../svgs/icon-booklet'; import { HorizontalRadioGroup, TheatreAudioPlayer, TheatreTrackList } from '../../../index'; /**