diff --git a/public/scripts/controllers/bookmarks-controller.js b/public/scripts/controllers/bookmarks-controller.js index 78b6338..5531c97 100644 --- a/public/scripts/controllers/bookmarks-controller.js +++ b/public/scripts/controllers/bookmarks-controller.js @@ -3,6 +3,27 @@ app.controller('bookmarksCtr', ['$scope', '$stateParams', '$filter', 'bookmarkSe $scope.bookmarks = []; // 书签数据 $scope.showSearch = false; // 书签数据 $scope.showStyle = 'table'; // 显示风格'navigate', 'card', 'table' + $scope.test = [{ + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }, { + a: 1 + }]; semanticInit(); diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 8ef11d1..df5cf58 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -1,3 +1,22 @@ +
+
+
+
+ ssssss +
+
+
+
+
+
Elliot Fu
+
Friend
+
+
+
+
+
+
+
- - + @@ -58,7 +76,13 @@ - + @@ -89,3 +113,16 @@
标题标题 链接 点击次数 创建日期
{{ bookmark.title }} + + + {{ bookmark.title }} + + + {{ bookmark.url }} {{ bookmark.click_count }} {{ bookmark.created_at }}
+ght chevron icon"> + + + + + + +/a> + + + + + diff --git a/routes/api.js b/routes/api.js index a8d4977..43b8cc2 100644 --- a/routes/api.js +++ b/routes/api.js @@ -1,9 +1,17 @@ var api = require('express').Router(); var mysql = require('mysql'); +// var client = mysql.createConnection({ +// host: '172.24.13.5', +// user: 'root', +// password: 'root123', +// database: 'mybookmarks', +// multipleStatements: true, +// port: 3306 +// }); var client = mysql.createConnection({ - host: '172.24.13.5', - user: 'root', - password: 'root123', + host: '127.0.0.1', + user: 'lcq', + password: '123456', database: 'mybookmarks', multipleStatements: true, port: 3306