Merge branch 'february_release' of https://github.com/Musare/Musare into february_release

app/client/scripts/events.js

@@ -933,9 +933,10 @@ Template.manageSongs.events({
             }
         });
     },
-    "click .remove-song-button": function(e){
-        var genre = $(e.target).data("genre") || $(e.target).parent().data("genre");
-        Meteor.call("removeSongFromPlaylist", genre, this.mid);
+    "click .remove-song-button": function(){
+        console.log(this.mid);
+        console.log("TEST!");
+        Meteor.call("deleteSong", this.mid);
     },
     "click #play": function() {
         var duration = Session.get("song").duration;

app/client/scripts/onCreated.js

@@ -17,15 +17,15 @@ Template.landing.onCreated(function(){
         scrolldelay = setTimeout(pageScroll,50);
     }
     pageScroll();
-})
+});
 
 Template.banned.onCreated(function() {
-    if (rTimeInterval !== undefined) {
-        Meteor.clearInterval(rTimeInterval)
+    if (Session.get("rTimeInterval") !== undefined) {
+        Meteor.clearInterval(Session.get("rTimeInterval"))
     }
-    rTimeInterval = Meteor.setInterval(function() {
+    Session.set("rTimeInterval", Meteor.setInterval(function() {
         Session.set("time", new Date().getTime());
-    }, 10000);
+    }, 10000));
     Session.set("ban", Meteor.user().punishments.ban);
 });
 

app/client/scripts/onRendered.js

@@ -1,5 +1,3 @@
-var rTimeInterval = undefined;
-
 Template.queues.onRendered(function() {
     $("#previewModal").on("hidden.bs.modal", function() {
         if (previewEndSongTimeout !== undefined) {
@@ -76,25 +74,23 @@ Template.manageSongs.onRendered(function() {
 });
 
 Template.news.onRendered(function() {
-    if (rTimeInterval !== undefined) {
-        Meteor.clearInterval(rTimeInterval)
+    if (Session.get("rTimeInterval") !== undefined) {
+        Meteor.clearInterval(Session.get("rTimeInterval"))
     }
-    rTimeInterval = Meteor.setInterval(function() {
+    Session.set("rTimeInterval", Meteor.setInterval(function() {
         Session.set("time", new Date().getTime());
-    }, 10000);
+    }, 10000));
 });
 
 Template.room.onRendered(function() {
-    if (rTimeInterval !== undefined) {
-        Meteor.clearInterval(rTimeInterval)
+    if (Session.get("rTimeInterval") !== undefined) {
+        Meteor.clearInterval(Session.get("rTimeInterval"))
     }
-    rTimeInterval = Meteor.setInterval(function() {
+    Session.set("rTimeInterval", Meteor.setInterval(function() {
         Session.set("time", new Date().getTime());
-    }, 10000);
+    }, 10000));
     window.setTimeout(function(){
-        console.log("THIS IS ME!")
         var volume = Number(localStorage.getItem("volume")) || 20;
         $("#volume_slider").val(volume);
-        console.log($("#volume_slider").val());
     }, 1000)
 });

app/client/templates/banned.html

@@ -2,12 +2,12 @@
     {{> alerts}}
 
     <div class="row">
-        <div class="col-md-4 col-md-offset-4" id="banned-container">
-            <i class="fa fa-gavel fa-5x" id="ban-icon"></i>
-            <hr/>
-            <h3 class="text text-center">You were banned by {{bannedBy}} <span title="{{bannedAt}}">{{rtime bannedAt}}</span>.</h3>
-            <h3 class="text text-center">You will be unbanned <span title="{{bannedAt}}">{{rtime bannedUntil}}</span>.</h3>
-            <h3 class="text text-center">Reason: {{bannedReason}}</h3>
+        <div class="col-md-4 col-md-offset-4 teal-text" id="banned-container">
+            <i class="material-icons center red-text" style="font-size: 20em; width: 100%;">remove_circle</i>
+            <div class="divider"></div>
+            <h3 class="text text-center"><b>You were banned by</b> {{bannedBy}} <span title="{{bannedAt}}">{{rtime bannedAt}}</span>.</h3>
+            <h3 class="text text-center"><b>You will be unbanned</b> <span title="{{bannedAt}}">{{rtime bannedUntil}}</span>.</h3>
+            <h3 class="text text-center"><b>Reason:</b> {{bannedReason}}</h3>
         </div>
     </div>
 </template>

app/client/templates/header.html

@@ -51,33 +51,33 @@
                             <a href="/news">News</a>
                         </li>
                         <li>
-                            <div class="collapsible-header white-text"><i class="material-icons">arrow_drop_down</i>
+                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
                                 Contribute
                             </div>
-                            <div class="collapsible-body white-text">
+                            <div class="collapsible-body black-text">
                                 <a href="https://www.github.com/Musare/Musare" target="_blank">Github</a>
                                 <a href="donate.html">Donate</a>
                                 <a href="/feedback">Feedback</a>
                             </div>
                         </li>
                         <li>
-                            <div class="collapsible-header white-text"><i class="material-icons">arrow_drop_down</i>
+                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
                                 About
                             </div>
-                            <div class="collapsible-body white-text">
+                            <div class="collapsible-body black-text">
                                 <a href="/project">The Project</a>
                                 <a href="/team">The Team</a>
                             </div>
                         </li>
                         <li>
-                            <div class="collapsible-header white-text"><i class="material-icons">arrow_drop_down</i>
+                            <div class="collapsible-header black-text"><i class="material-icons">arrow_drop_down</i>
                                 {{#if currentUser}}
                                     {{currentUser.profile.username}}
                                 {{else}}
                                     Account
                                 {{/if}}
                             </div>
-                            <div class="collapsible-body white-text">
+                            <div class="collapsible-body black-text">
                                 <a href="/login">Login</a>
                                 <a href="/register">Register</a>
                             </div>

app/database/schemas.js

@@ -378,6 +378,10 @@ Schemas.UserPunishments = new SimpleSchema({
         type: String,
         label: "Banned By"
     },
+    "ban.bannedReason": {
+        type: String,
+        label: "Banned Reason"
+    },
     "ban.bannedAt": {
         type: Date,
         label: "Banned At"
@@ -399,6 +403,10 @@ Schemas.UserPunishments = new SimpleSchema({
         type: String,
         label: "Banned By"
     },
+    "bans.$.bannedReason": {
+        type: String,
+        label: "Banned Reason"
+    },
     "bans.$.bannedAt": {
         type: Date,
         label: "Banned At"

app/server/server.js

@@ -290,7 +290,7 @@ console.log(song);
         }
     };
 
-    this.songTimer();
+    this.skipSong();
     this.voted = [];
 }
 
@@ -1081,6 +1081,13 @@ Meteor.methods({
             throw new Meteor.Error(403, "Invalid permissions.");
         }
     },
+    deleteSong: function (mid) {
+        if (isModerator() && !isBanned()) {
+            Songs.remove({mid: mid})
+        } else {
+            throw new Meteor.Error(403, "Invalid permissions.");
+        }
+    },
     addSongToPlaylist: function (songData) {
         if (isModerator() && !isBanned()) {
             var requiredProperties = ["_id", "mid", "id", "title", "artist", "duration", "skipDuration", "img", "likes", "dislikes", "requestedBy", "genres"];