KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-12-08 20:48:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

IAM A TOAST FUCK

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2015-04-14 23:03:35 +02:00
parent 3335823772
commit 7419c18427
2 changed files with 20 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
server/server.js
View File

@@ -134,11 +134,11 @@ io.on('connection', function(socket){
}); });
}); });
}else{ }else{
vote(coll, id, guid); vote(coll, id, guid, socket);
} }
}); });
}else }else
socket.emit("error_settings", "Password Protected List!"); socket.emit("toast", "Password Protected List!");
}); });
}); });
@@ -155,9 +155,9 @@ io.on('connection', function(socket){
{ {
if((docs[0]["vote"] == "true" && (hash == docs[0]["adminpass"] || docs[0]["adminpass"] == "")) || docs[0]["vote"] == "false") if((docs[0]["vote"] == "true" && (hash == docs[0]["adminpass"] || docs[0]["adminpass"] == "")) || docs[0]["vote"] == "false")
{ {
vote(coll, id, guid); vote(coll, id, guid, socket);
}else{ }else{
socket.emit("error_settings", "Password Protected List!"); socket.emit("toast", "Password Protected List!");
} }
}); });
} }
@@ -178,7 +178,7 @@ io.on('connection', function(socket){
}); });
} }
}else }else
socket.emit("error_settings", "No Skipping!"); socket.emit("sucess_settings", "No Skipping!");
}); });
}); });
@@ -209,13 +209,13 @@ io.on('connection', function(socket){
shuffle:shuffling, shuffle:shuffling,
longsongs:longsongs, longsongs:longsongs,
adminpass:hash}}, function(err, docs){ adminpass:hash}}, function(err, docs){
socket.emit("success_settings", "Successfully applied settings!"); socket.emit("toast", "Successfully applied settings!");
sort_list(coll,undefined,false); sort_list(coll,undefined,false);
}); });
}else }else
{ {
socket.emit("error_settings", "Wrong Password!"); socket.emit("toast", "Wrong Password!");
} }
}); });
}); });
@@ -233,12 +233,12 @@ io.on('connection', function(socket){
num = Math.floor(Math.random()*1000000); num = Math.floor(Math.random()*1000000);
db.collection(coll).update({id:docs["id"]}, {$set:{added:num}}, function(err, d) db.collection(coll).update({id:docs["id"]}, {$set:{added:num}}, function(err, d)
{ {
socket.emit("success_settings", "Shuffled Playlist!"); socket.emit("toast", "Shuffled Playlist!");
}); });
} }
}); });
}else }else
socket.emit("error_settings", "Wrong Password!"); socket.emit("toast", "Wrong Password!");
}); });
}); });
@@ -268,6 +268,7 @@ function del(params)
if(docs[0]["adminpass"] == hash_pass(params[4])) if(docs[0]["adminpass"] == hash_pass(params[4]))
{ {
db.collection(coll).remove({id:params[1]}, function(err, docs){ db.collection(coll).remove({id:params[1]}, function(err, docs){
socket.emit("toast", "The song was deleted.");
sort_list(coll, undefined, false); sort_list(coll, undefined, false);
}) })
} }
@@ -279,7 +280,7 @@ function hash_pass(adminpass)
return crypto.createHash('sha256').update(adminpass).digest('base64'); return crypto.createHash('sha256').update(adminpass).digest('base64');
} }
function vote(coll, id, guid) function vote(coll, id, guid, socket)
{ {
db.collection(coll).find({id:id}, function(err, docs){ db.collection(coll).find({id:id}, function(err, docs){
if(!contains(docs[0]["guids"], guid)) if(!contains(docs[0]["guids"], guid))
@@ -288,11 +289,15 @@ function vote(coll, id, guid)
{ {
db.collection(coll).update({id:id}, {$push :{guids: guid}}, function(err, docs) db.collection(coll).update({id:id}, {$push :{guids: guid}}, function(err, docs)
{ {
socket.emit("toast", "Voted on song!");
sort_list(coll, undefined, false); sort_list(coll, undefined, false);
}); });
//sort_list(coll, undefined, false); //sort_list(coll, undefined, false);
}); });
} }else
{
socket.emit("toast", "You've already voted on that song!");
}
}); });
} }

15
static/js/admin.js
View File

@@ -1,21 +1,14 @@
var adminTogg = false; var adminTogg = false;
var pass_corr = ""; var pass_corr = "";
socket.on("success_settings", function(msg) socket.on("toast", function(msg)
{ {
pass_corr = "correct"; pass_corr = "correct";
document.getElementById("sBar").innerHTML = msg; Materialize.toast(msg, 4000);
/*document.getElementById("sBar").innerHTML = msg;
$("#sBar").addClass("opacityFull"); $("#sBar").addClass("opacityFull");
document.getElementById("passbox").value = ""; document.getElementById("passbox").value = "";
remove_bar(); remove_bar();*/
});
socket.on("error_settings", function(msg){
pass_corr = "wrong";
document.getElementById("eBar").innerHTML = "Error: " + msg;
$("#eBar").addClass("opacityFull");
document.getElementById("passbox").value = "";
remove_bar();
}); });
function admin() function admin()