Skip to content

Commit 7e80578

Browse files
crazylxrcrazylxr
committed
标签
1 parent e40c7fb commit 7e80578

File tree

10 files changed

+27
-44
lines changed

10 files changed

+27
-44
lines changed

‎routers/main.js‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
var express = require('express');
22
var router = express.Router();
33
var Category = require('../models/Category');
4+
var Tag = require('../models/Tag');
45
var Content = require('../models/Contents');
56
var marked = require('marked');
67

@@ -11,17 +12,22 @@ router.use(function (req, res, next) {
1112
data = {
1213
userInfo: req.userInfo,
1314
categries: [],
15+
tags: [],
1416
}
1517

1618
Category.find().then(function (categries) {
1719
data.categries = categries;
18-
next();
20+
Tag.find().then(function (tags) {
21+
data.tags = tags;
22+
next();
23+
})
1924
})
2025
});
2126

2227
router.get('/', function (req, res, next) {
2328
Object.assign(data,{
2429
category: req.query.category || '',
30+
tag: req.query.tag || '',
2531
page : Number(req.query.page || 1),
2632
limit : 4,
2733
pages : 0,
@@ -33,6 +39,10 @@ router.get('/', function (req, res, next) {
3339
where.category = data.category;
3440
}
3541

42+
if(data.tag){
43+
where.tag = data.tag;
44+
}
45+
3646
Content.where(where).count().then(function (count) {
3747
data.count = count;
3848
data.pages = Math.ceil(data.count / data.limit);
@@ -42,7 +52,6 @@ router.get('/', function (req, res, next) {
4252
var limit = data.limit;
4353
var skip = (data.page - 1) * data.limit;
4454

45-
4655
return Content.where(where).find().limit(limit).skip(skip).populate(['category', 'user']).sort({
4756
addTime: -1
4857
});

‎schemas/WiredTiger.turtle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ WiredTiger 2.9.2: (December 23, 2016)
33
WiredTiger version
44
major=2,minor=9,patch=2
55
file:WiredTiger.wt
6-
access_pattern_hint=none,allocation_size=4KB,app_metadata=,block_allocation=best,block_compressor=,cache_resident=false,checkpoint=(WiredTigerCheckpoint.445=(addr="018d81e45b0b78228e81e42331ab758f81e4bdec29f5808080e2efc0e22fc0",order=445,time=1507737129,size=24576,write_gen=881)),checkpoint_lsn=(13,23040),checksum=uncompressed,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,value_format=S,version=(major=1,minor=1)
6+
access_pattern_hint=none,allocation_size=4KB,app_metadata=,block_allocation=best,block_compressor=,cache_resident=false,checkpoint=(WiredTigerCheckpoint.451=(addr="018d81e4371f420b8e81e42331ab758f81e4bdec29f5808080e2efc0e22fc0",order=451,time=1507777751,size=24576,write_gen=893)),checkpoint_lsn=(13,27008),checksum=uncompressed,collator=,columns=,dictionary=0,encryption=(keyid=,name=),format=btree,huffman_key=,huffman_value=,id=0,ignore_in_memory_cache_size=false,internal_item_max=0,internal_key_max=0,internal_key_truncate=true,internal_page_max=4KB,key_format=S,key_gap=10,leaf_item_max=0,leaf_key_max=0,leaf_page_max=32KB,leaf_value_max=0,log=(enabled=true),memory_page_max=5MB,os_cache_dirty_max=0,os_cache_max=0,prefix_compression=false,prefix_compression_min=4,split_deepen_min_child=0,split_deepen_per_child=0,split_pct=90,value_format=S,version=(major=1,minor=1)

‎schemas/WiredTiger.wt‎

0 Bytes
Binary file not shown.

‎schemas/collection-2-4369070181537040941.wt‎

0 Bytes
Binary file not shown.

‎schemas/diagnostic.data/metrics.2017-10-11T02-53-09Z-00000‎

1.93 MB
Binary file not shown.

‎schemas/diagnostic.data/metrics.interim‎

-2.03 KB
Binary file not shown.

‎schemas/index-3-4369070181537040941.wt‎

0 Bytes
Binary file not shown.

‎schemas/journal/WiredTigerLog.0000000013‎

3.88 KB
Binary file not shown.

‎schemas/sizeStorer.wt‎

0 Bytes
Binary file not shown.

‎views/main/layout.html‎

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,18 @@
2222
<nav>
2323
<div class="menu">
2424
{% if category %}
25-
<a href="/">首页</a> {% else %}
26-
<a href="/" class="focus">首页</a> {% endif%} {% for cate in categries%} {% if category == cate.id %}
27-
<a href="/?category={{cate.id}}" class="focus">{{cate.name}}</a> {% else %}
28-
<a href="/?category={{cate.id}}">{{cate.name}}</a> {% endif%} {% endfor %}
25+
<a href="/">首页</a>
26+
{% else %}
27+
<a href="/" class="focus">首页</a>
28+
{% endif%}
29+
30+
{% for cate in categries%}
31+
{% if category == cate.id %}
32+
<a href="/?category={{cate.id}}" class="focus">{{cate.name}}</a>
33+
{% else %}
34+
<a href="/?category={{cate.id}}">{{cate.name}}</a>
35+
{% endif%}
36+
{% endfor %}
2937
</div>
3038
</nav>
3139

@@ -35,38 +43,6 @@
3543
</div>
3644

3745
<div class="mainRight">
38-
<!-- {% if userInfo._id %}
39-
<div class="rightBox" id="userInfo">
40-
<div class="title"><h3 class="title__text">用户信息</h3></div>
41-
<p><span class="colDark username">{{userInfo.username}}</span></p>
42-
{% if userInfo.isAdmin %}
43-
<p><span class="colDanger info">你好，你是管理员 <a href="/admin">你可以点击进入管理</a></span></p>
44-
{% else %}
45-
<p><span class="colDanger info">你好，欢迎光临我的博客 </p>
46-
{% endif %}
47-
48-
<p><span class="colDark "><a href="javascript:;" id="logout">退出</a></span></p>
49-
</div>
50-
{% else %}
51-
<div class="rightBox" id="loginBox" >
52-
<div class="title"><h3 class="title__text">登录</h3></div>
53-
<div class="line"><span class="colDark">用户名：</span><input name="username" type="text"><em></em></div>
54-
<div class="line"><span class="colDark">密码：</span><input name="password" type="text"><em></em></div>
55-
<div class="line"><span class="colDark"><button>登录</button></span></div>
56-
<p class="textRight">还没注册？ <a href="javascript:;" class="colMint">马上注册</a></p>
57-
<p class="colWarning textCenter"></p>
58-
</div>
59-
60-
<div class="rightBox" id="registerBox" style="display: none">
61-
<div class="title"><h3>注册</h3></div>
62-
<div class="line"><span class="colDark">用户名：</span><input name="username" type="text"><em></em></div>
63-
<div class="line"><span class="colDark">密码：</span><input name='password' type="text"><em></em></div>
64-
<div class="line"><span class="colDark">确认：</span><input name='repassword' type="text"><em></em></div>
65-
<div class="line"><span class="colDark"><button>注册</button></span></div>
66-
<p class="textRight">已有账号？ <a href="javascript:;" class="colMint">马上登录</a></p>
67-
<p class="colWarning textCenter"></p>
68-
</div>
69-
{% endif %} -->
7046
<div class="rightBox archive-container">
7147
<div class="title">
7248
<h3 class="title__text">归档</h3>
@@ -82,11 +58,9 @@ <h3 class="title__text">归档</h3>
8258
<div class="rightBox label-cloud">
8359
<div class="title">
8460
<h3 class="title__text">标签云</h3>
85-
<a href="" class="colDanger label-cloud__item">Java</a>
86-
<a href="" class="colDanger label-cloud__item">Javascript</a>
87-
<a href="" class="colDanger label-cloud__item">C</a>
88-
<a href="" class="colDanger label-cloud__item">Webstorm</a>
89-
<a href="" class="colDanger label-cloud__item">Phtyon</a>
61+
{% for tag in tags%}
62+
<a href="/?tag={{tag.name}}" class="colDanger label-cloud__item">{{tag.name}}</a>
63+
{% endfor %}
9064
</div>
9165
</div>
9266

0 commit comments

Comments
 (0)