Corrected long last page with dynamic reloading
This commit is contained in:
@@ -3,24 +3,23 @@ var vcode = require('../../lib/vcode.js');
|
||||
|
||||
module.exports.index = function(req, res) {
|
||||
|
||||
db.verifyUser(req.session.userId, function(ok) {
|
||||
// If not micro-worker
|
||||
if (req.session.workerId === undefined) {
|
||||
|
||||
if (ok) {
|
||||
res.setHead('Content-Type', 'text/html');
|
||||
|
||||
res.locals.vcode = vcode(req.session.workerId, req.session.campaignIp);
|
||||
|
||||
}
|
||||
|
||||
res.locals.workerId = req.session.workerId;
|
||||
req.session = null;
|
||||
res.locals.session = null;
|
||||
|
||||
res.setHeader('Content-Type', 'text/html');
|
||||
|
||||
res.render('index.jade', res.locals, function(err, result) {
|
||||
res.render('normal.jade', res.locals, function(err, result) {
|
||||
res.send(result);
|
||||
});
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
res.setHeader('Content-Type', 'text/html');
|
||||
|
||||
res.render('vcode.jade', res.locals, function(err, result) {
|
||||
console.log(err);
|
||||
res.send(result);
|
||||
});
|
||||
|
||||
};
|
||||
|
||||
@@ -6,8 +6,3 @@ block content
|
||||
source(src="/static/data/music/thankyou.ogg")
|
||||
source(src="/static/data/music/thankyou.mp3")
|
||||
|
||||
if (vcode !== undefined)
|
||||
p Your vcode is #{vcode}.
|
||||
else if (workerId !== undefined)
|
||||
p You have no vcode because you're bad
|
||||
|
||||
36
controllers/thankyou/views/vcode.jade
Normal file
36
controllers/thankyou/views/vcode.jade
Normal file
@@ -0,0 +1,36 @@
|
||||
extends ../../../views/base.jade
|
||||
|
||||
block content
|
||||
h1 Thank you for everything !
|
||||
audio(autoplay)
|
||||
source(src="/static/data/music/thankyou.ogg")
|
||||
source(src="/static/data/music/thankyou.mp3")
|
||||
|
||||
p We are verifying that the experiment was correctly done...
|
||||
#vcode
|
||||
|
||||
script.
|
||||
function tryVcode() {
|
||||
var xhr = new XMLHttpRequest();
|
||||
xhr.open('GET', '/vcode', true);
|
||||
xhr.onreadystatechange = function (aEvt) {
|
||||
if (xhr.readyState == 4) {
|
||||
if(xhr.status == 200) {
|
||||
changeHtml(xhr.responseText);
|
||||
}
|
||||
}
|
||||
};
|
||||
xhr.send(null);
|
||||
}
|
||||
|
||||
function changeHtml(vcode) {
|
||||
if (vcode === 'not ready') {
|
||||
setTimeout(tryVcode, 1000);
|
||||
} else if (vcode === 'no vcode') {
|
||||
$('#vcode').html('Sorry, the experiment has not been correctly done ! You have no vcode.');
|
||||
} else {
|
||||
$('#vcode').html('Your vcode is ' + vcode);
|
||||
}
|
||||
}
|
||||
|
||||
tryVcode();
|
||||
Reference in New Issue
Block a user