Merge branch 'master' of github.com:luchenqun/my-bookmark

README.md

@@ -31,8 +31,8 @@
 - [x] 在热门标签里面，有在网上找的热门书签。可以转存收藏到自己书签里面，快捷键R随机查看热门书签。
 - [x] 新增备忘录功能，有时候随手要做点纪录，就方便了。任意界面按快捷键A增加备忘录。双击备忘录可查看详情！
 - [x] 在设置的全局链接，可设置快捷键，用来在任何页面，快速打开设置的链接。
-- [x] 增加[Chrome插件](https://chrome.google.com/webstore/detail/%E4%B9%A6%E7%AD%BE%E5%BF%AB%E9%80%9F%E6%B7%BB%E5%8A%A0/paajmalhmjgdihaikmdfiplfmjlnkjgp)，可在任意界面快速添加书签至系统。
+- [x] 增加[Chrome插件](https://chrome.google.com/webstore/detail/%E4%B9%A6%E7%AD%BE%E5%BF%AB%E9%80%9F%E6%B7%BB%E5%8A%A0/paajmalhmjgdihaikmdfiplfmjlnkjgp)，可在任意界面快速添加书签至系统。   
-- [×] 适配手机平板，手机端请访问[m.mybookmark.cn](http://m.mybookmark.cn/)。
+- [x] 适配手机平板，手机端请访问[m.mybookmark.cn](http://m.mybookmark.cn/)。   
 
 
 4 主要用到的模块说明

public/index.html

@@ -51,7 +51,7 @@
             <div class="ui container" style="width:100%;height:10px"></div>
             <div class="foot" style="margin-bottom:10px;">
                 <div class="ui segment container">
-                    我爱佳佳与这个世界&nbsp;&nbsp;|&nbsp;&nbsp;Copyleft ©All Rights Reserved LCQ&nbsp;&nbsp;|&nbsp;&nbsp;联系我(QQ:530485521)&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://github.com/luchenqun/my-bookmark" target="_blank">网站源码</a>&nbsp;&nbsp;|&nbsp;&nbsp;V1.5.0&nbsp;&nbsp;|&nbsp;&nbsp;<span>由于使用国外服务器，如果加载失败，请按F5，你懂的！(●'◡'●)</span><br/>
+                    我爱佳佳与这个世界&nbsp;&nbsp;|&nbsp;&nbsp;Copyleft ©All Rights Reserved LCQ&nbsp;&nbsp;|&nbsp;&nbsp;<a href="http://m.mybookmark.cn/">移动设备访问</a>&nbsp;&nbsp;|&nbsp;&nbsp;联系我(QQ:530485521)&nbsp;&nbsp;|&nbsp;&nbsp;<a href="https://github.com/luchenqun/my-bookmark" target="_blank">网站源码</a>&nbsp;&nbsp;|&nbsp;&nbsp;V1.5.0&nbsp;&nbsp;|&nbsp;&nbsp;<span>加载失败，请按F5！(●'◡'●)</span><br/>
                 </div>
                 <!-- 主要用来配合clipboard.min.js复制文本的 -->
                 <div id="clipboard" data-clipboard-text="i love this world and jiajia!" style="opacity:0;cursor:default">
@@ -64,6 +64,7 @@
             <bookmarkinfo></bookmarkinfo>
         </div>
         <script src="/scripts/externe/jquery-3.1.1.min.js"></script>
+        <script src="/scripts/externe/jquery.form.js"></script>
         <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>

public/scripts/controllers/advice-controller.js

@@ -1,5 +1,9 @@
 app.controller('adviceCtr', ['$scope', '$state', '$timeout', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $timeout, bookmarkService, pubSubService, dataService) {
     console.log("Hello adviceCtr");
+    if(dataService.smallDevice()){
+        $window.location = "http://m.mybookmark.cn/#/tags";
+        return;
+    }
     var maxSelections = 3;
 
     $scope.comment = '';

public/scripts/controllers/bookmarks-controller.js

@@ -1,7 +1,6 @@
 app.controller('bookmarksCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello bookmarksCtr...", $stateParams);
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
         $window.location = "http://m.mybookmark.cn/#/tags";
         return;
     }

public/scripts/controllers/home-controller.js

@@ -1,9 +1,7 @@
 app.controller('homeCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $stateParams, $filter, $state, $window, bookmarkService, pubSubService, dataService) {
     console.log('Hello homeCtr......');
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
+        $window.location = "http://m.mybookmark.cn/#/tags";
-        toastr.success(JSON.stringify(browser), "提示");
-        $window.location = "http://m.mybookmark.cn";
         return;
     }
     bookmarkService.autoLogin()

public/scripts/controllers/hot-controller.js

@@ -1,7 +1,6 @@
 app.controller('hotCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello hotCtr...");
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
         $window.location = "http://m.mybookmark.cn/#/tags";
         return;
     }

public/scripts/controllers/login-controller.js

@@ -1,8 +1,7 @@
 app.controller('loginCtr', ['$scope', '$filter', '$state', '$cookieStore', '$window', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $filter, $state, $cookieStore, $window, bookmarkService, pubSubService, dataService) {
     console.log("Hello loginCtr...", $cookieStore.get("username"));
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
+        $window.location = "http://m.mybookmark.cn/#/tags";
-        $window.location = "http://m.mybookmark.cn/#/login";
         return;
     }
 

public/scripts/controllers/menus-controller.js

@@ -156,6 +156,16 @@ app.controller('menuCtr', ['$scope', '$stateParams', '$state', '$window', '$time
         });
     }
 
+    $scope.coffee = function () {
+        $state.go('settings', {
+            formIndex: 6,
+        });
+        pubSubService.publish('Common.menuActive', {
+            login: true,
+            index: dataService.LoginIndexSettings
+        });
+    }
+
     function updateMenuActive(index) {
         $('.ui.menu a.item').removeClass('selected');
         $('.ui.menu a.item:eq(' + index + ')').addClass('selected');

public/scripts/controllers/note-controller.js

@@ -1,8 +1,7 @@
 app.controller('noteCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello noteCtr...", $stateParams);
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
+        $window.location = "http://m.mybookmark.cn/#/tags";
-        $window.location = "http://m.mybookmark.cn/#/note";
         return;
     }
 

public/scripts/controllers/praise-controller.js

@@ -1,6 +1,9 @@
 app.controller('praiseCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello praiseCtr...", $stateParams);
-
+    if(dataService.smallDevice()){
+        $window.location = "http://m.mybookmark.cn/#/tags";
+        return;
+    }
     bookmarkService.autoLogin()
         .then((data) => {
             var login = data.logined;

public/scripts/controllers/search-controller.js

@@ -1,8 +1,7 @@
 app.controller('searchCtr', ['$scope', '$state', '$stateParams', '$filter', '$window', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $state, $stateParams, $filter, $window, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello searchCtr...", $stateParams);
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
+        $window.location = "http://m.mybookmark.cn/#/tags";
-        $window.location = "http://m.mybookmark.cn/#/search";
         return;
     }
 

public/scripts/controllers/settings-controller.js

@@ -1,13 +1,12 @@
 app.controller('settingsCtr', ['$scope', '$stateParams', '$filter', '$state', '$window', '$timeout', 'bookmarkService', 'pubSubService', 'dataService', function($scope, $stateParams, $filter, $state, $window, $timeout, bookmarkService, pubSubService, dataService) {
     console.log('Hello settingsCtr......', $stateParams);
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
+        $window.location = "http://m.mybookmark.cn/#/tags";
-        $window.location = "http://m.mybookmark.cn/#/settings";
         return;
     }
 
     $scope.forbidQuickKey = dataService.forbidQuickKey
-    $scope.form = [false, false, false, false, false, false];
+    $scope.form = [false, false, false, false, false, false, false];
     $scope.passwordOrgin = "";
     $scope.passwordNew1 = "";
     $scope.passwordNew2 = "";

public/scripts/controllers/tags-controller.js

@@ -1,7 +1,6 @@
 app.controller('tagsCtr', ['$scope', '$filter', '$window', '$stateParams', '$timeout', '$document', 'ngDialog', 'bookmarkService', 'pubSubService', 'dataService', function ($scope, $filter, $window, $stateParams, $timeout, $document, ngDialog, bookmarkService, pubSubService, dataService) {
     console.log("Hello tagsCtr...", $stateParams);
-    var browser = dataService.browser();
+    if(dataService.smallDevice()){
-    if(browser.mobile && !browser.iPad){
         $window.location = "http://m.mybookmark.cn/#/tags";
         return;
     }

public/scripts/services/data-service.js

@@ -33,9 +33,6 @@ app.factory('dataService', [function() {
         }, {
             uiSref: 'advice',
             title: '留言'
-        }, {
-            uiSref: 'praise',
-            title: '咖啡'
         }],
         notLoginMenus: [{
             uiSref: '/',
@@ -133,10 +130,10 @@ app.factory('dataService', [function() {
             $("#clipboard").attr("data-clipboard-text", text);
             document.getElementById("clipboard").click();
         },
-        browser: function() {
+        smallDevice: function() {
-            var u = navigator.userAgent,
+            var u = navigator.userAgent;
-                app = navigator.appVersion;
+            var app = navigator.appVersion;
-            return { //移动终端浏览器版本信息
+            var device = { //移动终端浏览器版本信息
                 trident: u.indexOf('Trident') > -1, //IE内核
                 presto: u.indexOf('Presto') > -1, //opera内核
                 webKit: u.indexOf('AppleWebKit') > -1, //苹果、谷歌内核
@@ -148,6 +145,12 @@ app.factory('dataService', [function() {
                 iPad: u.indexOf('iPad') > -1, //是否iPad
                 webApp: u.indexOf('Safari') == -1 //是否web应该程序，没有头部与底部
             };
+
+            if((device.mobile && !device.iPad) || (screen && screen.availWidth < 768)){
+                return true;
+            }
+
+            return false;
         }
     };
 

public/views/bookmarks.html

@@ -30,10 +30,10 @@
                             id="{{bookmark.id}}">
                             <img
                                 class="ui ui middle aligned tiny image bookmarkInfo"
-                                ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}"
+                                ng-src="./images/favicon/{{bookmark.id}}.ico"
                                 style="width:16px;height:16px;"
                                 ng-click="detailBookmark(bookmark);$event.stopPropagation()"
-                                favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                                favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}">
                             <span>{{ bookmark.title}}</span>
                         </div>
                     </div>
@@ -66,10 +66,10 @@
             id="{{bookmark.id}}">
             <img
                 class="ui ui middle aligned tiny image bookmarkInfo"
-                ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}"
+                ng-src="./images/favicon/{{bookmark.id}}.ico"
                 style="width:16px;height:16px;"
                 ng-click="detailBookmark(bookmark);$event.stopPropagation()"
-                favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}">
             <span>{{ bookmark.title}}</span>
         </div>
     </div>
@@ -89,7 +89,7 @@
     <tbody>
         <tr ng-repeat="bookmark in bookmarks" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
             <td>
-                <img class="ui ui middle aligned tiny image" ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                <img class="ui ui middle aligned tiny image" ng-src="./images/favicon/{{bookmark.id}}.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}">
                 <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
                     {{ bookmark.title }}
                 </span>
@@ -142,7 +142,7 @@
             </div>
             <div class="extra content" ng-show="!bookmark.edit" style="height:50px;padding-right:2px;padding-left:8px;">
                 <span class="left floated like" style="margin-top:6px;">
-                    <img class="ui ui middle aligned tiny image" ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                    <img class="ui ui middle aligned tiny image" ng-src="./images/favicon/{{bookmark.id}}.ico" style="width:16px;height:16px;cursor:pointer;" ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}">
                     创建于:
                     <span title="{{bookmark.created_at}}" class="need_to_be_rendered" data-timeago="{{bookmark.created_at}}"></span>
                     <!-- {{ bookmark.created_at }} -->

public/views/menus.html

@@ -13,12 +13,6 @@
                             <label>导航</label>
                         </div>
                     </div>
-                    <!-- <div class="field item js-field-costomTag" ng-click="updateShowStyle('costomTag')">
-                        <div class="ui radio checkbox js-radio-costomTag">
-                            <input type="radio" name="costomTag-style">
-                            <label>标签</label>
-                        </div>
-                    </div> -->
                     <div class="field item js-field-table" ng-click="updateShowStyle('table')">
                         <div class="ui radio checkbox js-radio-table">
                             <input type="radio" name="show-style">
@@ -82,6 +76,11 @@
                     <i class="info circle icon"></i>
                 </span>
             </div>
+            <div class="item" style="padding:0 8px 0 13px;" ng-click="coffee()">
+                <span data-tooltip="请我喝杯咖啡">
+                    <i class="coffee icon"></i>
+                </span>
+            </div>
         </div>
     </div>
     <div class="ui huge menu js-not-login-in" ng-if="!login">

public/views/search.html

@@ -142,10 +142,10 @@
                     ng-if="searchHotBookmarks">
                 <img
                     class="ui ui middle aligned mini image"
-                    ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}"
+                    ng-src="./images/favicon/{{bookmark.id}}.ico"
                     style="width:16px;height:16px;cursor:pointer;"
                     ng-click="jumpToUrl(bookmark.url, bookmark.id)"
-                    favicon-err="./images/favicon/{{bookmark.id}}.ico"
+                    favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}"
                     ng-if="!searchHotBookmarks">
                 <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
                     {{ bookmark.title }}

public/views/settings.html

@@ -14,6 +14,8 @@
                 </a>
                 <a class="item" ng-class="{active:form[5]}" ng-click="changeForm(5)">更新日志
                 </a>
+                <a class="item" ng-class="{active:form[6]}" ng-click="changeForm(6)">请喝咖啡
+                </a>
             </div>
         </div>
         <div class="twelve wide stretched column">
@@ -214,6 +216,44 @@
                     更早日志
                 </button>
             </div>
+            <div class="ui container js-p-info" ng-show="form[6]">
+                <h3 class="ui dividing header">赞赏说明</h3>
+                <p>赞赏金额主要用于服务器的租用与域名的费用，对于赞赏有以下几点说明：</p>
+                <p>1、目前租用的服务器Vultr，每月5$，折合人名币大概35元/月。如果有新用户想购买Vultr服务器的，可以点击<a href="http://www.vultr.com/?ref=6902013" target="_blank">链接</a>进行购买，这样你我将都能得到10$。域名mybookmark.cn我花151元买了五年，2021年11月份到期。</p>
+                <p>2、由于目前的服务器在国外，导致有时候访问比较慢，如果赞赏金融余额能支撑起在国内租用服务器费用，将在国内租用一个服务器，以提高访问速度。如果有能提供国内免费服务器的更佳！</p>
+                <p>3、对于开发计划，优先开发赞赏用户提出的需求，当然需要我自己同意加入开发计划。</p>
+                <p>4、赞赏用户的一些其他特权（暂未开发），如：可以自定义网站背景，可自定义更多的分类（目前上限为30个）。</p>
+                <p>5、赞赏转账的时候，请留言至少添加“书签赞赏”这四个汉字，以供我做区分。赞赏之后我会及时将赞赏信息更新到网站上，如果有遗漏，可联系我微信QQ530485521或者在留言版块说明。</p>
+                <h3 class="ui dividing header">赞赏二维码</h3>
+                <div class="ui grid">
+                    <div class="one wide column"></div>
+                    <div class="five wide column">微信<img class="ui rounded left floated medium image" src="./images/wx.png"></div>
+                    <div class="two wide column"></div>
+                    <div class="five wide column">支付宝<img class="ui rounded right floated medium image" src="./images/zfb.png"></div>
+                    <div class="one wide column"></div>
+                </div>
+                <h3 class="ui dividing header">赞赏排行版</h3>
+                <table class="ui selectable celled table">
+                    <thead>
+                        <tr>
+                            <th>用户</th>
+                            <th>昵称</th>
+                            <th>赞赏日期</th>
+                            <th>赞赏金融(人民币)</th>
+                            <th>留言说明</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <tr>
+                            <td>lcq</td>
+                            <td>泥巴</td>
+                            <td>2017-03-01 12:03:08</td>
+                            <td>210</td>
+                            <td>本人用于服务器租用</td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
         </div>
     </div>
 </div>

public/views/tags.html

@@ -85,8 +85,8 @@
     <tbody>
         <tr ng-repeat="bookmark in bookmarksByTag" id="{{ bookmark.id }}" ng-mouseover="setHoverBookmark(bookmark)" ng-mouseleave="setHoverBookmark(null)">
             <td>
-                <img class="ui ui middle aligned tiny image" ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}" style="width:16px;height:16px;cursor:pointer;"
+                <img class="ui ui middle aligned tiny image" ng-src="./images/favicon/{{bookmark.id}}.ico" style="width:16px;height:16px;cursor:pointer;"
-                    ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                    ng-click="jumpToUrl(bookmark.url, bookmark.id)" favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}">
                 <span ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{bookmark.title}}" style="cursor:pointer;">
                     {{ bookmark.title }}
                 </span>
@@ -129,8 +129,8 @@
         <div ng-repeat="bookmark in bookmarksByTag" class="column js-costomTag-item" ng-class="{bookmarkNormalHover:bookmarkNormalHover, bookmark:(!bookmarkNormalHover)}"
             ng-mouseover="bookmarkNormalHover=true; setHoverBookmark(bookmark)" ng-mouseleave="bookmarkNormalHover=false; setHoverBookmark(null)"
             ng-click="jumpToUrl(bookmark.url, bookmark.id)" title="{{ bookmark.title }}" id="{{bookmark.id}}">
-            <img class="ui ui middle aligned tiny image bookmarkInfo" ng-src="http://45.32.69.126:3000/?url={{bookmark.url}}" style="width:16px;height:16px;"
+            <img class="ui ui middle aligned tiny image bookmarkInfo" ng-src="./images/favicon/{{bookmark.id}}.ico" style="width:16px;height:16px;"
-                ng-click="detailBookmark(bookmark);$event.stopPropagation()" favicon-err="./images/favicon/{{bookmark.id}}.ico">
+                ng-click="detailBookmark(bookmark);$event.stopPropagation()" favicon-err="http://45.32.69.126:3000/?url={{bookmark.url}}">
             <span>{{ bookmark.title}}</span>
         </div>
     </div>