Briq/multiparty-meeting
9
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Linting and translations

Browse Source
This commit is contained in:
Håvar Aambø Fosstveit
2020-03-27 22:57:04 +01:00
parent 34cdac8102
commit a1dc652d04
30 changed files with 176 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/components/ChooseRoom.js
+2 -1
View File
@@ -178,7 +178,8 @@ const ChooseRoom = ({
<CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand',
defaultMessage : 'I understand'
})}>
})}
>
<FormattedMessage
id='room.cookieConsent'
defaultMessage='This website uses cookies to enhance the user experience'
app/src/components/Containers/Me.js
+30 -31
View File
@@ -68,34 +68,33 @@ const styles = (theme) =>
},
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) =>
<FormattedMessage
id='room.me'
defaultMessage='ME'
/>
/>
</p>
<div className={classnames(classes.ptt, (micState ==='muted' && me.isSpeaking) ? 'enabled' : null)} >
<FormattedMessage
id='me.mutedPTT'
defaultMessage='You are muted: hold SPACE-BAR to speak!'
defaultMessage='You are muted, hold down SPACE-BAR to talk'
/>
</div>
app/src/components/Controls/TopBar.js
+9 -9
View File
@@ -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
});
app/src/components/JoinDialog.js
+2 -1
View File
@@ -339,7 +339,8 @@ const JoinDialog = ({
<CookieConsent buttonText={intl.formatMessage({
id : 'room.consentUnderstand',
defaultMessage : 'I understand'
})}>
})}
>
<FormattedMessage
id='room.cookieConsent'
defaultMessage='This website uses cookies to enhance the user experience'
app/src/components/MeetingDrawer/ParticipantList/ListPeer.js
+18 -18
View File
@@ -151,14 +151,14 @@ const ListPeer = (props) =>
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 ?
<ScreenIcon />
@@ -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 ?
<MicIcon />
@@ -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);
}}
>
<ExitIcon />
</IconButton>
app/src/components/MeetingViews/Filmstrip.js
+17 -17
View File
@@ -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)
};
};
app/src/components/Room.js
+3 -3
View File
@@ -159,13 +159,13 @@ class Room extends React.PureComponent
<CookieConsent
buttonText={
<FormattedMessage
id = 'room.consentUnderstand'
defaultMessage = 'I understand'
id='room.consentUnderstand'
defaultMessage='I understand'
/>
}
>
<FormattedMessage
id = 'room.cookieConsent'
id='room.cookieConsent'
defaultMessage='This website uses cookies to enhance the user experience'
/>
</CookieConsent>
app/src/components/Settings/Settings.js
+11 -11
View File
@@ -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(
app/src/components/VideoContainers/FullScreenView.js
+2 -2
View File
@@ -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) =>