From e7813b4318a21b708c527613964c2e91a99cbe51 Mon Sep 17 00:00:00 2001 From: luchenqun Date: Wed, 23 Nov 2016 23:03:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/images/more.png | Bin 0 -> 318 bytes public/views/bookmarks.html | 16 +++++++++--- routes/api.js | 49 ++++++++++++++++++------------------ 3 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 public/images/more.png diff --git a/public/images/more.png b/public/images/more.png new file mode 100644 index 0000000000000000000000000000000000000000..0ab3dbbeaa4ed33cf17329cf18ca9b4ca0c25ad5 GIT binary patch literal 318 zcmV-E0m1%>P)X9IQ~;Ea4$?s=A?YBgfY1SSfS%-yjAdsz1nuR2X%FlD zo*9qF-Vp=WXkdOqKsXQ%gahF~p99ap3HWMU*$==JI08S7o*6I(z7y6}TT6h%?|=lB z0+xl4EwIVZ-cnCDO>TjI7Aw~JzeHC5hJy=m3k+1L-Vhlm>#kcMfkYpf2+1YQlU|1K6Px#07*qoM6N<$f{=-T2LJ#7 literal 0 HcmV?d00001 diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 568a00a..4eae2bd 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -7,16 +7,26 @@
-
+
{{ bookmark.title}}
+
+ +
-
+
diff --git a/routes/api.js b/routes/api.js index 96b9535..41a0dfc 100644 --- a/routes/api.js +++ b/routes/api.js @@ -36,6 +36,7 @@ api.post('/login', function(req, res) { if (user && user.password === password) { ret.logined = true; ret.user = user; + req.session.user = user; req.session.username = ret.user.username; req.session.userId = ret.user.id; } @@ -53,8 +54,8 @@ api.get('/autoLogin', function(req, res) { logined: false, user: {}, } - if (req.session.username) { - db.getUser(req.session.username) + if (req.session.user) { + db.getUser(req.session.user.username) .then((user) => { if (user) { ret.logined = true; @@ -71,7 +72,7 @@ api.get('/autoLogin', function(req, res) { }); api.delete('/delBookmark', function(req, res) { - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } @@ -85,30 +86,30 @@ api.delete('/delBookmark', function(req, res) { }) api.post('/updateBookmark', function(req, res) { - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } var bookmark = req.body.params; console.log('hello updateBookmark', JSON.stringify(bookmark)); var bookmark = req.body.params; - var user_id = '1'; + var userId = req.session.user.id; var tags = bookmark.tags; db.updateBookmark(bookmark) // 更新标签信息 .then((affectedRows) => db.delBookmarkTags(bookmark.id)) // 将之前所有的书签分类信息删掉 .then((affectedRows) => db.addTagsBookmarks(tags, bookmark.id)) // 将新的分类关联起来 - .then(() => db.updateLastUseTags(user_id, tags)) // 更新最近使用的分类(这个有待考虑) + .then(() => db.updateLastUseTags(userId, tags)) // 更新最近使用的分类(这个有待考虑) .then(() => res.json({})) // 运气不错 .catch((err) => console.log('updateBookmark err', err)); // oops! }) api.get('/bookmark', function(req, res) { - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } var bookmarkId = req.query.bookmarkId; - var userId = '1'; + var userId = req.session.user.id; var ret = { bookmark: {}, bookmarkTags: [], @@ -133,11 +134,11 @@ api.get('/bookmark', function(req, res) { api.get('/bookmarks', function(req, res) { console.log('hello bookmarks', JSON.stringify(req.query), req.session.username); - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } - var userId = req.session.userId; + var userId = req.session.user.id; var params = req.query; if (params.showStyle === 'navigate') { db.getBookmarksNavigate(userId) @@ -182,7 +183,7 @@ api.get('/bookmarks', function(req, res) { totalItems: totalItems, bookmarks: [] } - params.user_id = req.session.userId; + params.userId = userId; db.getBookmarksTable(params) .then((bookmarksData) => { bookmarks = bookmarksData.bookmarks; @@ -221,12 +222,12 @@ api.get('/bookmarks', function(req, res) { api.get('/searchBookmarks', function(req, res) { console.log('hello searchBookmarks', JSON.stringify(req.query), req.session.username); - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } var params = req.query; - params.userId = req.session.userId; + params.userId = req.session.user.id; var bookmarks = []; var tagsBookmarks = []; var userId = '1'; @@ -276,42 +277,42 @@ api.get('/searchBookmarks', function(req, res) { }); api.get('/tags', function(req, res) { - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } - db.getTags(req.query.user_id) + db.getTags(req.session.user.id) .then((tags) => res.json(tags)) .catch((err) => console.log('tags', err)); }); api.post('/addBookmark', function(req, res) { console.log('hello addBookmark', JSON.stringify(req.body)); - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } var bookmark = req.body.params; - var user_id = '1'; + var userId = req.session.user.id; var tags = bookmark.tags; - db.addBookmark(user_id, bookmark) // 插入书签 + db.addBookmark(userId, bookmark) // 插入书签 .then((bookmark_id) => db.addTagsBookmarks(tags, bookmark_id)) // 插入分类 - .then(() => db.updateLastUseTags(user_id, tags)) // 更新最新使用的分类 + .then(() => db.updateLastUseTags(userId, tags)) // 更新最新使用的分类 .then(() => res.json({})) // 运气不错 .catch((err) => console.log('addBookmark err', err)); // oops! }); api.post('/addTags', function(req, res) { console.log('hello addTags', JSON.stringify(req.query), JSON.stringify(req.body)); - if (!req.session.username) { + if (!req.session.user) { res.send(401); return; } var tagsName = req.body.params; - var user_id = '1'; + var userId = req.session.user.id; var addTagNames = []; - db.getTags(user_id) + db.getTags(userId) .then((tags) => { // 需要插入的书签是该用户在数据库不存在的书签 addTagNames = tagsName.filter((name) => { @@ -324,8 +325,8 @@ api.post('/addTags', function(req, res) { }); return Promise.resolve(addTagNames); }) - .then((newTagNames) => db.addTags(user_id, newTagNames)) - .then(() => db.getTags(user_id)) + .then((newTagNames) => db.addTags(userId, newTagNames)) + .then(() => db.getTags(userId)) .then((tags) => res.json(tags)) .catch((err) => console.log('addTags err', err)); });