diff --git a/app/src/BrowserRecorder.js b/app/src/BrowserRecorder.js index de3b6345..acd80fa3 100644 --- a/app/src/BrowserRecorder.js +++ b/app/src/BrowserRecorder.js @@ -3,8 +3,8 @@ import streamSaver from 'streamsaver'; import { WritableStream } from 'web-streams-polyfill/ponyfill'; import { openDB, deleteDB } from 'idb'; import { store } from './store/store'; -import * as requestActions from './actions/requestActions'; -import * as recorderActions from './actions/recorderActions'; +import * as requestActions from './store/actions/requestActions'; +import * as recorderActions from './store/actions/recorderActions'; export default class BrowserRecorder { diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index 9247ef42..c60fe930 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -2,25 +2,25 @@ import Logger from './Logger'; import hark from 'hark'; import { getSignalingUrl } from './urlFactory'; import { SocketTimeoutError } from './utils'; -import * as requestActions from './actions/requestActions'; -import * as meActions from './actions/meActions'; -import * as intlActions from './actions/intlActions'; -import * as roomActions from './actions/roomActions'; -import * as peerActions from './actions/peerActions'; -import * as peerVolumeActions from './actions/peerVolumeActions'; -import * as settingsActions from './actions/settingsActions'; -import * as chatActions from './actions/chatActions'; -import * as fileActions from './actions/fileActions'; -import * as lobbyPeerActions from './actions/lobbyPeerActions'; -import * as consumerActions from './actions/consumerActions'; -import * as producerActions from './actions/producerActions'; -import * as notificationActions from './actions/notificationActions'; -import * as transportActions from './actions/transportActions'; +import * as requestActions from './store/actions/requestActions'; +import * as meActions from './store/actions/meActions'; +import * as intlActions from './store/actions/intlActions'; +import * as roomActions from './store/actions/roomActions'; +import * as peerActions from './store/actions/peerActions'; +import * as peerVolumeActions from './store/actions/peerVolumeActions'; +import * as settingsActions from './store/actions/settingsActions'; +import * as chatActions from './store/actions/chatActions'; +import * as fileActions from './store/actions/fileActions'; +import * as lobbyPeerActions from './store/actions/lobbyPeerActions'; +import * as consumerActions from './store/actions/consumerActions'; +import * as producerActions from './store/actions/producerActions'; +import * as notificationActions from './store/actions/notificationActions'; +import * as transportActions from './store/actions/transportActions'; import Spotlights from './Spotlights'; import { permissions } from './permissions'; import * as locales from './translations/locales'; import { createIntl } from 'react-intl'; -import * as recorderActions from './actions/recorderActions'; +import * as recorderActions from './store/actions/recorderActions'; import { directReceiverTransform, opusReceiverTransform } from './transforms/receiver'; import { config } from './config'; diff --git a/app/src/components/AccessControl/LockDialog/LockDialog.js b/app/src/components/AccessControl/LockDialog/LockDialog.js index b87d3c8b..1cc0036a 100644 --- a/app/src/components/AccessControl/LockDialog/LockDialog.js +++ b/app/src/components/AccessControl/LockDialog/LockDialog.js @@ -8,7 +8,7 @@ import { permissions } from '../../../permissions'; import * as appPropTypes from '../../appPropTypes'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../../../RoomContext'; -import * as roomActions from '../../../actions/roomActions'; +import * as roomActions from '../../../store/actions/roomActions'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Dialog from '@material-ui/core/Dialog'; diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js index 213a5773..2fd726c2 100644 --- a/app/src/components/Containers/Peer.js +++ b/app/src/components/Containers/Peer.js @@ -6,7 +6,7 @@ import classnames from 'classnames'; import * as appPropTypes from '../appPropTypes'; import { withRoomContext } from '../../RoomContext'; import { withStyles } from '@material-ui/core/styles'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import { useIntl, FormattedMessage } from 'react-intl'; import VideoView from '../VideoContainers/VideoView'; import Tooltip from '@material-ui/core/Tooltip'; diff --git a/app/src/components/Controls/About.js b/app/src/components/Controls/About.js index 08641784..950f69ae 100644 --- a/app/src/components/Controls/About.js +++ b/app/src/components/Controls/About.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../../RoomContext'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; diff --git a/app/src/components/Controls/ExtraVideo.js b/app/src/components/Controls/ExtraVideo.js index f15b399d..36e21ddb 100644 --- a/app/src/components/Controls/ExtraVideo.js +++ b/app/src/components/Controls/ExtraVideo.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../../RoomContext'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import PropTypes from 'prop-types'; import { useIntl, FormattedMessage } from 'react-intl'; import Dialog from '@material-ui/core/Dialog'; diff --git a/app/src/components/Controls/Help.js b/app/src/components/Controls/Help.js index 427d9ea0..de65e0b2 100644 --- a/app/src/components/Controls/Help.js +++ b/app/src/components/Controls/Help.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../../RoomContext'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import PropTypes from 'prop-types'; import { useIntl, FormattedMessage } from 'react-intl'; diff --git a/app/src/components/Controls/RolesManager.js b/app/src/components/Controls/RolesManager.js index d5e0d4a8..25d36f76 100644 --- a/app/src/components/Controls/RolesManager.js +++ b/app/src/components/Controls/RolesManager.js @@ -7,7 +7,7 @@ import { makePermissionSelector } from '../../store/selectors'; import { permissions } from '../../permissions'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Dialog from '@material-ui/core/Dialog'; diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js index 12408b28..5d65476f 100644 --- a/app/src/components/Controls/TopBar.js +++ b/app/src/components/Controls/TopBar.js @@ -14,9 +14,9 @@ import { permissions } from '../../permissions'; import * as appPropTypes from '../appPropTypes'; import { withRoomContext } from '../../RoomContext'; import { withStyles } from '@material-ui/core/styles'; -import * as roomActions from '../../actions/roomActions'; -import * as toolareaActions from '../../actions/toolareaActions'; -import * as notificationActions from '../../actions/notificationActions'; +import * as roomActions from '../../store/actions/roomActions'; +import * as toolareaActions from '../../store/actions/toolareaActions'; +import * as notificationActions from '../../store/actions/notificationActions'; import { useIntl, FormattedMessage } from 'react-intl'; import classnames from 'classnames'; import AppBar from '@material-ui/core/AppBar'; diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index 0a311892..e333ad21 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -5,7 +5,7 @@ import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../RoomContext'; import classnames from 'classnames'; import isElectron from 'is-electron'; -import * as settingsActions from '../actions/settingsActions'; +import * as settingsActions from '../store/actions/settingsActions'; import PropTypes from 'prop-types'; import { useIntl, FormattedMessage } from 'react-intl'; import Dialog from '@material-ui/core/Dialog'; diff --git a/app/src/components/LeaveDialog.js b/app/src/components/LeaveDialog.js index 732e935b..1ec55014 100644 --- a/app/src/components/LeaveDialog.js +++ b/app/src/components/LeaveDialog.js @@ -2,7 +2,7 @@ import React, { useRef } from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../RoomContext'; -import * as roomActions from '../actions/roomActions'; +import * as roomActions from '../store/actions/roomActions'; import PropTypes from 'prop-types'; import { FormattedMessage } from 'react-intl'; import Dialog from '@material-ui/core/Dialog'; diff --git a/app/src/components/MeetingDrawer/Chat/List/List.js b/app/src/components/MeetingDrawer/Chat/List/List.js index 3ed7f228..715a1a62 100644 --- a/app/src/components/MeetingDrawer/Chat/List/List.js +++ b/app/src/components/MeetingDrawer/Chat/List/List.js @@ -4,7 +4,7 @@ import PropTypes from 'prop-types'; import { withStyles } from '@material-ui/core/styles'; import { injectIntl, FormattedMessage } from 'react-intl'; import * as appPropTypes from '../../../appPropTypes'; -import * as chatActions from '../../../../actions/chatActions'; +import * as chatActions from '../../../../store/actions/chatActions'; import classnames from 'classnames'; import Message from './Item/Message'; import File from './Item/File'; diff --git a/app/src/components/MeetingDrawer/MeetingDrawer.js b/app/src/components/MeetingDrawer/MeetingDrawer.js index ffeb789e..30df9a84 100644 --- a/app/src/components/MeetingDrawer/MeetingDrawer.js +++ b/app/src/components/MeetingDrawer/MeetingDrawer.js @@ -3,8 +3,8 @@ import { connect } from 'react-redux'; import { raisedHandsSelector } from '../../store/selectors'; import PropTypes from 'prop-types'; import { withStyles } from '@material-ui/core/styles'; -import * as toolareaActions from '../../actions/toolareaActions'; -import * as settingsActions from '../../actions/settingsActions'; +import * as toolareaActions from '../../store/actions/toolareaActions'; +import * as settingsActions from '../../store/actions/settingsActions'; import { useIntl } from 'react-intl'; import AppBar from '@material-ui/core/AppBar'; import Tabs from '@material-ui/core/Tabs'; diff --git a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js index 47793b80..06e365a2 100644 --- a/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js +++ b/app/src/components/MeetingDrawer/ParticipantList/ListPeer.js @@ -2,7 +2,7 @@ import React, { useState } from 'react'; import { connect } from 'react-redux'; import { makePeerConsumerSelector } from '../../../store/selectors'; import { withStyles } from '@material-ui/core/styles'; -import * as roomActions from '../../../actions/roomActions'; +import * as roomActions from '../../../store/actions/roomActions'; import PropTypes from 'prop-types'; import * as appPropTypes from '../../appPropTypes'; import { withRoomContext } from '../../../RoomContext'; diff --git a/app/src/components/Notifications/Notifications.js b/app/src/components/Notifications/Notifications.js index 226a6532..e13f4b67 100644 --- a/app/src/components/Notifications/Notifications.js +++ b/app/src/components/Notifications/Notifications.js @@ -2,7 +2,7 @@ import React, { Component, Fragment } from 'react'; import { connect } from 'react-redux'; import PropTypes from 'prop-types'; import { withSnackbar } from 'notistack'; -import * as notificationActions from '../../actions/notificationActions'; +import * as notificationActions from '../../store/actions/notificationActions'; import { config } from '../../config'; import Button from '@material-ui/core/Button'; import ButtonGroup from '@material-ui/core/ButtonGroup'; diff --git a/app/src/components/Room.js b/app/src/components/Room.js index 472301c3..d4f80feb 100644 --- a/app/src/components/Room.js +++ b/app/src/components/Room.js @@ -4,8 +4,8 @@ import PropTypes from 'prop-types'; import * as appPropTypes from './appPropTypes'; import { withStyles } from '@material-ui/core/styles'; import isElectron from 'is-electron'; -import * as roomActions from '../actions/roomActions'; -import * as toolareaActions from '../actions/toolareaActions'; +import * as roomActions from '../store/actions/roomActions'; +import * as toolareaActions from '../store/actions/toolareaActions'; import { idle } from '../utils'; import FullScreen from './FullScreen'; import { FormattedMessage } from 'react-intl'; diff --git a/app/src/components/Settings/AdvancedSettings.js b/app/src/components/Settings/AdvancedSettings.js index 75976e0f..e0fb8fb5 100644 --- a/app/src/components/Settings/AdvancedSettings.js +++ b/app/src/components/Settings/AdvancedSettings.js @@ -2,7 +2,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../../RoomContext'; -import * as settingsActions from '../../actions/settingsActions'; +import * as settingsActions from '../../store/actions/settingsActions'; import PropTypes from 'prop-types'; import classnames from 'classnames'; import { useIntl, FormattedMessage } from 'react-intl'; diff --git a/app/src/components/Settings/AppearanceSettings.js b/app/src/components/Settings/AppearanceSettings.js index 47c147ea..820a5cfd 100644 --- a/app/src/components/Settings/AppearanceSettings.js +++ b/app/src/components/Settings/AppearanceSettings.js @@ -2,8 +2,8 @@ import React from 'react'; import { connect } from 'react-redux'; import * as appPropTypes from '../appPropTypes'; import { withStyles } from '@material-ui/core/styles'; -import * as roomActions from '../../actions/roomActions'; -import * as settingsActions from '../../actions/settingsActions'; +import * as roomActions from '../../store/actions/roomActions'; +import * as settingsActions from '../../store/actions/settingsActions'; import classnames from 'classnames'; import PropTypes from 'prop-types'; import { useIntl, FormattedMessage } from 'react-intl'; diff --git a/app/src/components/Settings/MediaSettings.js b/app/src/components/Settings/MediaSettings.js index 706bb54e..b5b3b025 100644 --- a/app/src/components/Settings/MediaSettings.js +++ b/app/src/components/Settings/MediaSettings.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import * as appPropTypes from '../appPropTypes'; import { withStyles } from '@material-ui/core/styles'; import { withRoomContext } from '../../RoomContext'; -import * as settingsActions from '../../actions/settingsActions'; +import * as settingsActions from '../../store/actions/settingsActions'; import PropTypes from 'prop-types'; import { useIntl, FormattedMessage } from 'react-intl'; import classnames from 'classnames'; diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js index e6c642b9..a4618a66 100644 --- a/app/src/components/Settings/Settings.js +++ b/app/src/components/Settings/Settings.js @@ -1,7 +1,7 @@ import React from 'react'; import { connect } from 'react-redux'; import { withStyles } from '@material-ui/core/styles'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import PropTypes from 'prop-types'; import { useIntl, FormattedMessage } from 'react-intl'; import Tabs from '@material-ui/core/Tabs'; diff --git a/app/src/components/VideoContainers/FullScreenView.js b/app/src/components/VideoContainers/FullScreenView.js index 7ea423c0..a17a4168 100644 --- a/app/src/components/VideoContainers/FullScreenView.js +++ b/app/src/components/VideoContainers/FullScreenView.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import classnames from 'classnames'; import { withStyles } from '@material-ui/core/styles'; import * as appPropTypes from '../appPropTypes'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import { withRoomContext } from '../../RoomContext'; import FullScreenExitIcon from '@material-ui/icons/FullscreenExit'; import VideoView from './VideoView'; diff --git a/app/src/components/VideoWindow/VideoWindow.js b/app/src/components/VideoWindow/VideoWindow.js index ede4be56..f4fcaccc 100644 --- a/app/src/components/VideoWindow/VideoWindow.js +++ b/app/src/components/VideoWindow/VideoWindow.js @@ -3,7 +3,7 @@ import { connect } from 'react-redux'; import NewWindow from './NewWindow'; import PropTypes from 'prop-types'; import * as appPropTypes from '../appPropTypes'; -import * as roomActions from '../../actions/roomActions'; +import * as roomActions from '../../store/actions/roomActions'; import FullView from '../VideoContainers/FullView'; const VideoWindow = (props) => diff --git a/app/src/index.js b/app/src/index.js index ce1e3909..2ab358dd 100644 --- a/app/src/index.js +++ b/app/src/index.js @@ -14,7 +14,7 @@ import debug from 'debug'; import RoomClient from './RoomClient'; import RoomContext from './RoomContext'; import deviceInfo from './deviceInfo'; -import * as meActions from './actions/meActions'; +import * as meActions from './store/actions/meActions'; import UnsupportedBrowser from './components/UnsupportedBrowser'; import ConfigDocumentation from './components/ConfigDocumentation'; import ConfigError from './components/ConfigError'; diff --git a/app/src/actions/chatActions.js b/app/src/store/actions/chatActions.js similarity index 100% rename from app/src/actions/chatActions.js rename to app/src/store/actions/chatActions.js diff --git a/app/src/actions/consumerActions.js b/app/src/store/actions/consumerActions.js similarity index 100% rename from app/src/actions/consumerActions.js rename to app/src/store/actions/consumerActions.js diff --git a/app/src/actions/fileActions.js b/app/src/store/actions/fileActions.js similarity index 100% rename from app/src/actions/fileActions.js rename to app/src/store/actions/fileActions.js diff --git a/app/src/actions/intlActions.js b/app/src/store/actions/intlActions.js similarity index 100% rename from app/src/actions/intlActions.js rename to app/src/store/actions/intlActions.js diff --git a/app/src/actions/lobbyPeerActions.js b/app/src/store/actions/lobbyPeerActions.js similarity index 100% rename from app/src/actions/lobbyPeerActions.js rename to app/src/store/actions/lobbyPeerActions.js diff --git a/app/src/actions/meActions.js b/app/src/store/actions/meActions.js similarity index 100% rename from app/src/actions/meActions.js rename to app/src/store/actions/meActions.js diff --git a/app/src/actions/notificationActions.js b/app/src/store/actions/notificationActions.js similarity index 100% rename from app/src/actions/notificationActions.js rename to app/src/store/actions/notificationActions.js diff --git a/app/src/actions/peerActions.js b/app/src/store/actions/peerActions.js similarity index 100% rename from app/src/actions/peerActions.js rename to app/src/store/actions/peerActions.js diff --git a/app/src/actions/peerVolumeActions.js b/app/src/store/actions/peerVolumeActions.js similarity index 100% rename from app/src/actions/peerVolumeActions.js rename to app/src/store/actions/peerVolumeActions.js diff --git a/app/src/actions/producerActions.js b/app/src/store/actions/producerActions.js similarity index 100% rename from app/src/actions/producerActions.js rename to app/src/store/actions/producerActions.js diff --git a/app/src/actions/recorderActions.js b/app/src/store/actions/recorderActions.js similarity index 100% rename from app/src/actions/recorderActions.js rename to app/src/store/actions/recorderActions.js diff --git a/app/src/actions/requestActions.js b/app/src/store/actions/requestActions.js similarity index 100% rename from app/src/actions/requestActions.js rename to app/src/store/actions/requestActions.js diff --git a/app/src/actions/roomActions.js b/app/src/store/actions/roomActions.js similarity index 100% rename from app/src/actions/roomActions.js rename to app/src/store/actions/roomActions.js diff --git a/app/src/actions/settingsActions.js b/app/src/store/actions/settingsActions.js similarity index 100% rename from app/src/actions/settingsActions.js rename to app/src/store/actions/settingsActions.js diff --git a/app/src/actions/toolareaActions.js b/app/src/store/actions/toolareaActions.js similarity index 100% rename from app/src/actions/toolareaActions.js rename to app/src/store/actions/toolareaActions.js diff --git a/app/src/actions/transportActions.js b/app/src/store/actions/transportActions.js similarity index 100% rename from app/src/actions/transportActions.js rename to app/src/store/actions/transportActions.js diff --git a/app/src/transforms/receiver.ts b/app/src/transforms/receiver.ts index 7e999c78..730561c7 100644 --- a/app/src/transforms/receiver.ts +++ b/app/src/transforms/receiver.ts @@ -1,6 +1,6 @@ import Logger from '../Logger'; import { store } from '../store/store'; -import * as consumerActions from '../actions/consumerActions'; +import * as consumerActions from '../store/actions/consumerActions'; const logger = new Logger('transforms.receiver');