KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:nixolas1/Zoff into dev

Browse Source
This commit is contained in:
Nicolas A. Tonne
2015-04-16 00:42:23 +02:00
parent 4e592545c2 ed925b2601
commit 44505b922e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.php
View File

@@ -14,6 +14,7 @@
</head> </head>
<body> <body>
<header> <header>
<div class="navbar-fixed">
<nav id="nav"> <nav id="nav">
<div class="nav-wrapper"> <div class="nav-wrapper">
<a href="//zoff.no" class="brand-logo hide-on-small-only"> <a href="//zoff.no" class="brand-logo hide-on-small-only">
@@ -51,6 +52,7 @@
<div id="results"></div> <div id="results"></div>
</div> </div>
</nav> </nav>
</div>
</header> </header>
<main class="container center-align main"> <main class="container center-align main">
<div class="row"> <div class="row">
@@ -88,7 +90,7 @@
<span class="list-votes"></span> <span class="list-votes"></span>
</span> </span>
<div class="card-action hide"> <div class="card-action hide">
<a id="del" onclick="vote('id','del')" class="clickable" class="waves-effect waves-orange btn-flat">Remove</a> <a id="del" onclick="vote('id','del')" class="waves-effect waves-orange btn-flat clickable">Remove</a>
</div> </div>
</div> </div>
</div> </div>

6
server/server.js
View File

@@ -145,7 +145,7 @@ io.on('connection', function(socket){
socket.on('vote', function(msg) socket.on('vote', function(msg)
{ {
if(msg[2] == "del") if(msg[2] == "del")
del(msg); del(msg, socket);
else else
{ {
var id = msg[1]; var id = msg[1];
@@ -282,14 +282,14 @@ io.on('connection', function(socket){
}); });
}); });
function del(params) function del(params, socket)
{ {
var coll = params[0].toLowerCase(); var coll = params[0].toLowerCase();
db.collection(coll).find({views:{$exists:true}}, function(err, docs){ db.collection(coll).find({views:{$exists:true}}, function(err, docs){
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."); socket.emit("toast", "Deleted song!");
sort_list(coll, undefined, false); sort_list(coll, undefined, false);
}) })
} }

1
static/js/admin.js
View File

@@ -20,6 +20,7 @@ socket.on("pw", function(msg)
for (var i = 0; i < names.length; i++) { for (var i = 0; i < names.length; i++) {
$("input[name="+names[i]+"]").attr("disabled", false); $("input[name="+names[i]+"]").attr("disabled", false);
} }
$(".card-action").removeClass("hide");
}); });
socket.on(chan.toLowerCase()+",conf", function(msg) socket.on(chan.toLowerCase()+",conf", function(msg)

2
static/js/list.js
View File

@@ -74,6 +74,8 @@ function populate_list(msg, conf_only)
song.find(".votebg").attr("onclick", "vote('"+video_id+"','pos')"); song.find(".votebg").attr("onclick", "vote('"+video_id+"','pos')");
song.find(".list-image").attr("style",video_thumb); song.find(".list-image").attr("style",video_thumb);
song.attr("id",video_id); song.attr("id",video_id);
song.find("#del").attr("onclick", "vote('"+video_id+"', 'del')");
if(!w_p) $(".card-action").removeClass("hide");
} }
}); });