From 080001f3a60af1c46ca59dd9228f5095e832152e Mon Sep 17 00:00:00 2001
From: xmcp <xiaoyuanan2000@sina.com>
Date: Wed, 28 Nov 2018 23:30:26 +0800
Subject: [PATCH] update

add flag DISABLE_PRESSURE
improve text
fix favicon location
---
 README.md                   |  2 +-
 public/static/manifest.json |  4 ++--
 src/PressureHelper.js       | 48 +++++++++++++++++++------------------
 src/Title.js                |  1 -
 src/UserAction.js           | 19 ++++++++-------
 5 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/README.md b/README.md
index 0f40654..aefd80e 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ React 版 P大树洞，[hole.xmcp.ml](http://hole.xmcp.ml)
 - 突出显示未读树洞
 - 精确显示发帖时间
 - 复制树洞链接
-- 3D Touch 支持
+- 3D Touch 支持（可通过修改 Flag `DISABLE_PRESSURE=on` 来关闭）
 - 自定义背景图片（请修改 Flag `REPLACE_ERIRI_WITH_URL=http://...`）
 - 检测被删除的树洞（请修改 Flag `DELETION_DETECT=on`）
 - 刷树洞负关注数（请修改 Flag `STAR_BRUSH=on`）
diff --git a/public/static/manifest.json b/public/static/manifest.json
index 12b6106..2e30f76 100644
--- a/public/static/manifest.json
+++ b/public/static/manifest.json
@@ -3,12 +3,12 @@
   "name": "P大树洞（非官方）",
   "icons": [
     {
-      "src": "static/favicon/256.png",
+      "src": "/static/favicon/256.png",
       "sizes": "256x256",
       "type": "image/png"
     },
     {
-      "src": "static/favicon/192.png",
+      "src": "/static/favicon/192.png",
       "sizes": "192x192",
       "type": "image/png"
     }
diff --git a/src/PressureHelper.js b/src/PressureHelper.js
index d139da3..4391931 100644
--- a/src/PressureHelper.js
+++ b/src/PressureHelper.js
@@ -32,31 +32,33 @@ export class PressureHelper extends  Component {
     }
 
     componentDidMount() {
-        Pressure.set(document.body, {
-            change: (force)=>{
-                if(!this.state.fired) {
+        if(localStorage['DISABLE_PRESSURE']!=='on') {            
+            Pressure.set(document.body, {
+                change: (force)=>{
+                    if(!this.state.fired) {
+                        this.setState({
+                            level: force,
+                        });
+                        if(force===1)
+                            this.do_fire();
+                    }
+                },
+                end: ()=>{
                     this.setState({
-                        level: force,
+                        level: 0,
+                        fired: false,
                     });
-                    if(force===1)
-                        this.do_fire();
-                }
-            },
-            end: ()=>{
-                this.setState({
-                    level: 0,
-                    fired: false,
-                });
-            },
-        }, {
-            polyfill: false,
-            only: 'touch',
-            preventSelect: false,
-        });
-        document.body.addEventListener('selectstart',(event)=>{
-            if(this.state.level>THRESHOLD)
-                event.preventDefault();
-        });
+                },
+            }, {
+                polyfill: false,
+                only: 'touch',
+                preventSelect: false,
+            });
+            document.body.addEventListener('selectstart',(event)=>{
+                if(this.state.level>THRESHOLD)
+                    event.preventDefault();
+            });
+        }
     }
 
     render() {
diff --git a/src/Title.js b/src/Title.js
index 2de3b59..988122e 100644
--- a/src/Title.js
+++ b/src/Title.js
@@ -15,7 +15,6 @@ const HELP_TEXT=(
             <li>在搜索框输入 #472865 等可以查看指定 ID 的树洞</li>
             <li>新的帖子会在左上角显示一个圆点</li>
             <li>本网站支持 3D Touch，重压屏幕可以快速返回 / 刷新树洞</li>
-            <li>请注意：使用 HTTPS 访问本站可能会<b>大幅减慢</b>加载速度</li>
         </ul>
         <p>使用本网站时，您需要了解并同意：</p>
         <ul>
diff --git a/src/UserAction.js b/src/UserAction.js
index ce02879..f87ee24 100644
--- a/src/UserAction.js
+++ b/src/UserAction.js
@@ -69,10 +69,13 @@ export class LoginForm extends Component {
             <TokenCtx.Consumer>{(token)=>
                 <div className="login-form box">
                     <form onSubmit={(e)=>this.do_login(e,token.set_value)}>
-                        <p>{token.value ?
-                            <span><b>您已登录。</b>Token: <code>{token.value||'(null)'}</code></span> :
-                            '登录后可以使用关注、回复等功能'
-                        }</p>
+                        {token.value ?
+                            <p>
+                                <b>您已登录。</b>Token: <code>{token.value||'(null)'}</code> <br />
+                                请勿泄露 Token，它代表您的登录状态，与您的账户唯一对应且泄露后无法重置
+                            </p> :
+                            <p>'登录后可以使用关注、回复等功能'</p>
+                        }
                         <p>
                             <label>
                                 学号：
@@ -98,10 +101,10 @@ export class LoginForm extends Component {
                             }
                             <button type="button" onClick={()=>{token.set_value(null);}}>退出</button>
                         </p>
-                        <ul>
-                            <li>我们不会记录您的密码和个人信息</li>
-                            <li><b>请勿泄露 Token</b>，它代表您的登录状态，与您的账户唯一对应且泄露后无法重置</li>
-                        </ul>
+                        <p>
+                            您的密码会被发送到 PKU Helper 服务器 <br />
+                            我们不会记录您的密码和个人信息
+                        </p>
                     </form>
                 </div>
             }</TokenCtx.Consumer>