From 3520cfea936e400d4eba7660368a4a8b646bac28 Mon Sep 17 00:00:00 2001 From: Stefan Otto Date: Fri, 16 Nov 2018 12:41:48 +0100 Subject: [PATCH 1/2] 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 2/2] 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 -
+
- +