初始化一下注册的用户
This commit is contained in:
luchenqun
parent
16688c4ec1
commit
24019963cf
|
|
@ -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);
|
||||
}
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
})
|
||||
}
|
||||
|
||||
}
|
||||
}]);
|
||||
|
|
|
|||
|
|
@ -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, "错误");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<div class="js-menu" ng-controller="menuCtr">
|
||||
<div class="ui huge menu js-login-in" ng-if="login">
|
||||
<a class="item" ng-class="{selected:$index===selectLoginIndex}" ui-sref="{{ menu.uiSref }}" ui-sref-opts="{reload: true}" ng-repeat="menu in loginMenus" jsMenuInit>
|
||||
<a class="item" ng-class="{selected:$index===selectLoginIndex}" ui-sref="{{ menu.uiSref }}" ui-sref-opts="{reload: true}" ng-repeat="menu in loginMenus" js-menu-init>
|
||||
<div>{{ menu.title }}</div>
|
||||
<div class="ui floating simple dropdown icon js-bookmark-dropdown" ng-if="$index==0" ng-click="$event.stopPropagation();">
|
||||
<i class="dropdown icon"></i>
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ api.post('/updateBookmark', function(req, res) {
|
|||
var tags = bookmark.tags;
|
||||
db.updateBookmark(bookmark) // 更新标签信息
|
||||
.then((affectedRows) => db.delBookmarkTags(bookmark.id)) // 将之前所有的书签分类信息删掉
|
||||
.then((affectedRows) => db.addTagsBookmarks(tags, bookmark.id)) // 将新的分类关联起来
|
||||
.then((insertId) => db.addTagsBookmarks(tags, bookmark.id)) // 将新的分类关联起来
|
||||
.then(() => db.updateLastUseTags(userId, tags)) // 更新最近使用的分类(这个有待考虑)
|
||||
.then(() => res.json({})) // 运气不错
|
||||
.catch((err) => console.log('updateBookmark err', err)); // oops!
|
||||
|
|
|
|||
Loading…
Reference in New Issue