diff --git a/app/chooseRoom.html b/app/chooseRoom.html
new file mode 100644
index 0000000..97d00de
--- /dev/null
+++ b/app/chooseRoom.html
@@ -0,0 +1,74 @@
+
+
+
+
+ Multiparty Meeting
+
+
+
+
+ 
+
+
+
+
+
+
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/app/stylus/components/Sidebar.styl b/app/stylus/components/Sidebar.styl
index be324c0..0c69fa8 100644
--- a/app/stylus/components/Sidebar.styl
+++ b/app/stylus/components/Sidebar.styl
@@ -9,13 +9,13 @@
align-items: center;
+desktop() {
- left: 20px;
- width: 36px;
+ left: 1.0em;
+ width: 2.6em;
}
+mobile() {
- left: 10px;
- width: 32px;
+ left: 0.5em;
+ width: 2.6em;
}
> .button {
@@ -34,13 +34,13 @@
justify-content: center;
+desktop() {
- height: 36px;
- width: 36px;
+ height: 2.5em;
+ width: 2.5em;
}
+mobile() {
- height: 32px;
- width: 32px;
+ height: 2.5em;
+ width: 2.5em;
}
&.on {
@@ -110,7 +110,7 @@
}
&.leave-meeting {
- background-image: url('/resources/images/leave-meeting.svg');
+ background-image: url('/resources/images/cancel.svg');
}
}
}
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' }),