liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加了一个用户

This commit is contained in:
luchenqun 2016-11-24 10:46:41 +08:00
parent 30102abb5b
commit 469ccbdbfd
9 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
database/db.js
View File

@ -1,8 +1,8 @@
var mysql = require('mysql');
var client = mysql.createConnection({
host: '127.0.0.1' || '172.24.13.5',
user: 'lcq' || 'root',
password: 'fendoubuxi596320' || 'root123',
host: '127.0.0.1'|| '172.24.13.5',
user: 'lcq'|| 'root',
password: 'fendoubuxi596320'|| 'root123',
database: 'mybookmarks',
multipleStatements: true,
port: 3306
@ -256,7 +256,7 @@ db.getBookmarksNavigate = function(user_id) {
};
db.getBookmarksTable = function(params) {
var user_id = params.user_id;
var user_id = params.userId;
params.currentPage = params.currentPage || 1;
params.perPageItems = params.perPageItems || 20;
@ -272,6 +272,7 @@ db.getBookmarksTable = function(params) {
} else {
sql += " LIMIT " + (params.currentPage - 1) * params.perPageItems + ", " + params.perPageItems;
var totalItems = result.length;
console.log(totalItems, sql);
client.query(sql, (err, result) => {
if (err) {
reject(err);

1
public/index.html
View File

@ -28,6 +28,7 @@
<script src="/scripts/externe/toastr.min.js"></script>
<script src="/scripts/externe/angular.min.js"></script>
<script src="/scripts/externe/angular-ui-router.min.js"></script>
<script src="/scripts/externe/angular-cookies.min.js"></script>
<script src="/scripts/app-angular.js"></script>
<script src="/scripts/services/bookmark-service.js"></script>
<script src="/scripts/services/data-service.js"></script>

2
public/scripts/app-angular.js
View File

@ -1,4 +1,4 @@
var app = angular.module('bookmarkApp', ['ui.router']);
var app = angular.module('bookmarkApp', ['ui.router', 'ngCookies']);
app.config(function($stateProvider, $urlRouterProvider, $httpProvider) {
$httpProvider.interceptors.push('httpInterceptor');

5
public/scripts/controllers/edit-controller.js
View File

@ -107,10 +107,7 @@ app.controller('editCtr', ['$scope', '$state', '$timeout', 'bookmarkService', 'p
$('.ui.modal.js-add-bookmark .ui.dropdown').dropdown('clear');
$('.ui.modal.js-add-bookmark .ui.dropdown').addClass('loading');
init();
var params = {
user_id: 1
};
getTags(params);
getTags({});
});
pubSubService.subscribe('bookmarksCtr.editBookmark', $scope, function(event, params) {

11
public/scripts/controllers/login-controller.js
View File

@ -1,13 +1,13 @@
app.controller('loginCtr', ['$scope', '$filter', '$state', 'bookmarkService', 'pubSubService', function($scope, $filter, $state, bookmarkService, pubSubService) {
console.log("Hello loginCtr...");
app.controller('loginCtr', ['$scope', '$filter', '$state', '$cookieStore', 'bookmarkService', 'pubSubService', function($scope, $filter, $state, $cookieStore, bookmarkService, pubSubService) {
console.log("Hello loginCtr...", $cookieStore.get("username"), $cookieStore.get("password"));
pubSubService.publish('Common.menuActive', {
login: false,
index: 1
});
$scope.username = "luchenqun";
$scope.password = "fendoubuxi";
$scope.username = $cookieStore.get("username") || "";
$scope.password = $cookieStore.get("password") || "";
$scope.showErr = false;
$scope.errInfo = '';
@ -25,6 +25,8 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', 'bookmarkService', 'p
password: $scope.password,
autoLogin: autoLogin,
};
$cookieStore.put("username", $scope.username);
$cookieStore.put("password", $scope.password);
bookmarkService.login(params)
.then((data) => {
console.log(data);
@ -37,6 +39,7 @@ app.controller('loginCtr', ['$scope', '$filter', '$state', 'bookmarkService', 'p
})
} else {
console.log('login failed......................')
toastr.error('账号或者密码错误', "错误");
}
})
.catch((err) => console.log('login err', err));

4
public/scripts/controllers/search-controller.js
View File

@ -27,9 +27,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
}
}
bookmarkService.getTags({
user_id: '1',
})
bookmarkService.getTags({})
.then((data) => {
$scope.tags = data;
})

11
public/scripts/controllers/tags-controller.js
View File

@ -1,18 +1,11 @@
app.controller('tagsCtr', ['$scope', '$filter', 'bookmarkService', 'pubSubService', function($scope, $filter, bookmarkService, pubSubService) {
console.log("Hello tagsCtr...");
getTags({
user_id: '1'
});
getTags({});
$scope.tags = []; // 书签数据
pubSubService.subscribe('MenuCtr.tags', $scope, function(event, data) {
console.log('subscribe MenuCtr.tags', data);
var params = {
a: 1,
b: 2,
c: 3
};
getTags(params);
getTags({});
});

9
public/scripts/externe/angular-cookies.min.js vendored Normal file
View File

@ -0,0 +1,9 @@
/*
AngularJS v1.5.8
(c) 2010-2016 Google, Inc. http://angularjs.org
License: MIT
*/
(function(n,c){'use strict';function l(b,a,g){var d=g.baseHref(),k=b[0];return function(b,e,f){var g,h;f=f||{};h=f.expires;g=c.isDefined(f.path)?f.path:d;c.isUndefined(e)&&(h="Thu, 01 Jan 1970 00:00:00 GMT",e="");c.isString(h)&&(h=new Date(h));e=encodeURIComponent(b)+"="+encodeURIComponent(e);e=e+(g?";path="+g:"")+(f.domain?";domain="+f.domain:"");e+=h?";expires="+h.toUTCString():"";e+=f.secure?";secure":"";f=e.length+1;4096<f&&a.warn("Cookie '"+b+"' possibly not set or overflowed because it was too large ("+
f+" > 4096 bytes)!");k.cookie=e}}c.module("ngCookies",["ng"]).provider("$cookies",[function(){var b=this.defaults={};this.$get=["$$cookieReader","$$cookieWriter",function(a,g){return{get:function(d){return a()[d]},getObject:function(d){return(d=this.get(d))?c.fromJson(d):d},getAll:function(){return a()},put:function(d,a,m){g(d,a,m?c.extend({},b,m):b)},putObject:function(d,b,a){this.put(d,c.toJson(b),a)},remove:function(a,k){g(a,void 0,k?c.extend({},b,k):b)}}}]}]);c.module("ngCookies").factory("$cookieStore",
["$cookies",function(b){return{get:function(a){return b.getObject(a)},put:function(a,c){b.putObject(a,c)},remove:function(a){b.remove(a)}}}]);l.$inject=["$document","$log","$browser"];c.module("ngCookies").provider("$$cookieWriter",function(){this.$get=l})})(window,window.angular);
//# sourceMappingURL=angular-cookies.min.js.map

1
routes/api.js
View File

@ -23,6 +23,7 @@ api.post('/login', function(req, res) {
var params = req.body.params;
var username = params.username;
var password = md5(params.password);
console.log(password);
db.getUser(username)
.then((user) => {
var ret = {