diff --git a/src/App/ErrorDialog/ErrorDialog.js b/src/App/ErrorDialog/ErrorDialog.js index 8429bb340..a2b31ba41 100644 --- a/src/App/ErrorDialog/ErrorDialog.js +++ b/src/App/ErrorDialog/ErrorDialog.js @@ -4,7 +4,7 @@ const React = require('react'); const { useTranslation } = require('react-i18next'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Button, Image } = require('stremio/common'); +const { Image, Button } = require('stremio/components'); const styles = require('./styles'); const ErrorDialog = ({ className }) => { diff --git a/src/common/Toast/ToastItem/ToastItem.js b/src/common/Toast/ToastItem/ToastItem.js index 379d64ce0..94b5a98b4 100644 --- a/src/common/Toast/ToastItem/ToastItem.js +++ b/src/common/Toast/ToastItem/ToastItem.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const ToastItem = ({ title, message, dataset, onSelect, onClose, ...props }) => { diff --git a/src/common/index.js b/src/common/index.js index da5462f0e..4c514dfbe 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -1,36 +1,8 @@ // Copyright (C) 2017-2023 Smart code 203358507 -const AddonDetailsModal = require('./AddonDetailsModal'); -const { default: BottomSheet } = require('./BottomSheet'); -const Button = require('./Button'); -const Toggle = require('./Toggle'); -const { default: Chips } = require('./Chips'); -const ColorInput = require('./ColorInput'); -const ContinueWatchingItem = require('./ContinueWatchingItem'); -const DelayedRenderer = require('./DelayedRenderer'); -const Image = require('./Image'); -const LibItem = require('./LibItem'); -const MainNavBars = require('./MainNavBars'); -const MetaItem = require('./MetaItem'); -const MetaPreview = require('./MetaPreview'); -const MetaRow = require('./MetaRow'); -const ModalDialog = require('./ModalDialog'); -const Multiselect = require('./Multiselect'); -const { default: MultiselectMenu } = require('./MultiselectMenu'); -const { HorizontalNavBar, VerticalNavBar } = require('./NavBar'); -const { default: HorizontalScroll } = require('./HorizontalScroll'); const { PlatformProvider, usePlatform } = require('./Platform'); -const PlayIconCircleCentered = require('./PlayIconCircleCentered'); -const Popup = require('./Popup'); -const SearchBar = require('./SearchBar'); -const StreamingServerWarning = require('./StreamingServerWarning'); -const SharePrompt = require('./SharePrompt'); -const Slider = require('./Slider'); -const { default: TextInput } = require('./TextInput'); const { ToastProvider, useToast } = require('./Toast'); const { TooltipProvider, Tooltip } = require('./Tooltips'); -const { default: Transition } = require('./Transition'); -const Video = require('./Video'); const comparatorWithPriorities = require('./comparatorWithPriorities'); const CONSTANTS = require('./CONSTANTS'); const { withCoreSuspender, useCoreSuspender } = require('./CoreSuspender'); @@ -50,44 +22,14 @@ const useProfile = require('./useProfile'); const useStreamingServer = require('./useStreamingServer'); const useTorrent = require('./useTorrent'); const useTranslate = require('./useTranslate'); -const EventModal = require('./EventModal'); module.exports = { - AddonDetailsModal, - BottomSheet, - Button, - Toggle, - Chips, - ColorInput, - ContinueWatchingItem, - DelayedRenderer, - Image, - LibItem, - MainNavBars, - MetaItem, - MetaPreview, - MetaRow, - ModalDialog, - Multiselect, - MultiselectMenu, - HorizontalNavBar, - HorizontalScroll, - VerticalNavBar, PlatformProvider, usePlatform, - PlayIconCircleCentered, - Popup, - SearchBar, - StreamingServerWarning, - SharePrompt, - Slider, - TextInput, ToastProvider, useToast, TooltipProvider, Tooltip, - Transition, - Video, comparatorWithPriorities, CONSTANTS, withCoreSuspender, @@ -108,5 +50,4 @@ module.exports = { useStreamingServer, useTorrent, useTranslate, - EventModal, }; diff --git a/src/common/AddonDetailsModal/AddonDetails/AddonDetails.js b/src/components/AddonDetailsModal/AddonDetails/AddonDetails.js similarity index 98% rename from src/common/AddonDetailsModal/AddonDetails/AddonDetails.js rename to src/components/AddonDetailsModal/AddonDetails/AddonDetails.js index cecd6ef3a..02e796891 100644 --- a/src/common/AddonDetailsModal/AddonDetails/AddonDetails.js +++ b/src/components/AddonDetailsModal/AddonDetails/AddonDetails.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Image = require('stremio/common/Image'); +const Image = require('stremio/components/Image'); const styles = require('./styles'); const AddonDetails = ({ className, id, name, version, logo, description, types, transportUrl, official }) => { diff --git a/src/common/AddonDetailsModal/AddonDetails/index.js b/src/components/AddonDetailsModal/AddonDetails/index.js similarity index 100% rename from src/common/AddonDetailsModal/AddonDetails/index.js rename to src/components/AddonDetailsModal/AddonDetails/index.js diff --git a/src/common/AddonDetailsModal/AddonDetails/styles.less b/src/components/AddonDetailsModal/AddonDetails/styles.less similarity index 100% rename from src/common/AddonDetailsModal/AddonDetails/styles.less rename to src/components/AddonDetailsModal/AddonDetails/styles.less diff --git a/src/common/AddonDetailsModal/AddonDetailsModal.js b/src/components/AddonDetailsModal/AddonDetailsModal.js similarity index 99% rename from src/common/AddonDetailsModal/AddonDetailsModal.js rename to src/components/AddonDetailsModal/AddonDetailsModal.js index 1ebbb2e60..332eab364 100644 --- a/src/common/AddonDetailsModal/AddonDetailsModal.js +++ b/src/components/AddonDetailsModal/AddonDetailsModal.js @@ -2,7 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); -const ModalDialog = require('stremio/common/ModalDialog'); +const ModalDialog = require('stremio/components/ModalDialog'); const { withCoreSuspender } = require('stremio/common/CoreSuspender'); const { usePlatform } = require('stremio/common/Platform'); const { useServices } = require('stremio/services'); diff --git a/src/common/AddonDetailsModal/index.js b/src/components/AddonDetailsModal/index.js similarity index 100% rename from src/common/AddonDetailsModal/index.js rename to src/components/AddonDetailsModal/index.js diff --git a/src/common/AddonDetailsModal/styles.less b/src/components/AddonDetailsModal/styles.less similarity index 93% rename from src/common/AddonDetailsModal/styles.less rename to src/components/AddonDetailsModal/styles.less index 73164a677..7182d0528 100644 --- a/src/common/AddonDetailsModal/styles.less +++ b/src/components/AddonDetailsModal/styles.less @@ -2,10 +2,6 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; -:import('~stremio/common/ModalDialog/styles.less') { - label: label; -} - .addon-details-modal-container { .addon-details-container, .addon-details-message-container { width: 40rem; diff --git a/src/common/AddonDetailsModal/useAddonDetails.js b/src/components/AddonDetailsModal/useAddonDetails.js similarity index 100% rename from src/common/AddonDetailsModal/useAddonDetails.js rename to src/components/AddonDetailsModal/useAddonDetails.js diff --git a/src/common/BottomSheet/BottomSheet.less b/src/components/BottomSheet/BottomSheet.less similarity index 100% rename from src/common/BottomSheet/BottomSheet.less rename to src/components/BottomSheet/BottomSheet.less diff --git a/src/common/BottomSheet/BottomSheet.tsx b/src/components/BottomSheet/BottomSheet.tsx similarity index 99% rename from src/common/BottomSheet/BottomSheet.tsx rename to src/components/BottomSheet/BottomSheet.tsx index d362aa02e..7ebfb79d8 100644 --- a/src/common/BottomSheet/BottomSheet.tsx +++ b/src/components/BottomSheet/BottomSheet.tsx @@ -11,7 +11,7 @@ const CLOSE_THRESHOLD = 100; type Props = { children: JSX.Element, title: string, - show?: boolean, + show: boolean, onClose: () => void, }; diff --git a/src/common/BottomSheet/index.ts b/src/components/BottomSheet/index.ts similarity index 100% rename from src/common/BottomSheet/index.ts rename to src/components/BottomSheet/index.ts diff --git a/src/common/Button/Button.js b/src/components/Button/Button.js similarity index 100% rename from src/common/Button/Button.js rename to src/components/Button/Button.js diff --git a/src/common/Button/index.js b/src/components/Button/index.js similarity index 100% rename from src/common/Button/index.js rename to src/components/Button/index.js diff --git a/src/common/Button/styles.less b/src/components/Button/styles.less similarity index 100% rename from src/common/Button/styles.less rename to src/components/Button/styles.less diff --git a/src/common/Chips/Chip/Chip.less b/src/components/Chips/Chip/Chip.less similarity index 100% rename from src/common/Chips/Chip/Chip.less rename to src/components/Chips/Chip/Chip.less diff --git a/src/common/Chips/Chip/Chip.tsx b/src/components/Chips/Chip/Chip.tsx similarity index 96% rename from src/common/Chips/Chip/Chip.tsx rename to src/components/Chips/Chip/Chip.tsx index e3a7fa849..cbb2487f7 100644 --- a/src/common/Chips/Chip/Chip.tsx +++ b/src/components/Chips/Chip/Chip.tsx @@ -2,7 +2,7 @@ import React, { MouseEvent, memo, useCallback, useEffect, useRef } from 'react'; import classNames from 'classnames'; -import Button from 'stremio/common/Button'; +import { Button } from 'stremio/components'; import styles from './Chip.less'; type Props = { diff --git a/src/common/Chips/Chip/index.ts b/src/components/Chips/Chip/index.ts similarity index 100% rename from src/common/Chips/Chip/index.ts rename to src/components/Chips/Chip/index.ts diff --git a/src/common/Chips/Chips.less b/src/components/Chips/Chips.less similarity index 100% rename from src/common/Chips/Chips.less rename to src/components/Chips/Chips.less diff --git a/src/common/Chips/Chips.tsx b/src/components/Chips/Chips.tsx similarity index 94% rename from src/common/Chips/Chips.tsx rename to src/components/Chips/Chips.tsx index 3d8f4a120..ebd50dca3 100644 --- a/src/common/Chips/Chips.tsx +++ b/src/components/Chips/Chips.tsx @@ -1,7 +1,7 @@ // Copyright (C) 2017-2024 Smart code 203358507 import React, { memo } from 'react'; -import HorizontalScroll from '../HorizontalScroll'; +import { HorizontalScroll } from 'stremio/components'; import Chip from './Chip'; import styles from './Chips.less'; diff --git a/src/common/Chips/index.ts b/src/components/Chips/index.ts similarity index 100% rename from src/common/Chips/index.ts rename to src/components/Chips/index.ts diff --git a/src/common/ColorInput/ColorInput.js b/src/components/ColorInput/ColorInput.js similarity index 97% rename from src/common/ColorInput/ColorInput.js rename to src/components/ColorInput/ColorInput.js index 2127b959f..88e9189ef 100644 --- a/src/common/ColorInput/ColorInput.js +++ b/src/components/ColorInput/ColorInput.js @@ -5,8 +5,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const AColorPicker = require('a-color-picker'); const { useTranslation } = require('react-i18next'); -const Button = require('stremio/common/Button'); -const ModalDialog = require('stremio/common/ModalDialog'); +const { Button, ModalDialog } = require('stremio/components'); const useBinaryState = require('stremio/common/useBinaryState'); const ColorPicker = require('./ColorPicker'); const styles = require('./styles'); diff --git a/src/common/ColorInput/ColorPicker/ColorPicker.js b/src/components/ColorInput/ColorPicker/ColorPicker.js similarity index 100% rename from src/common/ColorInput/ColorPicker/ColorPicker.js rename to src/components/ColorInput/ColorPicker/ColorPicker.js diff --git a/src/common/ColorInput/ColorPicker/index.js b/src/components/ColorInput/ColorPicker/index.js similarity index 100% rename from src/common/ColorInput/ColorPicker/index.js rename to src/components/ColorInput/ColorPicker/index.js diff --git a/src/common/ColorInput/ColorPicker/styles.less b/src/components/ColorInput/ColorPicker/styles.less similarity index 100% rename from src/common/ColorInput/ColorPicker/styles.less rename to src/components/ColorInput/ColorPicker/styles.less diff --git a/src/common/ColorInput/index.js b/src/components/ColorInput/index.js similarity index 100% rename from src/common/ColorInput/index.js rename to src/components/ColorInput/index.js diff --git a/src/common/ColorInput/styles.less b/src/components/ColorInput/styles.less similarity index 100% rename from src/common/ColorInput/styles.less rename to src/components/ColorInput/styles.less diff --git a/src/common/ContinueWatchingItem/ContinueWatchingItem.js b/src/components/ContinueWatchingItem/ContinueWatchingItem.js similarity index 97% rename from src/common/ContinueWatchingItem/ContinueWatchingItem.js rename to src/components/ContinueWatchingItem/ContinueWatchingItem.js index 7d1ab824d..8a0143619 100644 --- a/src/common/ContinueWatchingItem/ContinueWatchingItem.js +++ b/src/components/ContinueWatchingItem/ContinueWatchingItem.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const { useServices } = require('stremio/services'); -const LibItem = require('stremio/common/LibItem'); +const LibItem = require('stremio/components/LibItem'); const ContinueWatchingItem = ({ _id, notifications, deepLinks, ...props }) => { const { core } = useServices(); diff --git a/src/common/ContinueWatchingItem/index.js b/src/components/ContinueWatchingItem/index.js similarity index 100% rename from src/common/ContinueWatchingItem/index.js rename to src/components/ContinueWatchingItem/index.js diff --git a/src/common/DelayedRenderer/DelayedRenderer.js b/src/components/DelayedRenderer/DelayedRenderer.js similarity index 100% rename from src/common/DelayedRenderer/DelayedRenderer.js rename to src/components/DelayedRenderer/DelayedRenderer.js diff --git a/src/common/DelayedRenderer/index.js b/src/components/DelayedRenderer/index.js similarity index 100% rename from src/common/DelayedRenderer/index.js rename to src/components/DelayedRenderer/index.js diff --git a/src/common/EventModal/EventModal.js b/src/components/EventModal/EventModal.js similarity index 96% rename from src/common/EventModal/EventModal.js rename to src/components/EventModal/EventModal.js index dcd9ca626..917190ba1 100644 --- a/src/common/EventModal/EventModal.js +++ b/src/components/EventModal/EventModal.js @@ -2,8 +2,7 @@ const React = require('react'); const { useTranslation } = require('react-i18next'); -const Button = require('stremio/common/Button'); -const ModalDialog = require('stremio/common/ModalDialog'); +const { Button, ModalDialog } = require('stremio/components'); const useEvents = require('./useEvents'); const styles = require('./styles'); const { default: Icon } = require('@stremio/stremio-icons/react'); diff --git a/src/common/EventModal/index.js b/src/components/EventModal/index.js similarity index 100% rename from src/common/EventModal/index.js rename to src/components/EventModal/index.js diff --git a/src/common/EventModal/styles.less b/src/components/EventModal/styles.less similarity index 98% rename from src/common/EventModal/styles.less rename to src/components/EventModal/styles.less index b251175e5..95279ae32 100644 --- a/src/common/EventModal/styles.less +++ b/src/components/EventModal/styles.less @@ -2,7 +2,7 @@ @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { modal-dialog-content: modal-dialog-content; modal-dialog-container: modal-dialog-container; } diff --git a/src/common/EventModal/useEvents.js b/src/components/EventModal/useEvents.js similarity index 100% rename from src/common/EventModal/useEvents.js rename to src/components/EventModal/useEvents.js diff --git a/src/common/HorizontalScroll/HorizontalScroll.less b/src/components/HorizontalScroll/HorizontalScroll.less similarity index 100% rename from src/common/HorizontalScroll/HorizontalScroll.less rename to src/components/HorizontalScroll/HorizontalScroll.less diff --git a/src/common/HorizontalScroll/HorizontalScroll.tsx b/src/components/HorizontalScroll/HorizontalScroll.tsx similarity index 100% rename from src/common/HorizontalScroll/HorizontalScroll.tsx rename to src/components/HorizontalScroll/HorizontalScroll.tsx diff --git a/src/common/HorizontalScroll/index.ts b/src/components/HorizontalScroll/index.ts similarity index 100% rename from src/common/HorizontalScroll/index.ts rename to src/components/HorizontalScroll/index.ts diff --git a/src/common/Image/Image.js b/src/components/Image/Image.js similarity index 100% rename from src/common/Image/Image.js rename to src/components/Image/Image.js diff --git a/src/common/Image/index.js b/src/components/Image/index.js similarity index 100% rename from src/common/Image/index.js rename to src/components/Image/index.js diff --git a/src/common/LibItem/LibItem.js b/src/components/LibItem/LibItem.js similarity index 98% rename from src/common/LibItem/LibItem.js rename to src/components/LibItem/LibItem.js index 141450a57..a42def27f 100644 --- a/src/common/LibItem/LibItem.js +++ b/src/components/LibItem/LibItem.js @@ -3,7 +3,7 @@ const React = require('react'); const { useServices } = require('stremio/services'); const PropTypes = require('prop-types'); -const MetaItem = require('stremio/common/MetaItem'); +const MetaItem = require('stremio/components/MetaItem'); const { t } = require('i18next'); const LibItem = ({ _id, removable, notifications, watched, ...props }) => { diff --git a/src/common/LibItem/index.js b/src/components/LibItem/index.js similarity index 100% rename from src/common/LibItem/index.js rename to src/components/LibItem/index.js diff --git a/src/common/MainNavBars/MainNavBars.js b/src/components/MainNavBars/MainNavBars.js similarity index 98% rename from src/common/MainNavBars/MainNavBars.js rename to src/components/MainNavBars/MainNavBars.js index 6bcde9031..f1553a38b 100644 --- a/src/common/MainNavBars/MainNavBars.js +++ b/src/components/MainNavBars/MainNavBars.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { VerticalNavBar, HorizontalNavBar } = require('stremio/common/NavBar'); +const { VerticalNavBar, HorizontalNavBar } = require('stremio/components/NavBar'); const styles = require('./styles'); const TABS = [ diff --git a/src/common/MainNavBars/index.js b/src/components/MainNavBars/index.js similarity index 100% rename from src/common/MainNavBars/index.js rename to src/components/MainNavBars/index.js diff --git a/src/common/MainNavBars/styles.less b/src/components/MainNavBars/styles.less similarity index 100% rename from src/common/MainNavBars/styles.less rename to src/components/MainNavBars/styles.less diff --git a/src/common/MetaItem/MetaItem.js b/src/components/MetaItem/MetaItem.js similarity index 97% rename from src/common/MetaItem/MetaItem.js rename to src/components/MetaItem/MetaItem.js index 5656ea6da..ae61f9b72 100644 --- a/src/common/MetaItem/MetaItem.js +++ b/src/components/MetaItem/MetaItem.js @@ -6,9 +6,9 @@ const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); const filterInvalidDOMProps = require('filter-invalid-dom-props').default; const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); -const Image = require('stremio/common/Image'); -const Multiselect = require('stremio/common/Multiselect'); +const Button = require('stremio/components/Button'); +const Image = require('stremio/components/Image'); +const Multiselect = require('stremio/components/Multiselect'); const useBinaryState = require('stremio/common/useBinaryState'); const { ICON_FOR_TYPE } = require('stremio/common/CONSTANTS'); const styles = require('./styles'); diff --git a/src/common/MetaItem/index.js b/src/components/MetaItem/index.js similarity index 100% rename from src/common/MetaItem/index.js rename to src/components/MetaItem/index.js diff --git a/src/common/MetaItem/styles.less b/src/components/MetaItem/styles.less similarity index 97% rename from src/common/MetaItem/styles.less rename to src/components/MetaItem/styles.less index 17c7c4884..089ef1c21 100644 --- a/src/common/MetaItem/styles.less +++ b/src/components/MetaItem/styles.less @@ -3,21 +3,16 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Popup/styles.less') { +:import('~stremio/components/Popup/styles.less') { popup-menu-container: menu-container; } -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; multiselect-option-container: option-container; multiselect-option-label: label; } -:import('~stremio/common/PlayIconCircleCentered/styles.less') { - play-icon-circle-centered-background: background; - play-icon-circle-centered-icon: icon; -} - @play-icon-size: 4rem; .meta-item-container { diff --git a/src/common/MetaPreview/ActionButton/ActionButton.js b/src/components/MetaPreview/ActionButton/ActionButton.js similarity index 96% rename from src/common/MetaPreview/ActionButton/ActionButton.js rename to src/components/MetaPreview/ActionButton/ActionButton.js index 8e2fcd11b..520c0483b 100644 --- a/src/common/MetaPreview/ActionButton/ActionButton.js +++ b/src/components/MetaPreview/ActionButton/ActionButton.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const { Tooltip } = require('stremio/common/Tooltips'); diff --git a/src/common/MetaPreview/ActionButton/index.js b/src/components/MetaPreview/ActionButton/index.js similarity index 100% rename from src/common/MetaPreview/ActionButton/index.js rename to src/components/MetaPreview/ActionButton/index.js diff --git a/src/common/MetaPreview/ActionButton/styles.less b/src/components/MetaPreview/ActionButton/styles.less similarity index 100% rename from src/common/MetaPreview/ActionButton/styles.less rename to src/components/MetaPreview/ActionButton/styles.less diff --git a/src/common/MetaPreview/MetaLinks/MetaLinks.js b/src/components/MetaPreview/MetaLinks/MetaLinks.js similarity index 96% rename from src/common/MetaPreview/MetaLinks/MetaLinks.js rename to src/components/MetaPreview/MetaLinks/MetaLinks.js index 9bb6ee13d..ce2cf341a 100644 --- a/src/common/MetaPreview/MetaLinks/MetaLinks.js +++ b/src/components/MetaPreview/MetaLinks/MetaLinks.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const MetaLinks = ({ className, label, links }) => { diff --git a/src/common/MetaPreview/MetaLinks/index.js b/src/components/MetaPreview/MetaLinks/index.js similarity index 100% rename from src/common/MetaPreview/MetaLinks/index.js rename to src/components/MetaPreview/MetaLinks/index.js diff --git a/src/common/MetaPreview/MetaLinks/styles.less b/src/components/MetaPreview/MetaLinks/styles.less similarity index 100% rename from src/common/MetaPreview/MetaLinks/styles.less rename to src/components/MetaPreview/MetaLinks/styles.less diff --git a/src/common/MetaPreview/MetaPreview.js b/src/components/MetaPreview/MetaPreview.js similarity index 98% rename from src/common/MetaPreview/MetaPreview.js rename to src/components/MetaPreview/MetaPreview.js index d5fd92b1a..895245b1f 100644 --- a/src/common/MetaPreview/MetaPreview.js +++ b/src/components/MetaPreview/MetaPreview.js @@ -6,10 +6,10 @@ const classnames = require('classnames'); const UrlUtils = require('url'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); -const Image = require('stremio/common/Image'); -const ModalDialog = require('stremio/common/ModalDialog'); -const SharePrompt = require('stremio/common/SharePrompt'); +const Button = require('stremio/components/Button'); +const Image = require('stremio/components/Image'); +const ModalDialog = require('stremio/components/ModalDialog'); +const SharePrompt = require('stremio/components/SharePrompt'); const CONSTANTS = require('stremio/common/CONSTANTS'); const routesRegexp = require('stremio/common/routesRegexp'); const useBinaryState = require('stremio/common/useBinaryState'); diff --git a/src/common/MetaPreview/MetaPreviewPlaceholder/MetaPreviewPlaceholder.js b/src/components/MetaPreview/MetaPreviewPlaceholder/MetaPreviewPlaceholder.js similarity index 100% rename from src/common/MetaPreview/MetaPreviewPlaceholder/MetaPreviewPlaceholder.js rename to src/components/MetaPreview/MetaPreviewPlaceholder/MetaPreviewPlaceholder.js diff --git a/src/common/MetaPreview/MetaPreviewPlaceholder/index.js b/src/components/MetaPreview/MetaPreviewPlaceholder/index.js similarity index 100% rename from src/common/MetaPreview/MetaPreviewPlaceholder/index.js rename to src/components/MetaPreview/MetaPreviewPlaceholder/index.js diff --git a/src/common/MetaPreview/MetaPreviewPlaceholder/styles.less b/src/components/MetaPreview/MetaPreviewPlaceholder/styles.less similarity index 100% rename from src/common/MetaPreview/MetaPreviewPlaceholder/styles.less rename to src/components/MetaPreview/MetaPreviewPlaceholder/styles.less diff --git a/src/common/MetaPreview/index.js b/src/components/MetaPreview/index.js similarity index 100% rename from src/common/MetaPreview/index.js rename to src/components/MetaPreview/index.js diff --git a/src/common/MetaPreview/styles.less b/src/components/MetaPreview/styles.less similarity index 100% rename from src/common/MetaPreview/styles.less rename to src/components/MetaPreview/styles.less diff --git a/src/common/MetaRow/MetaRow.js b/src/components/MetaRow/MetaRow.js similarity index 98% rename from src/common/MetaRow/MetaRow.js rename to src/components/MetaRow/MetaRow.js index 7d023202a..9f076c835 100644 --- a/src/common/MetaRow/MetaRow.js +++ b/src/components/MetaRow/MetaRow.js @@ -5,7 +5,7 @@ const ReactIs = require('react-is'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const CONSTANTS = require('stremio/common/CONSTANTS'); const useTranslate = require('stremio/common/useTranslate'); const MetaRowPlaceholder = require('./MetaRowPlaceholder'); diff --git a/src/common/MetaRow/MetaRowPlaceholder/MetaRowPlaceholder.js b/src/components/MetaRow/MetaRowPlaceholder/MetaRowPlaceholder.js similarity index 97% rename from src/common/MetaRow/MetaRowPlaceholder/MetaRowPlaceholder.js rename to src/components/MetaRow/MetaRowPlaceholder/MetaRowPlaceholder.js index 05c0e7c2f..33a2eb33d 100644 --- a/src/common/MetaRow/MetaRowPlaceholder/MetaRowPlaceholder.js +++ b/src/components/MetaRow/MetaRowPlaceholder/MetaRowPlaceholder.js @@ -5,7 +5,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const CONSTANTS = require('stremio/common/CONSTANTS'); const styles = require('./styles'); diff --git a/src/common/MetaRow/MetaRowPlaceholder/index.js b/src/components/MetaRow/MetaRowPlaceholder/index.js similarity index 100% rename from src/common/MetaRow/MetaRowPlaceholder/index.js rename to src/components/MetaRow/MetaRowPlaceholder/index.js diff --git a/src/common/MetaRow/MetaRowPlaceholder/styles.less b/src/components/MetaRow/MetaRowPlaceholder/styles.less similarity index 100% rename from src/common/MetaRow/MetaRowPlaceholder/styles.less rename to src/components/MetaRow/MetaRowPlaceholder/styles.less diff --git a/src/common/MetaRow/index.js b/src/components/MetaRow/index.js similarity index 100% rename from src/common/MetaRow/index.js rename to src/components/MetaRow/index.js diff --git a/src/common/MetaRow/styles.less b/src/components/MetaRow/styles.less similarity index 100% rename from src/common/MetaRow/styles.less rename to src/components/MetaRow/styles.less diff --git a/src/common/ModalDialog/ModalDialog.js b/src/components/ModalDialog/ModalDialog.js similarity index 99% rename from src/common/ModalDialog/ModalDialog.js rename to src/components/ModalDialog/ModalDialog.js index 1efa6ea6e..36f09e370 100644 --- a/src/common/ModalDialog/ModalDialog.js +++ b/src/components/ModalDialog/ModalDialog.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useRouteFocused, useModalsContainer } = require('stremio-router'); -const Button = require('stremio/common/Button'); +const Button = require('stremio/components/Button'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { Modal } = require('stremio-router'); const styles = require('./styles'); diff --git a/src/common/ModalDialog/index.js b/src/components/ModalDialog/index.js similarity index 100% rename from src/common/ModalDialog/index.js rename to src/components/ModalDialog/index.js diff --git a/src/common/ModalDialog/styles.less b/src/components/ModalDialog/styles.less similarity index 100% rename from src/common/ModalDialog/styles.less rename to src/components/ModalDialog/styles.less diff --git a/src/common/Multiselect/Multiselect.js b/src/components/Multiselect/Multiselect.js similarity index 97% rename from src/common/Multiselect/Multiselect.js rename to src/components/Multiselect/Multiselect.js index 73638eaa0..c791c60d1 100644 --- a/src/common/Multiselect/Multiselect.js +++ b/src/components/Multiselect/Multiselect.js @@ -4,9 +4,9 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); -const Popup = require('stremio/common/Popup'); -const ModalDialog = require('stremio/common/ModalDialog'); +const { Button } = require('stremio/components'); +const Popup = require('stremio/components/Popup'); +const ModalDialog = require('stremio/components/ModalDialog'); const useBinaryState = require('stremio/common/useBinaryState'); const styles = require('./styles'); diff --git a/src/common/Multiselect/index.js b/src/components/Multiselect/index.js similarity index 100% rename from src/common/Multiselect/index.js rename to src/components/Multiselect/index.js diff --git a/src/common/Multiselect/styles.less b/src/components/Multiselect/styles.less similarity index 98% rename from src/common/Multiselect/styles.less rename to src/components/Multiselect/styles.less index cfb0c3234..f87c86d9b 100644 --- a/src/common/Multiselect/styles.less +++ b/src/components/Multiselect/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Popup/styles.less') { +:import('~stremio/components/Popup/styles.less') { popup-menu-container: menu-container; } diff --git a/src/common/MultiselectMenu/Dropdown/Dropdown.less b/src/components/MultiselectMenu/Dropdown/Dropdown.less similarity index 100% rename from src/common/MultiselectMenu/Dropdown/Dropdown.less rename to src/components/MultiselectMenu/Dropdown/Dropdown.less diff --git a/src/common/MultiselectMenu/Dropdown/Dropdown.tsx b/src/components/MultiselectMenu/Dropdown/Dropdown.tsx similarity index 97% rename from src/common/MultiselectMenu/Dropdown/Dropdown.tsx rename to src/components/MultiselectMenu/Dropdown/Dropdown.tsx index cb7de76c2..b58582271 100644 --- a/src/common/MultiselectMenu/Dropdown/Dropdown.tsx +++ b/src/components/MultiselectMenu/Dropdown/Dropdown.tsx @@ -1,7 +1,7 @@ // Copyright (C) 2017-2024 Smart code 203358507 import React from 'react'; -import Button from 'stremio/common/Button'; +import { Button } from 'stremio/components'; import { useTranslation } from 'react-i18next'; import classNames from 'classnames'; import Option from './Option'; diff --git a/src/common/MultiselectMenu/Dropdown/Option/Option.less b/src/components/MultiselectMenu/Dropdown/Option/Option.less similarity index 100% rename from src/common/MultiselectMenu/Dropdown/Option/Option.less rename to src/components/MultiselectMenu/Dropdown/Option/Option.less diff --git a/src/common/MultiselectMenu/Dropdown/Option/Option.tsx b/src/components/MultiselectMenu/Dropdown/Option/Option.tsx similarity index 96% rename from src/common/MultiselectMenu/Dropdown/Option/Option.tsx rename to src/components/MultiselectMenu/Dropdown/Option/Option.tsx index 13ea37bd5..877bebc72 100644 --- a/src/common/MultiselectMenu/Dropdown/Option/Option.tsx +++ b/src/components/MultiselectMenu/Dropdown/Option/Option.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from 'react'; import classNames from 'classnames'; -import Button from 'stremio/common/Button'; +import { Button } from 'stremio/components'; import styles from './Option.less'; import Icon from '@stremio/stremio-icons/react'; diff --git a/src/common/MultiselectMenu/Dropdown/Option/index.ts b/src/components/MultiselectMenu/Dropdown/Option/index.ts similarity index 100% rename from src/common/MultiselectMenu/Dropdown/Option/index.ts rename to src/components/MultiselectMenu/Dropdown/Option/index.ts diff --git a/src/common/MultiselectMenu/Dropdown/index.ts b/src/components/MultiselectMenu/Dropdown/index.ts similarity index 100% rename from src/common/MultiselectMenu/Dropdown/index.ts rename to src/components/MultiselectMenu/Dropdown/index.ts diff --git a/src/common/MultiselectMenu/MultiselectMenu.less b/src/components/MultiselectMenu/MultiselectMenu.less similarity index 100% rename from src/common/MultiselectMenu/MultiselectMenu.less rename to src/components/MultiselectMenu/MultiselectMenu.less diff --git a/src/common/MultiselectMenu/MultiselectMenu.tsx b/src/components/MultiselectMenu/MultiselectMenu.tsx similarity index 97% rename from src/common/MultiselectMenu/MultiselectMenu.tsx rename to src/components/MultiselectMenu/MultiselectMenu.tsx index df4208c4c..35be107c9 100644 --- a/src/common/MultiselectMenu/MultiselectMenu.tsx +++ b/src/components/MultiselectMenu/MultiselectMenu.tsx @@ -1,7 +1,7 @@ // Copyright (C) 2017-2024 Smart code 203358507 import React from 'react'; -import Button from 'stremio/common/Button'; +import { Button } from 'stremio/components'; import useBinaryState from 'stremio/common/useBinaryState'; import Dropdown from './Dropdown'; import classNames from 'classnames'; diff --git a/src/common/MultiselectMenu/index.ts b/src/components/MultiselectMenu/index.ts similarity index 100% rename from src/common/MultiselectMenu/index.ts rename to src/components/MultiselectMenu/index.ts diff --git a/src/common/MultiselectMenu/types.d.ts b/src/components/MultiselectMenu/types.d.ts similarity index 100% rename from src/common/MultiselectMenu/types.d.ts rename to src/components/MultiselectMenu/types.d.ts diff --git a/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js b/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js similarity index 97% rename from src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js rename to src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js index 0df4e833f..0cedd8638 100644 --- a/src/common/NavBar/HorizontalNavBar/HorizontalNavBar.js +++ b/src/components/NavBar/HorizontalNavBar/HorizontalNavBar.js @@ -4,8 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); -const Image = require('stremio/common/Image'); +const { Button, Image } = require('stremio/components'); const useFullscreen = require('stremio/common/useFullscreen'); const usePWA = require('stremio/common/usePWA'); const SearchBar = require('./SearchBar'); diff --git a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenu.js b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenu.js similarity index 97% rename from src/common/NavBar/HorizontalNavBar/NavMenu/NavMenu.js rename to src/components/NavBar/HorizontalNavBar/NavMenu/NavMenu.js index 8c4477b42..8d381f3ca 100644 --- a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenu.js +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenu.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useRouteFocused } = require('stremio-router'); -const Popup = require('stremio/common/Popup'); +const Popup = require('stremio/components/Popup'); const useBinaryState = require('stremio/common/useBinaryState'); const NavMenuContent = require('./NavMenuContent'); const styles = require('./styles.less'); diff --git a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js similarity index 99% rename from src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js rename to src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js index 25a647d33..832492acb 100644 --- a/src/common/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js @@ -6,7 +6,7 @@ const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { useServices } = require('stremio/services'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const useFullscreen = require('stremio/common/useFullscreen'); const useProfile = require('stremio/common/useProfile'); const usePWA = require('stremio/common/usePWA'); diff --git a/src/common/NavBar/HorizontalNavBar/NavMenu/index.js b/src/components/NavBar/HorizontalNavBar/NavMenu/index.js similarity index 100% rename from src/common/NavBar/HorizontalNavBar/NavMenu/index.js rename to src/components/NavBar/HorizontalNavBar/NavMenu/index.js diff --git a/src/common/NavBar/HorizontalNavBar/NavMenu/styles.less b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less similarity index 98% rename from src/common/NavBar/HorizontalNavBar/NavMenu/styles.less rename to src/components/NavBar/HorizontalNavBar/NavMenu/styles.less index 5d1b71b93..f7f36cab9 100644 --- a/src/common/NavBar/HorizontalNavBar/NavMenu/styles.less +++ b/src/components/NavBar/HorizontalNavBar/NavMenu/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Popup/styles.less') { +:import('~stremio/components/Popup/styles.less') { popup-menu-container: menu-container; } diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js b/src/components/NavBar/HorizontalNavBar/SearchBar/SearchBar.js similarity index 98% rename from src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js rename to src/components/NavBar/HorizontalNavBar/SearchBar/SearchBar.js index f9e4176bd..b87c555e5 100644 --- a/src/common/NavBar/HorizontalNavBar/SearchBar/SearchBar.js +++ b/src/components/NavBar/HorizontalNavBar/SearchBar/SearchBar.js @@ -7,14 +7,13 @@ const debounce = require('lodash.debounce'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { useRouteFocused } = require('stremio-router'); -const Button = require('stremio/common/Button'); +const { Button, TextInput } = require('stremio/components'); const useTorrent = require('stremio/common/useTorrent'); const { withCoreSuspender } = require('stremio/common/CoreSuspender'); const useSearchHistory = require('./useSearchHistory'); const useLocalSearch = require('./useLocalSearch'); const styles = require('./styles'); const useBinaryState = require('stremio/common/useBinaryState'); -const { default: TextInput } = require('stremio/common/TextInput'); const SearchBar = React.memo(({ className, query, active }) => { const { t } = useTranslation(); diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/index.js b/src/components/NavBar/HorizontalNavBar/SearchBar/index.js similarity index 100% rename from src/common/NavBar/HorizontalNavBar/SearchBar/index.js rename to src/components/NavBar/HorizontalNavBar/SearchBar/index.js diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/styles.less b/src/components/NavBar/HorizontalNavBar/SearchBar/styles.less similarity index 100% rename from src/common/NavBar/HorizontalNavBar/SearchBar/styles.less rename to src/components/NavBar/HorizontalNavBar/SearchBar/styles.less diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.d.ts b/src/components/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.d.ts similarity index 100% rename from src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.d.ts rename to src/components/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.d.ts diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js b/src/components/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js similarity index 100% rename from src/common/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js rename to src/components/NavBar/HorizontalNavBar/SearchBar/useLocalSearch.js diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.d.ts b/src/components/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.d.ts similarity index 100% rename from src/common/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.d.ts rename to src/components/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.d.ts diff --git a/src/common/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.js b/src/components/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.js similarity index 100% rename from src/common/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.js rename to src/components/NavBar/HorizontalNavBar/SearchBar/useSearchHistory.js diff --git a/src/common/NavBar/HorizontalNavBar/index.js b/src/components/NavBar/HorizontalNavBar/index.js similarity index 100% rename from src/common/NavBar/HorizontalNavBar/index.js rename to src/components/NavBar/HorizontalNavBar/index.js diff --git a/src/common/NavBar/HorizontalNavBar/styles.less b/src/components/NavBar/HorizontalNavBar/styles.less similarity index 100% rename from src/common/NavBar/HorizontalNavBar/styles.less rename to src/components/NavBar/HorizontalNavBar/styles.less diff --git a/src/common/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js b/src/components/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js similarity index 95% rename from src/common/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js rename to src/components/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js index fba97ed55..65c6a02a9 100644 --- a/src/common/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js +++ b/src/components/NavBar/VerticalNavBar/NavTabButton/NavTabButton.js @@ -4,8 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); -const Image = require('stremio/common/Image'); +const { Button, Image } = require('stremio/components'); const styles = require('./styles'); const NavTabButton = ({ className, logo, icon, label, href, selected, onClick }) => { diff --git a/src/common/NavBar/VerticalNavBar/NavTabButton/index.js b/src/components/NavBar/VerticalNavBar/NavTabButton/index.js similarity index 100% rename from src/common/NavBar/VerticalNavBar/NavTabButton/index.js rename to src/components/NavBar/VerticalNavBar/NavTabButton/index.js diff --git a/src/common/NavBar/VerticalNavBar/NavTabButton/styles.less b/src/components/NavBar/VerticalNavBar/NavTabButton/styles.less similarity index 100% rename from src/common/NavBar/VerticalNavBar/NavTabButton/styles.less rename to src/components/NavBar/VerticalNavBar/NavTabButton/styles.less diff --git a/src/common/NavBar/VerticalNavBar/VerticalNavBar.js b/src/components/NavBar/VerticalNavBar/VerticalNavBar.js similarity index 100% rename from src/common/NavBar/VerticalNavBar/VerticalNavBar.js rename to src/components/NavBar/VerticalNavBar/VerticalNavBar.js diff --git a/src/common/NavBar/VerticalNavBar/index.js b/src/components/NavBar/VerticalNavBar/index.js similarity index 100% rename from src/common/NavBar/VerticalNavBar/index.js rename to src/components/NavBar/VerticalNavBar/index.js diff --git a/src/common/NavBar/VerticalNavBar/styles.less b/src/components/NavBar/VerticalNavBar/styles.less similarity index 100% rename from src/common/NavBar/VerticalNavBar/styles.less rename to src/components/NavBar/VerticalNavBar/styles.less diff --git a/src/common/NavBar/index.js b/src/components/NavBar/index.js similarity index 100% rename from src/common/NavBar/index.js rename to src/components/NavBar/index.js diff --git a/src/common/Popup/Popup.js b/src/components/Popup/Popup.js similarity index 100% rename from src/common/Popup/Popup.js rename to src/components/Popup/Popup.js diff --git a/src/common/Popup/index.js b/src/components/Popup/index.js similarity index 100% rename from src/common/Popup/index.js rename to src/components/Popup/index.js diff --git a/src/common/Popup/styles.less b/src/components/Popup/styles.less similarity index 100% rename from src/common/Popup/styles.less rename to src/components/Popup/styles.less diff --git a/src/common/RadioButton/RadioButton.less b/src/components/RadioButton/RadioButton.less similarity index 100% rename from src/common/RadioButton/RadioButton.less rename to src/components/RadioButton/RadioButton.less diff --git a/src/common/RadioButton/RadioButton.tsx b/src/components/RadioButton/RadioButton.tsx similarity index 100% rename from src/common/RadioButton/RadioButton.tsx rename to src/components/RadioButton/RadioButton.tsx diff --git a/src/common/RadioButton/index.ts b/src/components/RadioButton/index.ts similarity index 100% rename from src/common/RadioButton/index.ts rename to src/components/RadioButton/index.ts diff --git a/src/common/SearchBar/SearchBar.js b/src/components/SearchBar/SearchBar.js similarity index 93% rename from src/common/SearchBar/SearchBar.js rename to src/components/SearchBar/SearchBar.js index 23ad327e0..5a31f4f6f 100644 --- a/src/common/SearchBar/SearchBar.js +++ b/src/components/SearchBar/SearchBar.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { default: TextInput } = require('../TextInput'); +const { default: TextInput } = require('stremio/components/TextInput'); const SearchBarPlaceholder = require('./SearchBarPlaceholder'); const styles = require('./styles'); diff --git a/src/common/SearchBar/SearchBarPlaceholder/SearchBarPlaceholder.js b/src/components/SearchBar/SearchBarPlaceholder/SearchBarPlaceholder.js similarity index 100% rename from src/common/SearchBar/SearchBarPlaceholder/SearchBarPlaceholder.js rename to src/components/SearchBar/SearchBarPlaceholder/SearchBarPlaceholder.js diff --git a/src/common/SearchBar/SearchBarPlaceholder/index.js b/src/components/SearchBar/SearchBarPlaceholder/index.js similarity index 100% rename from src/common/SearchBar/SearchBarPlaceholder/index.js rename to src/components/SearchBar/SearchBarPlaceholder/index.js diff --git a/src/common/SearchBar/SearchBarPlaceholder/styles.less b/src/components/SearchBar/SearchBarPlaceholder/styles.less similarity index 100% rename from src/common/SearchBar/SearchBarPlaceholder/styles.less rename to src/components/SearchBar/SearchBarPlaceholder/styles.less diff --git a/src/common/SearchBar/index.js b/src/components/SearchBar/index.js similarity index 100% rename from src/common/SearchBar/index.js rename to src/components/SearchBar/index.js diff --git a/src/common/SearchBar/styles.less b/src/components/SearchBar/styles.less similarity index 100% rename from src/common/SearchBar/styles.less rename to src/components/SearchBar/styles.less diff --git a/src/common/SharePrompt/SharePrompt.js b/src/components/SharePrompt/SharePrompt.js similarity index 96% rename from src/common/SharePrompt/SharePrompt.js rename to src/components/SharePrompt/SharePrompt.js index 4d49087c8..0a9843a02 100644 --- a/src/common/SharePrompt/SharePrompt.js +++ b/src/components/SharePrompt/SharePrompt.js @@ -7,9 +7,9 @@ const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { useRouteFocused } = require('stremio-router'); const { useServices } = require('stremio/services'); +const { Button } = require('stremio/components'); +const { default: TextInput } = require('stremio/components/TextInput'); const useToast = require('stremio/common/Toast/useToast'); -const { default: TextInput } = require('../TextInput'); -const Button = require('stremio/common/Button'); const styles = require('./styles'); const SharePrompt = ({ className, url }) => { diff --git a/src/common/SharePrompt/index.js b/src/components/SharePrompt/index.js similarity index 100% rename from src/common/SharePrompt/index.js rename to src/components/SharePrompt/index.js diff --git a/src/common/SharePrompt/styles.less b/src/components/SharePrompt/styles.less similarity index 100% rename from src/common/SharePrompt/styles.less rename to src/components/SharePrompt/styles.less diff --git a/src/common/Slider/Slider.js b/src/components/Slider/Slider.js similarity index 100% rename from src/common/Slider/Slider.js rename to src/components/Slider/Slider.js diff --git a/src/common/Slider/index.js b/src/components/Slider/index.js similarity index 100% rename from src/common/Slider/index.js rename to src/components/Slider/index.js diff --git a/src/common/Slider/styles.less b/src/components/Slider/styles.less similarity index 100% rename from src/common/Slider/styles.less rename to src/components/Slider/styles.less diff --git a/src/common/TextInput/TextInput.tsx b/src/components/TextInput/TextInput.tsx similarity index 100% rename from src/common/TextInput/TextInput.tsx rename to src/components/TextInput/TextInput.tsx diff --git a/src/common/TextInput/index.ts b/src/components/TextInput/index.ts similarity index 100% rename from src/common/TextInput/index.ts rename to src/components/TextInput/index.ts diff --git a/src/common/TextInput/styles.less b/src/components/TextInput/styles.less similarity index 100% rename from src/common/TextInput/styles.less rename to src/components/TextInput/styles.less diff --git a/src/common/Toggle/Toggle.js b/src/components/Toggle/Toggle.js similarity index 93% rename from src/common/Toggle/Toggle.js rename to src/components/Toggle/Toggle.js index 837944747..420f78392 100644 --- a/src/common/Toggle/Toggle.js +++ b/src/components/Toggle/Toggle.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const Toggle = React.forwardRef(({ className, checked, children, ...props }, ref) => { diff --git a/src/common/Toggle/index.js b/src/components/Toggle/index.js similarity index 100% rename from src/common/Toggle/index.js rename to src/components/Toggle/index.js diff --git a/src/common/Toggle/styles.less b/src/components/Toggle/styles.less similarity index 100% rename from src/common/Toggle/styles.less rename to src/components/Toggle/styles.less diff --git a/src/common/Transition/Transition.tsx b/src/components/Transition/Transition.tsx similarity index 100% rename from src/common/Transition/Transition.tsx rename to src/components/Transition/Transition.tsx diff --git a/src/common/Transition/index.ts b/src/components/Transition/index.ts similarity index 100% rename from src/common/Transition/index.ts rename to src/components/Transition/index.ts diff --git a/src/common/Video/Video.js b/src/components/Video/Video.js similarity index 98% rename from src/common/Video/Video.js rename to src/components/Video/Video.js index f74b994eb..efa1a6847 100644 --- a/src/common/Video/Video.js +++ b/src/components/Video/Video.js @@ -6,9 +6,7 @@ const classnames = require('classnames'); const { t } = require('i18next'); const { useRouteFocused } = require('stremio-router'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); -const Image = require('stremio/common/Image'); -const Popup = require('stremio/common/Popup'); +const { Button, Image, Popup } = require('stremio/components'); const useBinaryState = require('stremio/common/useBinaryState'); const VideoPlaceholder = require('./VideoPlaceholder'); const styles = require('./styles'); diff --git a/src/common/Video/VideoPlaceholder/VideoPlaceholder.js b/src/components/Video/VideoPlaceholder/VideoPlaceholder.js similarity index 100% rename from src/common/Video/VideoPlaceholder/VideoPlaceholder.js rename to src/components/Video/VideoPlaceholder/VideoPlaceholder.js diff --git a/src/common/Video/VideoPlaceholder/index.js b/src/components/Video/VideoPlaceholder/index.js similarity index 100% rename from src/common/Video/VideoPlaceholder/index.js rename to src/components/Video/VideoPlaceholder/index.js diff --git a/src/common/Video/VideoPlaceholder/styles.less b/src/components/Video/VideoPlaceholder/styles.less similarity index 100% rename from src/common/Video/VideoPlaceholder/styles.less rename to src/components/Video/VideoPlaceholder/styles.less diff --git a/src/common/Video/index.js b/src/components/Video/index.js similarity index 100% rename from src/common/Video/index.js rename to src/components/Video/index.js diff --git a/src/common/Video/styles.less b/src/components/Video/styles.less similarity index 99% rename from src/common/Video/styles.less rename to src/components/Video/styles.less index 2083a3458..3b0c91367 100644 --- a/src/common/Video/styles.less +++ b/src/components/Video/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Popup/styles.less') { +:import('~stremio/components/Popup/styles.less') { context-menu-container: menu-container; menu-direction-top-left: menu-direction-top-left; menu-direction-bottom-left: menu-direction-bottom-left; diff --git a/src/components/index.ts b/src/components/index.ts new file mode 100644 index 000000000..f65d66f81 --- /dev/null +++ b/src/components/index.ts @@ -0,0 +1,60 @@ +import AddonDetailsModal from './AddonDetailsModal'; +import BottomSheet from './BottomSheet'; +import Button from './Button'; +import Chips from './Chips'; +import ColorInput from './ColorInput'; +import ContinueWatchingItem from './ContinueWatchingItem'; +import DelayedRenderer from './DelayedRenderer'; +import EventModal from './EventModal'; +import HorizontalScroll from './HorizontalScroll'; +import Image from './Image'; +import LibItem from './LibItem'; +import MainNavBars from './MainNavBars'; +import MetaItem from './MetaItem'; +import MetaPreview from './MetaPreview'; +import MetaRow from './MetaRow'; +import ModalDialog from './ModalDialog'; +import Multiselect from './Multiselect'; +import MultiselectMenu from './MultiselectMenu'; +import { HorizontalNavBar, VerticalNavBar } from './NavBar'; +import Popup from './Popup'; +import RadioButton from './RadioButton'; +import SearchBar from './SearchBar'; +import SharePrompt from './SharePrompt'; +import Slider from './Slider'; +import TextInput from './TextInput'; +import Toggle from './Toggle'; +import Transition from './Transition'; +import Video from './Video'; + +export { + AddonDetailsModal, + BottomSheet, + Button, + Chips, + ColorInput, + ContinueWatchingItem, + DelayedRenderer, + EventModal, + HorizontalScroll, + Image, + LibItem, + MainNavBars, + MetaItem, + MetaPreview, + MetaRow, + ModalDialog, + Multiselect, + MultiselectMenu, + HorizontalNavBar, + VerticalNavBar, + Popup, + RadioButton, + SearchBar, + SharePrompt, + Slider, + TextInput, + Toggle, + Transition, + Video, +}; diff --git a/src/modules.d.ts b/src/modules.d.ts index b3eb8813f..549eb71c8 100644 --- a/src/modules.d.ts +++ b/src/modules.d.ts @@ -4,4 +4,4 @@ declare module '*.less' { } declare module 'stremio/common'; -declare module 'stremio/common/Button'; +declare module 'stremio/components/Button'; diff --git a/src/routes/Addons/Addon/Addon.js b/src/routes/Addons/Addon/Addon.js index ae27dca51..0b1687465 100644 --- a/src/routes/Addons/Addon/Addon.js +++ b/src/routes/Addons/Addon/Addon.js @@ -5,7 +5,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Button, Image } = require('stremio/common'); +const { Button, Image } = require('stremio/components'); const styles = require('./styles'); const Addon = ({ className, id, name, version, logo, description, types, behaviorHints, installed, onToggle, onConfigure, onShare, dataset }) => { diff --git a/src/routes/Addons/Addons.js b/src/routes/Addons/Addons.js index 1c410b819..2ceb5b4fb 100644 --- a/src/routes/Addons/Addons.js +++ b/src/routes/Addons/Addons.js @@ -5,7 +5,8 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { AddonDetailsModal, Button, Image, Multiselect, MainNavBars, TextInput, SearchBar, SharePrompt, ModalDialog, usePlatform, useBinaryState, withCoreSuspender } = require('stremio/common'); +const { usePlatform, useBinaryState, withCoreSuspender } = require('stremio/common'); +const { AddonDetailsModal, Button, Image, MainNavBars, Multiselect, ModalDialog, SearchBar, SharePrompt, TextInput } = require('stremio/components'); const Addon = require('./Addon'); const useInstalledAddons = require('./useInstalledAddons'); const useRemoteAddons = require('./useRemoteAddons'); diff --git a/src/routes/Addons/styles.less b/src/routes/Addons/styles.less index 8060e23b8..8e53ac07c 100644 --- a/src/routes/Addons/styles.less +++ b/src/routes/Addons/styles.less @@ -3,20 +3,20 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; } -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { share-modal-content: modal-dialog-content; } -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { addon-modal-content: modal-dialog-content; cancel-button-label: label; } -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { filters-modal-container: modal-dialog-container; filters-modal-content: modal-dialog-content; } diff --git a/src/routes/Board/Board.js b/src/routes/Board/Board.js index a494a02ee..d78e212c3 100644 --- a/src/routes/Board/Board.js +++ b/src/routes/Board/Board.js @@ -4,7 +4,9 @@ const React = require('react'); const classnames = require('classnames'); const debounce = require('lodash.debounce'); const { useTranslation } = require('react-i18next'); -const { MainNavBars, MetaRow, ContinueWatchingItem, MetaItem, StreamingServerWarning, useStreamingServer, useNotifications, withCoreSuspender, getVisibleChildrenRange, EventModal } = require('stremio/common'); +const { useStreamingServer, useNotifications, withCoreSuspender, getVisibleChildrenRange } = require('stremio/common'); +const { ContinueWatchingItem, EventModal, MainNavBars, MetaItem, MetaRow } = require('stremio/components'); +const StreamingServerWarning = require('./StreamingServerWarning'); const useBoard = require('./useBoard'); const useContinueWatchingPreview = require('./useContinueWatchingPreview'); const styles = require('./styles'); diff --git a/src/common/StreamingServerWarning/StreamingServerWarning.js b/src/routes/Board/StreamingServerWarning/StreamingServerWarning.js similarity index 98% rename from src/common/StreamingServerWarning/StreamingServerWarning.js rename to src/routes/Board/StreamingServerWarning/StreamingServerWarning.js index d427215cb..61a70dff3 100644 --- a/src/common/StreamingServerWarning/StreamingServerWarning.js +++ b/src/routes/Board/StreamingServerWarning/StreamingServerWarning.js @@ -5,7 +5,7 @@ const { useServices } = require('stremio/services'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const useProfile = require('stremio/common/useProfile'); const { withCoreSuspender } = require('stremio/common/CoreSuspender'); const styles = require('./styles'); diff --git a/src/common/StreamingServerWarning/index.js b/src/routes/Board/StreamingServerWarning/index.js similarity index 100% rename from src/common/StreamingServerWarning/index.js rename to src/routes/Board/StreamingServerWarning/index.js diff --git a/src/common/StreamingServerWarning/styles.less b/src/routes/Board/StreamingServerWarning/styles.less similarity index 100% rename from src/common/StreamingServerWarning/styles.less rename to src/routes/Board/StreamingServerWarning/styles.less diff --git a/src/routes/Board/styles.less b/src/routes/Board/styles.less index b949d8689..d410a35c0 100644 --- a/src/routes/Board/styles.less +++ b/src/routes/Board/styles.less @@ -3,11 +3,11 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/MetaRow/styles.less') { +:import('~stremio/components/MetaRow/styles.less') { meta-item: meta-item; } -:import('~stremio/common/MetaRow/MetaRowPlaceholder/styles.less') { +:import('~stremio/components/MetaRow/MetaRowPlaceholder/styles.less') { meta-item-placeholder: meta-item; } diff --git a/src/routes/Calendar/Calendar.tsx b/src/routes/Calendar/Calendar.tsx index 2ff1da70a..6d9fbe90e 100644 --- a/src/routes/Calendar/Calendar.tsx +++ b/src/routes/Calendar/Calendar.tsx @@ -1,7 +1,8 @@ // Copyright (C) 2017-2024 Smart code 203358507 import React, { useMemo, useState } from 'react'; -import { MainNavBars, BottomSheet, useProfile, withCoreSuspender } from 'stremio/common'; +import { useProfile, withCoreSuspender } from 'stremio/common'; +import { MainNavBars, BottomSheet } from 'stremio/components'; import Selector from './Selector'; import Table from './Table'; import List from './List'; @@ -54,7 +55,7 @@ const Calendar = ({ urlParams }: Props) => { profile={profile} onChange={setSelected} /> - +
{ diff --git a/src/routes/Calendar/Selector/Selector.tsx b/src/routes/Calendar/Selector/Selector.tsx index d6aa23336..ad13d606c 100644 --- a/src/routes/Calendar/Selector/Selector.tsx +++ b/src/routes/Calendar/Selector/Selector.tsx @@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from 'react'; import Icon from '@stremio/stremio-icons/react'; -import { Button } from 'stremio/common'; +import { Button } from 'stremio/components'; import useCalendarDate from '../useCalendarDate'; import styles from './Selector.less'; diff --git a/src/routes/Calendar/Table/Cell/Cell.tsx b/src/routes/Calendar/Table/Cell/Cell.tsx index d1e8e13ae..715ee46f7 100644 --- a/src/routes/Calendar/Table/Cell/Cell.tsx +++ b/src/routes/Calendar/Table/Cell/Cell.tsx @@ -3,7 +3,7 @@ import React, { useMemo } from 'react'; import Icon from '@stremio/stremio-icons/react'; import classNames from 'classnames'; -import { Button, Image, HorizontalScroll } from 'stremio/common'; +import { Button, HorizontalScroll, Image } from 'stremio/components'; import styles from './Cell.less'; type Props = { diff --git a/src/routes/Discover/Discover.js b/src/routes/Discover/Discover.js index 2e2e90beb..abcdfb205 100644 --- a/src/routes/Discover/Discover.js +++ b/src/routes/Discover/Discover.js @@ -5,7 +5,8 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { useServices } = require('stremio/services'); -const { AddonDetailsModal, DelayedRenderer, Button, MainNavBars, MetaItem, Image, MetaPreview, Multiselect, ModalDialog, CONSTANTS, useBinaryState, useOnScrollToBottom, withCoreSuspender } = require('stremio/common'); +const { CONSTANTS, useBinaryState, useOnScrollToBottom, withCoreSuspender } = require('stremio/common'); +const { AddonDetailsModal, Button, DelayedRenderer, Image, MainNavBars, MetaItem, MetaPreview, Multiselect, ModalDialog } = require('stremio/components'); const useDiscover = require('./useDiscover'); const useSelectableInputs = require('./useSelectableInputs'); const styles = require('./styles'); diff --git a/src/routes/Discover/styles.less b/src/routes/Discover/styles.less index 9f7969702..7460d1d47 100644 --- a/src/routes/Discover/styles.less +++ b/src/routes/Discover/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; multiselect-modal-container: modal-container; multiselect-option-container: option-container; @@ -11,7 +11,7 @@ multiselect-label: label; } -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { selectable-inputs-modal-container: modal-dialog-container; selectable-inputs-modal-content: modal-dialog-content; } diff --git a/src/routes/Intro/ConsentToggle/ConsentToggle.js b/src/routes/Intro/ConsentToggle/ConsentToggle.js index 76d1f38c9..9a0210607 100644 --- a/src/routes/Intro/ConsentToggle/ConsentToggle.js +++ b/src/routes/Intro/ConsentToggle/ConsentToggle.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Button, Toggle } = require('stremio/common'); +const { Button, Toggle } = require('stremio/components'); const styles = require('./styles'); const ConsentToggle = React.forwardRef(({ className, label, link, href, onToggle, ...props }, ref) => { diff --git a/src/routes/Intro/ConsentToggle/styles.less b/src/routes/Intro/ConsentToggle/styles.less index 6bd2ca2e8..e8229e244 100644 --- a/src/routes/Intro/ConsentToggle/styles.less +++ b/src/routes/Intro/ConsentToggle/styles.less @@ -2,7 +2,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; -:import('~stremio/common/Toggle/styles.less') { +:import('~stremio/components/Toggle/styles.less') { checkbox-icon: icon; } diff --git a/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js b/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js index 36d26e880..a2fc207ec 100644 --- a/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js +++ b/src/routes/Intro/CredentialsTextInput/CredentialsTextInput.js @@ -2,7 +2,7 @@ const React = require('react'); const PropTypes = require('prop-types'); -const { default: TextInput } = require('stremio/common/TextInput'); +const { TextInput } = require('stremio/components'); const CredentialsTextInput = React.forwardRef((props, ref) => { const onKeyDown = React.useCallback((event) => { diff --git a/src/routes/Intro/Intro.js b/src/routes/Intro/Intro.js index 8ac2785c6..fc98fe5cf 100644 --- a/src/routes/Intro/Intro.js +++ b/src/routes/Intro/Intro.js @@ -7,7 +7,8 @@ const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { Modal, useRouteFocused } = require('stremio-router'); const { useServices } = require('stremio/services'); -const { Button, Image, useBinaryState } = require('stremio/common'); +const { useBinaryState } = require('stremio/common'); +const { Button, Image } = require('stremio/components'); const CredentialsTextInput = require('./CredentialsTextInput'); const ConsentToggle = require('./ConsentToggle'); const PasswordResetModal = require('./PasswordResetModal'); diff --git a/src/routes/Intro/PasswordResetModal/PasswordResetModal.js b/src/routes/Intro/PasswordResetModal/PasswordResetModal.js index 1061f6044..6f295fdd6 100644 --- a/src/routes/Intro/PasswordResetModal/PasswordResetModal.js +++ b/src/routes/Intro/PasswordResetModal/PasswordResetModal.js @@ -3,7 +3,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const { useRouteFocused } = require('stremio-router'); -const { ModalDialog, usePlatform } = require('stremio/common'); +const { usePlatform } = require('stremio/common'); +const { ModalDialog } = require('stremio/components'); const CredentialsTextInput = require('../CredentialsTextInput'); const styles = require('./styles'); diff --git a/src/routes/Intro/PasswordResetModal/styles.less b/src/routes/Intro/PasswordResetModal/styles.less index 9a84b79c0..9f7e27baf 100644 --- a/src/routes/Intro/PasswordResetModal/styles.less +++ b/src/routes/Intro/PasswordResetModal/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { password-reset-modal-content: modal-dialog-content; cancel-button-label: label; } diff --git a/src/routes/Library/Library.js b/src/routes/Library/Library.js index 8f22a0c00..2871a9b3f 100644 --- a/src/routes/Library/Library.js +++ b/src/routes/Library/Library.js @@ -4,7 +4,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const NotFound = require('stremio/routes/NotFound'); -const { Button, Chips, DelayedRenderer, Multiselect, MainNavBars, LibItem, Image, useProfile, useNotifications, routesRegexp, useOnScrollToBottom, withCoreSuspender } = require('stremio/common'); +const { useProfile, useNotifications, routesRegexp, useOnScrollToBottom, withCoreSuspender } = require('stremio/common'); +const { Button, DelayedRenderer, Chips, Image, MainNavBars, Multiselect, LibItem } = require('stremio/components'); const useLibrary = require('./useLibrary'); const useSelectableInputs = require('./useSelectableInputs'); const styles = require('./styles'); diff --git a/src/routes/Library/styles.less b/src/routes/Library/styles.less index 9bdd49d4a..e6cf97ffa 100644 --- a/src/routes/Library/styles.less +++ b/src/routes/Library/styles.less @@ -3,11 +3,11 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; } -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { selectable-inputs-modal-container: modal-dialog-container; selectable-inputs-modal-content: modal-dialog-content; } diff --git a/src/routes/MetaDetails/MetaDetails.js b/src/routes/MetaDetails/MetaDetails.js index acbe03517..79bd03906 100644 --- a/src/routes/MetaDetails/MetaDetails.js +++ b/src/routes/MetaDetails/MetaDetails.js @@ -4,7 +4,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useServices } = require('stremio/services'); -const { VerticalNavBar, HorizontalNavBar, MetaPreview, ModalDialog, Image, DelayedRenderer, withCoreSuspender } = require('stremio/common'); +const { withCoreSuspender } = require('stremio/common'); +const { VerticalNavBar, HorizontalNavBar, DelayedRenderer, Image, MetaPreview, ModalDialog } = require('stremio/components'); const StreamsList = require('./StreamsList'); const VideosList = require('./VideosList'); const useMetaDetails = require('./useMetaDetails'); diff --git a/src/routes/MetaDetails/StreamsList/Stream/Stream.js b/src/routes/MetaDetails/StreamsList/Stream/Stream.js index e4829ece0..768b8d40a 100644 --- a/src/routes/MetaDetails/StreamsList/Stream/Stream.js +++ b/src/routes/MetaDetails/StreamsList/Stream/Stream.js @@ -5,7 +5,8 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { t } = require('i18next'); -const { Button, Image, useProfile, usePlatform, useToast, Popup, useBinaryState } = require('stremio/common'); +const { useProfile, usePlatform, useToast, useBinaryState } = require('stremio/common'); +const { Button, Image, Popup } = require('stremio/components'); const { useServices } = require('stremio/services'); const { useRouteFocused } = require('stremio-router'); const StreamPlaceholder = require('./StreamPlaceholder'); diff --git a/src/common/PlayIconCircleCentered/PlayIconCircleCentered.js b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/PlayIconCircleCentered/PlayIconCircleCentered.js similarity index 100% rename from src/common/PlayIconCircleCentered/PlayIconCircleCentered.js rename to src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/PlayIconCircleCentered/PlayIconCircleCentered.js diff --git a/src/common/PlayIconCircleCentered/index.js b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/PlayIconCircleCentered/index.js similarity index 100% rename from src/common/PlayIconCircleCentered/index.js rename to src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/PlayIconCircleCentered/index.js diff --git a/src/common/PlayIconCircleCentered/styles.less b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/PlayIconCircleCentered/styles.less similarity index 100% rename from src/common/PlayIconCircleCentered/styles.less rename to src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/PlayIconCircleCentered/styles.less diff --git a/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/StreamPlaceholder.js b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/StreamPlaceholder.js index 47200cfa6..ae400ad2e 100644 --- a/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/StreamPlaceholder.js +++ b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/StreamPlaceholder.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const PlayIconCircleCentered = require('stremio/common/PlayIconCircleCentered'); +const PlayIconCircleCentered = require('./PlayIconCircleCentered'); const styles = require('./styles'); const StreamPlaceholder = ({ className }) => { diff --git a/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/styles.less b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/styles.less index 1c2772963..0de5e0afc 100644 --- a/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/styles.less +++ b/src/routes/MetaDetails/StreamsList/Stream/StreamPlaceholder/styles.less @@ -1,6 +1,6 @@ // Copyright (C) 2017-2023 Smart code 203358507 -:import('~stremio/common/PlayIconCircleCentered/styles.less') { +:import('~./PlayIconCircleCentered/styles.less') { play-icon-circle-centered-background: background; play-icon-circle-centered-icon: icon; } diff --git a/src/routes/MetaDetails/StreamsList/Stream/styles.less b/src/routes/MetaDetails/StreamsList/Stream/styles.less index 22b2abc61..0461c77ee 100644 --- a/src/routes/MetaDetails/StreamsList/Stream/styles.less +++ b/src/routes/MetaDetails/StreamsList/Stream/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Popup/styles.less') { +:import('~stremio/components/Popup/styles.less') { context-menu-container: menu-container; menu-direction-top-left: menu-direction-top-left; menu-direction-bottom-left: menu-direction-bottom-left; diff --git a/src/routes/MetaDetails/StreamsList/StreamsList.js b/src/routes/MetaDetails/StreamsList/StreamsList.js index 56f9c0d08..e1d18bab6 100644 --- a/src/routes/MetaDetails/StreamsList/StreamsList.js +++ b/src/routes/MetaDetails/StreamsList/StreamsList.js @@ -5,7 +5,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Button, Image, Multiselect } = require('stremio/common'); +const { Button, Image, Multiselect } = require('stremio/components'); const { useServices } = require('stremio/services'); const Stream = require('./Stream'); const styles = require('./styles'); diff --git a/src/routes/MetaDetails/StreamsList/styles.less b/src/routes/MetaDetails/StreamsList/styles.less index 7ada03719..c49cedf95 100644 --- a/src/routes/MetaDetails/StreamsList/styles.less +++ b/src/routes/MetaDetails/StreamsList/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; multiselect-label: label; multiselect-icon: icon; diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js index 71c10ce92..29637a24c 100644 --- a/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js +++ b/src/routes/MetaDetails/VideosList/SeasonsBar/SeasonsBar.js @@ -5,10 +5,9 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { t } = require('i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Button } = require('stremio/common'); +const { Button, MultiselectMenu } = require('stremio/components'); const SeasonsBarPlaceholder = require('./SeasonsBarPlaceholder'); const styles = require('./styles'); -const { MultiselectMenu } = require('stremio/common'); const SeasonsBar = ({ className, seasons, season, onSelect }) => { const options = React.useMemo(() => { diff --git a/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less index 5611c8afc..c6719b8c6 100644 --- a/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less +++ b/src/routes/MetaDetails/VideosList/SeasonsBar/styles.less @@ -3,7 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; multiselect-label: label; multiselect-icon: icon; diff --git a/src/routes/MetaDetails/VideosList/VideosList.js b/src/routes/MetaDetails/VideosList/VideosList.js index 14a390b8b..999a1a1ae 100644 --- a/src/routes/MetaDetails/VideosList/VideosList.js +++ b/src/routes/MetaDetails/VideosList/VideosList.js @@ -5,7 +5,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const { t } = require('i18next'); const { useServices } = require('stremio/services'); -const { Image, SearchBar, Toggle, Video } = require('stremio/common'); +const { Image, SearchBar, Toggle, Video } = require('stremio/components'); const SeasonsBar = require('./SeasonsBar'); const styles = require('./styles'); diff --git a/src/routes/MetaDetails/styles.less b/src/routes/MetaDetails/styles.less index 54352fe7e..d703487a1 100644 --- a/src/routes/MetaDetails/styles.less +++ b/src/routes/MetaDetails/styles.less @@ -3,11 +3,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/MetaPreview/styles.less') { - meta-info-container: meta-info-container; -} - -:import('~stremio/common/ModalDialog/styles.less') { +:import('~stremio/components/ModalDialog/styles.less') { modal-dialog-container: modal-dialog-container; title-modal-container: title-container; } diff --git a/src/routes/NotFound/NotFound.js b/src/routes/NotFound/NotFound.js index 69a88d22f..323dfd866 100644 --- a/src/routes/NotFound/NotFound.js +++ b/src/routes/NotFound/NotFound.js @@ -1,7 +1,7 @@ // Copyright (C) 2017-2023 Smart code 203358507 const React = require('react'); -const { Image, HorizontalNavBar } = require('stremio/common'); +const { HorizontalNavBar, Image } = require('stremio/components'); const styles = require('./styles'); const NotFound = () => { diff --git a/src/routes/Player/AudioMenu/AudioMenu.tsx b/src/routes/Player/AudioMenu/AudioMenu.tsx index 92f9c3c01..3149f1336 100644 --- a/src/routes/Player/AudioMenu/AudioMenu.tsx +++ b/src/routes/Player/AudioMenu/AudioMenu.tsx @@ -1,7 +1,8 @@ import React, { MouseEvent, useCallback } from 'react'; import { useTranslation } from 'react-i18next'; import classNames from 'classnames'; -import { Button, languages } from 'stremio/common'; +import { languages } from 'stremio/common'; +import { Button } from 'stremio/components'; import styles from './AudioMenu.less'; type Props = { diff --git a/src/routes/Player/BufferingLoader/BufferingLoader.js b/src/routes/Player/BufferingLoader/BufferingLoader.js index ba700672c..2fea2f4a0 100644 --- a/src/routes/Player/BufferingLoader/BufferingLoader.js +++ b/src/routes/Player/BufferingLoader/BufferingLoader.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Image } = require('stremio/common'); +const { Image } = require('stremio/components'); const styles = require('./styles'); const BufferingLoader = ({ className, logo }) => { diff --git a/src/routes/Player/ControlBar/ControlBar.js b/src/routes/Player/ControlBar/ControlBar.js index a5fe1adf9..0fa6de1a4 100644 --- a/src/routes/Player/ControlBar/ControlBar.js +++ b/src/routes/Player/ControlBar/ControlBar.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Button } = require('stremio/common'); +const { Button } = require('stremio/components'); const { useServices } = require('stremio/services'); const SeekBar = require('./SeekBar'); const VolumeSlider = require('./VolumeSlider'); diff --git a/src/routes/Player/ControlBar/SeekBar/SeekBar.js b/src/routes/Player/ControlBar/SeekBar/SeekBar.js index 7a58aa0a2..3140bf5d1 100644 --- a/src/routes/Player/ControlBar/SeekBar/SeekBar.js +++ b/src/routes/Player/ControlBar/SeekBar/SeekBar.js @@ -5,7 +5,8 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const debounce = require('lodash.debounce'); const { useRouteFocused } = require('stremio-router'); -const { Slider, Button, useBinaryState } = require('stremio/common'); +const { useBinaryState } = require('stremio/common'); +const { Button, Slider } = require('stremio/components'); const formatTime = require('./formatTime'); const styles = require('./styles'); diff --git a/src/routes/Player/ControlBar/SeekBar/styles.less b/src/routes/Player/ControlBar/SeekBar/styles.less index 98446fbfb..54e75117d 100644 --- a/src/routes/Player/ControlBar/SeekBar/styles.less +++ b/src/routes/Player/ControlBar/SeekBar/styles.less @@ -2,7 +2,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; -:import('~stremio/common/Slider/styles.less') { +:import('~stremio/components/Slider/styles.less') { slider-track-after: track-after; slider-thumb: thumb; } diff --git a/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js b/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js index 88c95b8d1..420f4ba41 100644 --- a/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js +++ b/src/routes/Player/ControlBar/VolumeSlider/VolumeSlider.js @@ -5,7 +5,7 @@ const PropTypes = require('prop-types'); const classnames = require('classnames'); const debounce = require('lodash.debounce'); const { useRouteFocused } = require('stremio-router'); -const { Slider } = require('stremio/common'); +const { Slider } = require('stremio/components'); const styles = require('./styles'); const VolumeSlider = ({ className, volume, onVolumeChangeRequested }) => { diff --git a/src/routes/Player/ControlBar/VolumeSlider/styles.less b/src/routes/Player/ControlBar/VolumeSlider/styles.less index 98ec07142..517dfc0e5 100644 --- a/src/routes/Player/ControlBar/VolumeSlider/styles.less +++ b/src/routes/Player/ControlBar/VolumeSlider/styles.less @@ -2,7 +2,7 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; -:import('~stremio/common/Slider/styles.less') { +:import('~stremio/components/Slider/styles.less') { slider-track: track; slider-track-after: track-after; } diff --git a/src/routes/Player/Error/Error.js b/src/routes/Player/Error/Error.js index 6bf638a52..c9a7c3bef 100644 --- a/src/routes/Player/Error/Error.js +++ b/src/routes/Player/Error/Error.js @@ -5,7 +5,7 @@ const { useTranslation } = require('react-i18next'); const PropTypes = require('prop-types'); const classNames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const Button = require('stremio/common/Button'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const Error = ({ className, code, message, stream }) => { diff --git a/src/routes/Player/NextVideoPopup/NextVideoPopup.js b/src/routes/Player/NextVideoPopup/NextVideoPopup.js index 51dace5f2..e772f4639 100644 --- a/src/routes/Player/NextVideoPopup/NextVideoPopup.js +++ b/src/routes/Player/NextVideoPopup/NextVideoPopup.js @@ -4,7 +4,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Image, Button, CONSTANTS } = require('stremio/common'); +const { CONSTANTS } = require('stremio/common'); +const { Button, Image } = require('stremio/components'); const styles = require('./styles'); const NextVideoPopup = ({ className, metaItem, nextVideo, onDismiss, onNextVideoRequested }) => { diff --git a/src/routes/Player/OptionsMenu/Option/Option.js b/src/routes/Player/OptionsMenu/Option/Option.js index f769fb476..7caea084c 100644 --- a/src/routes/Player/OptionsMenu/Option/Option.js +++ b/src/routes/Player/OptionsMenu/Option/Option.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Button } = require('stremio/common'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const Option = ({ icon, label, deviceId, disabled, onClick }) => { diff --git a/src/routes/Player/Player.js b/src/routes/Player/Player.js index 2d48f326d..c76a8dcae 100644 --- a/src/routes/Player/Player.js +++ b/src/routes/Player/Player.js @@ -8,7 +8,8 @@ const langs = require('langs'); const { useTranslation } = require('react-i18next'); const { useRouteFocused } = require('stremio-router'); const { useServices } = require('stremio/services'); -const { HorizontalNavBar, Transition, useFullscreen, useBinaryState, useToast, useStreamingServer, withCoreSuspender } = require('stremio/common'); +const { useFullscreen, useBinaryState, useToast, useStreamingServer, withCoreSuspender } = require('stremio/common'); +const { HorizontalNavBar, Transition } = require('stremio/components'); const BufferingLoader = require('./BufferingLoader'); const VolumeChangeIndicator = require('./VolumeChangeIndicator'); const Error = require('./Error'); diff --git a/src/routes/Player/SideDrawer/SideDrawer.less b/src/routes/Player/SideDrawer/SideDrawer.less index 575e3fbc4..be3d0af09 100644 --- a/src/routes/Player/SideDrawer/SideDrawer.less +++ b/src/routes/Player/SideDrawer/SideDrawer.less @@ -2,7 +2,7 @@ @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/MetaPreview/styles.less') { +:import('~stremio/components/MetaPreview/styles.less') { action-buttons-container: action-buttons-container; } diff --git a/src/routes/Player/SideDrawer/SideDrawer.tsx b/src/routes/Player/SideDrawer/SideDrawer.tsx index e40dd3d86..9ed713879 100644 --- a/src/routes/Player/SideDrawer/SideDrawer.tsx +++ b/src/routes/Player/SideDrawer/SideDrawer.tsx @@ -5,8 +5,7 @@ import classNames from 'classnames'; import Icon from '@stremio/stremio-icons/react'; import { useServices } from 'stremio/services'; import { CONSTANTS } from 'stremio/common'; -import MetaPreview from 'stremio/common/MetaPreview/MetaPreview'; -import Video from 'stremio/common/Video/Video'; +import { MetaPreview, Video } from 'stremio/components'; import SeasonsBar from 'stremio/routes/MetaDetails/VideosList/SeasonsBar'; import styles from './SideDrawer.less'; diff --git a/src/routes/Player/SpeedMenu/Option/Option.js b/src/routes/Player/SpeedMenu/Option/Option.js index bac89ed33..1bcde6970 100644 --- a/src/routes/Player/SpeedMenu/Option/Option.js +++ b/src/routes/Player/SpeedMenu/Option/Option.js @@ -3,7 +3,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Button } = require('stremio/common'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const OptionButton = ({ className, value, selected, onSelect }) => { diff --git a/src/routes/Player/SubtitlesMenu/DiscreteSelectInput/DiscreteSelectInput.js b/src/routes/Player/SubtitlesMenu/DiscreteSelectInput/DiscreteSelectInput.js index 924e677eb..a57754793 100644 --- a/src/routes/Player/SubtitlesMenu/DiscreteSelectInput/DiscreteSelectInput.js +++ b/src/routes/Player/SubtitlesMenu/DiscreteSelectInput/DiscreteSelectInput.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Button } = require('stremio/common'); +const { Button } = require('stremio/components'); const styles = require('./styles'); const DiscreteSelectInput = ({ className, value, label, disabled, dataset, onChange }) => { diff --git a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js index 1a51d1363..44cd20864 100644 --- a/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js +++ b/src/routes/Player/SubtitlesMenu/SubtitlesMenu.js @@ -3,7 +3,8 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); -const { Button, CONSTANTS, comparatorWithPriorities, languages } = require('stremio/common'); +const { CONSTANTS, comparatorWithPriorities, languages } = require('stremio/common'); +const { Button } = require('stremio/components'); const DiscreteSelectInput = require('./DiscreteSelectInput'); const styles = require('./styles'); const { t } = require('i18next'); diff --git a/src/routes/Player/VideosMenu/VideosMenu.js b/src/routes/Player/VideosMenu/VideosMenu.js index d418b3f31..7140ea37f 100644 --- a/src/routes/Player/VideosMenu/VideosMenu.js +++ b/src/routes/Player/VideosMenu/VideosMenu.js @@ -4,7 +4,7 @@ const React = require('react'); const PropTypes = require('prop-types'); const classnames = require('classnames'); const { useServices } = require('stremio/services'); -const { Video } = require('stremio/common'); +const { Video } = require('stremio/components'); const styles = require('./styles'); const VideosMenu = ({ className, metaItem, seriesInfo }) => { diff --git a/src/routes/Player/styles.less b/src/routes/Player/styles.less index e74604294..918ea0de2 100644 --- a/src/routes/Player/styles.less +++ b/src/routes/Player/styles.less @@ -3,11 +3,11 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Slider/styles.less') { +:import('~stremio/components/Slider/styles.less') { active-slider-within: active-slider-within; } -:import('~stremio/common/NavBar/HorizontalNavBar/styles.less') { +:import('~stremio/components/NavBar/HorizontalNavBar/styles.less') { nav-bar-button-container: button-container; nav-bar-title: title; nav-bar-icon: icon; diff --git a/src/routes/Search/Search.js b/src/routes/Search/Search.js index 7422d7db7..353b4956a 100644 --- a/src/routes/Search/Search.js +++ b/src/routes/Search/Search.js @@ -6,7 +6,8 @@ const classnames = require('classnames'); const debounce = require('lodash.debounce'); const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); -const { Image, MainNavBars, MetaRow, MetaItem, withCoreSuspender, getVisibleChildrenRange } = require('stremio/common'); +const { withCoreSuspender, getVisibleChildrenRange } = require('stremio/common'); +const { Image, MainNavBars, MetaItem, MetaRow } = require('stremio/components'); const useSearch = require('./useSearch'); const styles = require('./styles'); diff --git a/src/routes/Search/styles.less b/src/routes/Search/styles.less index 20d7e90f9..00f911e53 100644 --- a/src/routes/Search/styles.less +++ b/src/routes/Search/styles.less @@ -3,11 +3,11 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/MetaRow/styles.less') { +:import('~stremio/components/MetaRow/styles.less') { meta-item: meta-item; } -:import('~stremio/common/MetaRow/MetaRowPlaceholder/styles.less') { +:import('~stremio/components/MetaRow/MetaRowPlaceholder/styles.less') { meta-item-placeholder: meta-item; } diff --git a/src/routes/Settings/Settings.js b/src/routes/Settings/Settings.js index 407a4c172..d6fcea35d 100644 --- a/src/routes/Settings/Settings.js +++ b/src/routes/Settings/Settings.js @@ -7,7 +7,8 @@ const { useTranslation } = require('react-i18next'); const { default: Icon } = require('@stremio/stremio-icons/react'); const { useRouteFocused } = require('stremio-router'); const { useServices } = require('stremio/services'); -const { Button, Toggle, MainNavBars, Multiselect, ColorInput, useProfile, usePlatform, useStreamingServer, withCoreSuspender, useToast } = require('stremio/common'); +const { useProfile, usePlatform, useStreamingServer, withCoreSuspender, useToast } = require('stremio/common'); +const { Button, ColorInput, MainNavBars, Multiselect, Toggle } = require('stremio/components'); const useProfileSettingsInputs = require('./useProfileSettingsInputs'); const useStreamingServerSettingsInputs = require('./useStreamingServerSettingsInputs'); const useDataExport = require('./useDataExport'); diff --git a/src/routes/Settings/URLsManager/AddItem/AddItem.tsx b/src/routes/Settings/URLsManager/AddItem/AddItem.tsx index 5220b0969..a73cf95e0 100644 --- a/src/routes/Settings/URLsManager/AddItem/AddItem.tsx +++ b/src/routes/Settings/URLsManager/AddItem/AddItem.tsx @@ -1,9 +1,8 @@ // Copyright (C) 2017-2024 Smart code 203358507 import React, { ChangeEvent, useCallback, useState } from 'react'; -import Button from 'stremio/common/Button'; import Icon from '@stremio/stremio-icons/react'; -import TextInput from 'stremio/common/TextInput'; +import { Button, TextInput } from 'stremio/components'; import styles from './AddItem.less'; type Props = { diff --git a/src/routes/Settings/URLsManager/Item/Item.tsx b/src/routes/Settings/URLsManager/Item/Item.tsx index 319592f02..ec712a78b 100644 --- a/src/routes/Settings/URLsManager/Item/Item.tsx +++ b/src/routes/Settings/URLsManager/Item/Item.tsx @@ -4,12 +4,11 @@ import React, { useCallback, useMemo } from 'react'; import { useProfile } from 'stremio/common'; import { DEFAULT_STREAMING_SERVER_URL } from 'stremio/common/CONSTANTS'; import { useTranslation } from 'react-i18next'; -import Button from 'stremio/common/Button'; +import { Button, RadioButton } from 'stremio/components'; import useStreamingServer from 'stremio/common/useStreamingServer'; import Icon from '@stremio/stremio-icons/react'; import styles from './Item.less'; import classNames from 'classnames'; -import RadioButton from 'stremio/common/RadioButton/RadioButton'; import useStreamingServerUrls from '../useStreamingServerUrls'; type Props = { diff --git a/src/routes/Settings/URLsManager/URLsManager.tsx b/src/routes/Settings/URLsManager/URLsManager.tsx index 33fb99713..b43232f4e 100644 --- a/src/routes/Settings/URLsManager/URLsManager.tsx +++ b/src/routes/Settings/URLsManager/URLsManager.tsx @@ -3,7 +3,7 @@ import React, { useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import styles from './URLsManager.less'; -import Button from 'stremio/common/Button'; +import { Button } from 'stremio/components'; import Item from './Item'; import AddItem from './AddItem'; import Icon from '@stremio/stremio-icons/react'; diff --git a/src/routes/Settings/styles.less b/src/routes/Settings/styles.less index 37103540f..0925d0da6 100644 --- a/src/routes/Settings/styles.less +++ b/src/routes/Settings/styles.less @@ -3,11 +3,11 @@ @import (reference) '~@stremio/stremio-colors/less/stremio-colors.less'; @import (reference) '~stremio/common/screen-sizes.less'; -:import('~stremio/common/Toggle/styles.less') { +:import('~stremio/components/Toggle/styles.less') { checkbox-icon: icon; } -:import('~stremio/common/Multiselect/styles.less') { +:import('~stremio/components/Multiselect/styles.less') { multiselect-menu-container: menu-container; multiselect-label: label; }