Skip to content

Commit 81c0807

Browse files
committed
Loader at start
This allows the api to completely load before a user enters a room.
1 parent 2b8abd3 commit 81c0807

File tree

5 files changed

+29
-1
lines changed

5 files changed

+29
-1
lines changed

css/style.css

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,24 @@
1919
display: none;
2020
}
2121

22+
#page {
23+
display: none;
24+
}
25+
/* Loader */
26+
#loading {
27+
display: block;
28+
position: absolute;
29+
top: 0;
30+
left: 0;
31+
z-index: 100;
32+
width: 100vw;
33+
height: 100vh;
34+
background-color: rgba(192, 192, 192, 0.5);
35+
background-image: url("/img/loader.gif");
36+
background-repeat: no-repeat;
37+
background-position: center;
38+
}
39+
2240
html, body {
2341
max-width: 100%;
2442
overflow-x: hidden;

img/loader.gif

13.7 KB
Loading

index.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,14 @@
6565
<!-- Page Content -->
6666
<div class="container">
6767

68+
<!-- Loading page -->
69+
<!-- Loader is currently dependent on the dailymotion api because it is the slowest -->
70+
<div id="loading"></div>
71+
6872
<!-- User Form (First Page) -->
6973
<div id="userFormArea" class="row">
7074
<div class="col-md-12">
75+
<!-- ADD DESCRIPTION HERE -->
7176
<form id="userForm">
7277
<div class="form-group">
7378
<label>Enter Name</label>

js/dm.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ setTimeout(function() {
2121

2222
dailyPlayer.addEventListener('apiready', function(e) {
2323
console.log('api ready', e);
24+
// When api is ready
25+
document.getElementById('loading').style.display = 'none';
2426
});
2527

2628
// Play Event

server.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,8 +221,11 @@ io.sockets.on('connection', function(socket) {
221221
io.sockets.adapter.rooms['room-' + socket.roomnum].host = host
222222
// Sets the default values when first initializing
223223
if (init) {
224+
// Default Player
224225
io.sockets.adapter.rooms['room-' + socket.roomnum].currPlayer = 0
225-
io.sockets.adapter.rooms['room-' + socket.roomnum].currVideo = ''
226+
// Default video
227+
io.sockets.adapter.rooms['room-' + socket.roomnum].currVideo = 'M7lc1UVf-VE'
228+
// Host username
226229
io.sockets.adapter.rooms['room-' + socket.roomnum].hostName = socket.username
227230
}
228231

0 commit comments

Comments
 (0)