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

完成热门的书签

This commit is contained in:
HelloWorld 2020-03-31 10:25:53 +08:00
parent e72e08d033
commit 7919ac95b2
6 changed files with 147 additions and 243 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/controller/api.js
View File

@ -215,8 +215,8 @@ module.exports = class extends Base {
bookmark.tagId = tagId;
}
}
let res = await this.model("bookmarks").add(bookmark);
this.json({ code: 0, data: res, msg: `书签 ${bookmark.title} 添加成功` });
let data = await this.model("bookmarks").add(bookmark);
this.json({ code: 0, data, msg: `书签 ${bookmark.title} 添加成功` });
} catch (error) {
this.json({ code: 1, data: '', msg: error.toString() });
}

8
www/scripts/controllers/menus-controller.js
View File

@ -27,16 +27,16 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time
$scope.notLoginMenus = dataService.notLoginMenus; // 未登陆显示的菜单数据
get('own', { full: true }).then(user => {
$scope.user = user;
$timeout(() => {
$scope.user = user;
$scope.searchHistory = JSON.parse(user.searchHistory || '[]');
$scope.quickUrl = JSON.parse(user.quickUrl || '{}');
$scope.searchHistory.forEach((item, index) => {
$scope.searchIcon(item);
})
if ($scope.user.username === 'lcq') {
$scope.loginMenus[dataService.LoginIndexHot].show = false;
}
// if ($scope.user.username === 'lcq') {
// $scope.loginMenus[dataService.LoginIndexHot].show = false;
// }
})
});

53
www/scripts/controllers/search-controller.js
View File

@ -5,10 +5,8 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
return;
}
const pageSize = 20;
var dialog = null;
$scope.hoverBookmark = null;
$scope.searchBookmarks = []; // 书签数据
$scope.bookmarks = []; // 书签数据
$scope.showSearch = false; //
$scope.showTags = false; //
$scope.keyword = ($stateParams && $stateParams.keyword) || ''
@ -18,14 +16,17 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
$scope.dateClickEnd = '';
$scope.range = 'self';
$scope.bookmarkCount = 0;
$scope.tags = []
$scope.tags = [];
$scope.user = [];
$scope.totalPages = 0;
$scope.currentPage = 1;
$scope.inputPage = '';
$scope.loading = false;
$scope.waitDelBookmark = {};
$scope.searchHotBookmarks = false;
var timeagoInstance = timeago();
var dialog = null;
$scope.changeCurrentPage = async function (page) {
page = parseInt(page) || 0;
@ -36,9 +37,8 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
}
}
get('tags').then((tags) => {
$scope.tags = tags;
})
get('tags').then((tags) => $scope.tags = tags)
get('own').then((user) => $scope.user = user)
// 默认登陆
pubSubService.publish('Common.menuActive', {
@ -51,7 +51,7 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
$window.open(url);
await post("clickBookmark", { id });
$scope.searchBookmarks.forEach(function (bookmark) {
$scope.bookmarks.forEach(function (bookmark) {
if (bookmark.id == id) {
bookmark.clickCount += 1;
bookmark.lastClick = $filter("date")(new Date(), "yyyy-MM-dd HH:mm:ss");
@ -140,13 +140,13 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
}
params.page = $scope.currentPage || 1;
params.pageSize = pageSize;
params.pageSize = 20;
console.log('params = ', params)
let reply = await get('bookmarksSearch', params);
$timeout(() => {
$scope.searchBookmarks = reply.data;
$scope.bookmarks = reply.data;
$scope.totalPages = reply.totalPages;
$scope.bookmarkCount = reply.count;
$scope.loading = false;
@ -203,45 +203,16 @@ app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$wi
pubSubService.subscribe('EditCtr.inserBookmarsSuccess', $scope, function (event, data) {
console.log('subscribe EditCtr.inserBookmarsSuccess', JSON.stringify(data));
$scope.searchBookmarks.forEach((bookmark) => {
$scope.bookmarks.forEach((bookmark) => {
if (bookmark.id == data.id) {
bookmark.title = data.title;
bookmark.url = data.url;
bookmark.description = data.description;
bookmark.tags = data.tags;
// bookmark.tags = data.tags; @todo
}
})
});
async function searchBookmarks(params) {
console.log(params);
$scope.loading = true;
$('.js-table-search').transition('hide');
// bookmarkService.searchHotBookmarks(params)
// .then((data) => {
// $scope.searchBookmarks = [];
// data.bookmarks.forEach((bookmark) => {
// bookmark.tags = [{
// id: -1,
// name: bookmark.created_by, // 给转存用
// }]
// bookmark.createdAt = $filter('date')(new Date(bookmark.createdAt), "yyyy-MM-dd HH:mm:ss");
// bookmark.lastClick = $filter('date')(new Date(bookmark.lastClick), "yyyy-MM-dd HH:mm:ss");
// $scope.searchBookmarks.push(bookmark);
// })
// $scope.bookmarkCount = data.totalItems;
// $scope.totalPages = Math.ceil($scope.bookmarkCount / pageSize);
// $scope.loading = false;
// transition();
// })
// .catch((err) => {
// console.log('searchHotBookmarks err', err);
// $scope.loading = false;
// });
}
function transition() {
$timeout(function () {
timeagoInstance.cancel();

126
www/scripts/controllers/weixin-article-controller.js
View File

@ -1,4 +1,4 @@
app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $state, $sce, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$filter', '$window', '$timeout', '$document', 'pubSubService', 'dataService', function ($scope, $state, $sce, $filter, $window, $timeout, $document, pubSubService, dataService) {
console.log("Hello weixinArticleCtr...");
if (dataService.smallDevice()) {
$window.location = "http://m.mybookmark.cn/#/tags";
@ -23,30 +23,22 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
$scope.toastrId = 0;
$scope.random = 0;
$scope.channels = JSON.parse(`[{"id":1,"name":"热门", "clicked": true},{"id":2,"name":"搞笑"},{"id":3,"name":"养生堂"},{"id":4,"name":"私房话"},{"id":5,"name":"八卦精"},{"id":6,"name":"科技咖"},{"id":7,"name":"财经迷"},{"id":8,"name":"汽车控"},{"id":9,"name":"生活家"},{"id":10,"name":"时尚圈"},{"id":11,"name":"育儿"},{"id":12,"name":"旅游"},{"id":13,"name":"职场"},{"id":14,"name":"美食"},{"id":15,"name":"历史"},{"id":16,"name":"教育"},{"id":17,"name":"星座"},{"id":18,"name":"体育"},{"id":19,"name":"军事"},{"id":20,"name":"游戏"},{"id":21,"name":"萌宠"}]`);
$scope.callCount = parseInt((localStorage && localStorage.getItem('weixin' + key)) || 1);
$scope.maxCallCount = 100;
$scope.user = {};
var timeagoInstance = timeago();
bookmarkService.autoLogin()
.then((data) => {
var login = data.logined;
var index = login ? dataService.LoginIndexHot : dataService.NotLoginIndexHot;
$scope.user = data.user || {};
get('own').then((user) => {
$scope.user = user;
pubSubService.publish('Common.menuActive', {
login: login,
index: index
login: true,
index: dataService.LoginIndexHot
});
})
.catch((err) => {
console.log('autoLogin err', err)
});
$scope.jumpToUrl = function (url) {
$scope.jumpToUrl = async function (url) {
$window.open(url, '_blank');
}
$scope.favoriteBookmark = function (b) {
$scope.favoriteBookmark = async function (b) {
var menusScope = $('div[ng-controller="menuCtr"]').scope();
var login = (menusScope && menusScope.login) || false;
if (!login) {
@ -54,28 +46,16 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
return;
}
var bookmark = {}
bookmark.description = '';
let bookmark = {}
bookmark.title = b.title;
bookmark.url = b.url;
bookmark.public = 1;
bookmark.click_count = 1;
bookmarkService.favoriteBookmark(bookmark)
.then((data) => {
pubSubService.publish('EditCtr.inserBookmarsSuccess', data);
if (data.title) {
toastr.success('[ ' + data.title + ' ] 收藏成功！', "提示");
} else {
toastr.error('[ ' + bookmark.title + ' ] 收藏失败！', "提示");
}
})
.catch((err) => {
toastr.error('[ ' + bookmark.title + ' ] 收藏失败，' + JSON.stringify(err), "提示");
});
let id = await post("addBookmark", bookmark);
bookmark = await get("bookmark", { id })
pubSubService.publish('EditCtr.inserBookmarsSuccess', bookmark);
}
$scope.storeBookmark = function (bookmark) {
$scope.storeBookmark = async function (bookmark) {
var menusScope = $('div[ng-controller="menuCtr"]').scope();
var login = (menusScope && menusScope.login) || false;
if (!login) {
@ -83,17 +63,17 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
} else {
var b = $.extend(true, {}, bookmark); // 利用jQuery执行深度拷贝
b.tags = [{
name: b.created_by
name: b.createdBy
}]
pubSubService.publish('TagCtr.storeBookmark', b);
}
}
$scope.copy = function (url) {
$scope.copy = async function (url) {
dataService.clipboard(url);
}
$scope.detailBookmark = function (b) {
$scope.detailBookmark = async function (b) {
if (!b.content) {
$scope.jumpToUrl(b.url);
return;
@ -106,7 +86,7 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
}, 10)
}
$scope.close = function () {
$scope.close = async function () {
$('.js-weixin-content').modal('setting', 'transition', dataService.animation()).modal('hide');
}
@ -134,7 +114,7 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
})
});
$scope.randomHotBookmarks = function () {
$scope.randomHotBookmarks = async function () {
var menusScope = $('div[ng-controller="menuCtr"]').scope();
var login = (menusScope && menusScope.login) || false;
if (login) {
@ -143,17 +123,16 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
var now = new Date();
var dayGap = parseInt(Math.abs(now - beginDay) / (1000 * 60 * 60 * 24)) + 1;
$scope.curDay = -(parseInt(Math.random() * 1000000) % dayGap);
getHotBookmarksbyCache();
} else {
$scope.toastrId = toastr.info('您只有先登录，才能使用查看随机热门标签', "提示");
}
}
$scope.setHoverBookmark = function (bookmark) {
$scope.setHoverBookmark = async function (bookmark) {
$scope.hoverBookmark = bookmark;
}
$scope.changeCurrentPage = function (currentPage) {
$scope.changeCurrentPage = async function (currentPage) {
currentPage = parseInt(currentPage) || 0;
console.log(currentPage);
if (currentPage <= $scope.totalPages && currentPage >= 1) {
@ -162,7 +141,7 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
}
}
$scope.getWeixinArticles = function (channelId, page) {
$scope.getWeixinArticles = async function (channelId, page) {
var menusScope = $('div[ng-controller="menuCtr"]').scope();
var login = (menusScope && menusScope.login) || false;
var index = login ? dataService.LoginIndexHot : dataService.NotLoginIndexHot;
@ -178,9 +157,6 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
$scope.totalPages = 0;
var start = (page - 1) * perPageItems;
var api = `https://api.jisuapi.com/weixinarticle/get?channelid=${channelId}&start=${start}&num=${perPageItems}&appkey=e95887468ab87d69`;
if (localStorage) {
var count = parseInt(localStorage.getItem('weixin' + key) || 1);
if (count <= $scope.maxCallCount || $scope.user.username === 'lcq') {
$.ajax({
url: api,
type: 'get',
@ -197,18 +173,9 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
error: function (json) {
$scope.loadBusy = false;
toastr.error('获取热门失败！失败原因：' + json.msg, "提示");
getHotBookmarksbyCache();
getHotBookmarksbyAPI();
}
});
localStorage.setItem('weixin' + key, count + 1)
$scope.callCount = count + 1;
} else {
getHotBookmarksbyCache();
toastr.warning('每天只允许实时调用 100 次剩下的只从缓存中获取', "提示");
}
} else {
getHotBookmarksbyCache();
}
}
function getHotBookmarksbyAPI() {
@ -242,22 +209,22 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
var b = {};
b.title = bookmark.title;
b.url = bookmark.url;
b.favicon_url = bookmark.sourceLogo || defaultFavicon;
b.created_by = bookmark.sourceName;
b.snap_url = defaultSnap;
b.faviconUrl = bookmark.sourceLogo || defaultFavicon;
b.createdBy = bookmark.sourceName;
b.snapUrl = defaultSnap;
if (bookmark.imageList.length >= 1) {
if (bookmark.imageList[0].url) {
b.snap_url = (json.data.pageNo == 1 ? (bookmark.imageList[0].url.match(alterRex) != null ? defaultSnap : bookmark.imageList[0].url) : defaultSnap);
b.snapUrl = (json.data.pageNo == 1 ? (bookmark.imageList[0].url.match(alterRex) != null ? defaultSnap : bookmark.imageList[0].url) : defaultSnap);
} else {
for (var i = 0; i < bookmark.images.length; i++) {
if (bookmark.images[i]) {
b.snap_url = bookmark.images[i];
b.snapUrl = bookmark.images[i];
break;
}
}
}
}
b.fav_count = bookmark.favCount;
b.favCount = bookmark.favCount;
b.created_at = $filter('date')(new Date(bookmark.createtime < bookmark.updatetime ? bookmark.createtime : bookmark.updatetime), "yyyy-MM-dd HH:mm:ss");
b.last_click = $filter('date')(new Date(bookmark.createtime > bookmark.updatetime ? bookmark.createtime : bookmark.updatetime), "yyyy-MM-dd HH:mm:ss");
b.id = bookmark.articleId;
@ -274,37 +241,6 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
});
}
function getHotBookmarksbyCache() {
$scope.loadBusy = true;
var date = curentDate($scope.curDay, "yyyyMMdd");
if (date < "20160715") {
toastr.info('您已将将所有的热门标签都加载完了！', "提示");
$scope.loadBusy = false;
return; // 这是最早的了。
}
var params = {
date: date,
}
bookmarkService.getHotBookmarks(params)
.then((data) => {
data.forEach((bookmark) => {
bookmark.created_at = $filter('date')(new Date(bookmark.updatetime), "yyyy-MM-dd HH:mm:ss");
bookmark.index = $scope.bookmarks.length - 1;
$scope.bookmarks.push(bookmark);
})
$scope.curDay--;
$scope.loadBusy = false;
if (data && data.length == 0) {
getHotBookmarksbyCache(); // 没有继续请求
}
})
.catch((err) => {
toastr.error("getHotBookmarksbyCache: " + JSON.stringify(err), "提示");
$scope.curDay--;
$scope.loadBusy = false;
getHotBookmarksbyCache(); // 没有继续请求
});
}
// TODO: 我要将编辑按钮固定在容器的右上角
@ -344,11 +280,11 @@ app.controller('weixinArticleCtr', ['$scope', '$state', '$sce', '$stateParams',
b.index = index;
b.title = articl.title;
b.url = articl.url;
b.favicon_url = defaultFavicon;
b.created_by = articl.weixinname;
b.faviconUrl = defaultFavicon;
b.createdBy = articl.weixinname;
b.account = articl.weixinaccount;
b.snap_url = articl.pic || defaultSnap;
b.fav_count = articl.likenum;
b.snapUrl = articl.pic || defaultSnap;
b.favCount = articl.likenum;
b.created_at = timeagoInstance.format(cdate, 'zh_CN');
b.content = articl.content
b.content = b.content.replace(/https:\/\/mmbiz.qpic.cn/gi, "http://img01.store.sogou.com/net/a/04/link?appid=100520029&url=https://mmbiz.qpic.cn")

10
www/views/search.html
View File

@ -129,7 +129,7 @@
</tr>
</thead>
<tbody>
<tr ng-repeat="bookmark in searchBookmarks" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
<tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
<td>
<img class="ui ui middle aligned mini image" ng-src="http://favicon.luchenqun.com/?url={{bookmark.favicon_url}}" err-src="./images/default.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" ng-if="searchHotBookmarks" />
<img class="ui ui middle aligned mini image" ng-src="http://favicon.luchenqun.com/?url={{bookmark.url}}" err-src="./images/default.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" ng-if="!searchHotBookmarks" />
@ -156,16 +156,16 @@
</span>
</td>
<td>
<span ng-show="bookmark.own">
<span ng-show="bookmark.userId == user.id">
<img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/delete.png" ng-click="delBookmark(bookmark)" title="删除书签" />
</span>
<span ng-show="bookmark.own">
<span ng-show="bookmark.userId == user.id">
<img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/edit-bookmark.png" ng-click="editBookmark(bookmark.id)" title="编辑书签" />
</span>
<span ng-show="!bookmark.own">
<span ng-show="bookmark.userId != user.id">
<img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/favorite.png" ng-click="favoriteBookmark(bookmark)" title="一键收藏" />
</span>
<span ng-show="!bookmark.own">
<span ng-show="bookmark.userId != user.id">
<img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/store-bookmark.png" ng-click="storeBookmark(bookmark)" title="转存到我的书签" />
</span>
<img class="ui mini spaced image" style="width:16px;height:16px;margin:0 1px" ng-src="./images/detail.png" ng-click="detailBookmark(bookmark)" title="书签详情" />

17
www/views/weixin-article.html
View File

@ -1,11 +1,8 @@
<!-- 高度至少要设置1000，元素少时才能触发滚动条事件 -->
<div class="ui segment js-hot-card js-weixin-articles">
<div class="ui container" style="cursor:default;" ng-if="callCount <= maxCallCount">
<div class="ui container" style="cursor:default;">
<div class="ui label" style="margin:3px 20px 8px 0px;cursor:default;" ng-class="{green:channel.id===channelId}" ng-repeat="channel in channels" ng-click="getWeixinArticles(channel.id, 1)">{{ channel.name }} {{ channel.total ? ('('+channel.total+')') : '' }}</div>
</div>
<div class="ui center aligned container" style="cursor:default;" ng-if="callCount > maxCallCount && (!loadBusy)">
<i class="random big link icon" title="随机刷一批" ng-click="randomHotBookmarks()"></i>
</div>
<div class="ui massive text centered inline loader js-hot-loader" style="margin: 50px 0px 120px 0px;" ng-class="{active:loadBusy, disabled:!loadBusy}">
正在加载中...
@ -20,12 +17,12 @@
</div>
</div>
<div class="image hot-image" href="{{ bookmark.url }}" style="cursor:pointer" ng-click="detailBookmark(bookmark)">
<img ng-src="{{bookmark.snap_url}}" />
<img ng-src="{{bookmark.snapUrl}}" />
</div>
<div class="extra content" ng-show="!bookmark.edit">
<img class="ui avatar image" style="width:16px;height:16px;" ng-src="{{bookmark.favicon_url}}" />
<span class="sourceName" title="{{ bookmark.created_by }}">{{ bookmark.created_by }}</span>
<span class="favCount" ng-if="bookmark.fav_count">·{{ bookmark.fav_count }}人收藏</span>
<img class="ui avatar image" style="width:16px;height:16px;" ng-src="{{bookmark.faviconUrl}}" />
<span class="sourceName" title="{{ bookmark.createdBy }}">{{ bookmark.createdBy }}</span>
<span class="favCount" ng-if="bookmark.favCount">·{{ bookmark.favCount }}人收藏</span>
<i class="ellipsis horizontal icon right floated" style="margin-top:6px;" ng-mouseover="bookmark.edit=true;"></i>
</div>
<div class="extra content" ng-show="bookmark.edit" ng-mouseleave="bookmark.edit=false;">
@ -41,7 +38,7 @@
<div class="header">{{ bookmark.title }}</div>
<div class="scrolling content js-main-content">
<div class="ui center aligned container" style="margin: 10px 0px">
<span style="color: #4383BF" title="公众号名称">{{bookmark.created_by}}</span>
<span style="color: #4383BF" title="公众号名称">{{bookmark.createdBy}}</span>
&nbsp;&nbsp;
<span title="公众号账号">{{bookmark.account}}</span>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@ -51,7 +48,7 @@
<p ng-bind-html="bookmark.content"></p>
<div class="ui divider"></div>
<div class="ui container">
<img class="ui middle aligned mini image" ng-src="{{bookmark.favicon_url}}" style="width:16px;height:16px;padding:0;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="点击跳转到原页面(如果过期，需要在微信中才能打开)" />
<img class="ui middle aligned mini image" ng-src="{{bookmark.faviconUrl}}" style="width:16px;height:16px;padding:0;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="点击跳转到原页面(如果过期，需要在微信中才能打开)" />
<span title="点击复制链接" ng-click="copy(bookmark.url)" class="urlSpan">{{bookmark.url}} </span>
</div>
<div class="ui divider"></div>