From a1dc652d0498716f0636a560a99399537401fb33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Fri, 27 Mar 2020 22:57:04 +0100 Subject: [PATCH] Linting and translations --- app/package.json | 3 +- app/src/RoomClient.js | 27 +++++--- app/src/actions/consumerActions.js | 10 ++- app/src/actions/meActions.js | 12 ++-- app/src/actions/peerActions.js | 1 - app/src/components/ChooseRoom.js | 3 +- app/src/components/Containers/Me.js | 61 +++++++++---------- app/src/components/Controls/TopBar.js | 18 +++--- app/src/components/JoinDialog.js | 3 +- .../MeetingDrawer/ParticipantList/ListPeer.js | 36 +++++------ app/src/components/MeetingViews/Filmstrip.js | 34 +++++------ app/src/components/Room.js | 6 +- app/src/components/Settings/Settings.js | 22 +++---- .../VideoContainers/FullScreenView.js | 4 +- app/src/reducers/settings.js | 2 +- app/src/translations/cn.json | 3 + app/src/translations/cz.json | 6 ++ app/src/translations/de.json | 3 + app/src/translations/dk.json | 3 + app/src/translations/el.json | 3 + app/src/translations/en.json | 3 + app/src/translations/es.json | 3 + app/src/translations/fr.json | 3 + app/src/translations/hr.json | 3 + app/src/translations/hu.json | 3 + app/src/translations/it.json | 6 ++ app/src/translations/nb.json | 3 + app/src/translations/pl.json | 3 + app/src/translations/pt.json | 3 + app/src/translations/ro.json | 3 + 30 files changed, 176 insertions(+), 117 deletions(-) diff --git a/app/package.json b/app/package.json index 89a116e..b58d66a 100644 --- a/app/package.json +++ b/app/package.json @@ -46,7 +46,8 @@ "test": "react-scripts test", "eject": "react-scripts eject", "electron": "electron --no-sandbox .", - "dev": "nf start -p 3000" + "dev": "nf start -p 3000", + "lint": "eslint -c .eslintrc.json --ext .js src" }, "browserslist": [ ">0.2%", diff --git a/app/src/RoomClient.js b/app/src/RoomClient.js index e6f9bc8..bb896c4 100644 --- a/app/src/RoomClient.js +++ b/app/src/RoomClient.js @@ -231,7 +231,7 @@ export default class RoomClient this._hark = null; // Local MediaStream for hark - this._harkStream = null + this._harkStream = null; // Local webcam mediasoup Producer. this._webcamProducer = null; @@ -1162,21 +1162,30 @@ export default class RoomClient ...VIDEO_CONSTRAINS[resolution] } }); - if (stream){ + + if (stream) + { const track = stream.getVideoTracks()[0]; - if (track) { + + if (track) + { await this._webcamProducer.replaceTrack({ track }); store.dispatch( producerActions.setProducerTrack(this._webcamProducer.id, track)); - } else { - logger.warn('getVideoTracks Error: First Video Track is null') + } + else + { + logger.warn('getVideoTracks Error: First Video Track is null'); } - } else { - logger.warn ('getUserMedia Error: Stream is null!') } + else + { + logger.warn('getUserMedia Error: Stream is null!'); + } + store.dispatch(settingsActions.setSelectedWebcamDevice(deviceId)); await this._updateWebcams(); @@ -2340,7 +2349,7 @@ export default class RoomClient dtlsParameters, iceServers : this._turnServers, // TODO: Fix for issue #72 - iceTransportPolicy : this._device.flag === 'firefox' ? 'relay' : undefined, + iceTransportPolicy : this._device.flag === 'firefox' ? 'relay' : undefined, proprietaryConstraints : PC_PROPRIETARY_CONSTRAINTS }); @@ -2402,7 +2411,7 @@ export default class RoomClient iceParameters, iceCandidates, dtlsParameters, - iceServers : this._turnServers, + iceServers : this._turnServers, // TODO: Fix for issue #72 iceTransportPolicy : this._device.flag === 'firefox' ? 'relay' : undefined }); diff --git a/app/src/actions/consumerActions.js b/app/src/actions/consumerActions.js index b8460a6..249d156 100644 --- a/app/src/actions/consumerActions.js +++ b/app/src/actions/consumerActions.js @@ -35,12 +35,10 @@ export const setConsumerPreferredLayers = (consumerId, spatialLayer, temporalLay }); export const setConsumerPriority = (consumerId, priority) => - { - return { - type : 'SET_CONSUMER_PRIORITY', - payload : { consumerId, priority } - }; - }; + ({ + type : 'SET_CONSUMER_PRIORITY', + payload : { consumerId, priority } + }); export const setConsumerTrack = (consumerId, track) => ({ diff --git a/app/src/actions/meActions.js b/app/src/actions/meActions.js index 6970a3f..fc72592 100644 --- a/app/src/actions/meActions.js +++ b/app/src/actions/meActions.js @@ -34,11 +34,11 @@ export const setPicture = (picture) => }); export const setMediaCapabilities = ({ - canSendMic, - canSendWebcam, - canShareScreen, - canShareFiles - }) => + canSendMic, + canSendWebcam, + canShareScreen, + canShareFiles +}) => ({ type : 'SET_MEDIA_CAPABILITIES', payload : { canSendMic, canSendWebcam, canShareScreen, canShareFiles } @@ -92,7 +92,7 @@ export const setDisplayNameInProgress = (flag) => payload : { flag } }); - export const setIsSpeaking = (flag) => +export const setIsSpeaking = (flag) => ({ type : 'SET_IS_SPEAKING', payload : { flag } diff --git a/app/src/actions/peerActions.js b/app/src/actions/peerActions.js index 1a87151..dc41568 100644 --- a/app/src/actions/peerActions.js +++ b/app/src/actions/peerActions.js @@ -46,7 +46,6 @@ export const setPeerPicture = (peerId, picture) => payload : { peerId, picture } }); - export const addPeerRole = (peerId, role) => ({ type : 'ADD_PEER_ROLE', diff --git a/app/src/components/ChooseRoom.js b/app/src/components/ChooseRoom.js index 31ff420..b81ff47 100644 --- a/app/src/components/ChooseRoom.js +++ b/app/src/components/ChooseRoom.js @@ -178,7 +178,8 @@ const ChooseRoom = ({ + })} + > }, controls : { - position : 'absolute', - width : '100%', - height : '100%', - backgroundColor : 'rgba(0, 0, 0, 0.3)', - display : 'flex', - flexDirection : 'column', - justifyContent : 'center', - alignItems : 'flex-end', - padding : theme.spacing(1), - zIndex : 21, - opacity : 0, - transition : 'opacity 0.3s', - touchAction : 'none', - pointerEvents : 'none', - '&.hover' : + position : 'absolute', + width : '100%', + height : '100%', + display : 'flex', + flexDirection : 'column', + justifyContent : 'center', + alignItems : 'flex-end', + padding : theme.spacing(1), + zIndex : 21, + touchAction : 'none', + pointerEvents : 'none', + '& p' : { - opacity : 1 - }, - '& p' : - { - position : 'absolute', - float : 'left', - top : '50%', - left : '50%', - transform : 'translate(-50%, -50%)', - color : 'rgba(255, 255, 255, 0.5)', - fontSize : '7em', - margin : 0 + position : 'absolute', + float : 'left', + top : '50%', + left : '50%', + opacity : 0, + transition : 'opacity 0.3s', + transform : 'translate(-50%, -50%)', + color : 'rgba(255, 255, 255, 0.5)', + fontSize : '7em', + margin : 0, + '&.hover' : + { + opacity : 1 + } } }, ptt : @@ -112,8 +111,8 @@ const styles = (theme) => padding : '15px', borderRadius : '20px', textAlign : 'center', - opacity : 0, - '&.enabled' : + opacity : 0, + '&.enabled' : { opacity : 1 } @@ -317,13 +316,13 @@ const Me = (props) => + />

diff --git a/app/src/components/Controls/TopBar.js b/app/src/components/Controls/TopBar.js index 6ef8dae..50a20c0 100644 --- a/app/src/components/Controls/TopBar.js +++ b/app/src/components/Controls/TopBar.js @@ -47,7 +47,7 @@ const styles = (theme) => }, divider : { - marginLeft : theme.spacing(3), + marginLeft : theme.spacing(3) }, show : { @@ -364,7 +364,7 @@ TopBar.propTypes = room : appPropTypes.Room.isRequired, peersLength : PropTypes.number, lobbyPeers : PropTypes.array, - permanentTopBar : PropTypes.bool, + permanentTopBar : PropTypes.bool, myPicture : PropTypes.string, loggedIn : PropTypes.bool.isRequired, loginEnabled : PropTypes.bool.isRequired, @@ -383,14 +383,14 @@ TopBar.propTypes = const mapStateToProps = (state) => ({ - room : state.room, - peersLength : peersLengthSelector(state), - lobbyPeers : lobbyPeersKeySelector(state), + room : state.room, + peersLength : peersLengthSelector(state), + lobbyPeers : lobbyPeersKeySelector(state), permanentTopBar : state.settings.permanentTopBar, - loggedIn : state.me.loggedIn, - loginEnabled : state.me.loginEnabled, - myPicture : state.me.picture, - unread : state.toolarea.unreadMessages + + loggedIn : state.me.loggedIn, + loginEnabled : state.me.loginEnabled, + myPicture : state.me.picture, + unread : state.toolarea.unreadMessages + state.toolarea.unreadFiles }); diff --git a/app/src/components/JoinDialog.js b/app/src/components/JoinDialog.js index d6af3fe..814a18d 100644 --- a/app/src/components/JoinDialog.js +++ b/app/src/components/JoinDialog.js @@ -339,7 +339,8 @@ const JoinDialog = ({ + })} + > id : 'tooltip.muteScreenSharing', defaultMessage : 'Mute participant share' })} - color={ screenVisible ? 'primary' : 'secondary'} - disabled={ peer.peerScreenInProgress } + color={screenVisible ? 'primary' : 'secondary'} + disabled={peer.peerScreenInProgress} onClick={() => - { - screenVisible ? - roomClient.modifyPeerConsumer(peer.id, 'screen', true) : - roomClient.modifyPeerConsumer(peer.id, 'screen', false); - }} + { + screenVisible ? + roomClient.modifyPeerConsumer(peer.id, 'screen', true) : + roomClient.modifyPeerConsumer(peer.id, 'screen', false); + }} > { screenVisible ? @@ -172,14 +172,14 @@ const ListPeer = (props) => id : 'tooltip.muteParticipant', defaultMessage : 'Mute participant' })} - color={ micEnabled ? 'primary' : 'secondary'} - disabled={ peer.peerAudioInProgress } + color={micEnabled ? 'primary' : 'secondary'} + disabled={peer.peerAudioInProgress} onClick={() => - { - micEnabled ? - roomClient.modifyPeerConsumer(peer.id, 'mic', true) : - roomClient.modifyPeerConsumer(peer.id, 'mic', false); - }} + { + micEnabled ? + roomClient.modifyPeerConsumer(peer.id, 'mic', true) : + roomClient.modifyPeerConsumer(peer.id, 'mic', false); + }} > { micEnabled ? @@ -193,11 +193,11 @@ const ListPeer = (props) => id : 'tooltip.kickParticipant', defaultMessage : 'Kick out participant' })} - disabled={ peer.peerKickInProgress } + disabled={peer.peerKickInProgress} onClick={() => - { - roomClient.kickPeer(peer.id); - }} + { + roomClient.kickPeer(peer.id); + }} > diff --git a/app/src/components/MeetingViews/Filmstrip.js b/app/src/components/MeetingViews/Filmstrip.js index 503948e..2ed11c6 100644 --- a/app/src/components/MeetingViews/Filmstrip.js +++ b/app/src/components/MeetingViews/Filmstrip.js @@ -287,28 +287,28 @@ class Filmstrip extends React.PureComponent } Filmstrip.propTypes = { - roomClient : PropTypes.any.isRequired, - activeSpeakerId : PropTypes.string, - advancedMode : PropTypes.bool, - peers : PropTypes.object.isRequired, - consumers : PropTypes.object.isRequired, - myId : PropTypes.string.isRequired, - selectedPeerId : PropTypes.string, - spotlights : PropTypes.array.isRequired, - boxes : PropTypes.number, - classes : PropTypes.object.isRequired + roomClient : PropTypes.any.isRequired, + activeSpeakerId : PropTypes.string, + advancedMode : PropTypes.bool, + peers : PropTypes.object.isRequired, + consumers : PropTypes.object.isRequired, + myId : PropTypes.string.isRequired, + selectedPeerId : PropTypes.string, + spotlights : PropTypes.array.isRequired, + boxes : PropTypes.number, + classes : PropTypes.object.isRequired }; const mapStateToProps = (state) => { return { - activeSpeakerId : state.room.activeSpeakerId, - selectedPeerId : state.room.selectedPeerId, - peers : state.peers, - consumers : state.consumers, - myId : state.me.id, - spotlights : state.room.spotlights, - boxes : videoBoxesSelector(state) + activeSpeakerId : state.room.activeSpeakerId, + selectedPeerId : state.room.selectedPeerId, + peers : state.peers, + consumers : state.consumers, + myId : state.me.id, + spotlights : state.room.spotlights, + boxes : videoBoxesSelector(state) }; }; diff --git a/app/src/components/Room.js b/app/src/components/Room.js index 1d6a180..aef3987 100644 --- a/app/src/components/Room.js +++ b/app/src/components/Room.js @@ -159,13 +159,13 @@ class Room extends React.PureComponent } > diff --git a/app/src/components/Settings/Settings.js b/app/src/components/Settings/Settings.js index 4817efe..91ba0db 100644 --- a/app/src/components/Settings/Settings.js +++ b/app/src/components/Settings/Settings.js @@ -353,15 +353,15 @@ const Settings = ({ Settings.propTypes = { - roomClient : PropTypes.any.isRequired, - me : appPropTypes.Me.isRequired, - room : appPropTypes.Room.isRequired, - settings : PropTypes.object.isRequired, - onToggleAdvancedMode : PropTypes.func.isRequired, + roomClient : PropTypes.any.isRequired, + me : appPropTypes.Me.isRequired, + room : appPropTypes.Room.isRequired, + settings : PropTypes.object.isRequired, + onToggleAdvancedMode : PropTypes.func.isRequired, onTogglePermanentTopBar : PropTypes.func.isRequired, - handleChangeMode : PropTypes.func.isRequired, - handleCloseSettings : PropTypes.func.isRequired, - classes : PropTypes.object.isRequired + handleChangeMode : PropTypes.func.isRequired, + handleCloseSettings : PropTypes.func.isRequired, + classes : PropTypes.object.isRequired }; const mapStateToProps = (state) => @@ -374,10 +374,10 @@ const mapStateToProps = (state) => }; const mapDispatchToProps = { - onToggleAdvancedMode : settingsActions.toggleAdvancedMode, + onToggleAdvancedMode : settingsActions.toggleAdvancedMode, onTogglePermanentTopBar : settingsActions.togglePermanentTopBar, - handleChangeMode : roomActions.setDisplayMode, - handleCloseSettings : roomActions.setSettingsOpen + handleChangeMode : roomActions.setDisplayMode, + handleCloseSettings : roomActions.setSettingsOpen }; export default withRoomContext(connect( diff --git a/app/src/components/VideoContainers/FullScreenView.js b/app/src/components/VideoContainers/FullScreenView.js index 5549712..05d1484 100644 --- a/app/src/components/VideoContainers/FullScreenView.js +++ b/app/src/components/VideoContainers/FullScreenView.js @@ -135,7 +135,7 @@ FullScreenView.propTypes = consumer : appPropTypes.Consumer, toggleConsumerFullscreen : PropTypes.func.isRequired, toolbarsVisible : PropTypes.bool, - permanentTopBar : PropTypes.bool, + permanentTopBar : PropTypes.bool, classes : PropTypes.object.isRequired }; @@ -143,7 +143,7 @@ const mapStateToProps = (state) => ({ consumer : state.consumers[state.room.fullScreenConsumer], toolbarsVisible : state.room.toolbarsVisible, - permanentTopBar : state.settings.permanentTopBar + permanentTopBar : state.settings.permanentTopBar }); const mapDispatchToProps = (dispatch) => diff --git a/app/src/reducers/settings.js b/app/src/reducers/settings.js index 4b3dde4..21d59db 100644 --- a/app/src/reducers/settings.js +++ b/app/src/reducers/settings.js @@ -6,7 +6,7 @@ const initialState = advancedMode : false, resolution : 'medium', // low, medium, high, veryhigh, ultra lastN : 4, - permanentTopBar : true + permanentTopBar : true }; const settings = (state = initialState, action) => diff --git a/app/src/translations/cn.json b/app/src/translations/cn.json index cb439e5..572d84e 100644 --- a/app/src/translations/cn.json +++ b/app/src/translations/cn.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "登录", "tooltip.logout": "注销", diff --git a/app/src/translations/cz.json b/app/src/translations/cz.json index 82ed962..1be5e7b 100644 --- a/app/src/translations/cz.json +++ b/app/src/translations/cz.json @@ -48,6 +48,12 @@ "room.spotlights": "Aktivní Účastníci", "room.passive": "Pasivní Účastníci", "room.videoPaused": "Toto video bylo pozastaveno", + "room.muteAll": null, + "room.stopAllVideo": null, + "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Přihlášení", "tooltip.logout": "Odhlášení", diff --git a/app/src/translations/de.json b/app/src/translations/de.json index d78e5bd..8aa3a4e 100644 --- a/app/src/translations/de.json +++ b/app/src/translations/de.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Anmelden", "tooltip.logout": "Abmelden", diff --git a/app/src/translations/dk.json b/app/src/translations/dk.json index 87be182..1eccd1f 100644 --- a/app/src/translations/dk.json +++ b/app/src/translations/dk.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Log ind", "tooltip.logout": "Log ud", diff --git a/app/src/translations/el.json b/app/src/translations/el.json index 1c028df..9125308 100644 --- a/app/src/translations/el.json +++ b/app/src/translations/el.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Σύνδεση", "tooltip.logout": "Αποσύνδεση", diff --git a/app/src/translations/en.json b/app/src/translations/en.json index b7248f5..55a80dd 100644 --- a/app/src/translations/en.json +++ b/app/src/translations/en.json @@ -52,6 +52,9 @@ "room.muteAll": "Mute all", "room.stopAllVideo": "Stop all video", "room.closeMeeting": "Close meeting", + "room.speechUnsupported": "Your browser does not support speech recognition", + + "me.mutedPTT": "You are muted, hold down SPACE-BAR to talk", "tooltip.login": "Log in", "tooltip.logout": "Log out", diff --git a/app/src/translations/es.json b/app/src/translations/es.json index 4325509..ef27cdc 100644 --- a/app/src/translations/es.json +++ b/app/src/translations/es.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Entrar", "tooltip.logout": "Salir", diff --git a/app/src/translations/fr.json b/app/src/translations/fr.json index 87643b5..d057178 100644 --- a/app/src/translations/fr.json +++ b/app/src/translations/fr.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Connexion", "tooltip.logout": "Déconnexion", diff --git a/app/src/translations/hr.json b/app/src/translations/hr.json index 5e97b0c..5f0d6a6 100644 --- a/app/src/translations/hr.json +++ b/app/src/translations/hr.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Prijava", "tooltip.logout": "Odjava", diff --git a/app/src/translations/hu.json b/app/src/translations/hu.json index 9c4399a..c7dedf1 100644 --- a/app/src/translations/hu.json +++ b/app/src/translations/hu.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Belépés", "tooltip.logout": "Kilépés", diff --git a/app/src/translations/it.json b/app/src/translations/it.json index 2234260..4529279 100644 --- a/app/src/translations/it.json +++ b/app/src/translations/it.json @@ -49,6 +49,12 @@ "room.spotlights": "Partecipanti in Evidenza", "room.passive": "Participanti Passivi", "room.videoPaused": "Il video è in pausa", + "room.muteAll": null, + "room.stopAllVideo": null, + "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Log in", "tooltip.logout": "Log out", diff --git a/app/src/translations/nb.json b/app/src/translations/nb.json index 6c81dea..1841857 100644 --- a/app/src/translations/nb.json +++ b/app/src/translations/nb.json @@ -52,6 +52,9 @@ "room.muteAll": "Demp alle", "room.stopAllVideo": "Stopp all video", "room.closeMeeting": "Avslutt møte", + "room.speechUnsupported": "Din nettleser støtter ikke stemmegjenkjenning", + + "me.mutedPTT": "Du er dempet, hold nede SPACE for å snakke", "tooltip.login": "Logg in", "tooltip.logout": "Logg ut", diff --git a/app/src/translations/pl.json b/app/src/translations/pl.json index 662f878..c5415fb 100644 --- a/app/src/translations/pl.json +++ b/app/src/translations/pl.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Zaloguj", "tooltip.logout": "Wyloguj", diff --git a/app/src/translations/pt.json b/app/src/translations/pt.json index 5f034e9..4c30812 100644 --- a/app/src/translations/pt.json +++ b/app/src/translations/pt.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Entrar", "tooltip.logout": "Sair", diff --git a/app/src/translations/ro.json b/app/src/translations/ro.json index a187665..0fae5de 100644 --- a/app/src/translations/ro.json +++ b/app/src/translations/ro.json @@ -52,6 +52,9 @@ "room.muteAll": null, "room.stopAllVideo": null, "room.closeMeeting": null, + "room.speechUnsupported": null, + + "me.mutedPTT": null, "tooltip.login": "Intră în cont", "tooltip.logout": "Deconectare",