From 60322c57c65d8d883d79ce03866ec3cbdb8aad5e Mon Sep 17 00:00:00 2001 From: Stefan Otto Date: Fri, 16 Nov 2018 09:59:41 +0100 Subject: [PATCH 01/18] Removed redundant not used css --- app/lib/components/ToolArea/ToolAreaButton.jsx | 2 +- app/stylus/components/ToolArea.styl | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/lib/components/ToolArea/ToolAreaButton.jsx b/app/lib/components/ToolArea/ToolAreaButton.jsx index c33047c..20b0024 100644 --- a/app/lib/components/ToolArea/ToolAreaButton.jsx +++ b/app/lib/components/ToolArea/ToolAreaButton.jsx @@ -27,7 +27,7 @@ class ToolAreaButton extends React.Component className={classnames('button toolarea-button', { on : toolAreaOpen })} - data-tip='Open tool box' + data-tip='Open tools' data-type='dark' onClick={() => toggleToolArea()} /> diff --git a/app/stylus/components/ToolArea.styl b/app/stylus/components/ToolArea.styl index 7fb18d2..d47852b 100644 --- a/app/stylus/components/ToolArea.styl +++ b/app/stylus/components/ToolArea.styl @@ -158,10 +158,6 @@ background-image: url('/resources/images/icon_tool_area_black.svg'); } } - - &.toolarea-close-button { - background-image: url('/resources/images/arrow_right.svg'); - } } > .badge { From c302374a6f2141192047e12eec07a93395a6bc5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Fri, 16 Nov 2018 12:00:03 +0100 Subject: [PATCH 02/18] Disable new window button on consumer that is in new window --- app/lib/components/Peer.jsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/lib/components/Peer.jsx b/app/lib/components/Peer.jsx index ee0861f..9da8c67 100644 --- a/app/lib/components/Peer.jsx +++ b/app/lib/components/Peer.jsx @@ -40,7 +40,8 @@ class Peer extends Component onUnmuteMic, toggleConsumerFullscreen, toggleConsumerWindow, - style + style, + windowConsumer } = this.props; const micEnabled = ( @@ -128,7 +129,9 @@ class Peer extends Component />
{ e.stopPropagation(); @@ -205,6 +208,7 @@ Peer.propTypes = micConsumer : appPropTypes.Consumer, webcamConsumer : appPropTypes.Consumer, screenConsumer : appPropTypes.Consumer, + windowConsumer : PropTypes.number, onMuteMic : PropTypes.func.isRequired, onUnmuteMic : PropTypes.func.isRequired, streamDimensions : PropTypes.object, @@ -229,7 +233,8 @@ const mapStateToProps = (state, { name }) => peer, micConsumer, webcamConsumer, - screenConsumer + screenConsumer, + windowConsumer : state.room.windowConsumer }; }; From 6dcda9cda72937f8f2b0037aea167f999b394c95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Fri, 16 Nov 2018 12:10:30 +0100 Subject: [PATCH 03/18] Hotkey m for muting/unmuting yourself --- app/lib/RoomClient.js | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/app/lib/RoomClient.js b/app/lib/RoomClient.js index fa283d7..b74a1ae 100644 --- a/app/lib/RoomClient.js +++ b/app/lib/RoomClient.js @@ -179,6 +179,13 @@ export default class RoomClient this.notify('Changed layout to filmstrip view.'); break; } + + case 'm': // Toggle microphone + { + this.toggleMic(); + this.notify('Muted/unmuted your microphone.'); + break; + } } } }); @@ -391,6 +398,16 @@ export default class RoomClient } } + toggleMic() + { + logger.debug('toggleMic()'); + + if (this._micProducer.locallyPaused) + this.unmuteMic(); + else + this.muteMic(); + } + muteMic() { logger.debug('muteMic()'); From 3520cfea936e400d4eba7660368a4a8b646bac28 Mon Sep 17 00:00:00 2001 From: Stefan Otto Date: Fri, 16 Nov 2018 12:41:48 +0100 Subject: [PATCH 04/18] Added start page --- app/chooseRoom.html | 74 +++++++++++++++++++++++++++++++++++++++++++++ app/gulpfile.js | 6 ++-- server/server.js | 9 ++++-- 3 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 app/chooseRoom.html diff --git a/app/chooseRoom.html b/app/chooseRoom.html new file mode 100644 index 0000000..4c83893 --- /dev/null +++ b/app/chooseRoom.html @@ -0,0 +1,74 @@ + + + + + Meet + + + + +
+ + + + + + diff --git a/app/gulpfile.js b/app/gulpfile.js index 126061e..a04e04f 100644 --- a/app/gulpfile.js +++ b/app/gulpfile.js @@ -137,7 +137,7 @@ gulp.task('lint', () => .pipe(eslint.format()); }); -gulp.task('lint-fix', function() +gulp.task('lint-fix', function() { return gulp.src(LINTING_FILES) .pipe(plumber()) @@ -168,7 +168,7 @@ gulp.task('css', () => gulp.task('html', () => { - return gulp.src('index.html') + return gulp.src('*.html') .pipe(change(changeHTML)) .pipe(gulp.dest(OUTPUT_DIR)); }); @@ -241,7 +241,7 @@ gulp.task('browser', (done) => gulp.task('watch', (done) => { // Watch changes in HTML. - gulp.watch([ 'index.html' ], gulp.series( + gulp.watch([ '*.html' ], gulp.series( 'html' )); diff --git a/server/server.js b/server/server.js index 8daa1f0..9a0583b 100755 --- a/server/server.js +++ b/server/server.js @@ -57,7 +57,7 @@ app.all('*', (req, res, next) => app.use(dataporten.passport.initialize()); app.use(dataporten.passport.session()); -app.get('/login', (req, res, next) => +app.get('/login', (req, res, next) => { dataporten.passport.authenticate('dataporten', { state : base64.encode(JSON.stringify({ @@ -65,12 +65,17 @@ app.get('/login', (req, res, next) => peerName : req.query.peerName, code : utils.random(10) })) - + })(req, res, next); }); dataporten.setupLogout(app, '/logout'); +app.get('/', function (req, res) { + console.log(req.url); + res.sendFile(`${__dirname}/public/chooseRoom.html`); +}) + app.get( '/auth-callback', dataporten.passport.authenticate('dataporten', { failureRedirect: '/login' }), From f9e0049e4d391b45beeb57e7083a3bd03e883101 Mon Sep 17 00:00:00 2001 From: Stefan Otto Date: Fri, 16 Nov 2018 14:39:41 +0100 Subject: [PATCH 05/18] Fix telephone icon + some css size fixes --- app/chooseRoom.html | 30 +++++++++++++++--------------- app/stylus/components/Sidebar.styl | 18 +++++++++--------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/app/chooseRoom.html b/app/chooseRoom.html index 4c83893..97d00de 100644 --- a/app/chooseRoom.html +++ b/app/chooseRoom.html @@ -2,12 +2,12 @@ - Meet + Multiparty Meeting -
+
- +