From 44b41b23864293f2326fe4ba7ac93c1a9f14a88c Mon Sep 17 00:00:00 2001 From: "Nicolas A. Tonne" Date: Thu, 16 Apr 2015 14:09:45 +0200 Subject: [PATCH] Moved scripts and made toast messages client side --- lists/.gitignore | 5 ----- php/nochan.php | 2 +- getnew.sh => scripts/getnew.sh | 0 install.sh => scripts/install.sh | 0 prodsett.sh => scripts/prodsett.sh | 0 setperms.sh => scripts/setperms.sh | 0 server/server.js | 22 +++++++++---------- static/css/style.css | 14 ++++++++---- static/js/admin.js | 35 +++++++++++++++++++++++++----- 9 files changed, 52 insertions(+), 26 deletions(-) delete mode 100755 lists/.gitignore rename getnew.sh => scripts/getnew.sh (100%) rename install.sh => scripts/install.sh (100%) rename prodsett.sh => scripts/prodsett.sh (100%) rename setperms.sh => scripts/setperms.sh (100%) diff --git a/lists/.gitignore b/lists/.gitignore deleted file mode 100755 index 0a9bae12..00000000 --- a/lists/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -# Ignore all -* - -# Not this file -!.gitignore \ No newline at end of file diff --git a/php/nochan.php b/php/nochan.php index e3c7cada..2aff7f5f 100755 --- a/php/nochan.php +++ b/php/nochan.php @@ -20,8 +20,8 @@ if(isset($_GET['chan'])){ diff --git a/getnew.sh b/scripts/getnew.sh similarity index 100% rename from getnew.sh rename to scripts/getnew.sh diff --git a/install.sh b/scripts/install.sh similarity index 100% rename from install.sh rename to scripts/install.sh diff --git a/prodsett.sh b/scripts/prodsett.sh similarity index 100% rename from prodsett.sh rename to scripts/prodsett.sh diff --git a/setperms.sh b/scripts/setperms.sh similarity index 100% rename from setperms.sh rename to scripts/setperms.sh diff --git a/server/server.js b/server/server.js index 236032eb..494c4e0e 100755 --- a/server/server.js +++ b/server/server.js @@ -138,7 +138,7 @@ io.on('connection', function(socket){ } }); }else - socket.emit("toast", "Password Protected List!"); + socket.emit("toast", "listhaspass"); }); }); @@ -157,7 +157,7 @@ io.on('connection', function(socket){ { vote(coll, id, guid, socket); }else{ - socket.emit("toast", "Password Protected List!"); + socket.emit("toast", "listhaspass"); } }); } @@ -190,10 +190,10 @@ io.on('connection', function(socket){ socket.emit("toast", (Math.ceil(lists[coll].length/2) - docs[0]["skips"].length-1) + " more are needed to skip!"); }); }else{ - socket.emit("toast", "You've already voted to skip!"); + socket.emit("toast", "alreadyskip"); } }else - socket.emit("toast", "No Skipping!"); + socket.emit("toast", "noskip"); }); }); @@ -230,14 +230,14 @@ io.on('connection', function(socket){ db.collection(coll).find({views:{$exists:true}}, function(err, docs) { io.sockets.emit(coll+",conf", docs); - socket.emit("toast", "Successfully applied settings!"); + socket.emit("toast", "savedsettings"); }); //sort_list(coll,undefined,false); }); }else { - socket.emit("toast", "Wrong Password!"); + socket.emit("toast", "wrongpass"); } }); }); @@ -255,12 +255,12 @@ io.on('connection', function(socket){ num = Math.floor(Math.random()*1000000); db.collection(coll).update({id:docs["id"]}, {$set:{added:num}}, function(err, d) { - socket.emit("toast", "Shuffled Playlist!"); + socket.emit("toast", "shuffled"); }); } }); }else - socket.emit("toast", "Wrong Password!"); + socket.emit("toast", "wrongpass"); }); }); @@ -290,7 +290,7 @@ function del(params, socket) if(docs[0]["adminpass"] == hash_pass(params[4])) { db.collection(coll).remove({id:params[1]}, function(err, docs){ - socket.emit("toast", "Deleted song!"); + socket.emit("toast", "deletesong"); sort_list(coll, undefined, false); }) } @@ -311,14 +311,14 @@ function vote(coll, id, guid, socket) { db.collection(coll).update({id:id}, {$push :{guids: guid}}, function(err, docs) { - socket.emit("toast", "Voted on song!"); + socket.emit("toast", "voted"); sort_list(coll, undefined, false); }); //sort_list(coll, undefined, false); }); }else { - socket.emit("toast", "You've already voted on that song!"); + socket.emit("toast", "alreadyvoted"); } }); } diff --git a/static/css/style.css b/static/css/style.css index 65087842..67253859 100755 --- a/static/css/style.css +++ b/static/css/style.css @@ -56,6 +56,9 @@ nav .brand-logo{ background-color:rgba(45,45,45,1); } +.footer-copyright a { color: #fff;} +.footer-copyright a:hover{color:#6699FF} + main { flex: 1 0 auto; } @@ -167,9 +170,7 @@ hide mdi-action-visibility mdi-action-visibility-off } .chan{ - opacity: 0.9; text-shadow: 4px 4px 9px rgba(0, 0, 0, 0.42); - } .nav-btn @@ -206,8 +207,9 @@ hide mdi-action-visibility mdi-action-visibility-off #result{height:100px;margin-left:40px;} #results{margin-top:-12px;background-color: rgba(0,0,0,0.6);} .result:hover { - background-color: rgba(0,0,0,0.4);} - .result { + background-color: rgba(0,0,0,0.4); + } +.result { border-bottom: solid 1px #E5E5E5; text-align: left; height: 70px; @@ -240,6 +242,10 @@ hide mdi-action-visibility mdi-action-visibility-off .switch label input[type=checkbox]:checked + .lever:after { background-color: white; } +.switch input[type=checkbox][disabled] + .lever { + cursor: default; + background-color: #939393; +} .switch label { color:#848484; diff --git a/static/js/admin.js b/static/js/admin.js index 0d3f98c8..3724f373 100755 --- a/static/js/admin.js +++ b/static/js/admin.js @@ -5,11 +5,36 @@ var pass_corr = ""; socket.on("toast", function(msg) { pass_corr = "correct"; + switch(msg) { + case "savedsettings": + msg="Saved settings" + break; + case "wrongpass": + msg="Wrong password" + break; + case "shuffled": + msg="Shuffled playlist" + break; + case "deletesong": + msg="Deleted song" + break; + case "vote": + msg="Voted on song" + break; + case "alreadyvoted": + msg="You have already voted on that song" + break; + case "listhaspass": + msg="The list is passwordprotected" + break; + case "noskip": + msg="Only admin can skip songs on this channel" + break; + case "alreadyskip": + msg="You've already voted to skip!" + break; + } Materialize.toast(msg, 4000); - /*document.getElementById("sBar").innerHTML = msg; - $("#sBar").addClass("opacityFull"); - document.getElementById("passbox").value = ""; - remove_bar();*/ }); socket.on("pw", function(msg) @@ -22,7 +47,7 @@ socket.on("pw", function(msg) } $(".card-action").removeClass("hide"); localStorage.setItem("passord_i_klartekst_lol", msg); - Materialize.toast("Correct Password!", 4000); + Materialize.toast("Correct Password. You are now admin", 4000); }); socket.on(chan.toLowerCase()+",conf", function(msg)