首页显示所有用户，提供gravatar支持

iwillwen · Mar 28, 2012 · fade7b7 · fade7b7
1 parent 61742bb
commit fade7b7
Show file tree

Hide file tree

Showing 22 changed files with 48 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -15,6 +15,8 @@ sumorio是用nodejs开发的社区系统，借鉴了[nodeclub][1]的一些通用
 
 #### 0.1.2
 
+* 首页显示所有用户（临时）
+* 支持gravatar头像
 * 添加全站导航，在nav表中添加数据
 
 #### 0.1.1

diff --git a/config.js b/config.js
@@ -5,7 +5,7 @@ exports.config = {
 	session_secret : 'sumorio_secret',
 	auth_cookie_name : 'sumorio_secret',
 	app_port : 8080,
-	version : '0.1.1 beta',
+	version : '0.1.2 beta',
 
 	//logfiles directory
 	logDirectory : __dirname + "/logs/",

diff --git a/controller/sign.js b/controller/sign.js
@@ -97,7 +97,7 @@ exports.signup = function(req, res, next) {
             // create gavatar
             var avatar_url = 'http://www.gravatar.com/avatar/' + common.md5(email) + '?size=48';
 
-            mysql.insert('insert into user(loginname,email,pwd,create_at) values(?,?,?,?)', [ loginname, email, pass, new Date() ], function(err, info) {
+            mysql.insert('insert into user(loginname,email,pwd,create_at,avatar) values(?,?,?,?,?)', [ loginname, email, pass, new Date(), avatar_url ], function(err, info) {
                 if (err)
                     return next(err);
                 res.render('sign/signup', {

diff --git a/controller/site.js b/controller/site.js
@@ -1,9 +1,13 @@
 var config = require('../config').config;
+var mysql = require('../lib/mysql.js');
 
 exports.index = function(req, res, next) {
 
-    res.render('index', {
-        "welcome" : "welcome to sumorio"
+    mysql.query('select * from user', function(err,users){//得到所有的用户
+        res.render('index', {
+            users : users
+        });
+        return;
     });
-
+    
 };
diff --git a/controller/user.js b/controller/user.js
@@ -1,9 +1,10 @@
 var log = require('../lib/log.js');
 var config = require('../config.js').config;
 var common = require('./common.js');
+var mysql = require('../lib/mysql.js');
 
 /**
- * 到用户首页
+ * 到所选用户首页
  * 
  * @param req
  * @param res
@@ -21,3 +22,5 @@ exports.index = function(req, res, next) {
         });
     });
 };
+
+
diff --git a/logs/error.log.2012-03-20 b/logs/error.log.2012-03-20
diff --git a/logs/error.log.2012-03-25 b/logs/error.log.2012-03-25
diff --git a/logs/error.log.2012-03-26 b/logs/error.log.2012-03-26
diff --git a/logs/error.log.2012-03-28 b/logs/error.log.2012-03-28
diff --git a/logs/exception.log.2012-03-20 b/logs/exception.log.2012-03-20
diff --git a/logs/exception.log.2012-03-25 b/logs/exception.log.2012-03-25
diff --git a/logs/exception.log.2012-03-26 b/logs/exception.log.2012-03-26
diff --git a/logs/exception.log.2012-03-28 b/logs/exception.log.2012-03-28
diff --git a/logs/info.log.2012-03-20 b/logs/info.log.2012-03-20
diff --git a/logs/info.log.2012-03-25 b/logs/info.log.2012-03-25
diff --git a/logs/info.log.2012-03-26 b/logs/info.log.2012-03-26
diff --git a/logs/info.log.2012-03-28 b/logs/info.log.2012-03-28
diff --git a/public/img/avatar.png b/public/img/avatar.png
diff --git a/view/index.html b/view/index.html
@@ -1,13 +1,13 @@
 
 
 
-<div class='panel' style="width: 600px; margin: auto; margin-top: 50px;height:300px;">
+<div class='panel' style="width: 100%; margin: auto; margin-top: 50px;height:300px;">
 	<div class='inner'>
 		<div class='sep10'></div>
 		<div class='sep10'></div>
-
+		<!-- 
 			<div class='control-group'>
-				<%-welcome%>
+				
 				<br>
 				sumorio(summary => input | ouput)<br/>
 				sumorio是基于nodejs开发的社区系统, 现已完成个人部分功能, 社区功能正在开发中...
@@ -27,6 +27,28 @@
 				}
 				%>
 			</div>
-
+		 -->
+
+		<% for(var i =0;i< locals.users.length;i++){
+			var user = locals.users[i];
+		%>
+		<div class='user' style="background-color:#ffffff;">
+			<div>
+				<% if(user.avatar){ %>
+				<a href='/user/<%= user.loginname %>'><img class='user_avatar' src='<%= user.avatar %>' title='<%= user.loginname %>' /></a>
+				<% }else{ %>
+				<a href='/user/<%= user.loginname %>'><img class='user_avatar' src='/img/avatar.png' title='<%= user.loginname %>' /></a>
+				<% } %>
+				<span class='user_name'><a class='dark' href='/user/<%= user.id %>'><%= user.loginname %></a></span>
+				<div class='sep5'></div>
+				<span class='col_fade'></span>
+				<span class='sp5'></span>
+				<span class='col_fade'></span>
+			</div>
+			<div class='sep10'></div>
+		</div>	
+		<%}%>
+
+
 	</div>
 </div>
diff --git a/view/layout.html b/view/layout.html
@@ -33,7 +33,7 @@
 							<a href="/user/<%=current_user.id %>" class="nav"><%=current_user.loginname %><span></span></a>
 							<ul>
 								<li><a href="/user/<%=current_user.id%>">我的主页</a></li>
-								<li><a href="/user/settings/">帐号设置</a></li>
+								<!-- <li><a href="/user/settings/">帐号设置</a></li>  -->
 								<li class="divider"><a href="/signout">退出登录</a></li>
 							</ul>
 						</li> 
@@ -61,13 +61,15 @@
 
 					</script>
 					<div id="search">
+					<!--  
 						<form id="search_form" method="get" action="/" class="text">
 							<input id="query" type="text" size="27" name="q"
 								autocomplete="off" placeholder="搜索话题" value=""
 								class="default_value"><a  style="width:16px;height:17px;" id="search_lens" href="#"
 								onclick="$(&#39;search_form&#39;).submit();return false;"
 								class="lg"><img src="/img/search.gif" alt="搜索"></a>
 						</form>
+					-->
 					</div>
 
 				</div>

diff --git a/view/reply/reply.html b/view/reply/reply.html
@@ -1,6 +1,6 @@
 <div class='cell reply_area reply_item' id='reply<%= indexInCollection+1 %>' reply_id='<%= reply.id %>'>
 	<% if(reply.author.avatar){ %>
-	<div class='user_avatar'><a href='/user/<%= reply.author.id %>'><img src='/img/<%= reply.author.avatar %>' title='<%= reply.author.loginname %>' /></a></div>
+	<div class='user_avatar'><a href='/user/<%= reply.author.id %>'><img src='<%= reply.author.avatar %>' title='<%= reply.author.loginname %>' /></a></div>
 	<% }else{ %>
 	<div class='user_avatar'><a href='/user/<%= reply.author.id %>'><img src='/img/avatar.png' title='<%= reply.author.loginname %>' /></a></div>
 	<% } %>

diff --git a/view/user/sidebar.html b/view/user/sidebar.html
@@ -10,11 +10,11 @@
 	<div class='user_card'>
 		<div class='user_card_left'>
 			<h1><a href="/user/<%=user.id%>"><%= user.loginname%></a></h1>
-			<p><a href="/followers/">粉丝<span>0</span>个</a></p>
-			<p><a href="/following/">关注<span>2</span>人</a></p>
+			<!--  <p><a href="/followers/">粉丝<span>0</span>个</a></p>
+			<p><a href="/following/">关注<span>2</span>人</a></p>-->
 		</div>
 		<div class='user_card_right'>
-			<a href="/user/<%=user.id%>" title="echover" class="img x"><img src="/img/avatar.png"></a>
+			<a href="/user/<%=user.id%>" title="echover" class="img x"><img src="<%=user.avatar%>"></a>
 		</div>
 	</div>