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

Made Me draggable.

master
Håvar Aambø Fosstveit 2018-06-29 11:19:57 +02:00
parent 12fb31825f
commit 4d7bf89325
3 changed files with 2123 additions and 2111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/lib/components/Room.jsx
View File

@ -13,6 +13,7 @@ import Notifications from './Notifications';
import ToolAreaButton from './ToolArea/ToolAreaButton'; import ToolAreaButton from './ToolArea/ToolAreaButton';
import ToolArea from './ToolArea/ToolArea'; import ToolArea from './ToolArea/ToolArea';
import FullScreenView from './FullScreenView'; import FullScreenView from './FullScreenView';
import Draggable from 'react-draggable';
class Room extends React.Component class Room extends React.Component
{ {
@ -69,10 +70,13 @@ class Room extends React.Component
<Notifications /> <Notifications />
<ToolAreaButton /> <ToolAreaButton />
<div className='state' data-tip='Server status'> {room.advancedMode ?
<div className={classnames('icon', room.state)} /> <div className='state' data-tip='Server status'>
<p className={classnames('text', room.state)}>{room.state}</p> <div className={classnames('icon', room.state)} />
</div> <p className={classnames('text', room.state)}>{room.state}</p>
</div>
:null
}
<div className='room-link-wrapper'> <div className='room-link-wrapper'>
<div className='room-link'> <div className='room-link'>
@ -109,15 +113,17 @@ class Room extends React.Component
advancedMode={room.advancedMode} advancedMode={room.advancedMode}
/> />
<div <Draggable handle='.me-container' bounds='body' cancel='.display-name'>
className={classnames('me-container', { <div
'active-speaker' : amActiveSpeaker className={classnames('me-container', {
})} 'active-speaker' : amActiveSpeaker
> })}
<Me >
advancedMode={room.advancedMode} <Me
/> advancedMode={room.advancedMode}
</div> />
</div>
</Draggable>
<div className='sidebar'> <div className='sidebar'>
<div <div

4199
app/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
app/package.json
View File

@ -14,13 +14,14 @@
"hark": "^1.1.6", "hark": "^1.1.6",
"js-cookie": "^2.2.0", "js-cookie": "^2.2.0",
"marked": "^0.3.17", "marked": "^0.3.17",
"mediasoup-client": "^2.0.14", "mediasoup-client": "^2.1.1",
"prop-types": "^15.6.0", "prop-types": "^15.6.0",
"protoo-client": "^2.0.7", "protoo-client": "^2.0.7",
"random-string": "^0.2.0", "random-string": "^0.2.0",
"react": "^16.2.0", "react": "^16.2.0",
"react-clipboard.js": "^1.1.3", "react-clipboard.js": "^1.1.3",
"react-dom": "^16.2.0", "react-dom": "^16.2.0",
"react-draggable": "^3.0.5",
"react-dropdown": "^1.5.0", "react-dropdown": "^1.5.0",
"react-redux": "^5.0.6", "react-redux": "^5.0.6",
"react-spinner": "^0.2.7", "react-spinner": "^0.2.7",