downbeats

Author: akvsh

app.js

@@ -1,10 +1,21 @@
+/*
+app.js
+import server files
+import modules
+open connection to our db (tunez)
+*/
+//middleware/routing [server side MVC framework for node]
 var express = require('express');
+//for path manipulation
 var path = require('path');
 var favicon = require('serve-favicon');
+//http request logging middle
 var logger = require('morgan');
 var cookieParser = require('cookie-parser');
+//express middleware, parses text makes it easier to work with
 var bodyParser = require('body-parser');
 var mongoose = require('mongoose');
+//the mongoose Models
 require('./models/Songs'); //Our song posts model
 require('./models/Comments'); //Our song posts model
 

models/Comments.js

@@ -13,12 +13,18 @@ var CommentSchema = new mongoose.Schema({
     } //in reference to which song post this comment under
 });
 
-//update comment upbeats and save to db
+//increment comment upbeats and save to db
 //cb is the callback function
 CommentSchema.methods.upbeat = function (cb) {
     this.upbeats += 1;
     this.save(cb);
 };
 
+//decrement comment upbeats and save to db
+//cb is the callback function
+CommentSchema.methods.downbeat = function (cb) {
+    this.upbeats -= 1;
+    this.save(cb);
+}
 
 mongoose.model('Comment', CommentSchema);

models/Songs.js

@@ -14,12 +14,19 @@ var SongSchema = new mongoose.Schema({
     }] //uses Mongoose's built in populate method to retreive array of Comment references
 });
 
-//update and save the number of upbeats
+//increment song post upbeats and save to db
 //cb is the callback function
 SongSchema.methods.upbeat = function (cb) {
     this.upbeats += 1;
     this.save(cb);
 };
 
+//decrement song post upbeats and save to db
+//cb is the callback function
+SongSchema.methods.downbeat = function (cb) {
+    this.upbeats -= 1;
+    this.save(cb);
+};
+
 
 mongoose.model('Song', SongSchema);

public/javascripts/angularApp.js

@@ -1,6 +1,6 @@
 //main app
 //external modules (like ui-router) are added as a dependancy here
-var app = angular.module('tunez', ['ui.router'])
+var app = angular.module('tunez', ['ui.router']);
 
 app.config([
 '$stateProvider', //refers to place in app (in terms of UI/navigation)
@@ -68,13 +68,20 @@ app.factory('songs', ['$http', function ($http) {
         });
     };
 
-    //request for upbeating a song post and after success increment song upbeats
+    //request for upbeating a song post and after success increment song upbeats in view
     o.upbeat = function (song) {
         return $http.put('/songs/' + song._id + '/upbeat').success(function (data) {
             song.upbeats += 1;
         });
     };
 
+    //request for downbeating a song post and after success decrement song upbeats in view
+    o.downbeat = function (song) {
+        return $http.put('/songs/' + song._id + '/downbeat').success(function (data) {
+            song.upbeats -= 1;
+        });
+    };
+
     o.get = function (id) {
         //get single song post from server (async, the data returned once request is complete)
         return $http.get('/songs/' + id).then(function (res) {
@@ -93,6 +100,12 @@ app.factory('songs', ['$http', function ($http) {
         });
     };
 
+    o.downbeatComment = function (song, comment) {
+        return $http.put('/songs/' + song._id + '/comments/' + comment._id + '/downbeat').success(function (data) {
+            comment.upbeats -= 1;
+        });
+    };
+
     return o;
 }]);
 
@@ -117,19 +130,27 @@ app.controller('mainCtrl', [
                 return;
             }
 
+            //add new song post
             songs.create({
                 title: $scope.title,
                 link: $scope.link, //TODO: check for valid link submissions
+                upbeats: 0
             });
 
             //clear name and link after
             $scope.title = "";
             $scope.link = "";
         };
 
+        //upbeat song post
         $scope.upbeat = function (song) {
             songs.upbeat(song);
         };
+
+        //downbeat song post
+        $scope.downbeat = function (song) {
+            songs.downbeat(song);
+        };
 }]);
 
 app.controller('songsCtrl', [
@@ -158,9 +179,13 @@ app.controller('songsCtrl', [
         };
 
         //upbeat given comment
-        //todo: add downbeat
         $scope.upbeat = function (comment) {
             songs.upbeatComment(song, comment);
         };
 
+        //downbeat given comment
+        $scope.downbeat = function (comment) {
+            songs.downbeatComment(song, comment);
+        };
+
 }]);

routes/index.js

@@ -10,6 +10,7 @@ router.get('/', function (req, res, next) {
     res.render('index');
 });
 
+
 //get all of the song posts (the front page essentially)
 router.get('/songs', function (req, res, next) {
 
@@ -20,7 +21,7 @@ router.get('/songs', function (req, res, next) {
             return next(err);
         }
         //json response of song posts
-        res.json(posts)
+        res.json(posts);
     });
 });
 
@@ -92,6 +93,16 @@ router.put('/songs/:song/upbeat', function (req, res, next) {
     });
 });
 
+//downbeat song post
+router.put('/songs/:song/downbeat', function (req, res, next) {
+    req.song.downbeat(function (err, song) {
+        if (err) {
+            return next(err);
+        }
+        res.json(song);
+    });
+});
+
 //add new comment to a certain song post
 router.post('/songs/:song/comments', function (req, res, next) {
 
@@ -127,4 +138,14 @@ router.put('/songs/:song/comments/:comment/upbeat', function (req, res, next) {
     });
 });
 
+//downbeat a specific comment on a specific song post
+router.put('/songs/:song/comments/:comment/downbeat', function (req, res, next) {
+    req.comment.downbeat(function (err, comment) {
+        if (err) {
+            return next(err);
+        }
+        res.json(comment);
+    });
+});
+
 module.exports = router;

views/index.ejs

@@ -9,18 +9,17 @@
     <!--loading AngularJS-->
     <script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.3.10/angular.js"></script>
     <!-- ui-router lib-->
-    <script src="//unpkg.com/angular-ui-router/release/angular-ui-router.min.js"></script>
-    <!--
     <script src="http://cdnjs.cloudflare.com/ajax/libs/angular-ui-router/0.2.10/angular-ui-router.js"></script>
--->
     <script src="/javascripts/angularApp.js"></script>
 
 
     <!--Style -->
     <script src="https://use.fontawesome.com/d4af7f078c.js"></script>
-
     <link href="https://fonts.googleapis.com/css?family=Montserrat:400,700" rel="stylesheet">
     <link rel="stylesheet" href="http://maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap.min.css">
+    <!--
+    <link rel="stylesheet" type="text/css" href="../public/stylesheets/appStyle.css">
+    -->
     <style>
         body {
             font-family: 'Montserrat', sans-serif;
@@ -82,7 +81,6 @@
             border-bottom-color: black;
         }
     </style>
-
 </head>
 <!-- Link the view and controller -->
 
@@ -103,10 +101,13 @@
                 <!-- upbeat button -->
                 <!--pass (reference) tune post to update upbeats when music icon is clicked -->
                 <span class="fa-stack">
-            <span class="fa fa-square-o fa-stack-2x"></span>
-                <span class="fa fa-heart fa-stack-1x" ng-click="upbeat(song)"></span>
+                <span class="fa fa-square-o fa-stack-2x"></span>
+                <span class="fa fa-volume-up fa-stack-1x" ng-click="upbeat(song)"></span>
+                </span>
+                <span class="fa-stack">
+                <span class="fa fa-square-o fa-stack-2x"></span>
+                <span class="fa fa-volume-down fa-stack-1x" ng-click="downbeat(song)"></span>
                 </span>
-
                 <span class="badge">UpBeats: {{song.upbeats}}</span>
                 <!-- show url if posted else hide-->
                 <a target="_blank" ng-show="song.link" href="{{song.link}}">
@@ -139,7 +140,7 @@
     <script type="text/ng-template" id="/songs.html">
         <div class="page-header">
             <h3>
-                <a ng-show="song.link" href="{{song.link}}">
+                <a target="_blank" ng-show="song.link" href="{{song.link}}">
                    {{song.title}}
                 </a>
                 <span ng-hide="song.link">
@@ -155,7 +156,11 @@
             <h4>{{comment.author}}</h4>
             <span class="fa-stack">
             <span class="fa fa-square-o fa-stack-2x"></span>
-            <span class="fa fa-heart fa-stack-1x" ng-click="upbeat(comment)"></span>
+            <span class="fa fa-volume-up fa-stack-1x" ng-click="upbeat(comment)"></span>
+            </span>
+            <span class="fa-stack">
+            <span class="fa fa-square-o fa-stack-2x"></span>
+            <span class="fa fa-volume-down fa-stack-1x" ng-click="downbeat(comment)"></span>
             </span>
             <span class="badge"> UpBeats: {{comment.upbeats}}</span>
             <br>