Skip to content

Commit 003aaaa

Browse files
jixiangacjixiangac
committed
student
1 parent 568e022 commit 003aaaa

File tree

20 files changed

+134
-42
lines changed

20 files changed

+134
-42
lines changed

‎public/css/admin.css

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,7 @@
77
@import "sidebar.css";
88
@import "table.css";
99
@import "kalendae.css";
10-
/*头部*/
11-
#header h1{
12-
text-align: center;
13-
font-size: 40px;
14-
color: #666;
15-
}
16-
/*Conent*/
17-
#main{
18-
border: 1px solid #d7d7d7;
19-
border-radius: 3px;
20-
background: #fff;
21-
}
22-
.content{
23-
width: 100%;
24-
float: left;
25-
}
26-
.main{
27-
margin-left: 200px;
28-
background:#fff;
29-
padding: 20px;
30-
}
31-
.sideleft{
32-
float: left;
33-
margin-left: -100%;
34-
background:#f7f7f7;
35-
}
10+
3611
/*日期*/
3712
.notice-date{
3813
width: 68px;

‎public/css/base.css

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,32 @@
1313
width: 980px;
1414
margin: 0 auto;
1515
}
16+
/*头部*/
17+
#header h1{
18+
text-align: center;
19+
font-size: 40px;
20+
color: #666;
21+
}
22+
/*Conent*/
23+
#main{
24+
border: 1px solid #d7d7d7;
25+
border-radius: 3px;
26+
background: #fff;
27+
}
28+
.content{
29+
width: 100%;
30+
float: left;
31+
}
32+
.main{
33+
margin-left: 200px;
34+
background:#fff;
35+
padding: 20px;
36+
}
37+
.sideleft{
38+
float: left;
39+
margin-left: -100%;
40+
background:#f7f7f7;
41+
}
1642
/* = 底部
1743
--------------------------*/
1844
.footer{

‎public/css/reset.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,9 @@ p{
119119
.hide{
120120
display: none;
121121
}
122+
.red{
123+
color: #f75b5e;
124+
}
122125
/*H*/
123126
.hbt{
124127
margin-top: 20px;

‎public/css/style.css

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* STYLE.CSS
33
*/
44
@import "base.css";
5+
@import "form.css";
56
@import "tip.css";
7+
@import "sidebar.css";
68
/*= Login && Register
79
-----------------------*/
810
.header{

‎public/js/models/validate.js

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77
define(function(require,exports,module){
88
//验证规则
99
var pattern = {
10-
'username':{
10+
'realname' :{
11+
name : '真实姓名'
12+
,rex : '^[\u4e00-\u9fa5]{2,}$'
13+
,tips : '请输入真实姓名！'
14+
,error : '真实姓名由中文组成！'
15+
}
16+
,'username':{
1117
name :　'用户名'
1218
,rex : '^[\\w]{3,10}'
1319
,tips : '请输入用户名！'
@@ -33,7 +39,7 @@ define(function(require,exports,module){
3339
}
3440
,'website' : {
3541
name : '网站名称'
36-
,rex : '^[\u4e00-\u9fa5]{2,}$'
42+
,rex : '^[^\\s]+$'
3743
,tips : '请输入网站名称'
3844
,error : '网站名称至少两个字！'
3945
}

‎routes.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44
var login = require('./routes/login')
55
,register = require('./routes/register')
6+
,student = require('./routes/student')
67

78

89
var admin = require('./routes/admin/index')
@@ -24,8 +25,10 @@ module.exports = function(app){
2425
//-------------------
2526
app.get('/reg',register.index);
2627
app.post('/reg',register.index);
27-
28-
28+
//--------------------
29+
// 学生个人中心
30+
//--------------------
31+
app.get('/:username',student.index);
2932

3033

3134

@@ -41,6 +44,7 @@ module.exports = function(app){
4144
// 用户
4245
//-------------------
4346
app.get('/admin/user',adminUser.index);
47+
app.post('/admin/user',adminUser.index);
4448
// 增加用户
4549
app.get('/admin/user/add',adminUser.adduser);
4650
app.post('/admin/user/add',adminUser.adduser);

‎routes/admin/index.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@ var config = require('../../config')
66

77
var index = function(req,res){
88
if(req.method == 'GET'){
9+
// if(req.session.user.cat !==3){
10+
// return res.redirect('/');
11+
// }
912
res.render('./admin/index',
1013
{
1114
title : config.name+'管理后台'

‎routes/admin/user.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ exports.index = function(req,res){
4343
}
4444
item.regdate = Utils.format_date(new Date(item.regdate),true);
4545
item.logindate = Utils.format_date(new Date(item.logindate),true);
46-
})
46+
});
4747
}
4848
res.render('./admin/user',
4949
{
@@ -58,6 +58,14 @@ exports.index = function(req,res){
5858
});
5959

6060
}else if(req.method == 'POST'){
61+
if(!!req.query.del){
62+
var uid = parseInt(req.query.uid,10) || 0;
63+
if(!uid)return;
64+
jixiang.delById(uid,'users',function(err){
65+
if(err)return res.json({flg:0,msg:err});
66+
return res.json({flg:1,msg:'删除成功！'});
67+
});
68+
}
6169

6270
}
6371
}

‎routes/login.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ var index = function(req,res){
1010
if(req.method == 'GET'){
1111
var n = 2;
1212
var result = {};
13+
if(!req.session.user){//没登入跳入登入页面
14+
render();
15+
return;
16+
}
1317
//公告
1418
jixiang.get({
1519
sort:{release_time:-1}
@@ -28,6 +32,7 @@ var index = function(req,res){
2832
});
2933
//友情链接
3034
jixiang.get({},'links',function(err,doc){
35+
console.log(doc)
3136
if(err)doc=[];
3237
result.links = doc;
3338
--n || render();
@@ -45,7 +50,8 @@ var index = function(req,res){
4550
//生成口令散列
4651
var md5 = crypto.createHash('md5');
4752
var password = md5.update(req.body.password).digest('base64');
48-
jixiang.getOne({username:req.body.username},'users',function(err,user){
53+
var cat = parseInt(req.body.cat,10) || 1;
54+
jixiang.getOne({username:req.body.username,cat : cat},'users',function(err,user){
4955
if(!user){
5056
return res.json({flg:0,msg:'用户名或者密码错误！'});
5157
}
@@ -65,7 +71,13 @@ var index = function(req,res){
6571
console.log("had logined!");
6672
});
6773
req.session.user = user;
68-
res.json({flg:1,msg:'登入成功!',redirect:'/'});
74+
var redirect = '/';
75+
if(cat === 2){
76+
redirect = '/teacher';
77+
}else if(cat === 3){
78+
redirect = '/admin'
79+
}
80+
res.json({flg:1,msg:'登入成功!',redirect:redirect});
6981
});
7082
}
7183
}

‎routes/register.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ var index = function(req,res){
3838
userdata.sex = req.body.sex;
3939
}
4040
if(cat === 2){
41+
userdata.realname = req.body.realname;
4142
userdata.school = req.body.school;
4243
}
4344
jixiang.getOne({

‎routes/student.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/**
2+
* student.js
3+
*/
4+
var jixiang = require('../models/base');
5+
var crypto = require('crypto');
6+
var config = require('../config');
7+
8+
var index = function(req,res){
9+
res.render('./index/student',{
10+
title : '学生个人中心'
11+
,user :　req.session.user
12+
})
13+
}

‎views/admin/adduser.jade

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ block content
1212
tr.separate
1313
th(colspan="2")
1414
tbody
15+
tr
16+
td 真实姓名
17+
td.aleft
18+
input#realname(type="text",name="realname",class="require")
1519
tr
1620
td 用户名
1721
td.aleft

‎views/admin/infouser.jade

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ block content
5454
tr.separate
5555
th(colspan="2")
5656
tbody
57+
tr
58+
td 真实姓名
59+
td.aleft=people.realname
5760
tr
5861
td 用户名
5962
td.aleft=people.username

‎views/admin/layout/layout.jade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ html
66
link(rel="stylesheet",href="/css/admin.css")
77
body
88
.container.clearfix
9-
include header
9+
include ../../layout/header
1010
#main.clearfix
1111
.content
1212
block content

‎views/admin/user.jade

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ block content
2828
td=item.logindate
2929
td
3030
a.btn-reply(href="/admin/user/info?cat=1&uid="+item._id) 查看
31+
a.btn-reply.btn-del(href="/admin/user?del=1&uid="+item._id) 删除
3132
if cat == 2
3233
table.table.order-table
3334
caption 老师列表
@@ -55,6 +56,7 @@ block content
5556
td=item.logindate
5657
td
5758
a.btn-reply(href="/admin/user/info?cat=2&uid="+item._id) 查看
59+
a.btn-reply.btn-del(href="/admin/user?del=1&uid="+item._id) 删除
5860
else
5961
tr
6062
td(colspan="8") 暂无老师，点击右上角添加老师
@@ -83,6 +85,7 @@ block content
8385
td=item.logindate
8486
td
8587
a.btn-reply(href="/admin/user/info?cat=3&uid="+item._id) 查看
88+
a.btn-reply.btn-del(href="/admin/user?del=1&uid="+item._id) 删除
8689
else
8790
tr
8891
td(colspan="6") 暂无管理员，点击右上角添加管理员

‎views/index/index.jade

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,15 @@ block content
3333
p 还没注册? <a href="/reg">点我注册</a>
3434
else
3535
.container
36+
//公告处
3637
if !!result.notice
37-
.grey-tips 公告：#{result.notice}
38-
if result.links && result.links.length
39-
.container.link
40-
h2.hbt 友情链接
41-
ul.clearfix
42-
each item in result.links
43-
li
44-
a(href=item.url,target="_blank",title=item.description)=item.name
38+
.grey-tips.red 公告：#{result.notice}
39+
if result.links && result.links.length
40+
.container.link
41+
h2.hbt 友情链接
42+
ul.clearfix
43+
each item in result.links
44+
li
45+
a(href=item.url,target="_blank",title=item.description)=item.name
4546

4647

‎views/index/student.jade

Whitespace-only changes.

‎views/admin/layout/header.jade renamed to ‎views/layout/header.jade

File renamed without changes.

‎views/layout/layout_student.jade

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
!!!5
2+
html
3+
head
4+
meta(charset="utf-8")
5+
title #{title}
6+
link(rel="stylesheet",href="/css/style.css")
7+
body
8+
.container.clearfix
9+
include header
10+
#main.clearfix
11+
.content
12+
block content
13+
include sidebar
14+
include footer

‎views/layout/sidebar.jade

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
.sidebar.sideleft
2+
div.category-item
3+
.name
4+
a(href="/admin/notice") 个人资料
5+
div.category-item
6+
.category.clearfix
7+
.name
8+
a(href="/admin/user") 我提问的
9+
.plus
10+
ul
11+
li
12+
a.item(href="/admin/user?cat=1") 已解决
13+
li
14+
a.item(href="/admin/user?cat=2") 未解决

0 commit comments

Comments
 (0)