From 24019963cff51090fdadc510f9d81b521006b4aa Mon Sep 17 00:00:00 2001 From: luchenqun Date: Mon, 6 Feb 2017 12:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E6=B3=A8=E5=86=8C=E7=9A=84=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- database/db.js | 63 ++++++++++++++++--- .../controllers/bookmarks-controller.js | 19 +++--- .../scripts/controllers/login-controller.js | 4 ++ public/views/menus.html | 2 +- routes/api.js | 2 +- 5 files changed, 70 insertions(+), 20 deletions(-) diff --git a/database/db.js b/database/db.js index ead308f..92fd4a3 100644 --- a/database/db.js +++ b/database/db.js @@ -31,15 +31,15 @@ client.connect(); // update delete 返回影响的行数 var db = { -} -// var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'"; -// client.query(sql, (err, result) => { -// if (err) { -// console.log(err); -// } else { -// console.log(result); -// } -// }); + } + // var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'"; + // client.query(sql, (err, result) => { + // if (err) { + // console.log(err); + // } else { + // console.log(result); + // } + // }); db.addBookmark = function(user_id, bookmark) { var sql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', '" + bookmark.title + "', '" + bookmark.description + "', '" + bookmark.url + "', '" + bookmark.public + "', '1')"; @@ -202,11 +202,54 @@ db.register = function(user) { reject(err); } else { resolve(result.affectedRows); + db.insertDefaultBookmarks(result.insertId); } }); }); }; +db.insertDefaultBookmarks = function(userId) { + var tags_name = ["常用", "未分类"]; + + db.addTags(userId, tags_name) + .then((insertId) => { + var bookmarks = [{ + title: "谷歌", + description: "要翻墙的搜索网站", + url: "https://www.google.com.hk/", + public: "1" + }, { + title: "百度", + description: "A:百度一下你会死啊？B:会！", + url: "https://www.baidu.com/", + public: "1" + }, { + title: "微博", + description: "随时随地发现新鲜事", + url: "http://weibo.com/", + public: "1" + }, { + title: "天猫", + description: "上天猫，就够了！", + url: "https://www.tmall.com/", + public: "1" + }, { + title: "优酷", + description: "视频网站", + url: "http://www.youku.com/", + public: "1" + }]; + + var tags = [insertId]; + bookmarks.forEach((bookmark) => { + db.addBookmark(userId, bookmark) + .then((insertId) => db.addTagsBookmarks(tags, insertId)) + .catch((err) => console.log('insertDefaultBookmarks err2', err)); // oops! + }) + }) + .catch((err) => console.log('insertDefaultBookmarks err1', err)); // oops! +} + db.getUser = function(username) { console.log('getUser'); var sql = "SELECT * FROM `users` WHERE `username` = '" + username + "'"; @@ -263,7 +306,7 @@ db.addTags = function(user_id, tags_name) { if (err) { reject(err); } else { - resolve(result.affectedRows); + resolve(result.insertId); } }); }); diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index dc5ad4e..8d84876 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -115,13 +115,16 @@ app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', ' setTimeout(updateEditPos, 100); function updateEditPos() { - var top = $('.js-segment-navigate').offset().top; - var left = $('.js-segment-navigate').offset().left; - var width = $('.js-segment-navigate').width(); - // console.log('js-edit position update', top+10, left+width-10) - $('.js-edit').offset({ - top: top + 10, - left: left + width - 10, - }) + if($scope.showStyl == 'navigate'){ + var top = $('.js-segment-navigate').offset().top; + var left = $('.js-segment-navigate').offset().left; + var width = $('.js-segment-navigate').width(); + // console.log('js-edit position update', top+10, left+width-10) + $('.js-edit').offset({ + top: top + 10, + left: left + width - 10, + }) + } + } }]); diff --git a/public/scripts/controllers/login-controller.js b/public/scripts/controllers/login-controller.js index 1c2ef33..b3b907a 100644 --- a/public/scripts/controllers/login-controller.js +++ b/public/scripts/controllers/login-controller.js @@ -78,6 +78,8 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', '$cookieStore', 'book } if ($scope.passwordRegister1 !== $scope.passwordRegister2) { toastr.error('两次输入账号密码不一致', "错误"); + $scope.passwordRegister1 = ""; + $scope.passwordRegister2 = ""; return; } if (!/([0-9a-zA-Z]){3,12}/.test($scope.usernameRegister)) { @@ -100,6 +102,8 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', '$cookieStore', 'book if (data.retCode == 0) { toastr.success('注册成功', "提示"); $('.ui.modal.js-register').modal('hide'); + $scope.username = $scope.usernameRegister; + $scope.password = ""; } else { toastr.error('注册失败，您的账号或者邮箱可能已经存在了。错误信息：' + data.msg, "错误"); } diff --git a/public/views/menus.html b/public/views/menus.html index 72be7b1..8573fa2 100644 --- a/public/views/menus.html +++ b/public/views/menus.html @@ -1,6 +1,6 @@