Skip to content

Commit fe5a9ce

Browse files
committed
verify disabled
1 parent 85a4293 commit fe5a9ce

File tree

3 files changed

+47
-17
lines changed

3 files changed

+47
-17
lines changed

html/index.html

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<div style="margin:0 0 10px;">
2020
<button id="set">Set</button>
2121
<button id="stop" style="display:none;">Stop</button>
22-
<button id="awake" style="display:none;">I'm awake!</button>
22+
<!--<button id="awake" style="display:none;">I'm awake!</button>
23+
<span id="awake_ticker"></span>-->
2324
</div>
2425

2526
<pre id="status" class="loading">Loading...</pre>
@@ -55,9 +56,11 @@
5556
$('#stop').show();
5657
}
5758

58-
if (data.canVerifyAwake) {
59-
('#awake').show();
60-
}
59+
/*if (data.canVerifyAwake) {
60+
$('#awake').show().removeAttr('disabled');
61+
} else {
62+
$('#awake').hide();
63+
}*/
6164
});
6265

6366
/*socket.on('disconnect', function () {
@@ -80,22 +83,35 @@
8083
socket.on('triggered', function () {
8184
//log('Triggered');
8285
$('#stop').show();
83-
$('#awake').hide();
86+
//$('#awake').hide();
8487
});
8588

8689
socket.on('stop', function () {
8790
//log('Stopped');
8891
$('#stop').hide();
8992
});
9093

91-
socket.on('verifyAwake', function () {
92-
$('#awake').show();
94+
/*socket.on('verifyAwake', function () {
95+
$('#awake').show().removeAttr('disabled');
96+
});
97+
98+
socket.on('canVerifyAwakeIn', function (ms) {
99+
$('#awake').show().attr('disabled', 'disabled');
100+
var end = new Date().getTime() + ms;
101+
var interval = setInterval(function () {
102+
if (end > new Date().getTime()) {
103+
$('#awake_ticker').text(Math.floor((end - new Date().getTime()) / 1000) + ' seconds left');
104+
} else {
105+
$('#awake_ticker').text('');
106+
clearInterval(interval);
107+
}
108+
}, 1000);
93109
});
94110
95111
$('#awake').click(function () {
96112
socket.emit('awake');
97113
$(this).hide();
98-
});
114+
});*/
99115

100116
$('#set').click(function () {
101117
socket.emit('set', { time: $('#alarm').val() });

index.js

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,12 @@ var util = require('util'),
88
alarm = new require('./lib/alarm').Alarm(),
99
player = new require('./lib/player').Player(),
1010
nextAlarm = alarm.getNext(),
11-
logHistory = [],
12-
verifyAwakeTimer, canVerifyAwake;
11+
logHistory = []
12+
/*config = {
13+
plugins: ['verify']
14+
},
15+
plugins = {},*/
16+
/*verifyAwakeTimer, canVerifyAwake*/;
1317

1418
function log(text) {
1519
socketServer.sockets.emit('log', text);
@@ -22,11 +26,11 @@ function soundAlarm() {
2226
player.play('sound/alarm.wav', { repeat: true });
2327
}
2428

25-
function verifyAwake() {
29+
/*function verifyAwake() {
2630
canVerifyAwake = false;
2731
clearTimeout(verifyAwakeTimer);
2832
log('Initiating awake verification');
29-
33+
socketServer.sockets.emit('canVerifyAwakeIn', 60000);
3034
verifyAwakeTimer = setTimeout(function () {
3135
socketServer.sockets.emit('verifyAwake');
3236
canVerifyAwake = true;
@@ -43,7 +47,7 @@ function verifiedAwake() {
4347
clearTimeout(verifyAwakeTimer);
4448
log('Awake verified');
4549
}
46-
}
50+
}*/
4751

4852
function parseTime(string) {
4953
var time = string.split(':');
@@ -88,7 +92,7 @@ socketServer.sockets.on('connection', function (socket) {
8892
socket.emit('init', {
8993
time: nextAlarm ? nextAlarm.format('HH:MM') : null,
9094
triggered: player.playing(),
91-
canVerifyAwake: canVerifyAwake,
95+
//canVerifyAwake: canVerifyAwake,
9296
logHistory: logHistory
9397
});
9498

@@ -104,13 +108,13 @@ socketServer.sockets.on('connection', function (socket) {
104108
log('Stopped');
105109
socketServer.sockets.emit('stop');
106110
player.stop();
107-
verifyAwake();
111+
//verifyAwake();
108112
}
109113
});
110114

111-
socket.on('awake', function (data) {
115+
/*socket.on('awake', function (data) {
112116
verifiedAwake();
113-
});
117+
});*/
114118

115119
/*socket.emit('news', { hello: 'world' });
116120
socket.on('my other event', function (data) {

plugins/verify.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*
2+
var _alarm, _events;
3+
4+
exports.init = function (alarm, events) {
5+
_alarm = alarm;
6+
_events = events;
7+
8+
_events.on('')
9+
};*/
10+

0 commit comments

Comments
 (0)