diff --git a/frontend/app/components/Assist/ChatControls/ChatControls.tsx b/frontend/app/components/Assist/ChatControls/ChatControls.tsx index 625cc7f31..959842961 100644 --- a/frontend/app/components/Assist/ChatControls/ChatControls.tsx +++ b/frontend/app/components/Assist/ChatControls/ChatControls.tsx @@ -2,7 +2,7 @@ import React, { useState } from 'react' import stl from './ChatControls.module.css' import cn from 'classnames' import { Button, Icon } from 'UI' -import type { LocalStream } from 'Player/MessageDistributor/managers/LocalStream'; +import type { LocalStream } from 'Player'; interface Props { diff --git a/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx b/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx index 35225c5d5..167db8281 100644 --- a/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx +++ b/frontend/app/components/Assist/ChatWindow/ChatWindow.tsx @@ -5,7 +5,7 @@ import Counter from 'App/components/shared/SessionItem/Counter'; import stl from './chatWindow.module.css'; import ChatControls from '../ChatControls/ChatControls'; import Draggable from 'react-draggable'; -import type { LocalStream } from 'Player/MessageDistributor/managers/LocalStream'; +import type { LocalStream } from 'Player'; import { toggleVideoLocalStream } from 'Player' export interface Props { diff --git a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx index ee5258747..e377cd3ba 100644 --- a/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx +++ b/frontend/app/components/Assist/components/AssistActions/AssistActions.tsx @@ -3,7 +3,7 @@ import { Button, Tooltip } from 'UI'; import { connect } from 'react-redux'; import cn from 'classnames'; import { toggleChatWindow } from 'Duck/sessions'; -import { connectPlayer } from 'Player/store'; +import { connectPlayer } from 'Player'; import ChatWindow from '../../ChatWindow'; import { callPeer, @@ -16,9 +16,9 @@ import { CallingState, ConnectionStatus, RemoteControlStatus, -} from 'Player/MessageDistributor/managers/AssistManager'; -import RequestLocalStream from 'Player/MessageDistributor/managers/LocalStream'; -import type { LocalStream } from 'Player/MessageDistributor/managers/LocalStream'; + RequestLocalStream, +} from 'Player'; +import type { LocalStream } from 'Player'; import { toast } from 'react-toastify'; import { confirm } from 'UI'; import stl from './AassistActions.module.css'; diff --git a/frontend/app/components/Session/Session.js b/frontend/app/components/Session/Session.js index ec8b42196..dae27df35 100644 --- a/frontend/app/components/Session/Session.js +++ b/frontend/app/components/Session/Session.js @@ -8,7 +8,6 @@ import { Link, NoContent, Loader } from 'UI'; import { sessions as sessionsRoute } from 'App/routes'; import withPermissions from 'HOCs/withPermissions' import WebPlayer from './WebPlayer'; -import IOSPlayer from './IOSPlayer'; import { useStore } from 'App/mstore'; const SESSIONS_ROUTE = sessionsRoute(); @@ -49,10 +48,7 @@ function Session({ } > - { session.isIOS - ? - : - } + ); diff --git a/frontend/app/components/Session_/Autoplay/Autoplay.js b/frontend/app/components/Session_/Autoplay/Autoplay.js index 4791b70b5..63fdf6841 100644 --- a/frontend/app/components/Session_/Autoplay/Autoplay.js +++ b/frontend/app/components/Session_/Autoplay/Autoplay.js @@ -3,8 +3,7 @@ import { connect } from 'react-redux'; import { setAutoplayValues } from 'Duck/sessions'; import { session as sessionRoute } from 'App/routes'; import { Link, Icon, Toggler, Tooltip } from 'UI'; -import { connectPlayer } from 'Player/store'; -import { Controls as PlayerControls } from 'Player'; +import { Controls as PlayerControls, connectPlayer } from 'Player'; import cn from 'classnames'; function Autoplay(props) { diff --git a/frontend/app/components/Session_/OverviewPanel/OverviewPanel.tsx b/frontend/app/components/Session_/OverviewPanel/OverviewPanel.tsx index bd48c7a23..360baba2a 100644 --- a/frontend/app/components/Session_/OverviewPanel/OverviewPanel.tsx +++ b/frontend/app/components/Session_/OverviewPanel/OverviewPanel.tsx @@ -1,4 +1,4 @@ -import { connectPlayer } from 'App/player'; +import { connectPlayer } from 'Player'; import { toggleBottomBlock } from 'Duck/components/player'; import React, { useEffect } from 'react'; import BottomBlock from '../BottomBlock'; diff --git a/frontend/app/components/Session_/OverviewPanel/components/OverviewPanelContainer/OverviewPanelContainer.tsx b/frontend/app/components/Session_/OverviewPanel/components/OverviewPanelContainer/OverviewPanelContainer.tsx index 5a898c67e..e017fe1db 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/OverviewPanelContainer/OverviewPanelContainer.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/OverviewPanelContainer/OverviewPanelContainer.tsx @@ -1,6 +1,6 @@ import React from 'react'; import VerticalLine from '../VerticalLine'; -import { connectPlayer, Controls } from 'App/player'; +import { connectPlayer, Controls } from 'Player'; interface Props { children: React.ReactNode; diff --git a/frontend/app/components/Session_/OverviewPanel/components/PerformanceGraph/PerformanceGraph.tsx b/frontend/app/components/Session_/OverviewPanel/components/PerformanceGraph/PerformanceGraph.tsx index 28193cd10..8da42f303 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/PerformanceGraph/PerformanceGraph.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/PerformanceGraph/PerformanceGraph.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { connectPlayer } from 'App/player'; +import { connectPlayer } from 'Player'; import { AreaChart, Area, Tooltip, ResponsiveContainer } from 'recharts'; interface Props { diff --git a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx index 0d6f3ba31..5c780b4ba 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/TimelinePointer/TimelinePointer.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { Controls } from 'App/player'; +import { Controls } from 'Player'; import { NETWORK, EXCEPTIONS } from 'Duck/components/player'; import { useModal } from 'App/components/Modal'; import { Icon, Tooltip } from 'UI'; diff --git a/frontend/app/components/Session_/OverviewPanel/components/TimelineScale/TimelineScale.tsx b/frontend/app/components/Session_/OverviewPanel/components/TimelineScale/TimelineScale.tsx index 3b7fc453e..3905f4538 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/TimelineScale/TimelineScale.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/TimelineScale/TimelineScale.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { connectPlayer } from 'App/player'; +import { connectPlayer } from 'Player'; import { millisToMinutesAndSeconds } from 'App/utils'; interface Props { diff --git a/frontend/app/components/Session_/OverviewPanel/components/VerticalPointerLine/VerticalPointerLine.tsx b/frontend/app/components/Session_/OverviewPanel/components/VerticalPointerLine/VerticalPointerLine.tsx index 8db015447..e3160fc79 100644 --- a/frontend/app/components/Session_/OverviewPanel/components/VerticalPointerLine/VerticalPointerLine.tsx +++ b/frontend/app/components/Session_/OverviewPanel/components/VerticalPointerLine/VerticalPointerLine.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import { connectPlayer } from 'App/player'; +import { connectPlayer } from 'Player'; import VerticalLine from '../VerticalLine'; interface Props { diff --git a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx index 9a3ecc210..999dae866 100644 --- a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx +++ b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorCard/SelectorCard.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import stl from './SelectorCard.module.css'; import cn from 'classnames'; -import type { MarkedTarget } from 'Player/MessageDistributor/StatedScreen/StatedScreen'; +import type { MarkedTarget } from 'Player'; import { activeTarget } from 'Player'; import { Tooltip } from 'react-tippy'; diff --git a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorsList/SelectorsList.tsx b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorsList/SelectorsList.tsx index 86274baba..14080e718 100644 --- a/frontend/app/components/Session_/PageInsightsPanel/components/SelectorsList/SelectorsList.tsx +++ b/frontend/app/components/Session_/PageInsightsPanel/components/SelectorsList/SelectorsList.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { NoContent } from 'UI'; -import { connectPlayer } from 'Player/store'; +import { connectPlayer } from 'Player'; import SelectorCard from '../SelectorCard/SelectorCard'; -import type { MarkedTarget } from 'Player/MessageDistributor/StatedScreen/StatedScreen'; +import type { MarkedTarget } from 'Player'; import stl from './selectorList.module.css'; interface Props { diff --git a/frontend/app/components/Session_/Player/Controls/Controls.js b/frontend/app/components/Session_/Player/Controls/Controls.js index 9a21ed865..ae829caa7 100644 --- a/frontend/app/components/Session_/Player/Controls/Controls.js +++ b/frontend/app/components/Session_/Player/Controls/Controls.js @@ -6,7 +6,7 @@ import { STORAGE_TYPES, selectStorageType, selectStorageListNow, -} from 'Player/store'; +} from 'Player'; import LiveTag from 'Shared/LiveTag'; import { jumpToLive } from 'Player'; diff --git a/frontend/app/components/Session_/Player/Overlay.tsx b/frontend/app/components/Session_/Player/Overlay.tsx index 14a2f2a17..7b610ded1 100644 --- a/frontend/app/components/Session_/Player/Overlay.tsx +++ b/frontend/app/components/Session_/Player/Overlay.tsx @@ -1,8 +1,8 @@ import React from 'react'; import { connectPlayer } from 'Player'; -import { getStatusText } from 'Player/MessageDistributor/managers/AssistManager'; -import type { MarkedTarget } from 'Player/MessageDistributor/StatedScreen/StatedScreen'; -import { CallingState, ConnectionStatus, RemoteControlStatus } from 'Player/MessageDistributor/managers/AssistManager'; +import { getStatusText } from 'Player'; +import type { MarkedTarget } from 'Player'; +import { CallingState, ConnectionStatus, RemoteControlStatus } from 'Player'; import AutoplayTimer from './Overlay/AutoplayTimer'; import PlayIconLayer from './Overlay/PlayIconLayer'; diff --git a/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx b/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx index 8a868f90a..cbb772020 100644 --- a/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx +++ b/frontend/app/components/Session_/Player/Overlay/ElementsMarker/Marker.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import type { MarkedTarget } from 'Player/MessageDistributor/StatedScreen/StatedScreen'; +import type { MarkedTarget } from 'Player'; import cn from 'classnames'; import stl from './Marker.module.css'; import { activeTarget } from 'Player'; diff --git a/frontend/app/components/Session_/Player/Overlay/LiveStatusText.tsx b/frontend/app/components/Session_/Player/Overlay/LiveStatusText.tsx index a416bf529..52238adf0 100644 --- a/frontend/app/components/Session_/Player/Overlay/LiveStatusText.tsx +++ b/frontend/app/components/Session_/Player/Overlay/LiveStatusText.tsx @@ -1,6 +1,6 @@ import React from 'react'; import ovStl from './overlay.module.css'; -import { ConnectionStatus } from 'Player/MessageDistributor/managers/AssistManager'; +import { ConnectionStatus } from 'Player'; import { Loader } from 'UI'; interface Props { diff --git a/frontend/app/components/Session_/Storage/Storage.js b/frontend/app/components/Session_/Storage/Storage.js index 04dd35090..ac9a0ec48 100644 --- a/frontend/app/components/Session_/Storage/Storage.js +++ b/frontend/app/components/Session_/Storage/Storage.js @@ -7,7 +7,7 @@ import { STORAGE_TYPES, selectStorageListNow, selectStorageList, -} from 'Player/store'; +} from 'Player'; import { JSONTree, NoContent, Tooltip } from 'UI'; import { formatMs } from 'App/date'; import { diff } from 'deep-diff'; diff --git a/frontend/app/components/Session_/Storage/Storge.DEPRECATED.js b/frontend/app/components/Session_/Storage/Storge.DEPRECATED.js index 9f5bf74c8..660d2057e 100644 --- a/frontend/app/components/Session_/Storage/Storge.DEPRECATED.js +++ b/frontend/app/components/Session_/Storage/Storge.DEPRECATED.js @@ -7,7 +7,7 @@ import { STORAGE_TYPES, selectStorageListNow, selectStorageList, -} from 'Player/store'; +} from 'Player'; import { JSONTree, NoContent } from 'UI'; import { formatMs } from 'App/date'; import { diff } from 'deep-diff'; diff --git a/frontend/app/player/MessageDistributor/managers/LocalStream.ts b/frontend/app/player/MessageDistributor/managers/LocalStream.ts index 360033c7f..e7d3bae15 100644 --- a/frontend/app/player/MessageDistributor/managers/LocalStream.ts +++ b/frontend/app/player/MessageDistributor/managers/LocalStream.ts @@ -18,7 +18,7 @@ function dummyTrack(): MediaStreamTrack { return canvas.captureStream(60).getTracks()[0]; } -export default function RequestLocalStream(): Promise { +export function RequestLocalStream(): Promise { return navigator.mediaDevices.getUserMedia({ audio:true }) .then(aStream => { const aTrack = aStream.getAudioTracks()[0] diff --git a/frontend/app/player/index.js b/frontend/app/player/index.js index 70b02ae53..c49d75294 100644 --- a/frontend/app/player/index.js +++ b/frontend/app/player/index.js @@ -1,2 +1,4 @@ -export { PlayerProvider, connectPlayer } from './store'; -export * from './singletone'; \ No newline at end of file +export * from './store'; +export * from './singletone'; +export * from './MessageDistributor/managers/AssistManager'; +export * from './MessageDistributor/managers/LocalStream'; \ No newline at end of file diff --git a/frontend/app/player/singletone.js b/frontend/app/player/singletone.js index fd62540f7..db9b3116a 100644 --- a/frontend/app/player/singletone.js +++ b/frontend/app/player/singletone.js @@ -1,5 +1,5 @@ import Player from './Player'; -import { update, clean as cleanStore, getState } from './store'; +import { update, cleanStore, getState } from './store'; import { clean as cleanLists } from './lists'; /** @type {Player} */ diff --git a/frontend/app/player/store/store.js b/frontend/app/player/store/store.js index 4917043a2..fd4fed5c0 100644 --- a/frontend/app/player/store/store.js +++ b/frontend/app/player/store/store.js @@ -13,7 +13,7 @@ export function update(...args) { return store.dispatch(action); } -export function clean() { +export function cleanStore() { return store.dispatch(cleanAction()); }