diff --git a/app.js b/app.js index e658ab4..eab9839 100644 --- a/app.js +++ b/app.js @@ -1,88 +1,88 @@ -var express = require('express'); -var path = require('path'); -var logger = require('morgan'); -var cookieParser = require('cookie-parser'); -var bodyParser = require('body-parser'); -var session = require('express-session'); -var RedisStore = require('connect-redis')(session); -const secret = 'keyboard cat'; - -var api = require('./routes/api'); -var app = express(); -var fs = require('fs'); -// 创建下载的目录 -var folders = ['./uploads', './public/images/favicon', './public/images/snap']; -folders.forEach((folder) => { - fs.exists(folder, function (exists) { - if (!exists) { - fs.mkdir(folder, function (err) { - if (err) console.error(err); - }); - } else { - console.log(folder + "is exists!"); - } - }); -}) - -app.use(logger('dev')); -app.use(bodyParser.json()); -app.use(bodyParser.urlencoded({ - extended: false -})); - -app.use(cookieParser('secret')); - -app.use(session({ - store: new RedisStore({ - host: "127.0.0.1", - port: 6379 - }), - cookie: { - maxAge: 7 * 24 * 60 * 60 * 1000, // 一周 - }, - resave: true, - saveUninitialized: true, - secret: secret -})) - -app.use(express.static(path.join(__dirname, 'public'))); -app.use('/api', api); - -// catch 404 and forward to error handler -app.use(function (req, res, next) { - var err = new Error('Not Found'); - err.status = 404; - next(err); -}); - -// error handlers - -// development error handler -// will print stacktrace -if (app.get('env') === 'development') { - app.use(function (err, req, res, next) { - res.status(err.status || 500); - res.render('error', { - message: err.message, - error: err - }); - }); -} - -// production error handler -// no stacktraces leaked to user -app.use(function (err, req, res, next) { - res.status(err.status || 500); - res.sendfile("./public/404.html"); - // res.render('error', { - // message: err.message, - // error: {} - // }); -}); -// 卡片这模式就没怎么用过，干掉了。 -// api.checkSnapFaviconState(); -// api.getSnapByTimer(); -api.getFaviconByTimer(); -api.getHotBookmarksByTimer(); - +var express = require('express'); +var path = require('path'); +var logger = require('morgan'); +var cookieParser = require('cookie-parser'); +var bodyParser = require('body-parser'); +var session = require('express-session'); +var RedisStore = require('connect-redis')(session); +const secret = 'keyboard cat'; + +var api = require('./routes/api'); +var app = express(); +var fs = require('fs'); +// 创建下载的目录 +var folders = ['./uploads', './public/images/favicon', './public/images/snap']; +folders.forEach((folder) => { + fs.exists(folder, function (exists) { + if (!exists) { + fs.mkdir(folder, function (err) { + if (err) console.error(err); + }); + } else { + console.log(folder + "is exists!"); + } + }); +}) + +app.use(logger('dev')); +app.use(bodyParser.json()); +app.use(bodyParser.urlencoded({ + extended: false +})); + +app.use(cookieParser('secret')); + +app.use(session({ + store: new RedisStore({ + host: "127.0.0.1", + port: 6379 + }), + cookie: { + maxAge: 7 * 24 * 60 * 60 * 1000, // 一周 + }, + resave: true, + saveUninitialized: true, + secret: secret +})) + +app.use(express.static(path.join(__dirname, 'public'))); +app.use('/api', api); + +// catch 404 and forward to error handler +app.use(function (req, res, next) { + var err = new Error('Not Found'); + err.status = 404; + next(err); +}); + +// error handlers + +// development error handler +// will print stacktrace +if (app.get('env') === 'development') { + app.use(function (err, req, res, next) { + res.status(err.status || 500); + res.render('error', { + message: err.message, + error: err + }); + }); +} + +// production error handler +// no stacktraces leaked to user +app.use(function (err, req, res, next) { + res.status(err.status || 500); + res.sendfile("./public/404.html"); + // res.render('error', { + // message: err.message, + // error: {} + // }); +}); +// 卡片这模式就没怎么用过，干掉了。 +// api.checkSnapFaviconState(); +// api.getSnapByTimer(); +// api.getFaviconByTimer(); +api.getHotBookmarksByTimer(); + module.exports = app; \ No newline at end of file diff --git a/public/scripts/controllers/bookmark-info-controller.js b/public/scripts/controllers/bookmark-info-controller.js index 2feb12a..86f9462 100644 --- a/public/scripts/controllers/bookmark-info-controller.js +++ b/public/scripts/controllers/bookmark-info-controller.js @@ -9,7 +9,7 @@ app.controller('bookmarkInfoCtr', ['$scope', '$state', '$timeout', '$sce', '$win $('.ui.modal.js-bookmark-info').modal({ closable: false, }).modal('setting', 'transition', dataService.animation()).modal('show'); - bookmark.favicon_url = bookmark.favicon_url || ('http://favicon.luchenqun.com/?url=' + bookmark.url); + bookmark.favicon_url = 'http://favicon.luchenqun.com/?url=' + bookmark.url; bookmark.snap_url = bookmark.snap_url || ('./images/snap/' + bookmark.id + '.png'); $scope.bookmark = bookmark; $scope.bookmark.description = $sce.trustAsHtml(bookmark.description); diff --git a/public/views/bookmark-info.html b/public/views/bookmark-info.html index 2c78888..4a18ff0 100644 --- a/public/views/bookmark-info.html +++ b/public/views/bookmark-info.html @@ -1,74 +1,74 @@ -
- -
- {{bookmark.title}} -
-
-
-
-
-
-
- - 网页地址： - {{bookmark.url}} - -
-
-
-
- 创建日期： - {{bookmark.created_at}} -
-
- 最后点击： - {{bookmark.last_click}} -
-
-
-
- 点击次数：{{bookmark.click_count}} -
-
- 收藏人数：{{bookmark.fav_count}} -
-
- 书签分类： -
- {{ tag.name }} -
-
-
- 来源信息：{{bookmark.created_by}} -
-
-
-
-
-
-
-
-
-
- 描述信息 -
- 
{{ bookmark.description }}
-
-
-
-
-
-
- 内容摘抄 -
-

- -
-
-
-
跳转到原页面
- -
+
+ +
+ {{bookmark.title}} +
+
+
+
+
+
+
+ + 网页地址： + {{bookmark.url}} + +
+
+
+
+ 创建日期： + {{bookmark.created_at}} +
+
+ 最后点击： + {{bookmark.last_click}} +
+
+
+
+ 点击次数：{{bookmark.click_count}} +
+
+ 收藏人数：{{bookmark.fav_count}} +
+
+ 书签分类： +
+ {{ tag.name }} +
+
+
+ 来源信息：{{bookmark.created_by}} +
+
+
+
+
+
+
+
+
+
+ 描述信息 +
+ 
{{ bookmark.description }}
+
+
+
+
+
+
+ 内容摘抄 +
+

+ +
+
+
+
跳转到原页面
+ +
\ No newline at end of file diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 8d3b341..8647f8a 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -30,10 +30,9 @@ id="{{bookmark.id}}"> + ng-click="detailBookmark(bookmark);$event.stopPropagation()"> {{ bookmark.title}}
@@ -66,10 +65,9 @@ id="{{bookmark.id}}"> + ng-click="detailBookmark(bookmark);$event.stopPropagation()"> {{ bookmark.title}} @@ -89,7 +87,7 @@ - + {{ bookmark.title }} @@ -142,7 +140,7 @@
- + 创建于: diff --git a/public/views/search.html b/public/views/search.html index d4c8a4b..aa775a8 100644 --- a/public/views/search.html +++ b/public/views/search.html @@ -135,17 +135,15 @@ {{ bookmark.title }} diff --git a/public/views/tags.html b/public/views/tags.html index 00e464a..02359c0 100644 --- a/public/views/tags.html +++ b/public/views/tags.html @@ -85,8 +85,8 @@ - + {{ bookmark.title }} @@ -129,8 +129,8 @@
- + {{ bookmark.title}}