Merge branch 'master' of github.com:psychobunny/node-forum

package.json

@@ -27,7 +27,8 @@
       "marked": "0.2.8",
       "bcrypt": "0.7.5",
       "node-gyp": "0.9.5",
-      "async": "0.2.8"
+      "async": "0.2.8",
+      "node-imagemagick": "0.1.8"
     },
   "devDependencies": {},
   "optionalDependencies": {},

public/css/style.less

@@ -390,6 +390,10 @@ footer.footer {
   margin-bottom:10px;
 }
 
+.account-sub-links a{
+	margin-left:10px;
+}
+
 .account-username{
   font-size:20px;
   font-weight:bold;

public/src/templates.js

@@ -65,7 +65,7 @@ var templates = {};
 
 	function init() {
 		loadTemplates([
-			'header', 'footer', 'register', 'home', 'topic','account', 'category', 'users', 'accountedit', 
+			'header', 'footer', 'register', 'home', 'topic','account', 'category', 'users', 'accountedit', 'friends',
 			'login', 'reset', 'reset_code', 'account',
 			'confirm', '403',
 			'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext',

public/templates/account.tpl

@@ -1,16 +1,17 @@
 
 <div class="well">
-    <div class="alert" id="message" style="display:none">
+   
-        <button type="button" class="close" data-dismiss="message">&times;</button>
-        <strong></strong>
-        <p></p>
-    </div>
 
 
   <div class="account-username-box">
-		<span class="account-username"><a href="/users/{username}">{username}</a></span>
+		<span class="account-username">
+			<a href="/users/{username}">{username}</a>
+		</span>
+		<div class="account-sub-links inline-block pull-right">
+			<span id="friendsLink" class="pull-right"><a href="/users/{username}/friends">friends</a></span>
 			<span id="editLink" class="pull-right"><a href="/users/{username}/edit">edit</a></span>
 		</div>
+	</div>
 		
 
 	<div class="row-fluid">
@@ -58,8 +59,10 @@
 		</div>
 	</div>
 	<div id="user-actions" class="container">
-		<a id="add-friend-btn" href="#" class="btn">Add Friend</a>
+		<a id="add-friend-btn" href="#" class="btn">Follow</a>
 	</div>
+	<br/>
+	<div id="user-action-alert" class="alert alert-success hide"></div>
 </div>
 
 <script type="text/javascript">
@@ -67,11 +70,9 @@
 var yourid = '{yourid}';
 var theirid = '{theirid}';
 
-
-
 (function() {
 
-	
+	var isFriend = {isFriend};
 
     function addCommas(text) {
         return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,");
@@ -91,26 +92,26 @@ var theirid = '{theirid}';
         
         if( yourid !== theirid) {
             editLink.hide();
+            if(isFriend)
+           		addFriendBtn.hide();
+           	else
            		addFriendBtn.show();
         }
     	else {
     		addFriendBtn.hide();        
-        
     	}
         
         addFriendBtn.on('click', function() {
         	$.post('/users/addfriend', {uid: theirid},
             	function(data) {
-            		
+            		addFriendBtn.remove();
+            		$('#user-action-alert').html('Friend Added!').show();
 				}                
 			);
         	return false;
         });
 
-        
-
     });
 
-
 }());
 </script>

public/templates/accountedit.tpl

@@ -1,11 +1,7 @@
 
 <div class="well">
 
-    <div class="alert" id="message" style="display:none">
+   
-        <button type="button" class="close" data-dismiss="message">&times;</button>
-        <strong></strong>
-        <p></p>
-    </div>
  
 	<!-- Change Picture Modal -->
 	<div id="change-picture-modal" class="modal hide" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
@@ -65,8 +61,14 @@
 	</div>
     
     <div class="account-username-box">
-        <span class="account-username"><a href="/users/{username}">{username}</a></span>
+		<span class="account-username">
-        <span class="pull-right"><a href="/users/{username}/edit">edit</a></span>
+			<a href="/users/{username}">{username}</a> >
+			<a href="/users/{username}/edit">edit</a>
+		</span>
+		<div class="account-sub-links inline-block pull-right">
+			<span id="friendsLink" class="pull-right"><a href="/users/{username}/friends">friends</a></span>
+			<span id="editLink" class="pull-right"><a href="/users/{username}/edit">edit</a></span>
+		</div>
 	</div>
 
 	<div class="row-fluid">

public/templates/config.json

@@ -4,6 +4,7 @@
     	"admin/categories[^]*": "admin/categories",
     	"admin/users[^]*": "admin/users",
     	"users[^]*edit": "accountedit",
+        "users[^]*friends": "friends",
         "users": "account",
         "latest": "category",
         "popular": "category",

public/templates/friends.tpl

@@ -0,0 +1,94 @@
+
+<div class="well">
+   
+
+
+	<div class="account-username-box">
+		<span class="account-username">
+			<a href="/users/{username}">{username}</a> >
+			<a href="/users/{username}/friends">friends</a>
+		</span>
+		<div class="account-sub-links inline-block pull-right">
+			<span id="friendsLink" class="pull-right"><a href="/users/{username}/friends">friends</a></span>
+			<span id="editLink" class="pull-right"><a href="/users/{username}/edit">edit</a></span>
+		</div>
+	</div>
+
+	<div>
+	    <!-- BEGIN friends -->
+
+	    <div class="users-box well">
+		 	<a href="/users/{friends.username}">
+			    <img src="{friends.picture}" class="user-8080-picture"/>
+		    </a>
+		    <br/>
+			<a href="/users/{friends.username}">{friends.username}</a>
+		    <br/>
+			<div title="reputation">
+				<span class='reputation'>{friends.reputation}</span>
+				<i class='icon-star'></i>
+			</div>
+			<div title="post count">
+				<span class='postcount'>{friends.postcount}</span>
+				<i class='icon-pencil'></i>
+			</div>
+			<a id="remove-friend-btn" href="#" class="btn remove-friend-btn" friendid="{friends.uid}">Unfollow</a>
+		</div>
+
+		<!-- END friends -->
+	</div>
+	<div id="no-friend-notice" class="alert alert-warning hide">This user doesn't have any friends :(</div>
+</div>
+
+<script>
+
+var yourid = '{yourid}';
+var theirid = '{theirid}';
+
+var friendCount = '{friendCount}';
+
+(function() {
+    
+    function addCommas(text) {
+        return text.replace(/(\d)(?=(\d\d\d)+(?!\d))/g, "$1,");
+    }
+    
+    $(document).ready(function() {
+    	
+    	if(parseInt(friendCount, 10) === 0) {
+    		$('#no-friend-notice').show();
+    	}
+    	var editLink = $('#editLink');
+
+		if(yourid !== theirid) {
+			editLink.hide();
+			$('.remove-friend-btn').hide();
+		}
+		else {
+			$('.remove-friend-btn').on('click',function(){
+
+				var removeBtn = $(this);
+				var friendid = $(this).attr('friendid');
+				
+				$.post('/users/removefriend', {uid: friendid},
+	            	function(data) {
+	            		removeBtn.parent().remove();
+					}                
+				);
+				return false;
+			});
+		}
+
+        $('.reputation').each(function(index, element) {
+        	$(element).html(addCommas($(element).html()));
+        })
+        
+        $('.postcount').each(function(index, element) {
+        	$(element).html(addCommas($(element).html()));
+        })
+        
+    });
+    
+
+}());
+</script>

src/routes/user.js

@@ -34,7 +34,8 @@ var user = require('./../user.js'),
 			
 		});
 
-		app.get('/users/:username*', function(req, res) {
+		app.get('/users/:username', function(req, res) {
+
 			if(!req.params.username) {
 				res.send("User doesn't exist!");
 				return;
@@ -90,9 +91,20 @@ var user = require('./../user.js'),
 			if(!req.user)
 				return res.redirect('/403');
 			
-			if(req.files.userPhoto.size > 131072) {
+			if(req.files.userPhoto.size > 262144) {
 				res.send({
-					error: 'Images must be smaller than 128kb!'
+					error: 'Images must be smaller than 256kb!'
+				});
+				return;
+			}
+			var allowedTypes = ['image/png', 'image/jpeg', 'image/jpg', 'image/gif'];
+			var type = req.files.userPhoto.type;
+			
+			console.log(req.files.userPhoto);
+
+			if(allowedTypes.indexOf(type) === -1) {
+				res.send({
+					error: 'Allowed image types are png, jpg and gif!'
 				});
 				return;	
 			}
@@ -151,6 +163,17 @@ var user = require('./../user.js'),
 		        user.setUserField(uid, 'uploadedpicture', imageUrl);
 		        user.setUserField(uid, 'picture', imageUrl);
 
+		        var im = require('node-imagemagick');
+
+		        im.resize({
+				  srcPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
+				  dstPath: global.configuration['ROOT_DIRECTORY'] + uploadPath,
+				  width: 128
+				}, function(err, stdout, stderr){
+				  if (err) 
+				  	throw err;
+				});
+
 			});
 
 			os.on('error', function(err) {
@@ -189,29 +212,32 @@ var user = require('./../user.js'),
 			if(req.user.uid == req.body.uid)
 				return res.redirect('/');
 
-			user.addFriend(req.user.uid, req.body.uid, function(err, data) {
+			user.addFriend(req.user.uid, req.body.uid, function(data) {
-				if(err)
+				res.send({data:data});
-					res.send({error:err});
-				else
-					res.send(data);
 			});
 		});
 
-		app.get('/users/:username/friends', function(req, res){
+		app.post('/users/removefriend', function(req, res){
-				
 			if(!req.user)
 				return res.redirect('/403');
 			
-			user.get_uid_by_username(req.params.username, function(uid) {
+			if(req.user.uid == req.body.uid)
-					user.getFriends(uid, function(data) {
+				return res.redirect('/');
-						res.send(JSON.stringify(data, null, 0));
+
-					});
+			user.removeFriend(req.user.uid, req.body.uid, function(data) {
+				res.send({data:data});
 			});
 		});
 
-		function api_method(req, res) {
+		app.get('/users/:username/friends', function(req, res){
 
+			if(!req.user)
+				return res.redirect('/403');
+			
+			res.send(templates['header'] + app.create_route('users/'+req.params.username+'/friends','friends') + templates['footer']);
+		});
 
+		function api_method(req, res) {
 			
 			var callerUID = req.user?req.user.uid : 0;
 	
@@ -225,6 +251,14 @@ var user = require('./../user.js'),
 			}
 			else if(String(req.params.section).toLowerCase() === 'friends') {
 				
+				getUserDataByUserName(req.params.username, callerUID, function(userData) {
+					
+					user.getFriends(userData.uid, function(friendsData){
+						userData.friends = friendsData;
+						userData.friendCount = friendsData.length;
+						res.send(JSON.stringify(userData));
+					});
+				});
 			}
 			else if (String(req.params.section).toLowerCase() === 'edit') {
 				getUserDataByUserName(req.params.username, callerUID, function(userData) {
@@ -232,16 +266,17 @@ var user = require('./../user.js'),
 				});
 			} else {
 				getUserDataByUserName(req.params.username, callerUID, function(userData) {
+					user.isFriend(callerUID, userData.theirid, function(isFriend) {
+						userData.isFriend = isFriend;
 						res.send(JSON.stringify(userData));
 					});
+				});						
 			}
 		
 		}
 
 		app.get('/api/users/:username?/:section?', api_method);
 
-
-
 		function getUserDataByUserName(username, callerUID, callback) {
 		
 			user.get_uid_by_username(username, function(uid) {

src/templates.js

@@ -29,7 +29,7 @@ var fs = require('fs');
 
 	Templates.init = function() {
 		loadTemplates([
-			'header', 'footer', 'register', 'home', 'topic', 'account',
+			'header', 'footer', 'register', 'home', 'topic', 'account', 'friends',
 			'login', 'reset', 'reset_code', 'logout',
 			'403',
 			'admin/header', 'admin/footer', 'admin/index',

src/user.js

@@ -64,6 +64,7 @@ var config = require('../config.js'),
 			{
 				if(data && data['password'])
 					delete data['password'];
+				data.uid = uid;
 				callback(data);
 			}
 			else
@@ -365,8 +366,24 @@ var config = require('../config.js'),
 
 	User.getFriends = function(uid, callback) {
 		RDB.smembers('user:'+uid+':friends', function(err, data){
-			if(err === null) 
+			if(err === null){ 
-				callback(data);
+				
+				var friendsData = [];
+
+				if(data.length === 0) {
+					callback(friendsData);
+					return;
+				}
+
+				for(var i=0, ii=data.length; i<ii; ++i) {
+					User.getUserData(data[i], function(userData){
+						friendsData.push(userData);
+						
+						if(friendsData.length == data.length)
+							callback(friendsData);			
+					});	
+				}
+			}
 			else
 				console.log(err);	
 		});
@@ -381,6 +398,16 @@ var config = require('../config.js'),
 		});
 	}
 
+	User.isFriend = function(uid, friendid, callback) {
+		RDB.sismember('user:'+uid+':friends', friendid, function(err, data){
+			if(err === null){
+				callback(data === 1);
+			}
+			else
+				console.log(err);
+		});
+	}
+
 	User.exists = function(username, callback) {
 		User.get_uid_by_username(username, function(exists) {
 			exists = !!exists;