Re added raiseHand feature: still missing state on server side and display in participant list
parent
4e1a4a9d4e
commit
19b1269dc3
|
|
@ -91,6 +91,20 @@ class Peer extends Component
|
||||||
}
|
}
|
||||||
|
|
||||||
<div className={classnames('view-container', 'webcam')} style={style}>
|
<div className={classnames('view-container', 'webcam')} style={style}>
|
||||||
|
<div className='indicators'>
|
||||||
|
{peer.raiseHandState ?
|
||||||
|
<div className={
|
||||||
|
classnames(
|
||||||
|
'icon', 'raise-hand', {
|
||||||
|
on : peer.raiseHandState,
|
||||||
|
off : !peer.raiseHandState
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
:null
|
||||||
|
}
|
||||||
|
</div>
|
||||||
<div
|
<div
|
||||||
className={classnames('controls', {
|
className={classnames('controls', {
|
||||||
visible : this.state.controlsVisible
|
visible : this.state.controlsVisible
|
||||||
|
|
|
||||||
|
|
@ -14,17 +14,17 @@ class Sidebar extends Component
|
||||||
|
|
||||||
handleToggleFullscreen = () =>
|
handleToggleFullscreen = () =>
|
||||||
{
|
{
|
||||||
if (fscreen.fullscreenElement)
|
if (fscreen.fullscreenElement)
|
||||||
{
|
{
|
||||||
fscreen.exitFullscreen();
|
fscreen.exitFullscreen();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
fscreen.requestFullscreen(document.documentElement);
|
fscreen.requestFullscreen(document.documentElement);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
handleFullscreenChange = () =>
|
handleFullscreenChange = () =>
|
||||||
{
|
{
|
||||||
this.setState({
|
this.setState({
|
||||||
fullscreen : fscreen.fullscreenElement !== null
|
fullscreen : fscreen.fullscreenElement !== null
|
||||||
|
|
@ -47,16 +47,16 @@ class Sidebar extends Component
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
render()
|
render()
|
||||||
{
|
{
|
||||||
const {
|
const {
|
||||||
toolbarsVisible, me, screenProducer, onLogin, onShareScreen,
|
toolbarsVisible, me, screenProducer, onLogin, onShareScreen,
|
||||||
onUnShareScreen, onNeedExtension, onLeaveMeeting, onLogout
|
onUnShareScreen, onNeedExtension, onLeaveMeeting, onLogout, onToggleHand
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
let screenState;
|
let screenState;
|
||||||
let screenTip;
|
let screenTip;
|
||||||
|
|
||||||
if (me.needExtension)
|
if (me.needExtension)
|
||||||
{
|
{
|
||||||
screenState = 'need-extension';
|
screenState = 'need-extension';
|
||||||
|
|
@ -77,7 +77,7 @@ class Sidebar extends Component
|
||||||
screenState = 'off';
|
screenState = 'off';
|
||||||
screenTip = 'Start screen sharing';
|
screenTip = 'Start screen sharing';
|
||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div
|
<div
|
||||||
className={classnames('sidebar room-controls', {
|
className={classnames('sidebar room-controls', {
|
||||||
|
|
@ -126,7 +126,7 @@ class Sidebar extends Component
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
{me.loginEnabled && (me.loggedIn ? (
|
{me.loginEnabled && (me.loggedIn ? (
|
||||||
<div
|
<div
|
||||||
className='button logout'
|
className='button logout'
|
||||||
|
|
@ -144,6 +144,15 @@ class Sidebar extends Component
|
||||||
onClick={onLogin}
|
onClick={onLogin}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
|
<div
|
||||||
|
className={classnames('button', 'raise-hand', {
|
||||||
|
on : me.raiseHand,
|
||||||
|
disabled : me.raiseHandInProgress
|
||||||
|
})}
|
||||||
|
data-tip='Raise hand'
|
||||||
|
data-type='dark'
|
||||||
|
onClick={() => onToggleHand(!me.raiseHand)}
|
||||||
|
/>
|
||||||
|
|
||||||
<div
|
<div
|
||||||
className={classnames('button', 'leave-meeting')}
|
className={classnames('button', 'leave-meeting')}
|
||||||
|
|
@ -162,6 +171,7 @@ Sidebar.propTypes = {
|
||||||
onShareScreen : PropTypes.func.isRequired,
|
onShareScreen : PropTypes.func.isRequired,
|
||||||
onUnShareScreen : PropTypes.func.isRequired,
|
onUnShareScreen : PropTypes.func.isRequired,
|
||||||
onNeedExtension : PropTypes.func.isRequired,
|
onNeedExtension : PropTypes.func.isRequired,
|
||||||
|
onToggleHand : PropTypes.func.isRequired,
|
||||||
onLeaveMeeting : PropTypes.func.isRequired,
|
onLeaveMeeting : PropTypes.func.isRequired,
|
||||||
onLogin : PropTypes.func.isRequired,
|
onLogin : PropTypes.func.isRequired,
|
||||||
onLogout : PropTypes.func.isRequired,
|
onLogout : PropTypes.func.isRequired,
|
||||||
|
|
@ -181,6 +191,7 @@ const mapDispatchToProps = {
|
||||||
onShareScreen : requestActions.enableScreenSharing,
|
onShareScreen : requestActions.enableScreenSharing,
|
||||||
onUnShareScreen : requestActions.disableScreenSharing,
|
onUnShareScreen : requestActions.disableScreenSharing,
|
||||||
onNeedExtension : requestActions.installExtension,
|
onNeedExtension : requestActions.installExtension,
|
||||||
|
onToggleHand : requestActions.toggleHand,
|
||||||
onLogin : requestActions.userLogin,
|
onLogin : requestActions.userLogin,
|
||||||
onLogout : requestActions.userLogout
|
onLogout : requestActions.userLogout
|
||||||
};
|
};
|
||||||
|
|
@ -188,4 +199,4 @@ const mapDispatchToProps = {
|
||||||
export default connect(
|
export default connect(
|
||||||
mapStateToProps,
|
mapStateToProps,
|
||||||
mapDispatchToProps
|
mapDispatchToProps
|
||||||
)(Sidebar);
|
)(Sidebar);
|
||||||
|
|
|
||||||
|
|
@ -191,6 +191,18 @@ export const installExtension = () =>
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const toggleHand = (enable) =>
|
||||||
|
{
|
||||||
|
if (enable)
|
||||||
|
return {
|
||||||
|
type : 'RAISE_HAND'
|
||||||
|
};
|
||||||
|
else
|
||||||
|
return {
|
||||||
|
type : 'LOWER_HAND'
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
export const sendChatMessage = (text, name, picture) =>
|
export const sendChatMessage = (text, name, picture) =>
|
||||||
{
|
{
|
||||||
const message = createNewMessage(text, 'response', name, picture);
|
const message = createNewMessage(text, 'response', name, picture);
|
||||||
|
|
|
||||||
|
|
@ -4599,12 +4599,14 @@
|
||||||
"balanced-match": {
|
"balanced-match": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
},
|
},
|
||||||
"brace-expansion": {
|
"brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.11",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
|
|
@ -4619,17 +4621,20 @@
|
||||||
"code-point-at": {
|
"code-point-at": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
},
|
},
|
||||||
"concat-map": {
|
"concat-map": {
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
},
|
},
|
||||||
"console-control-strings": {
|
"console-control-strings": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
},
|
},
|
||||||
"core-util-is": {
|
"core-util-is": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
|
|
@ -4746,7 +4751,8 @@
|
||||||
"inherits": {
|
"inherits": {
|
||||||
"version": "2.0.3",
|
"version": "2.0.3",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
},
|
},
|
||||||
"ini": {
|
"ini": {
|
||||||
"version": "1.3.5",
|
"version": "1.3.5",
|
||||||
|
|
@ -4758,6 +4764,7 @@
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"number-is-nan": "^1.0.0"
|
"number-is-nan": "^1.0.0"
|
||||||
}
|
}
|
||||||
|
|
@ -4772,6 +4779,7 @@
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"brace-expansion": "^1.1.7"
|
"brace-expansion": "^1.1.7"
|
||||||
}
|
}
|
||||||
|
|
@ -4890,7 +4898,8 @@
|
||||||
"number-is-nan": {
|
"number-is-nan": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true
|
"dev": true,
|
||||||
|
"optional": true
|
||||||
},
|
},
|
||||||
"object-assign": {
|
"object-assign": {
|
||||||
"version": "4.1.1",
|
"version": "4.1.1",
|
||||||
|
|
@ -4902,6 +4911,7 @@
|
||||||
"version": "1.4.0",
|
"version": "1.4.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"wrappy": "1"
|
"wrappy": "1"
|
||||||
}
|
}
|
||||||
|
|
@ -5023,6 +5033,7 @@
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"dev": true,
|
"dev": true,
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"code-point-at": "^1.0.0",
|
"code-point-at": "^1.0.0",
|
||||||
"is-fullwidth-code-point": "^1.0.0",
|
"is-fullwidth-code-point": "^1.0.0",
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@
|
||||||
> .view-container {
|
> .view-container {
|
||||||
position: relative;
|
position: relative;
|
||||||
flex-grow: 1;
|
flex-grow: 1;
|
||||||
|
|
||||||
&.webcam {
|
&.webcam {
|
||||||
order: 2;
|
order: 2;
|
||||||
}
|
}
|
||||||
|
|
@ -32,7 +32,58 @@
|
||||||
order: 1;
|
order: 1;
|
||||||
max-width: 50%;
|
max-width: 50%;
|
||||||
}
|
}
|
||||||
|
> .indicators {
|
||||||
|
position: absolute;
|
||||||
|
z-index: 200;
|
||||||
|
left: 0;
|
||||||
|
top: 0;
|
||||||
|
display: flex;
|
||||||
|
flex-direction:; row;
|
||||||
|
justify-content: flex-start;
|
||||||
|
align-items: center;
|
||||||
|
padding: 0.4vmin;
|
||||||
|
transition: opacity 0.3s;
|
||||||
|
|
||||||
|
> .icon {
|
||||||
|
flex: 0 0 auto;
|
||||||
|
margin: 0.2vmin;
|
||||||
|
border-radius: 2px;
|
||||||
|
background-position: center;
|
||||||
|
background-size: 75%;
|
||||||
|
background-repeat: no-repeat;
|
||||||
|
background-color: rgba(#000, 0.5);
|
||||||
|
cursor: pointer;
|
||||||
|
transition-property: opacity, background-color;
|
||||||
|
transition-duration: 0.15s;
|
||||||
|
|
||||||
|
+desktop() {
|
||||||
|
width: 24px;
|
||||||
|
height: 24px;
|
||||||
|
opacity: 0.85;
|
||||||
|
|
||||||
|
&:hover {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+mobile() {
|
||||||
|
width: 22px;
|
||||||
|
height: 22px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.on {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.off {
|
||||||
|
opacity: 0.2;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.raise-hand {
|
||||||
|
background-image: url('/resources/images/icon-hand-white.svg');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
> .controls {
|
> .controls {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
|
|
@ -45,11 +96,11 @@
|
||||||
padding: 0.4vmin;
|
padding: 0.4vmin;
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.3s;
|
transition: opacity 0.3s;
|
||||||
|
|
||||||
&.visible {
|
&.visible {
|
||||||
opacity: 1;
|
opacity: 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
> .button {
|
> .button {
|
||||||
flex: 0 0 auto;
|
flex: 0 0 auto;
|
||||||
margin: 0.2vmin;
|
margin: 0.2vmin;
|
||||||
|
|
|
||||||
|
|
@ -113,4 +113,4 @@
|
||||||
background-image: url('/resources/images/leave-meeting.svg');
|
background-image: url('/resources/images/leave-meeting.svg');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue