From 417dbc22f8fadde1d5abd36bdc827b4ba283b3b6 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Fri, 9 Dec 2022 13:19:36 +0800
Subject: [PATCH 01/72] highlight.js: fix Bug 522.

---
 app/static/js/highlight.js | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
index 1003918..1922c57 100644
--- a/app/static/js/highlight.js
+++ b/app/static/js/highlight.js
@@ -31,7 +31,17 @@ function highLight() {
         list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符
         if (list[i] !== "" && "<mark>".indexOf(list[i]) === -1 && "</mark>".indexOf(list[i]) === -1) {
 	    //将文章中所有出现该单词word的地方改为：" <mark>" + word + "<mark> "。 正则表达式RegExp()中，"\\s"代表单词前后必须要有空格，以防止只对单词中的部分字符高亮的情况出现。
-            articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " <mark>" + list[i] + "</mark> ");
+            let articleContent_fb = articleContent;  //文章副本
+            while(articleContent_fb.toLowerCase().indexOf(list[i]) !== -1){
+                //针对同一篇文章中可能存在相同单词的不同大小写问题，采用while循环判断副本中是否还存在匹配单词。
+
+                //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。
+                list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i]),list[i].length);
+
+                articleContent_fb = articleContent_fb.replace(new RegExp("\\s"+list[i]+"\\s","g"),""); //删除副本中和list[i]匹配的单词
+
+                articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " <mark>" + list[i] + "</mark> ");
+            }
         }
     }
     document.getElementById("article").innerHTML = articleContent;

From c76d4f21ecc26f81cd23e9a95e2ff45c9106ac3b Mon Sep 17 00:00:00 2001
From: xujiahui <1419417159@qq.com>
Date: Tue, 13 Dec 2022 15:40:17 +0800
Subject: [PATCH 02/72] SPM2022F-CONTRIBUTORS-XieQiuHan

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ec92598..71f82e4 100644
--- a/README.md
+++ b/README.md
@@ -180,5 +180,6 @@ Demo video link: https://b23.tv/QuB77m
 
 Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
 
+小组：谢秋涵
 
-*Last modified on 2021-10-17*
\ No newline at end of file
+*Last modified on 2021-10-17*

From 3bce4506203831ff5d8a0d494633798c6d227c12 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 15 Dec 2022 10:50:04 +0800
Subject: [PATCH 03/72] =?UTF-8?q?=E9=BB=84=E5=AD=90=E7=9D=BF:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=20'Otherwise,'=20=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=AB=98=E4=BA=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E5=8D=B3=20Otherwise=20=E5=90=8E=E9=9D=A2=E8=B7=9F?=
 =?UTF-8?q?=E4=BA=86=E4=B8=AA=E9=80=97=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/static/js/highlight.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
index 1922c57..13b9865 100644
--- a/app/static/js/highlight.js
+++ b/app/static/js/highlight.js
@@ -30,17 +30,22 @@ function highLight() {
     for (let i = 0; i < list.length; ++i) {
         list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); //消除单词两边的空字符
         if (list[i] !== "" && "<mark>".indexOf(list[i]) === -1 && "</mark>".indexOf(list[i]) === -1) {
-	    //将文章中所有出现该单词word的地方改为：" <mark>" + word + "<mark> "。 正则表达式RegExp()中，"\\s"代表单词前后必须要有空格，以防止只对单词中的部分字符高亮的情况出现。
+           //将文章中所有出现该单词word的地方改为："<mark>" + word + "<mark>"。 正则表达式RegExp()中，"\\b"代表单词边界匹配。
+
+            //修改代码
             let articleContent_fb = articleContent;  //文章副本
-            while(articleContent_fb.toLowerCase().indexOf(list[i]) !== -1){
+            let count = 1000;  //简单计数器，防止陷入死循环。
+            while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){
                 //针对同一篇文章中可能存在相同单词的不同大小写问题，采用while循环判断副本中是否还存在匹配单词。
 
+                count--;
+                if(count <= 0)break;   //TimeOut!
+
                 //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。
-                list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i]),list[i].length);
+                list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()),list[i].length);
 
-                articleContent_fb = articleContent_fb.replace(new RegExp("\\s"+list[i]+"\\s","g"),""); //删除副本中和list[i]匹配的单词
-
-                articleContent = articleContent.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " <mark>" + list[i] + "</mark> ");
+                articleContent_fb = articleContent_fb.replace(list[i],""); //删除副本中和list[i]匹配的单词
+                articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"<mark>" + list[i] + "</mark>");
             }
         }
     }

From 74eccfbebd04899a08ff5d3ab56d41c0e83808bf Mon Sep 17 00:00:00 2001
From: xujiahui <1419417159@qq.com>
Date: Tue, 20 Dec 2022 19:55:02 +0800
Subject: [PATCH 04/72] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                       |  2 --
 app/templates/userpage_get.html | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 71f82e4..bdf08ef 100644
--- a/README.md
+++ b/README.md
@@ -180,6 +180,4 @@ Demo video link: https://b23.tv/QuB77m
 
 Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
 
-小组：谢秋涵
-
 *Last modified on 2021-10-17*
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 9e3891b..7d8f981 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -17,10 +17,19 @@
             <script src="{{ js }}"></script>
         {% endfor %}
     {% endif %}
+    <script type="text/javascript">
+	function fresh(){
+	    try{
+	        document.getElementById('rv').click();
+	    }
+	    catch{
 
+	    }
+	}
+    </script>
     <title>EnglishPal Study Room for {{ username }}</title>
 </head>
-<body>
+<body onload="fresh()">
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
         <a class="btn btn-secondary" href="/logout" role="button">退出</a>
@@ -29,6 +38,11 @@
     {{ flashed_messages|safe }}
 
     <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>    
+    {% if session.get('articleID') == session.get('old_articleID') %}
+        {% if session.get('old_articleID') != None %}
+            <a class="btn btn-success" href="/{{ username }}/reset" role="button" id="rv"> 出bug了 </a>
+        {% endif%}
+    {% endif %}
     {% if session.get('articleID') != session.get('old_articleID') %}
         {% if session.get('old_articleID') != None %}
             <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>

From 0209548896d0dbbcfae95b0836306f5c1e0ed2f6 Mon Sep 17 00:00:00 2001
From: yugaoxiang <jiangyuan@quseit.com>
Date: Sat, 31 Dec 2022 18:25:13 +0800
Subject: [PATCH 05/72] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BD=9C=E4=B8=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/main.py                     |  74 ++++++++++++++++++++-
 app/templates/admin_index.html  | 112 ++++++++++++++++++++++++++++++++
 app/templates/mainpage_get.html |   4 +-
 app/templates/userpage_get.html |   1 +
 4 files changed, 188 insertions(+), 3 deletions(-)
 create mode 100644 app/templates/admin_index.html

diff --git a/app/main.py b/app/main.py
index e311bb0..bcbd3f8 100644
--- a/app/main.py
+++ b/app/main.py
@@ -5,7 +5,7 @@
 # Copyright 2019 (C) Hui Lan <hui.lan@cantab.net>
 # Written permission must be obtained from the author for commercial uses.
 ###########################################################################
-
+from datetime import datetime
 from flask import escape
 from Login import *
 from Article import *
@@ -102,6 +102,78 @@ def mainpage():
                                d_len=d_len, lst=lst, yml=Yaml.yml)
 
 
+def insert_article(content, source='manual_input', level=5, question=''):
+    sql = f"INSERT into article (text,source, date, level, question) VALUES " \
+          f"('{content}','{source}','{datetime.now().strftime('%Y-%m-%d')}', '{level}', '{question}');"
+    print(sql)
+    rq = RecordQuery('./static/wordfreqapp.db')
+    rq.instructions(sql)
+    rq.do()
+
+
+def get_articles():
+    sql = f"SELECT * from article order by -article_id;"
+    rq = RecordQuery('./static/wordfreqapp.db')
+    rq.instructions(sql)
+    rq.do()
+    result = rq.get_results()
+    return result
+
+
+def get_users():
+    sql = f"SELECT * from user;"
+    rq = RecordQuery('./static/wordfreqapp.db')
+    rq.instructions(sql)
+    rq.do()
+    result = rq.get_results()
+    return result
+
+
+def update_user_password(username, password='123456'):
+    password = md5(username + password)
+    sql = f"UPDATE user SET password='{password}' where name='{username}';"
+    rq = RecordQuery('./static/wordfreqapp.db')
+    rq.instructions(sql)
+    rq.do()
+
+
+@app.route("/admin", methods=['GET', 'POST'])
+def admin():
+    '''
+    '''
+    # 未登录，跳转到未登录界面
+    if not session.get('logged_in'):
+        return render_template('not_login.html')
+
+    # 获取session里的用户名
+    username = session.get('username')
+
+    context = {
+        # 'user': request.user,
+        'text_list': get_articles(),
+        'user_list': get_users(),
+        'username': username
+    }
+    if request.method == 'GET':
+        return render_template('admin_index.html', **context)
+    else:
+        data = request.form
+        content = data.get('content')
+        source = data.get('source', '')
+        question = data.get('question', '')
+        username = data.get('username')
+        if content:
+            insert_article(
+                content=content,
+                source=source,
+                question=question
+            )
+            context['text_list'] = get_articles()
+        if username:
+            update_user_password(username)
+        return render_template('admin_index.html', **context)
+
+
 
 if __name__ == '__main__':
     '''
diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
new file mode 100644
index 0000000..be88556
--- /dev/null
+++ b/app/templates/admin_index.html
@@ -0,0 +1,112 @@
+<html>
+
+<head>
+    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet"
+          integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+
+</head>
+
+<body class="container" style="width: 800px; margin: auto; margin-top:24px;">
+<nav class="navbar navbar-expand-lg bg-light">
+    <div class="container-fluid">
+        <a class="navbar-brand" href="#">你好 {{ username }}</a>
+        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
+                aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+        </button>
+        <div class="collapse navbar-collapse" id="navbarNav">
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <a class="nav-link" href="/logout">退出登录</a>
+                </li>
+            </ul>
+        </div>
+    </div>
+</nav>
+
+<div class="card" style="margin-top:24px;">
+    <h5>重置选中用户密码</h5>
+    <form action="" method="post" class="container mb-3">
+        <div class="mb-3">
+            <label for="exampleInputEmail1" class="form-label">用户</label>
+            <select
+                    id="username"
+                    name="username"
+                    class="form-select"
+                    aria-label="Default select example">
+              <option selected>选择用户</option>
+                {% for user in user_list %}
+                    <option value="{{ user['name'] }}">{{ user['name'] }}</option>
+                {% endfor %}
+
+            </select>
+        </div>
+
+        <input type="submit" value="重置密码为：123456" class="btn btn-primary">
+    </form>
+</div>
+
+<div class="card" style="margin-top:24px;">
+    {% if tips %}
+        <div class="alert alert-success" role="alert">
+            {{ tips }}
+        </div>
+    {% endif %}
+
+    <div class="card-content">
+        <h5>录入文章</h5>
+        <form action="" method="post" class="container mb-3">
+            <div class="mb-3">
+                <label for="exampleInputEmail1" class="form-label">文章内容</label>
+                <textarea
+                        id="content"
+                        name="content"
+                        class="form-control"
+                        placeholder="请输入文章内容"
+                ></textarea>
+                <label for="exampleInputEmail1" class="form-label">文章来源</label>
+
+                <textarea
+                        id="source"
+                        name="source"
+                        class="form-control"
+                        placeholder="请输入来源"
+                ></textarea>
+                <label for="exampleInputEmail1" class="form-label">文章问题</label>
+
+                <textarea
+                        id="question"
+                        name="question"
+                        class="form-control"
+                        placeholder="请输入问题"
+                ></textarea>
+            </div>
+
+            <input type="submit" value="保存" class="btn btn-primary">
+        </form>
+    </div>
+</div>
+
+<div class="card" style="margin-top:24px;">
+        <h5>文章列表</h5>
+    <div class="list-group">
+        {% for text in text_list %}
+            <div class="list-group-item list-group-item-action" aria-current="true">
+                <div class="d-flex w-100 justify-content-between">
+                    <h5 class="mb-1">{{ text['source'] }}</h5>
+                    <small>Date:{{ text['date'] }} Level:{{ text['level'] }}</small>
+                </div>
+                <p class="mb-1">{{ text['text'] }}</p>
+            </div>
+        {% endfor %}
+
+    </div>
+</div>
+
+
+
+</body>
+
+</html>
+
+
diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html
index cbb51a6..4cc4417 100644
--- a/app/templates/mainpage_get.html
+++ b/app/templates/mainpage_get.html
@@ -23,9 +23,9 @@
     <div class="container-fluid">
         <p><b><font size="+3" color="red">English Pal - Learn English smartly!</font></b></p>
         {% if session['logged_in'] %}
-            <a href="/{{session['username']}}">{{session['username']}}</a></p>
+            <a href="/{{session['username']}}">{{session['username']}}</a> <a href="/admin">管理</a></p>
         {% else %}
-            <p><a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
+            <p><a href="/admin">管理</a> <a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
             <p><b>{{random_ads|safe}}</b></p>
         {% endif %}
         <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{number_of_essays}} </span> 篇</div>
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 24bff60..863d2e4 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -23,6 +23,7 @@
 <body>
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
+        <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
         <a class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
     </p>

From 43bd0bd09d3c345e52262ad2a3bfb58e83a39858 Mon Sep 17 00:00:00 2001
From: yugaoxiang <jiangyuan@quseit.com>
Date: Sun, 1 Jan 2023 22:05:32 +0800
Subject: [PATCH 06/72] update requirement.txt

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2746a3b..8552794 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-Flask==1.1.2
+Flask==2.1.0
 selenium==3.141.0
 PyYAML~=6.0

From 93390374ad3e67568c3a2ce5376f683734516a0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Tue, 21 Feb 2023 20:05:48 +0800
Subject: [PATCH 07/72] =?UTF-8?q?=E6=A0=87=E6=B3=A8=E4=B9=8B=E5=89=8D?=
 =?UTF-8?q?=E9=98=9F=E4=BC=8D=E7=9A=84=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/userpage_get.html | 42 +++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 7d8f981..ee9a7f0 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -17,18 +17,21 @@
             <script src="{{ js }}"></script>
         {% endfor %}
     {% endif %}
-    <script type="text/javascript">
-	function fresh(){
-	    try{
-	        document.getElementById('rv').click();
-	    }
-	    catch{
 
-	    }
-	}
+{#     // add !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  #}
+    <script type="text/javascript">
+        function fresh() {
+            try {
+                document.getElementById('rv').click();
+            } catch {
+
+            }
+        }
     </script>
+{#     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #}
     <title>EnglishPal Study Room for {{ username }}</title>
 </head>
+{#   original code: <body>  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #}
 <body onload="fresh()">
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
@@ -37,17 +40,19 @@
     </p>
     {{ flashed_messages|safe }}
 
-    <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>    
+    <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
+{#  add code !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  #}
     {% if session.get('articleID') == session.get('old_articleID') %}
         {% if session.get('old_articleID') != None %}
             <a class="btn btn-success" href="/{{ username }}/reset" role="button" id="rv"> 出bug了 </a>
-        {% endif%}
+        {% endif %}
     {% endif %}
     {% if session.get('articleID') != session.get('old_articleID') %}
         {% if session.get('old_articleID') != None %}
             <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
-        {% endif%}
+        {% endif %}
     {% endif %}
+{# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  #}
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">{{ today_article|safe }}</div>
@@ -60,9 +65,9 @@
             <div class="sliderValue">
                 <span id="rangeValue">1×</span>
             </div>
-        <input type="range" id="rangeComponent" min="0.5" max="2" value="1" step="0.25" "/>
+            <input type="range" id="rangeComponent" min="0.5" max="2" value="1" step="0.25" "/>
         </div>
-    </div>    
+    </div>
     <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
     <form method="post" action="/{{ username }}">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
@@ -88,8 +93,9 @@
             {% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
                 <a name="aaa"></a>
             {% endif %}
-            <p id='p_{{ word }}' class="new-word" >
-                <a id="word_{{ word }}"  class="btn btn-light" href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
+            <p id='p_{{ word }}' class="new-word">
+                <a id="word_{{ word }}" class="btn btn-light"
+                   href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
                    role="button">{{ word }}</a>
                 ( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
                 <a class="btn btn-success" onclick="familiar('{{ word }}')" role="button">熟悉</a>
@@ -109,9 +115,9 @@
 </body>
 <style>
     mark {
-    color: #{{ yml['highlight']['color'] }};
-    background-color: rgba(0,0,0,0);
-}
+        color: #{{ yml['highlight']['color'] }};
+        background-color: rgba(0, 0, 0, 0);
+    }
 </style>
 
 </html>

From 944c931c9b65d6f566a365d78f4bc3f214861c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Wed, 8 Mar 2023 16:33:13 +0800
Subject: [PATCH 08/72] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E5=AF=B9bug50?=
 =?UTF-8?q?9=E7=9A=84=E4=BF=AE=E5=A4=8D=EF=BC=8C=E4=BB=A5=E5=8F=8A?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E9=A1=B9=E7=9B=AE=EF=BC=88=E5=8E=BB=E6=8E=89?=
 =?UTF-8?q?=E4=BA=86=E4=B8=9A=E5=8A=A1=E4=B8=AD=E7=9A=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E8=84=9A=E6=9C=AC=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py                  | 73 +++++++++++++++------------------
 app/account_service.py          | 57 +++++--------------------
 app/main.py                     |  3 +-
 app/templates/login.html        | 37 +++++++++++++----
 app/templates/mainpage_get.html |  2 +-
 app/templates/reset.html        | 45 ++++++++++++++++----
 app/templates/signup.html       | 51 ++++++++++++++++++++---
 app/templates/userpage_get.html | 59 ++++++++++++++------------
 app/user_service.py             | 28 +++++--------
 9 files changed, 199 insertions(+), 156 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index 04a32ea..707ad91 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -32,12 +32,14 @@ def get_article_body(s):
     return '\n'.join(lst)
 
 
-def get_today_article(user_word_list, articleID):
+def get_today_article(user_word_list, existing_articles):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    if articleID == None:
+    if existing_articles is None:
+        existing_articles = [0, []]  # existing_articles[0]：为existing_articles[1]的索引；existing_articles[1]:之前显示文章的id列表，越后越新
+    if existing_articles[0] > len(existing_articles[1])-1:
         rq.instructions("SELECT * FROM article")
     else:
-        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (articleID))
+        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles[1][existing_articles[0]]))
     rq.do()
     result = rq.get_results()
     random.shuffle(result)
@@ -50,33 +52,39 @@ def get_today_article(user_word_list, articleID):
     d = {}
     d_user = load_freq_history(user_word_list)
     user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
-    random.shuffle(result)  # shuffle list
-    d = random.choice(result)
-    text_level = text_difficulty_level(d['text'], d3)
-    if articleID == None:
+    text_level = 0
+    flag = False
+    if existing_articles[0] > len(existing_articles[1])-1:  # 下一篇
         for reading in result:
             text_level = text_difficulty_level(reading['text'], d3)
             factor = random.gauss(0.8,
                                   0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            if within_range(text_level, user_level, (8.0 - user_level) * factor):
+            if within_range(reading['article_id'] not in existing_articles[1] and text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                 d = reading
+                existing_articles[1].append(d['article_id'])  # 列表添加新的文章id；下面进行
+                flag = True
                 break
+    else:  # 上一篇
+        d = random.choice(result)
+        text_level = text_difficulty_level(d['text'], d3)
+        flag = True
 
-    s = '<div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success">%4.2f</span>  and we have chosen an article with a difficulty level of <span class="badge bg-success">%4.2f</span> for you.</div>' % (
-        user_level, text_level)
-    s += '<p class="text-muted">Article added on: %s</p>' % (d['date'])
-    s += '<div class="p-3 mb-2 bg-light text-dark">'
-    article_title = get_article_title(d['text'])
-    article_body = get_article_body(d['text'])
-    s += '<p class="display-5">%s</p>' % (article_title)
-    s += '<p class="lead"><font id="article" size=2>%s</font></p>' % (article_body)
-    s += '<p><small class="text-muted">%s</small></p>' % (d['source'])
-    s += '<p><b>%s</b></p>' % (get_question_part(d['question']))
-    s = s.replace('\n', '<br/>')
-    s += '%s' % (get_answer_part(d['question']))
-    s += '</div>'
-    session['articleID'] = d['article_id']
-    return s
+    today_article = None
+    if flag:
+        today_article = {
+            "user_level": '%4.2f' % user_level,
+            "text_level": '%4.2f' % text_level,
+            "date": d['date'],
+            "article_title": get_article_title(d['text']),
+            "article_body": get_article_body(d['text']),
+            "source": d["source"],
+            "question": get_question_part(d['question']),
+            "answer": get_answer_part(d['question'])
+        }
+    else:
+        existing_articles[0] -= 1
+
+    return existing_articles, today_article
 
 
 def load_freq_history(path):
@@ -116,21 +124,4 @@ def get_answer_part(s):
             flag = 1
         elif flag == 1:
             result.append(line)
-    # https://css-tricks.com/snippets/javascript/showhide-element/
-    js = '''
-<script type="text/javascript">
-
-    function toggle_visibility(id) {
-       var e = document.getElementById(id);
-       if(e.style.display == 'block')
-          e.style.display = 'none';
-       else
-          e.style.display = 'block';
-    }
-</script>
-    '''
-    html_code = js
-    html_code += '\n'
-    html_code += '<button onclick="toggle_visibility(\'answer\');">ANSWER</button>\n'
-    html_code += '<div id="answer" style="display:none;">%s</div>\n' % ('\n'.join(result))
-    return html_code
\ No newline at end of file
+    return '\n'.join(result)
\ No newline at end of file
diff --git a/app/account_service.py b/app/account_service.py
index 9b1c46b..c1bd64c 100644
--- a/app/account_service.py
+++ b/app/account_service.py
@@ -19,21 +19,15 @@ def signup():
         # POST方法需判断是否注册成功，再根据结果返回不同的内容
         username = escape(request.form['username'])
         password = escape(request.form['password'])
-        password2 = escape(request.form['password2'])
         
         #! 添加如下代码为了过滤注册时的非法字符
         warn = WarningMessage(username)
         if str(warn) != 'OK':
-            return str(warn)
+            return jsonify({'status': '3', 'warn': str(warn)})
         
         available = check_username_availability(username)
         if not available: # 用户名不可用
-            flash('用户名 %s 已经被注册。' % (username))
-            return render_template('signup.html')
-        elif len(password.strip()) < 4: # 密码过短
-            return '密码过于简单。'
-        elif password != password2:
-            return '确认密码与输入密码不一致！'
+            return jsonify({'status': '0'})
         else: # 添加账户信息
             add_user(username, password)
             verified = verify_user(username, password)
@@ -43,11 +37,10 @@ def signup():
                 session[username] = username
                 session['username'] = username
                 session['expiry_date'] = get_expiry_date(username)
-                session['articleID'] = None
-                return '<p>恭喜，你已成功注册， 你的用户名是 <a href="%s">%s</a>。</p>\
-                <p><a href="/%s">开始使用</a> <a href="/">返回首页</a><p/>' % (username, username, username)
+                session['existing_articles'] = None
+                return jsonify({'status': '2'})
             else:
-                return '用户名密码验证失败。'
+                return jsonify({'status': '1'})
 
 
 
@@ -59,13 +52,7 @@ def login():
     '''
     if request.method == 'GET':
         # GET请求
-        if not session.get('logged_in'):
-            # 未登录，返回登录页面
-            return render_template('login.html')
-        else:
-            # 已登录，提示信息并显示登出按钮
-            return '你已登录 <a href="/%s">%s</a>。 登出点击<a href="/logout">这里</a>。' % (
-                session['username'], session['username'])
+        return render_template('login.html')
     elif request.method == 'POST':
         # POST方法用于判断登录是否成功
         # check database and verify user
@@ -79,10 +66,10 @@ def login():
             session['username'] = username
             user_expiry_date = get_expiry_date(username)
             session['expiry_date'] = user_expiry_date
-            session['articleID'] = None
-            return redirect(url_for('user_bp.userpage', username=username))
+            session['existing_articles'] = None
+            return jsonify({'status': '1'})
         else:
-            return '无法通过验证。'
+            return jsonify({'status': '0'})
 
 
 @accountService.route("/logout", methods=['GET', 'POST'])
@@ -115,31 +102,9 @@ def reset():
         # POST请求用于提交修改后信息
         old_password = escape(request.form['old-password'])
         new_password = escape(request.form['new-password'])
-
-        re_new_password = escape(request.form['re-new-password'])  # 确认新密码
-        if re_new_password != new_password: #验证新密码两次输入是否相同
-            return '新密码不匹配，请重新输入'
-        if len(new_password) < 4: #验证新密码长度，原则参照注册模块
-            return '密码过于简单。(密码长度至少4位)'
-
         flag = change_password(username, old_password, new_password) # flag表示是否修改成功
         if flag:
             session['logged_in'] = False
-            return \
-'''
-<script>
-alert('密码修改成功，请重新登录。');
-window.location.href="/login";
-</script>
-
-'''
-
+            return jsonify({'status':'1'})  # 修改成功
         else:
-            return \
-'''
-<script>
-alert('密码修改失败');
-window.location.href="/reset";
-</script>
-
-'''
+            return jsonify({'status':'2'})  # 修改失败
diff --git a/app/main.py b/app/main.py
index e311bb0..59e0b88 100644
--- a/app/main.py
+++ b/app/main.py
@@ -39,8 +39,7 @@ def get_random_ads():
     返回随机广告
     :return: 一个广告(包含HTML标签)
     '''
-    ads = random.choice(['个性化分析精准提升', '你的专有单词本', '智能捕捉阅读弱点，针对性提高你的阅读水平'])
-    return ads + '。 <a href="/signup">试试</a>吧！'
+    return random.choice(['个性化分析精准提升', '你的专有单词本', '智能捕捉阅读弱点，针对性提高你的阅读水平'])
 
 
 def appears_in_test(word, d):
diff --git a/app/templates/login.html b/app/templates/login.html
index a347e22..ccf6f34 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -1,28 +1,47 @@
 {% block body %}
 {% if session['logged_in'] %}
 
-You're logged in already!
+你已登录 <a href="/{{ session['username'] }}">{{ session['username'] }}</a>。 登出点击<a href="/logout">这里</a>。
 
 {% else %}
 <meta charset="utf-8" name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
 <link rel="stylesheet" href="static/css/login_service.css">
-
+<script src="static/js/jquery.js"></script>
+<script>
+    function login(){
+        let username = $("#username").val();
+        let password = $("#password").val();
+        if (username === "" || password === ""){
+            alert('输入不能为空!');
+            return false;
+        }
+        $.post(
+            "/login", {'username': username, 'password': password},
+            function (response) {
+                if (response.status === '0') {
+                    alert('无法通过验证。');
+                    window.location.href = "/login";
+                } else if (response.status === '1') {
+                    window.location.href = "/"+username;
+                }
+            }
+        )
+        return false;
+    }
+</script>
 <div class="container">
 
   <section class="signin-heading">
     <h1>Sign In</h1>
   </section>
 
-  <form action="/login" method="POST">
-    <input type="text" placeholder="用户名" class="username" name="username" required>
-    <input type="password" placeholder="密码" class="password"  name="password" required>
-    <button type="submit" class="btn">登录</button>
-  </form>
+  <input type="text" placeholder="用户名" class="username" id="username">
+  <input type="password" placeholder="密码" class="password"  id="password">
+  <button type="button" class="btn" onclick="login()">登录</button>
+  <a class="signup" href="/signup">注册</a>
 
 </div>
 
-<a href="/signup" class="signup">注册</a>
-
 {% endif %}
 {% endblock %}
 
diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html
index cbb51a6..7f02c12 100644
--- a/app/templates/mainpage_get.html
+++ b/app/templates/mainpage_get.html
@@ -26,7 +26,7 @@
             <a href="/{{session['username']}}">{{session['username']}}</a></p>
         {% else %}
             <p><a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
-            <p><b>{{random_ads|safe}}</b></p>
+            <p><b> {{ random_ads }}。 <a href="/signup">试试</a>吧！</b></p>
         {% endif %}
         <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{number_of_essays}} </span> 篇</div>
         <p>粘贴1篇文章 (English only)</p>
diff --git a/app/templates/reset.html b/app/templates/reset.html
index 902d046..d29855b 100644
--- a/app/templates/reset.html
+++ b/app/templates/reset.html
@@ -2,6 +2,38 @@
     <meta charset="utf-8" name="viewport"
           content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes"/>
     <link rel="stylesheet" href="static/css/login_service.css">
+    <script src="static/js/jquery.js"></script>
+    <script>
+        function reset() {
+            let old_password = $("#old-password").val();
+            let new_password = $("#new-password").val();
+            let re_new_password = $("#re-new-password").val();
+            if (old_password === "" || new_password === "" || re_new_password === ""){
+                alert('输入不能为空!');
+                return false;
+            }
+            if (new_password !== re_new_password) {
+                alert('新密码不匹配，请重新输入');
+                return false;
+            }
+            if (new_password.length < 4) {
+                alert('密码过于简单。(密码长度至少4位)');
+                return false;
+            }
+            $.post("/reset", {'old-password': old_password, 'new-password': new_password},
+                function (response) {
+                    if (response.status === '1') {
+                        alert('密码修改成功，请重新登录。');
+                        window.location.href = "/login";
+                    } else if (response.status === '2') {
+                        alert('密码修改失败');
+                        window.location.href = "/reset";
+                    }
+                }
+            )
+            return false;
+        }
+    </script>
 
     <div class="container">
 
@@ -9,14 +41,11 @@
             <h1>Reset Password</h1>
         </section>
 
-        <form action="/reset" method="POST">
-            <input type="password" placeholder="原密码" class="old-password" name="old-password" required>
-            <input type="password" placeholder="新密码" class="new-password" name="new-password" required>
-            <input type="password" placeholder="确认新密码" class="re-new-password" name="re-new-password" required>
-            <input type="submit" name="submit" class="btn" value="提交"/>
-            <input type="button" name="submit" class="btn" value="放弃修改"
-                   onclick="window.location.href='/{{ username }}'"/>
-        </form>
+        <input type="password" placeholder="原密码" class="old-password" name="old-password" id="old-password"/>
+        <input type="password" placeholder="新密码" class="new-password" name="new-password" id="new-password"/>
+        <input type="password" placeholder="确认新密码" class="re-new-password" name="re-new-password" id="re-new-password"/>
+        <button id="submit" class="btn" onclick="reset()">提交</button>
+        <button class="btn" onclick="window.location.href='/{{ username }}'">放弃修改</button>
 
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/signup.html b/app/templates/signup.html
index 1fd05f0..c70e4ba 100644
--- a/app/templates/signup.html
+++ b/app/templates/signup.html
@@ -6,6 +6,47 @@ You're logged in already! <a href="/logout">Logout</a>.
 {% else %}
 <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
 <link rel="stylesheet" href="static/css/login_service.css">
+<script src="static/js/jquery.js"></script>
+    <script>
+        function signup() {
+            let username = $("#username").val();
+            let password = $("#password").val();
+            let password2 = $("#password2").val();
+            if (username === "" || password === "" || password2 === ""){
+                alert('输入不能为空!');
+                return false;
+            }
+            if (password !== password2) {
+                alert('确认密码与输入密码不一致！');
+                return false;
+            }
+            if (password.length < 4) {
+                alert('密码过于简单。(密码长度至少4位)');
+                return false;
+            }
+            $.post("/signup", {'username': username, 'password': password},
+                function (response) {
+                    if (response.status === '0') {
+                        alert('用户名'+username+'已经被注册。');
+                        window.location.href = "/signup";
+                    } else if (response.status === '1') {
+                        alert('用户名密码验证失败。');
+                        window.location.href = "/signup";
+                    } else if (response.status === '2') {
+                        let f = confirm("恭喜，你已成功注册，你的用户名是"+username+'.\n点击“确认”开始使用，或点击“取消”返回首页');
+                        if (f) {
+                            window.location.href = '/'+username;
+                        } else {
+                            window.location.href = '/';
+                        }
+                    } else if (response.status === '3') {
+                        alert(response.warn);
+                    }
+                }
+            )
+            return false;
+        }
+    </script>
 <p>{{ get_flashed_messages()[0] | safe }}</p>
 
 
@@ -15,12 +56,10 @@ You're logged in already! <a href="/logout">Logout</a>.
     <h1>Sign Up</h1>
   </section>
 
-  <form action="/signup" method="POST">
-    <p><input type="username" name="username" placeholder="输入用户名" required="required" class="username"></p>
-    <p><input type="password" name="password" placeholder="输入密码" required="required" class="password"></p>
-    <p><input type="password" name="password2" placeholder="确认密码" required="required" class="password" ></p>
-    <button type="submit" class="btn">注册</button>
-  </form>
+  <p><input type="username" id="username" placeholder="输入用户名" class="username"></p>
+  <p><input type="password" id="password" placeholder="输入密码" class="password"></p>
+  <p><input type="password" id="password2" placeholder="确认密码" class="password" ></p>
+  <button type="button" class="btn" onclick="signup()">注册</button>
 
 </div>
   
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index ea91c58..5ef86c7 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -18,17 +18,6 @@
         {% endfor %}
     {% endif %}
 
-{#     // add !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  #}
-    <script type="text/javascript">
-        function fresh() {
-            try {
-                document.getElementById('rv').click();
-            } catch {
-
-            }
-        }
-    </script>
-{#     !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #}
     <title>EnglishPal Study Room for {{ username }}</title>
 
     <style>
@@ -45,31 +34,49 @@
         }
     </style>
 </head>
-{#   original code: <body>  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! #}
-<body onload="fresh()">
+<body>
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
         <a class="btn btn-secondary" href="/logout" role="button">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button">重设密码</a>
     </p>
-    {{ flashed_messages|safe }}
+    {% for message in messages %}
+        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>
+    {% endfor %}
 
     <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
-{#  add code !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  #}
-    {% if session.get('articleID') == session.get('old_articleID') %}
-        {% if session.get('old_articleID') != None %}
-            <a class="btn btn-success" href="/{{ username }}/reset" role="button" id="rv"> 出bug了 </a>
-        {% endif %}
+    {% if session.get('existing_articles')[0] != None and session.get('existing_articles')[0] !=0 %}
+        <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
     {% endif %}
-    {% if session.get('articleID') != session.get('old_articleID') %}
-        {% if session.get('old_articleID') != None %}
-            <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
-        {% endif %}
-    {% endif %}
-{# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!  #}
 
     <p><b>阅读文章并回答问题</b></p>
-    <div id="text-content">{{ today_article|safe }}</div>
+    <div id="text-content">
+        {% if today_article %}
+            <div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="badge bg-success">{{ today_article["text_level"] }}</span> for you.</div>
+                <p class="text-muted">Article added on: {{ today_article["date"] }}</p><br/>
+            <div class="p-3 mb-2 bg-light text-dark"><br/>
+            <p class="display-5">{{ today_article["article_title"] }}</p><br/>
+            <p class="lead"><font id="article" size=2>{{ today_article["article_body"] }}</font></p><br/>
+            <p><small class="text-muted">{{ today_article['source'] }}</small></p><br/>
+            <p><b>{{ today_article['question'] }}</b></p><br/>
+                <script type="text/javascript">
+                    function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
+                        const e = document.getElementById(id);
+                        if(e.style.display === 'block')
+                            e.style.display = 'none';
+                        else
+                            e.style.display = 'block';
+                    }
+                </script>
+                <button onclick="toggle_visibility('answer');">ANSWER</button>
+                <div id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
+            </div>
+        {% else %}
+            <div class="alert alert-success" role="alert">
+                <p class="text-muted"><span class="badge bg-success">Notes:</span><br>No article is currently available for you. You can try again a few times or mark new words in the passage to improve your level.</p>
+            </div>
+        {% endif %}
+    </div>
 
     <input type="checkbox" onclick="toggleHighlighting()" checked/>生词高亮
     <input type="checkbox" onclick="onReadClick()" checked/>大声朗读
diff --git a/app/user_service.py b/app/user_service.py
index 2d10404..2c91391 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -29,9 +29,10 @@ def user_reset(username):
     :param username: 用户名
     :return: 返回页面内容
     '''
-    session['old_articleID'] = session.get('articleID')
     if request.method == 'GET':
-        session['articleID'] = None
+        existing_articles = session.get("existing_articles")
+        existing_articles[0] += 1
+        session["existing_articles"] = existing_articles
         return redirect(url_for('user_bp.userpage', username=username))
     else:
         return 'Under construction'
@@ -44,7 +45,9 @@ def user_back(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        session['articleID'] = session.get('old_articleID')
+        existing_articles = session.get("existing_articles")
+        existing_articles[0] -= 1
+        session["existing_articles"] = existing_articles
         return redirect(url_for('user_bp.userpage', username=username))
 
 
@@ -130,11 +133,14 @@ def userpage(username):
         words = ''
         for x in lst3:
             words += x[0] + ' '
+        existing_articles, today_article = get_today_article(user_freq_record, session.get('existing_articles'))
+        session['existing_articles'] = existing_articles
+        # 通过 today_article，加载前端的显示页面
         return render_template('userpage_get.html',
                                username=username,
                                session=session,
-                               flashed_messages=get_flashed_messages_if_any(),
-                               today_article=get_today_article(user_freq_record, session['articleID']),
+                               flashed_messages=get_flashed_messages(),
+                               today_article=today_article,
                                d_len=len(d),
                                lst3=lst3,
                                yml=Yaml.yml,
@@ -173,15 +179,3 @@ def get_time():
     '''
     return datetime.now().strftime('%Y%m%d%H%M')  # upper to minutes
 
-def get_flashed_messages_if_any():
-    '''
-    在用户界面显示黄色提示信息
-    :return: 包含HTML标签的提示信息
-    '''
-    messages = get_flashed_messages()
-    s = ''
-    for message in messages:
-        s += '<div class="alert alert-warning" role="alert">'
-        s += f'Congratulations! {message}'
-        s += '</div>'
-    return s

From 376ef9bcbcd32298895e6875bbc307c84e962a2e Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 20:08:14 +0800
Subject: [PATCH 09/72] feat: add pong orm requirement

---
 requirements.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/requirements.txt b/requirements.txt
index 8552794..1972e7d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,4 @@
 Flask==2.1.0
 selenium==3.141.0
 PyYAML~=6.0
+pony==0.7.16

From df82748518afdabf323696ad7dfce0ff6265e0ca Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 20:09:32 +0800
Subject: [PATCH 10/72] feat: create classes necessary for orm operations

---
 app/model.py | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 app/model.py

diff --git a/app/model.py b/app/model.py
new file mode 100644
index 0000000..a913e65
--- /dev/null
+++ b/app/model.py
@@ -0,0 +1,30 @@
+from pony.orm import *
+
+db = Database()
+db.bind("sqlite", "./static/wordfreqapp.db", create_db=True)  # bind sqlit file
+
+
+class User(db.Entity):
+    _table_ = "user"  # table name
+    name = PrimaryKey(str)
+    password = Optional(str)
+    start_date = Optional(str)
+    expiry_date = Optional(str)
+
+
+class Article(db.Entity):
+    _table_ = "article"  # table name
+    article_id = PrimaryKey(int, auto=True)
+    text = Optional(str)
+    source = Optional(str)
+    date = Optional(str)
+    level = Optional(str)
+    question = Optional(str)
+
+
+db.generate_mapping(create_tables=True)  # must mapping after class declaration
+
+
+if __name__ == "__main__":
+    with db_session:
+        print(Article[2].text)  # test get article which id=2 text content

From e2b165ada84b7ed4827e2f211f4aa55d9218a009 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 20:11:37 +0800
Subject: [PATCH 11/72] fix: add url 'admin' into banned url list

---
 app/Login.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Login.py b/app/Login.py
index 8e0030b..f914359 100644
--- a/app/Login.py
+++ b/app/Login.py
@@ -98,7 +98,7 @@ class UserName:
         for c in self.username: # a user name must not include special characters, except non-leading periods or underscores
             if c in string.punctuation and c is not '.' and c is not '_':
                 return f'{c} is not allowed in the user name.'
-        if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del']:
+        if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del', "admin"]:
             return 'You used a restricted word as your user name.  Please come up with a better one.'
 
         return 'OK'

From 13d8977636f9fe41b67a06d403ce03cecd630165 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 20:15:58 +0800
Subject: [PATCH 12/72] fix: set specific management displays for admin

---
 app/templates/userpage_get.html | 7 ++-----
 app/user_service.py             | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index fbe281d..efb55da 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -37,14 +37,11 @@
 <body>
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
-<<<<<<< HEAD
+        {% if username ==  admin_name%}
         <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
+        {% endif %}
         <a class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
-=======
-        <a class="btn btn-secondary" href="/logout" role="button">退出</a>
-        <a class="btn btn-secondary" href="/reset" role="button">重设密码</a>
->>>>>>> master
     </p>
     {{ flashed_messages|safe }}
 
diff --git a/app/user_service.py b/app/user_service.py
index 2d10404..215f0e5 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -1,5 +1,5 @@
 from datetime import datetime
-
+from admin_service import ADMIN_NAME
 from flask import *
 
 # from app import Yaml
@@ -131,6 +131,7 @@ def userpage(username):
         for x in lst3:
             words += x[0] + ' '
         return render_template('userpage_get.html',
+                               admin_name=ADMIN_NAME,
                                username=username,
                                session=session,
                                flashed_messages=get_flashed_messages_if_any(),

From ade10e58431e141ef576fc77d37286ddc73988a9 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 20:16:48 +0800
Subject: [PATCH 13/72] feat: add admin_service blueprint

---
 app/admin_service.py           | 118 +++++++++++++++++++++
 app/main.py                    |  77 +-------------
 app/templates/admin_index.html | 184 +++++++++++++++++----------------
 3 files changed, 216 insertions(+), 163 deletions(-)
 create mode 100644 app/admin_service.py

diff --git a/app/admin_service.py b/app/admin_service.py
new file mode 100644
index 0000000..87d2610
--- /dev/null
+++ b/app/admin_service.py
@@ -0,0 +1,118 @@
+from flask import *
+from model import *
+from pony.orm import *
+from Yaml import yml
+from Login import md5
+from datetime import datetime
+
+# ? from difficulty import text_difficulty_level
+
+ADMIN_NAME = "114514"  # unique admin name
+_cur_page = 1  # current article page
+_page_size = 5  # article sizes per page
+adminService = Blueprint("admin_service", __name__)
+
+
+@adminService.route("/admin", methods=["GET", "POST"])
+def admin():
+    global _cur_page, _page_size
+    # 未登录，跳转到未登录界面
+    if not session.get("logged_in"):
+        return render_template("not_login.html")
+
+    # 获取session里的用户名
+    username = session.get("username")
+    if username != ADMIN_NAME:
+        return "You are not admin!"
+
+    article_len = get_articles_len()
+    try:
+        _page_size = min(int(request.args.get("size", 5)), article_len)
+        if _page_size <= 0:
+            raise ZeroDivisionError
+        _cur_page = min(int(request.args.get("page", 1)), article_len // _page_size)
+    except ValueError:
+        return "page parmas must be int!"
+    except ZeroDivisionError:
+        return "page size must bigger than zero"
+
+    context = {
+        "text_len": article_len,
+        "page_size": _page_size,
+        "cur_page": _cur_page,
+        "text_list": get_page_articles(_cur_page, _page_size),
+        "user_list": get_users(),
+        "username": username,
+        "yml": yml,
+    }
+
+    def _update_context():
+        article_len = get_articles_len()
+        context["text_len"] = article_len
+        context["text_list"] = get_page_articles(_cur_page, _page_size)
+
+    if request.method == "GET":
+        if delete_id := int(request.args.get("delete_id", 0)):  # delete article
+            delete_article(delete_id)
+            _update_context()
+    else:
+        data = request.form
+        content = data.get("content", "")
+        source = data.get("source", "")
+        question = data.get("question", "")
+        username = data.get("username", "")
+        if content:
+            add_article(content, source, question)
+            _update_context()
+        if username:
+            update_user_password(username)
+
+    return render_template("admin_index.html", **context)
+
+
+def add_article(content, source="manual_input", question="No question"):
+    with db_session:
+        # add one atricle to sqlite
+        Article(
+            text=content,
+            source=source,
+            date=datetime.now().strftime("%-d %b %Y"),  # format style of `5 Oct 2022`
+            level="1",
+            question=question,
+        )
+        # ? There is a question that:
+        # ? How can i get one article level?
+        # ? I try to use the function `text_difficulty_level(content,{"test":1})`
+        # ? However, i lose one dict parma from pickle
+        # ? So I temporarily fixed the level to 1
+
+
+def delete_article(article_id):
+    article_id &= 0xFFFFFFFF  # max 32 bits
+    with db_session:
+        if article := Article.select(article_id=article_id):
+            article.first().delete()
+
+
+def get_articles_len():
+    with db_session:
+        return len(Article.select()[:])
+
+
+def get_page_articles(num, size):
+    with db_session:
+        return [
+            x
+            for x in Article.select().order_by(desc(Article.article_id)).page(num, size)
+        ]
+
+
+def get_users():
+    with db_session:
+        return User.select()[:]
+
+
+def update_user_password(username, password="123456"):
+    with db_session:
+        if user := User.select(name=username).first():
+            user.password = md5(username + password)
diff --git a/app/main.py b/app/main.py
index bcbd3f8..2af57e3 100644
--- a/app/main.py
+++ b/app/main.py
@@ -5,24 +5,24 @@
 # Copyright 2019 (C) Hui Lan <hui.lan@cantab.net>
 # Written permission must be obtained from the author for commercial uses.
 ###########################################################################
-from datetime import datetime
 from flask import escape
 from Login import *
 from Article import *
 import Yaml
 from user_service import userService
 from account_service import accountService
+from admin_service import adminService
 app = Flask(__name__)
 app.secret_key = 'lunch.time!'
 
 # 将蓝图注册到Lab app
 app.register_blueprint(userService)
 app.register_blueprint(accountService)
+app.register_blueprint(adminService)
 
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment
 
-
 def get_random_image(path):
     '''
     返回随机图
@@ -102,79 +102,6 @@ def mainpage():
                                d_len=d_len, lst=lst, yml=Yaml.yml)
 
 
-def insert_article(content, source='manual_input', level=5, question=''):
-    sql = f"INSERT into article (text,source, date, level, question) VALUES " \
-          f"('{content}','{source}','{datetime.now().strftime('%Y-%m-%d')}', '{level}', '{question}');"
-    print(sql)
-    rq = RecordQuery('./static/wordfreqapp.db')
-    rq.instructions(sql)
-    rq.do()
-
-
-def get_articles():
-    sql = f"SELECT * from article order by -article_id;"
-    rq = RecordQuery('./static/wordfreqapp.db')
-    rq.instructions(sql)
-    rq.do()
-    result = rq.get_results()
-    return result
-
-
-def get_users():
-    sql = f"SELECT * from user;"
-    rq = RecordQuery('./static/wordfreqapp.db')
-    rq.instructions(sql)
-    rq.do()
-    result = rq.get_results()
-    return result
-
-
-def update_user_password(username, password='123456'):
-    password = md5(username + password)
-    sql = f"UPDATE user SET password='{password}' where name='{username}';"
-    rq = RecordQuery('./static/wordfreqapp.db')
-    rq.instructions(sql)
-    rq.do()
-
-
-@app.route("/admin", methods=['GET', 'POST'])
-def admin():
-    '''
-    '''
-    # 未登录，跳转到未登录界面
-    if not session.get('logged_in'):
-        return render_template('not_login.html')
-
-    # 获取session里的用户名
-    username = session.get('username')
-
-    context = {
-        # 'user': request.user,
-        'text_list': get_articles(),
-        'user_list': get_users(),
-        'username': username
-    }
-    if request.method == 'GET':
-        return render_template('admin_index.html', **context)
-    else:
-        data = request.form
-        content = data.get('content')
-        source = data.get('source', '')
-        question = data.get('question', '')
-        username = data.get('username')
-        if content:
-            insert_article(
-                content=content,
-                source=source,
-                question=question
-            )
-            context['text_list'] = get_articles()
-        if username:
-            update_user_password(username)
-        return render_template('admin_index.html', **context)
-
-
-
 if __name__ == '__main__':
     '''
     运行程序
diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index be88556..03d6ee4 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -1,112 +1,120 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
 
 <head>
-    <link href="https://cdn.jsdelivr.net/npm/bootstrap@5.2.3/dist/css/bootstrap.min.css" rel="stylesheet"
-          integrity="sha384-rbsA2VBKQhggwzxH7pPCaAqO46MgnOM80zW1RWuH61DGLwZJEdK2Kadq2F9CUG65" crossorigin="anonymous">
+    <meta charset="UTF-8">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
+    <meta name="format-detection" content="telephone=no" />
+    {{ yml['header'] | safe }}
+    {% if yml['css']['item'] %}
+    {% for css in yml['css']['item'] %}
+    <link href="{{ css }}" rel="stylesheet">
+    {% endfor %}
+    {% endif %}
+    {% if yml['js']['head'] %}
+    {% for js in yml['js']['head'] %}
+    <script src="{{ js }}"></script>
+    {% endfor %}
+    {% endif %}
 
 </head>
 
 <body class="container" style="width: 800px; margin: auto; margin-top:24px;">
-<nav class="navbar navbar-expand-lg bg-light">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="#">你好 {{ username }}</a>
-        <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
+    <nav class="navbar navbar-expand-lg bg-light">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="#">管理员 {{ username }} 您好！</a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
                 aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-        </button>
-        <div class="collapse navbar-collapse" id="navbarNav">
-            <ul class="navbar-nav">
-                <li class="nav-item">
-                    <a class="nav-link" href="/logout">退出登录</a>
-                </li>
-            </ul>
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarNav">
+                <ul class="navbar-nav">
+                    <li class="nav-item">
+                        <a class="nav-link" href="/{{ username }}">返回主页</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/logout">退出登录</a>
+                    </li>
+                </ul>
+            </div>
         </div>
+    </nav>
+
+    <div class="card" style="margin-top:24px;">
+        <h5 style="margin-top: 10px;padding-left: 10px;">重置选中用户密码</h5>
+        <form action="" method="post" class="container mb-3">
+            <div class="mb-3">
+                <label for="exampleInputEmail1" class="form-label">用户</label>
+                <select id="username" name="username" class="form-select" aria-label="Default select example">
+                    <option selected>选择用户</option>
+                    {% for user in user_list %}
+                    <option value="{{ user.name }}">{{ user.name }}</option>
+                    {% endfor %}
+                </select>
+            </div>
+            <input type="submit" value="重置密码为：123456" class="btn btn-outline-primary">
+        </form>
     </div>
-</nav>
 
-<div class="card" style="margin-top:24px;">
-    <h5>重置选中用户密码</h5>
-    <form action="" method="post" class="container mb-3">
-        <div class="mb-3">
-            <label for="exampleInputEmail1" class="form-label">用户</label>
-            <select
-                    id="username"
-                    name="username"
-                    class="form-select"
-                    aria-label="Default select example">
-              <option selected>选择用户</option>
-                {% for user in user_list %}
-                    <option value="{{ user['name'] }}">{{ user['name'] }}</option>
-                {% endfor %}
-
-            </select>
-        </div>
-
-        <input type="submit" value="重置密码为：123456" class="btn btn-primary">
-    </form>
-</div>
-
-<div class="card" style="margin-top:24px;">
-    {% if tips %}
+    <div class="card" style="margin-top:24px;">
+        {% if tips %}
         <div class="alert alert-success" role="alert">
             {{ tips }}
         </div>
-    {% endif %}
+        {% endif %}
+        <div class="card-content">
+            <h5 style="margin-top: 10px;padding-left: 10px;">录入文章</h5>
+            <form action="" method="post" class="container mb-3">
+                <div class="mb-3">
+                    <label for="exampleInputEmail1" class="form-label">文章内容</label>
+                    <textarea id="content" name="content" class="form-control" placeholder="请输入文章内容"></textarea>
+                    <label for="exampleInputEmail1" class="form-label">文章来源</label>
 
-    <div class="card-content">
-        <h5>录入文章</h5>
-        <form action="" method="post" class="container mb-3">
-            <div class="mb-3">
-                <label for="exampleInputEmail1" class="form-label">文章内容</label>
-                <textarea
-                        id="content"
-                        name="content"
-                        class="form-control"
-                        placeholder="请输入文章内容"
-                ></textarea>
-                <label for="exampleInputEmail1" class="form-label">文章来源</label>
+                    <textarea id="source" name="source" class="form-control" placeholder="请输入来源"></textarea>
+                    <label for="exampleInputEmail1" class="form-label">文章问题</label>
 
-                <textarea
-                        id="source"
-                        name="source"
-                        class="form-control"
-                        placeholder="请输入来源"
-                ></textarea>
-                <label for="exampleInputEmail1" class="form-label">文章问题</label>
-
-                <textarea
-                        id="question"
-                        name="question"
-                        class="form-control"
-                        placeholder="请输入问题"
-                ></textarea>
-            </div>
-
-            <input type="submit" value="保存" class="btn btn-primary">
-        </form>
+                    <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
+                </div>
+                <input type="submit" value="保存" class="btn btn-outline-primary">
+            </form>
+        </div>
     </div>
-</div>
 
-<div class="card" style="margin-top:24px;">
-        <h5>文章列表</h5>
-    <div class="list-group">
-        {% for text in text_list %}
+    <div class="card" style="margin-top:24px;">
+        <h5 style="margin-top: 10px;padding-left: 10px;">文章列表</h5>
+        <div class="list-group">
+            {% for text in text_list %}
             <div class="list-group-item list-group-item-action" aria-current="true">
                 <div class="d-flex w-100 justify-content-between">
-                    <h5 class="mb-1">{{ text['source'] }}</h5>
-                    <small>Date:{{ text['date'] }} Level:{{ text['level'] }}</small>
+                    <h5 class="mb-1">{{ text.source }}</h5>
+                    <small>Date:{{ text.date }} Level:{{ text.level }}</small>
                 </div>
-                <p class="mb-1">{{ text['text'] }}</p>
+                <div style="text-align: right; padding-bottom: 5px;"><a href="/admin?delete_id={{text.article_id}}"
+                        class="btn btn-outline-danger btn-sm">
+                        删除文章
+                    </a></div>
+                <p class="mb-1">{{ text.text }}</p>
             </div>
-        {% endfor %}
-
+            {% endfor %}
+        </div>
+    </div>
+    <div style="margin:20px 0;">
+        <ul class="pagination pagination-sm justify-content-center">
+            <li class="page-item"><a class="page-link" href="/admin?page={{cur_page-1}}&size={{page_size}}">Previous</a>
+            </li>
+            {% for i in range(1, text_len//page_size+1) %}
+            {% if cur_page == i %}
+            <li class="page-item active"><a class="page-link" href="/admin?page={{i}}&size={{page_size}}">{{ i }}</a>
+            </li>
+            {% else %}
+            <li class="page-item"><a class="page-link" href="/admin?page={{i}}&size={{page_size}}">{{ i }}</a></li>
+            {% endif %}
+            {% endfor %}
+            <li class="page-item"><a class="page-link" href="/admin?page={{cur_page+1}}&size={{page_size}}">Next</a>
+            </li>
+        </ul>
     </div>
-</div>
-
-
-
 </body>
 
-</html>
-
-
+</html>
\ No newline at end of file

From b80fbc936c46bca7075e18f0abb428f5ced1e8b4 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 20:19:56 +0800
Subject: [PATCH 14/72] fix: fix admin_name

---
 app/admin_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 87d2610..23c1544 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -7,7 +7,7 @@ from datetime import datetime
 
 # ? from difficulty import text_difficulty_level
 
-ADMIN_NAME = "114514"  # unique admin name
+ADMIN_NAME = "lanhui"  # unique admin name
 _cur_page = 1  # current article page
 _page_size = 5  # article sizes per page
 adminService = Blueprint("admin_service", __name__)

From 70d44fcf5c913e9d1f5a2c4d33c906e2a8a9935d Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Tue, 21 Mar 2023 11:44:05 +0800
Subject: [PATCH 15/72] Login.py: fix SyntaxWrning: 'is not' with a literal.

---
 app/Login.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Login.py b/app/Login.py
index f914359..48dffc5 100644
--- a/app/Login.py
+++ b/app/Login.py
@@ -96,7 +96,7 @@ class UserName:
         if ' ' in self.username: # a user name must not include a whitespace
             return 'Whitespace is not allowed in the user name.'
         for c in self.username: # a user name must not include special characters, except non-leading periods or underscores
-            if c in string.punctuation and c is not '.' and c is not '_':
+            if c in string.punctuation and c != '.' and c != '_':
                 return f'{c} is not allowed in the user name.'
         if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del', "admin"]:
             return 'You used a restricted word as your user name.  Please come up with a better one.'

From b34f260d98309eea6819e57d9bf6dec6832cc9dd Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Tue, 21 Mar 2023 11:48:09 +0800
Subject: [PATCH 16/72] requirements.txt: use an older version of Flask to
 avoid deployment ERROR: No matching distribution found for Flask==2.1.0.

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 1972e7d..e2d1e1f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-Flask==2.1.0
+Flask==1.1.2
 selenium==3.141.0
 PyYAML~=6.0
 pony==0.7.16

From cabf6702a7428ab742345946e021fde904938bcd Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Mon, 20 Mar 2023 23:37:27 +0800
Subject: [PATCH 17/72] fix: add one way to set article level & rename some
 functions and vars

---
 app/admin_service.py           | 35 +++++++++++++++++-----------------
 app/templates/admin_index.html |  6 +++---
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 23c1544..a06c838 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -5,8 +5,6 @@ from Yaml import yml
 from Login import md5
 from datetime import datetime
 
-# ? from difficulty import text_difficulty_level
-
 ADMIN_NAME = "lanhui"  # unique admin name
 _cur_page = 1  # current article page
 _page_size = 5  # article sizes per page
@@ -25,19 +23,19 @@ def admin():
     if username != ADMIN_NAME:
         return "You are not admin!"
 
-    article_len = get_articles_len()
+    article_number = get_number_of_articles()
     try:
-        _page_size = min(int(request.args.get("size", 5)), article_len)
+        _page_size = min(int(request.args.get("size", 5)), article_number)
         if _page_size <= 0:
             raise ZeroDivisionError
-        _cur_page = min(int(request.args.get("page", 1)), article_len // _page_size)
+        _cur_page = min(int(request.args.get("page", 1)), article_number // _page_size)
     except ValueError:
         return "page parmas must be int!"
     except ZeroDivisionError:
         return "page size must bigger than zero"
 
     context = {
-        "text_len": article_len,
+        "article_number": article_number,
         "page_size": _page_size,
         "cur_page": _cur_page,
         "text_list": get_page_articles(_cur_page, _page_size),
@@ -47,8 +45,8 @@ def admin():
     }
 
     def _update_context():
-        article_len = get_articles_len()
-        context["text_len"] = article_len
+        article_len = get_number_of_articles()
+        context["article_number"] = article_len
         context["text_list"] = get_page_articles(_cur_page, _page_size)
 
     if request.method == "GET":
@@ -61,8 +59,14 @@ def admin():
         source = data.get("source", "")
         question = data.get("question", "")
         username = data.get("username", "")
+        level = data.get("level", "5")
         if content:
-            add_article(content, source, question)
+            try:    # check level
+                if not (0 < int(level) <= 5):
+                    raise ValueError
+            except ValueError:
+                return "level must be between 1 and 5"
+            add_article(content, source, level, question)
             _update_context()
         if username:
             update_user_password(username)
@@ -70,21 +74,16 @@ def admin():
     return render_template("admin_index.html", **context)
 
 
-def add_article(content, source="manual_input", question="No question"):
+def add_article(content, source="manual_input", level="5", question="No question"):
     with db_session:
-        # add one atricle to sqlite
+        # add one article to sqlite
         Article(
             text=content,
             source=source,
             date=datetime.now().strftime("%-d %b %Y"),  # format style of `5 Oct 2022`
-            level="1",
+            level=level,
             question=question,
         )
-        # ? There is a question that:
-        # ? How can i get one article level?
-        # ? I try to use the function `text_difficulty_level(content,{"test":1})`
-        # ? However, i lose one dict parma from pickle
-        # ? So I temporarily fixed the level to 1
 
 
 def delete_article(article_id):
@@ -94,7 +93,7 @@ def delete_article(article_id):
             article.first().delete()
 
 
-def get_articles_len():
+def get_number_of_articles():
     with db_session:
         return len(Article.select()[:])
 
diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index 03d6ee4..985ece0 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -70,10 +70,10 @@
                     <label for="exampleInputEmail1" class="form-label">文章内容</label>
                     <textarea id="content" name="content" class="form-control" placeholder="请输入文章内容"></textarea>
                     <label for="exampleInputEmail1" class="form-label">文章来源</label>
-
                     <textarea id="source" name="source" class="form-control" placeholder="请输入来源"></textarea>
+                    <label for="exampleInputEmail1" class="form-label">文章等级</label>
+                    <textarea id="level" name="level" class="form-control" placeholder="请输入等级"></textarea>
                     <label for="exampleInputEmail1" class="form-label">文章问题</label>
-
                     <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
                 </div>
                 <input type="submit" value="保存" class="btn btn-outline-primary">
@@ -103,7 +103,7 @@
         <ul class="pagination pagination-sm justify-content-center">
             <li class="page-item"><a class="page-link" href="/admin?page={{cur_page-1}}&size={{page_size}}">Previous</a>
             </li>
-            {% for i in range(1, text_len//page_size+1) %}
+            {% for i in range(1, article_number//page_size+1) %}
             {% if cur_page == i %}
             <li class="page-item active"><a class="page-link" href="/admin?page={{i}}&size={{page_size}}">{{ i }}</a>
             </li>

From 1015704e23969506bef99745d6e3d28c1cf4ec90 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Tue, 21 Mar 2023 12:29:44 +0800
Subject: [PATCH 18/72] fix: fix the way to check article level

---
 app/admin_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index a06c838..2ed9768 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -62,7 +62,7 @@ def admin():
         level = data.get("level", "5")
         if content:
             try:    # check level
-                if not (0 < int(level) <= 5):
+                if level not in [str(x + 1) for x in range(5)]:
                     raise ValueError
             except ValueError:
                 return "level must be between 1 and 5"

From 48de496caa31ebfa6294beb7ca62917566ea1c18 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Tue, 21 Mar 2023 12:42:59 +0800
Subject: [PATCH 19/72] fix: Remove 'Assignment Expresions' & Fix annotation
 words

---
 app/admin_service.py | 11 +++++++----
 app/model.py         |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 2ed9768..2893434 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -50,7 +50,8 @@ def admin():
         context["text_list"] = get_page_articles(_cur_page, _page_size)
 
     if request.method == "GET":
-        if delete_id := int(request.args.get("delete_id", 0)):  # delete article
+        delete_id = int(request.args.get("delete_id", 0))
+        if delete_id:  # delete article
             delete_article(delete_id)
             _update_context()
     else:
@@ -89,7 +90,8 @@ def add_article(content, source="manual_input", level="5", question="No question
 def delete_article(article_id):
     article_id &= 0xFFFFFFFF  # max 32 bits
     with db_session:
-        if article := Article.select(article_id=article_id):
+        article = Article.select(article_id=article_id)
+        if article:
             article.first().delete()
 
 
@@ -113,5 +115,6 @@ def get_users():
 
 def update_user_password(username, password="123456"):
     with db_session:
-        if user := User.select(name=username).first():
-            user.password = md5(username + password)
+        user = User.select(name=username)
+        if user and user.first():
+            user.first().password = md5(username + password)
diff --git a/app/model.py b/app/model.py
index a913e65..bc8a08a 100644
--- a/app/model.py
+++ b/app/model.py
@@ -1,7 +1,7 @@
 from pony.orm import *
 
 db = Database()
-db.bind("sqlite", "./static/wordfreqapp.db", create_db=True)  # bind sqlit file
+db.bind("sqlite", "./static/wordfreqapp.db", create_db=True)  # bind sqlite file
 
 
 class User(db.Entity):

From 44db2218c1636291f00dabba9e04fad965a783d6 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Tue, 21 Mar 2023 12:45:57 +0800
Subject: [PATCH 20/72] fix: Use better conditional judgment methods

---
 app/admin_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 2893434..95e9d8b 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -116,5 +116,5 @@ def get_users():
 def update_user_password(username, password="123456"):
     with db_session:
         user = User.select(name=username)
-        if user and user.first():
+        if user:
             user.first().password = md5(username + password)

From 691c5b0d437694300bfb7823803054cb631701b5 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Tue, 21 Mar 2023 16:07:10 +0800
Subject: [PATCH 21/72] build.sh: Install requirements first.

---
 app/admin_service.py | 2 +-
 build.sh             | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 23c1544..e014ee0 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -114,5 +114,5 @@ def get_users():
 
 def update_user_password(username, password="123456"):
     with db_session:
-        if user := User.select(name=username).first():
+        if if user := User.select(name=username).first():
             user.password = md5(username + password)
diff --git a/build.sh b/build.sh
index 4348b2f..e313fce 100755
--- a/build.sh
+++ b/build.sh
@@ -3,6 +3,10 @@
 DEPLOYMENT_DIR=/home/lanhui/englishpal2/EnglishPal
 cd $DEPLOYMENT_DIR
 
+# Install dependencies
+
+pip3 install -r requirements.txt
+
 # Stop service
 sudo docker stop EnglishPal
 sudo docker rm EnglishPal

From 2909b4d9735f41d60b23893af3a89a32aa3174b6 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Tue, 21 Mar 2023 16:22:45 +0800
Subject: [PATCH 22/72] =?UTF-8?q?admin=5Fservice.py:=20=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E7=9A=84=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D=E6=8C=89=E7=85=A7=E5=90=8D=E5=AD=97=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin_service.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 95e9d8b..de05b46 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -110,7 +110,7 @@ def get_page_articles(num, size):
 
 def get_users():
     with db_session:
-        return User.select()[:]
+        return User.select().order_by(User.name)[:]
 
 
 def update_user_password(username, password="123456"):

From 6df25c58b400be6bc1820c5e76995caac9a7576b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Tue, 21 Mar 2023 18:57:00 +0800
Subject: [PATCH 23/72] =?UTF-8?q?=E6=9F=A5=E6=BC=8F=EF=BC=8C=E4=B8=9A?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=AD=E7=9A=84=E4=B8=A4=E5=A4=84=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=B8=8D=E5=81=9A=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=9B=A0=E4=B8=BA=E4=B8=8D=E8=A2=AB=E4=BD=BF=E7=94=A8=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/user_service.py | 2 +-
 app/wordfreqCMD.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/user_service.py b/app/user_service.py
index 2c91391..8944b59 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -92,7 +92,7 @@ def deleteword(username, word):
     '''
     user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
     pickle_idea2.deleteRecord(user_freq_record, word)
-    flash(f'<strong>{word}</strong> is no longer in your word list.')
+    flash(f'<strong>{word}</strong> is no longer in your word list.')  # 模板 userpage_get.html 中已经没有对flash信息的获取了，就不做修改了
     return "success"
 
 
diff --git a/app/wordfreqCMD.py b/app/wordfreqCMD.py
index c4f8a63..e56ba0c 100644
--- a/app/wordfreqCMD.py
+++ b/app/wordfreqCMD.py
@@ -70,7 +70,7 @@ def sort_in_ascending_order(lst):# 单词按频率降序排列
     return lst2
 
 
-def make_html_page(lst, fname):
+def make_html_page(lst, fname):  # 只是在wordfreqCMD.py中的main函数中调用，所以不做修改
     '''
     功能：把lst的信息存到fname中，以html格式。
     '''

From c9bfa086589fbcad05dc6ff46c64dafafede21d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Tue, 21 Mar 2023 19:19:51 +0800
Subject: [PATCH 24/72] =?UTF-8?q?=E6=B3=A8=E9=87=8Aflash=E7=9A=84=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=EF=BC=8C=E5=9B=A0=E4=B8=BA=E5=85=B6=E5=AF=B9=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BC=9A=E6=9C=89=E5=BD=B1=E5=93=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/user_service.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/user_service.py b/app/user_service.py
index 8944b59..94a522a 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -92,7 +92,8 @@ def deleteword(username, word):
     '''
     user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
     pickle_idea2.deleteRecord(user_freq_record, word)
-    flash(f'<strong>{word}</strong> is no longer in your word list.')  # 模板 userpage_get.html 中已经没有对flash信息的获取了，就不做修改了
+    # 模板 userpage_get.html 中已经没有对flash信息的获取了，而且会影响 signup.html的显示，因为其中去获取了flash。在删除单词，退出，注册，页面就会出现提示信息
+    # flash(f'<strong>{word}</strong> is no longer in your word list.')
     return "success"
 
 

From 5cffa1fadae10e01256d961faa93fe9eccca1984 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 13:32:11 +0800
Subject: [PATCH 25/72] fix: use single quotation mark 'admin'

---
 app/Login.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Login.py b/app/Login.py
index 48dffc5..db4df18 100644
--- a/app/Login.py
+++ b/app/Login.py
@@ -98,7 +98,7 @@ class UserName:
         for c in self.username: # a user name must not include special characters, except non-leading periods or underscores
             if c in string.punctuation and c != '.' and c != '_':
                 return f'{c} is not allowed in the user name.'
-        if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del', "admin"]:
+        if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del', 'admin']:
             return 'You used a restricted word as your user name.  Please come up with a better one.'
 
         return 'OK'

From 52025d55bc5c6ef7d5ecfcc79dbca87f2bf1c4c7 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 13:35:10 +0800
Subject: [PATCH 26/72] fix: add a blankspace

---
 app/templates/userpage_get.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index efb55da..94bfef1 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -37,7 +37,7 @@
 <body>
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
-        {% if username ==  admin_name%}
+        {% if username ==  admin_name %}
         <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
         {% endif %}
         <a class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>

From bdda754af6d718b95384240d9ecfc5e0eb1e343d Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 13:40:22 +0800
Subject: [PATCH 27/72] fix: check current user is admin

---
 app/main.py                     | 11 ++++++++---
 app/templates/mainpage_get.html |  7 +++++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/main.py b/app/main.py
index 2af57e3..e134da2 100644
--- a/app/main.py
+++ b/app/main.py
@@ -11,7 +11,7 @@ from Article import *
 import Yaml
 from user_service import userService
 from account_service import accountService
-from admin_service import adminService
+from admin_service import adminService, ADMIN_NAME
 app = Flask(__name__)
 app.secret_key = 'lunch.time!'
 
@@ -98,8 +98,13 @@ def mainpage():
         d = load_freq_history(path_prefix + 'static/frequency/frequency.p')
         d_len = len(d)
         lst = sort_in_descending_order(pickle_idea.dict2lst(d))
-        return render_template('mainpage_get.html', random_ads=random_ads, number_of_essays=number_of_essays,
-                               d_len=d_len, lst=lst, yml=Yaml.yml)
+        return render_template('mainpage_get.html', 
+                               admin_name=ADMIN_NAME,
+                               random_ads=random_ads,
+                               d_len=d_len,
+                               lst=lst,
+                               yml=Yaml.yml,
+                               number_of_essays=number_of_essays)
 
 
 if __name__ == '__main__':
diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html
index 4cc4417..15da6c4 100644
--- a/app/templates/mainpage_get.html
+++ b/app/templates/mainpage_get.html
@@ -23,12 +23,15 @@
     <div class="container-fluid">
         <p><b><font size="+3" color="red">English Pal - Learn English smartly!</font></b></p>
         {% if session['logged_in'] %}
-            <a href="/{{session['username']}}">{{session['username']}}</a> <a href="/admin">管理</a></p>
+            <a href="/{{ session['username'] }}">{{ session['username'] }}</a>
+            {% if session['username'] == admin_name %}
+            <a href="/admin">管理</a></p>
+            {% endif %}
         {% else %}
             <p><a href="/admin">管理</a> <a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
             <p><b>{{random_ads|safe}}</b></p>
         {% endif %}
-        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{number_of_essays}} </span> 篇</div>
+        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇</div>
         <p>粘贴1篇文章 (English only)</p>
         <form method="post" action="/">
             <textarea name="content" rows="10" cols="120"></textarea><br/>

From ec6a2249ae32f7748e5d0d231e27042ed6fca39b Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 13:47:53 +0800
Subject: [PATCH 28/72] fix: fix the pagination

---
 app/admin_service.py           |  8 ++------
 app/templates/admin_index.html | 10 +++++-----
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index de05b46..717d4b4 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -25,14 +25,10 @@ def admin():
 
     article_number = get_number_of_articles()
     try:
-        _page_size = min(int(request.args.get("size", 5)), article_number)
-        if _page_size <= 0:
-            raise ZeroDivisionError
-        _cur_page = min(int(request.args.get("page", 1)), article_number // _page_size)
+        _page_size = min(max(1, int(request.args.get("size", 5))), article_number)  # 最小的size是1
+        _cur_page = min(max(1, int(request.args.get("page", 1))), article_number // _page_size + 1) # 最小的page是1
     except ValueError:
         return "page parmas must be int!"
-    except ZeroDivisionError:
-        return "page size must bigger than zero"
 
     context = {
         "article_number": article_number,
diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index 985ece0..ed5eecd 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -101,17 +101,17 @@
     </div>
     <div style="margin:20px 0;">
         <ul class="pagination pagination-sm justify-content-center">
-            <li class="page-item"><a class="page-link" href="/admin?page={{cur_page-1}}&size={{page_size}}">Previous</a>
+            <li class="page-item"><a class="page-link" href="/admin?page={{ cur_page - 1 }}&size={{ page_size }}">Previous</a>
             </li>
-            {% for i in range(1, article_number//page_size+1) %}
+            {% for i in range(1, article_number // page_size + 2) %}
             {% if cur_page == i %}
-            <li class="page-item active"><a class="page-link" href="/admin?page={{i}}&size={{page_size}}">{{ i }}</a>
+            <li class="page-item active"><a class="page-link" href="/admin?page={{ i }}&size={{ page_size }}">{{ i }}</a>
             </li>
             {% else %}
-            <li class="page-item"><a class="page-link" href="/admin?page={{i}}&size={{page_size}}">{{ i }}</a></li>
+            <li class="page-item"><a class="page-link" href="/admin?page={{ i }}&size={{ page_size }}">{{ i }}</a></li>
             {% endif %}
             {% endfor %}
-            <li class="page-item"><a class="page-link" href="/admin?page={{cur_page+1}}&size={{page_size}}">Next</a>
+            <li class="page-item"><a class="page-link" href="/admin?page={{ cur_page + 1 }}&size={{ page_size }}">Next</a>
             </li>
         </ul>
     </div>

From 13ccbaf25c489d491f3f62228445c5287d033a69 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 13:58:11 +0800
Subject: [PATCH 29/72] fix: use select to choose article level

---
 app/templates/admin_index.html | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index ed5eecd..5bc5901 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -45,7 +45,7 @@
         <h5 style="margin-top: 10px;padding-left: 10px;">重置选中用户密码</h5>
         <form action="" method="post" class="container mb-3">
             <div class="mb-3">
-                <label for="exampleInputEmail1" class="form-label">用户</label>
+                <label  class="form-label">用户</label>
                 <select id="username" name="username" class="form-select" aria-label="Default select example">
                     <option selected>选择用户</option>
                     {% for user in user_list %}
@@ -67,13 +67,19 @@
             <h5 style="margin-top: 10px;padding-left: 10px;">录入文章</h5>
             <form action="" method="post" class="container mb-3">
                 <div class="mb-3">
-                    <label for="exampleInputEmail1" class="form-label">文章内容</label>
+                    <label class="form-label">文章内容</label>
                     <textarea id="content" name="content" class="form-control" placeholder="请输入文章内容"></textarea>
-                    <label for="exampleInputEmail1" class="form-label">文章来源</label>
+                    <label class="form-label">文章来源</label>
                     <textarea id="source" name="source" class="form-control" placeholder="请输入来源"></textarea>
-                    <label for="exampleInputEmail1" class="form-label">文章等级</label>
-                    <textarea id="level" name="level" class="form-control" placeholder="请输入等级"></textarea>
-                    <label for="exampleInputEmail1" class="form-label">文章问题</label>
+                    <label class="form-label">文章等级</label>
+                    <select id="level" class="form-select" name="level">
+                        <option value="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                        <option selected value="5">5</option>
+                    </select>
+                    <label class="form-label">文章问题</label>
                     <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
                 </div>
                 <input type="submit" value="保存" class="btn btn-outline-primary">

From 82896de3368c5002475f1031599e2b5d25f94392 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 16:21:02 +0800
Subject: [PATCH 30/72] update .gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 413c71c..3d901ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ app/static/frequency/frequency.p
 app/static/wordfreqapp.db
 app/static/donate-the-author.jpg
 app/static/donate-the-author-hidden.jpg
+app/model/__pycache__/
\ No newline at end of file

From 3e35679a91515425ec77573dc9a710860081dd2a Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 17:09:25 +0800
Subject: [PATCH 31/72] refactor: refactor the model

---
 app/{model.py => model/__init__.py} |  2 +-
 app/model/article.py                | 34 +++++++++++++++++++++++++++++
 app/model/user.py                   | 19 ++++++++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)
 rename app/{model.py => model/__init__.py} (89%)
 create mode 100644 app/model/article.py
 create mode 100644 app/model/user.py

diff --git a/app/model.py b/app/model/__init__.py
similarity index 89%
rename from app/model.py
rename to app/model/__init__.py
index bc8a08a..9526313 100644
--- a/app/model.py
+++ b/app/model/__init__.py
@@ -1,7 +1,7 @@
 from pony.orm import *
 
 db = Database()
-db.bind("sqlite", "./static/wordfreqapp.db", create_db=True)  # bind sqlite file
+db.bind("sqlite", "../static/wordfreqapp.db", create_db=True)  # bind sqlite file
 
 
 class User(db.Entity):
diff --git a/app/model/article.py b/app/model/article.py
new file mode 100644
index 0000000..a3b4bf7
--- /dev/null
+++ b/app/model/article.py
@@ -0,0 +1,34 @@
+from model import *
+from datetime import datetime
+
+def add_article(content, source="manual_input", level="5", question="No question"):
+    with db_session:
+        # add one article to sqlite
+        Article(
+            text=content,
+            source=source,
+            date=datetime.now().strftime("%-d %b %Y"),  # format style of `5 Oct 2022`
+            level=level,
+            question=question,
+        )
+
+
+def delete_article_by_id(article_id):
+    article_id &= 0xFFFFFFFF  # max 32 bits
+    with db_session:
+        article = Article.select(article_id=article_id)
+        if article:
+            article.first().delete()
+
+
+def get_number_of_articles():
+    with db_session:
+        return len(Article.select()[:])
+
+
+def get_page_articles(num, size):
+    with db_session:
+        return [
+            x
+            for x in Article.select().order_by(desc(Article.article_id)).page(num, size)
+        ]
diff --git a/app/model/user.py b/app/model/user.py
new file mode 100644
index 0000000..6c030c2
--- /dev/null
+++ b/app/model/user.py
@@ -0,0 +1,19 @@
+from model import *
+from Login import md5
+
+def get_users():
+    with db_session:
+        return User.select().order_by(User.name)[:]
+
+
+def update_password_by_username(username, password="123456"):
+    with db_session:
+        user = User.select(name=username)
+        if user:
+            user.first().password = md5(username + password)
+
+def update_expiry_time_by_username(username, expiry_time="20230323"):
+    with db_session:
+        user = User.select(name=username)
+        if user:
+            user.first().expiry_date = expiry_time

From 2cf65123e9f06f7fc63caefd04db32d644e0e713 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 17:12:23 +0800
Subject: [PATCH 32/72] feat: admin can manage articles and users without
 interfering with each other

---
 app/admin_service.py                    | 141 ++++++++++++------------
 app/templates/admin_index.html          |  81 ++------------
 app/templates/admin_manage_article.html |  99 +++++++++++++++++
 app/templates/admin_manage_user.html    |  83 ++++++++++++++
 4 files changed, 260 insertions(+), 144 deletions(-)
 create mode 100644 app/templates/admin_manage_article.html
 create mode 100644 app/templates/admin_manage_user.html

diff --git a/app/admin_service.py b/app/admin_service.py
index 717d4b4..35e032c 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -1,9 +1,10 @@
+# System Library
 from flask import *
-from model import *
-from pony.orm import *
+
+# Personal library
 from Yaml import yml
-from Login import md5
-from datetime import datetime
+from model.user import *
+from model.article import *
 
 ADMIN_NAME = "lanhui"  # unique admin name
 _cur_page = 1  # current article page
@@ -11,33 +12,54 @@ _page_size = 5  # article sizes per page
 adminService = Blueprint("admin_service", __name__)
 
 
-@adminService.route("/admin", methods=["GET", "POST"])
-def admin():
-    global _cur_page, _page_size
+def check_is_admin():
     # 未登录，跳转到未登录界面
     if not session.get("logged_in"):
         return render_template("not_login.html")
 
-    # 获取session里的用户名
-    username = session.get("username")
-    if username != ADMIN_NAME:
+    # 用户名不是admin_name
+    if session.get("username") != ADMIN_NAME:
         return "You are not admin!"
 
+    return "pass"
+
+
+@adminService.route("/admin", methods=["GET"])
+def admin():
+    is_admin = check_is_admin()
+    if is_admin != "pass":
+        return is_admin
+
+    return render_template(
+        "admin_index.html", yml=yml, username=session.get("username")
+    )
+
+
+@adminService.route("/admin/article", methods=["GET", "POST"])
+def article():
+    global _cur_page, _page_size
+
+    is_admin = check_is_admin()
+    if is_admin != "pass":
+        return is_admin
+
     article_number = get_number_of_articles()
     try:
-        _page_size = min(max(1, int(request.args.get("size", 5))), article_number)  # 最小的size是1
-        _cur_page = min(max(1, int(request.args.get("page", 1))), article_number // _page_size + 1) # 最小的page是1
+        _page_size = min(
+            max(1, int(request.args.get("size", 5))), article_number
+        )  # 最小的size是1
+        _cur_page = min(
+            max(1, int(request.args.get("page", 1))), article_number // _page_size + 1
+        )  # 最小的page是1
     except ValueError:
         return "page parmas must be int!"
 
     context = {
         "article_number": article_number,
+        "text_list": get_page_articles(_cur_page, _page_size),
         "page_size": _page_size,
         "cur_page": _cur_page,
-        "text_list": get_page_articles(_cur_page, _page_size),
-        "user_list": get_users(),
-        "username": username,
-        "yml": yml,
+        "username": session.get("username"),
     }
 
     def _update_context():
@@ -46,71 +68,50 @@ def admin():
         context["text_list"] = get_page_articles(_cur_page, _page_size)
 
     if request.method == "GET":
-        delete_id = int(request.args.get("delete_id", 0))
+        try:
+            delete_id = int(request.args.get("delete_id", 0))
+        except:
+            return "Delete article ID must be int!"
         if delete_id:  # delete article
-            delete_article(delete_id)
+            delete_article_by_id(delete_id)
             _update_context()
-    else:
+    elif request.method == "POST":
         data = request.form
         content = data.get("content", "")
         source = data.get("source", "")
         question = data.get("question", "")
-        username = data.get("username", "")
         level = data.get("level", "5")
         if content:
-            try:    # check level
+            try:  # check level
                 if level not in [str(x + 1) for x in range(5)]:
                     raise ValueError
             except ValueError:
-                return "level must be between 1 and 5"
+                return "Level must be between 1 and 5"
             add_article(content, source, level, question)
             _update_context()
+
+    return render_template("admin_manage_article.html", **context)
+
+
+@adminService.route("/admin/user", methods=["GET", "POST"])
+def user():
+    is_admin = check_is_admin()
+    if is_admin != "pass":
+        return is_admin
+    
+    context = {
+        "user_list": get_users(),
+        "username": session.get("username"),
+    }
+    if request.method == "POST":
+        data = request.form
+        username = data.get("username","")
+        new_password = data.get("new_password", "")
+        expiry_time = data.get("expiry_time", "")
         if username:
-            update_user_password(username)
-
-    return render_template("admin_index.html", **context)
-
-
-def add_article(content, source="manual_input", level="5", question="No question"):
-    with db_session:
-        # add one article to sqlite
-        Article(
-            text=content,
-            source=source,
-            date=datetime.now().strftime("%-d %b %Y"),  # format style of `5 Oct 2022`
-            level=level,
-            question=question,
-        )
-
-
-def delete_article(article_id):
-    article_id &= 0xFFFFFFFF  # max 32 bits
-    with db_session:
-        article = Article.select(article_id=article_id)
-        if article:
-            article.first().delete()
-
-
-def get_number_of_articles():
-    with db_session:
-        return len(Article.select()[:])
-
-
-def get_page_articles(num, size):
-    with db_session:
-        return [
-            x
-            for x in Article.select().order_by(desc(Article.article_id)).page(num, size)
-        ]
-
-
-def get_users():
-    with db_session:
-        return User.select().order_by(User.name)[:]
-
-
-def update_user_password(username, password="123456"):
-    with db_session:
-        user = User.select(name=username)
-        if user:
-            user.first().password = md5(username + password)
+            if new_password:
+                update_password_by_username(username, new_password)
+            if expiry_time:
+                update_expiry_time_by_username(username, "".join(expiry_time.split("-")))
+    
+    return render_template("admin_manage_user.html", **context)
\ No newline at end of file
diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index 5bc5901..4d3f436 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -42,82 +42,15 @@
     </nav>
 
     <div class="card" style="margin-top:24px;">
-        <h5 style="margin-top: 10px;padding-left: 10px;">重置选中用户密码</h5>
-        <form action="" method="post" class="container mb-3">
-            <div class="mb-3">
-                <label  class="form-label">用户</label>
-                <select id="username" name="username" class="form-select" aria-label="Default select example">
-                    <option selected>选择用户</option>
-                    {% for user in user_list %}
-                    <option value="{{ user.name }}">{{ user.name }}</option>
-                    {% endfor %}
-                </select>
-            </div>
-            <input type="submit" value="重置密码为：123456" class="btn btn-outline-primary">
-        </form>
-    </div>
-
-    <div class="card" style="margin-top:24px;">
-        {% if tips %}
-        <div class="alert alert-success" role="alert">
-            {{ tips }}
+        <div class="card-header">
+            请选择您需要的操作
         </div>
-        {% endif %}
-        <div class="card-content">
-            <h5 style="margin-top: 10px;padding-left: 10px;">录入文章</h5>
-            <form action="" method="post" class="container mb-3">
-                <div class="mb-3">
-                    <label class="form-label">文章内容</label>
-                    <textarea id="content" name="content" class="form-control" placeholder="请输入文章内容"></textarea>
-                    <label class="form-label">文章来源</label>
-                    <textarea id="source" name="source" class="form-control" placeholder="请输入来源"></textarea>
-                    <label class="form-label">文章等级</label>
-                    <select id="level" class="form-select" name="level">
-                        <option value="1">1</option>
-                        <option value="2">2</option>
-                        <option value="3">3</option>
-                        <option value="4">4</option>
-                        <option selected value="5">5</option>
-                    </select>
-                    <label class="form-label">文章问题</label>
-                    <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
+        <ul class="list-group list-group-flush">
+            <li class="list-group-item">
+                <div class="d-grid gap-2">
+                    <a href="/admin/article" class="btn btn-outline-primary" type="button">管理文章</a>
+                    <a href="/admin/user" class="btn btn-outline-primary" type="button">管理用户</a>
                 </div>
-                <input type="submit" value="保存" class="btn btn-outline-primary">
-            </form>
-        </div>
-    </div>
-
-    <div class="card" style="margin-top:24px;">
-        <h5 style="margin-top: 10px;padding-left: 10px;">文章列表</h5>
-        <div class="list-group">
-            {% for text in text_list %}
-            <div class="list-group-item list-group-item-action" aria-current="true">
-                <div class="d-flex w-100 justify-content-between">
-                    <h5 class="mb-1">{{ text.source }}</h5>
-                    <small>Date:{{ text.date }} Level:{{ text.level }}</small>
-                </div>
-                <div style="text-align: right; padding-bottom: 5px;"><a href="/admin?delete_id={{text.article_id}}"
-                        class="btn btn-outline-danger btn-sm">
-                        删除文章
-                    </a></div>
-                <p class="mb-1">{{ text.text }}</p>
-            </div>
-            {% endfor %}
-        </div>
-    </div>
-    <div style="margin:20px 0;">
-        <ul class="pagination pagination-sm justify-content-center">
-            <li class="page-item"><a class="page-link" href="/admin?page={{ cur_page - 1 }}&size={{ page_size }}">Previous</a>
-            </li>
-            {% for i in range(1, article_number // page_size + 2) %}
-            {% if cur_page == i %}
-            <li class="page-item active"><a class="page-link" href="/admin?page={{ i }}&size={{ page_size }}">{{ i }}</a>
-            </li>
-            {% else %}
-            <li class="page-item"><a class="page-link" href="/admin?page={{ i }}&size={{ page_size }}">{{ i }}</a></li>
-            {% endif %}
-            {% endfor %}
-            <li class="page-item"><a class="page-link" href="/admin?page={{ cur_page + 1 }}&size={{ page_size }}">Next</a>
             </li>
         </ul>
     </div>
diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
new file mode 100644
index 0000000..d90af50
--- /dev/null
+++ b/app/templates/admin_manage_article.html
@@ -0,0 +1,99 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <link href="../static/css/bootstrap.css" rel="stylesheet">
+</head>
+
+<body class="container" style="width: 800px; margin: auto; margin-top:24px;">
+    <nav class="navbar navbar-expand-lg bg-light">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="#">管理员 {{ username }} 您好！</a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
+                aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarNav">
+                <ul class="navbar-nav">
+                    <li class="nav-item">
+                        <a class="nav-link" href="/{{ username }}">返回主页</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/logout">退出登录</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+
+    <div class="card" style="margin-top:24px;">
+        {% if tips %}
+        <div class="alert alert-success" role="alert">
+            {{ tips }}
+        </div>
+        {% endif %}
+        <div class="card-content">
+            <h5 style="margin-top: 10px;padding-left: 10px;">录入文章</h5>
+            <form action="" method="post" class="container mb-3">
+                <div class="mb-3">
+                    <label class="form-label">文章内容</label>
+                    <textarea id="content" name="content" class="form-control" placeholder="请输入文章内容"></textarea>
+                    <label class="form-label">文章来源</label>
+                    <textarea id="source" name="source" class="form-control" placeholder="请输入来源"></textarea>
+                    <label class="form-label">文章等级</label>
+                    <select id="level" class="form-select" name="level">
+                        <option value="1">1</option>
+                        <option value="2">2</option>
+                        <option value="3">3</option>
+                        <option value="4">4</option>
+                        <option selected value="5">5</option>
+                    </select>
+                    <label class="form-label">文章问题</label>
+                    <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
+                </div>
+                <input type="submit" value="保存" class="btn btn-outline-primary">
+            </form>
+        </div>
+    </div>
+
+    <div class="card" style="margin-top:24px;">
+        <h5 style="margin-top: 10px;padding-left: 10px;">文章列表</h5>
+        <div class="list-group">
+            {% for text in text_list %}
+            <div class="list-group-item list-group-item-action" aria-current="true">
+                <div class="d-flex w-100 justify-content-between">
+                    <h5 class="mb-1">{{ text.source }}</h5>
+                    <small>Date:{{ text.date }} Level:{{ text.level }}</small>
+                </div>
+                <div style="text-align: right; padding-bottom: 5px;"><a href="/admin/article?delete_id={{text.article_id}}"
+                        class="btn btn-outline-danger btn-sm">
+                        删除文章
+                    </a></div>
+                <p class="mb-1">{{ text.text }}</p>
+            </div>
+            {% endfor %}
+        </div>
+    </div>
+    <div style="margin:20px 0;">
+        <ul class="pagination pagination-sm justify-content-center">
+            <li class="page-item"><a class="page-link" href="/admin/article?page={{ cur_page - 1 }}&size={{ page_size }}">Previous</a>
+            </li>
+            {% for i in range(1, article_number // page_size + 2) %}
+            {% if cur_page == i %}
+            <li class="page-item active"><a class="page-link" href="/admin/article?page={{ i }}&size={{ page_size }}">{{ i }}</a>
+            </li>
+            {% else %}
+            <li class="page-item"><a class="page-link" href="/admin/article?page={{ i }}&size={{ page_size }}">{{ i }}</a></li>
+            {% endif %}
+            {% endfor %}
+            <li class="page-item"><a class="page-link" href="/admin/article?page={{ cur_page + 1 }}&size={{ page_size }}">Next</a>
+            </li>
+        </ul>
+    </div>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
new file mode 100644
index 0000000..59e1766
--- /dev/null
+++ b/app/templates/admin_manage_user.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport"
+        content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
+    <meta name="format-detection" content="telephone=no" />
+    <link href="../static/css/bootstrap.css" rel="stylesheet">
+    <script src="../static/js/jquery.js"></script>
+</head>
+
+<body class="container" style="width: 800px; margin: auto; margin-top:24px;">
+    <nav class="navbar navbar-expand-lg bg-light">
+        <div class="container-fluid">
+            <a class="navbar-brand" href="#">管理员 {{ username }} 您好！</a>
+            <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
+                aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
+                <span class="navbar-toggler-icon"></span>
+            </button>
+            <div class="collapse navbar-collapse" id="navbarNav">
+                <ul class="navbar-nav">
+                    <li class="nav-item">
+                        <a class="nav-link" href="/{{ username }}">返回主页</a>
+                    </li>
+                    <li class="nav-item">
+                        <a class="nav-link" href="/logout">退出登录</a>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </nav>
+
+    <div class="card" style="margin-top:24px;">
+        <h5 style="margin-top: 10px;padding-left: 10px;">重置选中用户的信息</h5>
+        <form id="user_form" action="" method="post" class="container mb-3">
+            <div>
+                <label class="form-label" style="padding-top: 10px;">用户</label>
+                <select id="username" name="username" class="form-select" aria-label="Default select example">
+                    <option selected>选择用户</option>
+                    {% for user in user_list %}
+                    <option value="{{ user.name }}">{{ user.name }}</option>
+                    {% endfor %}
+                </select>
+
+                <label class="form-label" style="padding-top: 10px;">修改密码</label>
+                <div>
+                    <button type="button" id="reset_pwd_btn" class="btn btn-outline-success">获取12位随机密码</button>
+                    <input style="margin-left: 20px;border: 0; font-size: 20px;" name="new_password"
+                        id="new_password"></input>
+                </div>
+
+                <label class="form-label" style="padding-top: 10px;">过期时间</label>
+                <div>
+                    <input type="date" name="expiry_time" placeholder="YYYY-MM-DD" pattern="yyyyMMdd">
+                </div>
+
+            </div>
+
+            <button style="margin-top: 50px;" type="submit" class="btn btn-primary">更新用户信息</button>
+        </form>
+    </div>
+</body>
+
+
+<script>
+    // 密码生成器
+    function generatePassword(length) {
+        var charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+~`|}{[]\:;?><,./-=";
+        var password = "";
+        for (var i = 0; i < length; i++) {
+            password += charset.charAt(Math.floor(Math.random() * charset.length));
+        }
+        return password;
+    }
+    document.getElementById("reset_pwd_btn").addEventListener("click", () => {
+        // 生成12位随机密码
+        let pwd = generatePassword(12)
+        document.getElementById("new_password").value = pwd
+    })
+</script>
+
+</html>
\ No newline at end of file

From 7941e5d1eb8526b38d8234127c66aa885f8df5c5 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Thu, 23 Mar 2023 17:34:37 +0800
Subject: [PATCH 33/72] fix: fix the way to show article title

---
 app/admin_service.py                    | 16 ++++++++++------
 app/templates/admin_manage_article.html | 16 +++++++++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 35e032c..9cbb75e 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -43,20 +43,24 @@ def article():
     if is_admin != "pass":
         return is_admin
 
-    article_number = get_number_of_articles()
+    _article_number = get_number_of_articles()
     try:
         _page_size = min(
-            max(1, int(request.args.get("size", 5))), article_number
+            max(1, int(request.args.get("size", 5))), _article_number
         )  # 最小的size是1
         _cur_page = min(
-            max(1, int(request.args.get("page", 1))), article_number // _page_size + 1
+            max(1, int(request.args.get("page", 1))), _article_number // _page_size + 1
         )  # 最小的page是1
     except ValueError:
         return "page parmas must be int!"
-
+    
+    _articles = get_page_articles(_cur_page, _page_size)
+    for article in _articles:   # 获取每篇文章的title
+        article.title = article.text.split("\n")[0]
+    
     context = {
-        "article_number": article_number,
-        "text_list": get_page_articles(_cur_page, _page_size),
+        "article_number": _article_number,
+        "text_list": _articles,
         "page_size": _page_size,
         "cur_page": _cur_page,
         "username": session.get("username"),
diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index d90af50..ed058de 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -66,14 +66,16 @@
             {% for text in text_list %}
             <div class="list-group-item list-group-item-action" aria-current="true">
                 <div class="d-flex w-100 justify-content-between">
-                    <h5 class="mb-1">{{ text.source }}</h5>
-                    <small>Date:{{ text.date }} Level:{{ text.level }}</small>
+                    <h5 class="mb-1">{{ text.title }}</h5>
+                    <a type="button" href="/admin/article?delete_id={{text.article_id}}"
+                        class="btn btn-outline-danger btn-sm">删除</a>
                 </div>
-                <div style="text-align: right; padding-bottom: 5px;"><a href="/admin/article?delete_id={{text.article_id}}"
-                        class="btn btn-outline-danger btn-sm">
-                        删除文章
-                    </a></div>
-                <p class="mb-1">{{ text.text }}</p>
+                <div><small>{{ text.source }}</small></div>
+                <div class="d-flex w-100 justify-content-between">
+                    <small>Level:{{text.level }}</small>
+                    <small>Date:{{ text.date }}</small>
+                </div>
+                <p style="padding-top: 5px;" class="mb-1">{{ text.text }}</p>
             </div>
             {% endfor %}
         </div>

From e27985127adcb0dd0cae3f301fdc86a20fa0aeb0 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 23 Mar 2023 21:00:31 +0800
Subject: [PATCH 34/72] =?UTF-8?q?admin=5Fmanage=5Farticle.html:=20?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E6=9C=80=E9=AB=98=E9=9A=BE=E5=BA=A6=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E6=98=AF4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_article.html | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index ed058de..0533517 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -49,8 +49,7 @@
                         <option value="1">1</option>
                         <option value="2">2</option>
                         <option value="3">3</option>
-                        <option value="4">4</option>
-                        <option selected value="5">5</option>
+                        <option selected value="4">4</option>
                     </select>
                     <label class="form-label">文章问题</label>
                     <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
@@ -98,4 +97,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>

From b97210a9e0b8d261743baef2f453dea97fff9b6a Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 23 Mar 2023 21:19:20 +0800
Subject: [PATCH 35/72] =?UTF-8?q?admin=5Fmanage=5Farticle.html:=20?=
 =?UTF-8?q?=E6=9B=B4=E4=B8=BA=E8=AF=A6=E7=BB=86=E7=9A=84=20placeholder=20?=
 =?UTF-8?q?=E5=86=85=E5=AE=B9.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_article.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index 0533517..ef1542c 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -41,9 +41,9 @@
             <form action="" method="post" class="container mb-3">
                 <div class="mb-3">
                     <label class="form-label">文章内容</label>
-                    <textarea id="content" name="content" class="form-control" placeholder="请输入文章内容"></textarea>
+                    <textarea id="content" name="content" class="form-control" rows="8" placeholder="首行是标题，后面是正文。"></textarea>
                     <label class="form-label">文章来源</label>
-                    <textarea id="source" name="source" class="form-control" placeholder="请输入来源"></textarea>
+                    <textarea id="source" name="source" class="form-control" placeholder="推荐格式：Source: HTTP 链接。"></textarea>
                     <label class="form-label">文章等级</label>
                     <select id="level" class="form-select" name="level">
                         <option value="1">1</option>
@@ -52,7 +52,7 @@
                         <option selected value="4">4</option>
                     </select>
                     <label class="form-label">文章问题</label>
-                    <textarea id="question" name="question" class="form-control" placeholder="请输入问题"></textarea>
+                    <textarea id="question" name="question" class="form-control" rows="6" placeholder="格式：&#x0a; QUESTION&#x0a; What?&#x0a;&#x0a; ANSWER&#x0a; Apple. "></textarea>
                 </div>
                 <input type="submit" value="保存" class="btn btn-outline-primary">
             </form>

From 7eb276937aff00d0a42010ed1d1c0f772377f025 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 23 Mar 2023 21:54:21 +0800
Subject: [PATCH 36/72] =?UTF-8?q?admin=5Fmanage=5Fuser.html:=20=E5=B0=86?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=87=E6=9C=9F=E6=97=B6=E9=97=B4=E8=AE=BE?=
 =?UTF-8?q?=E4=B8=BA365=E5=A4=A9=E4=BB=A5=E5=90=8E.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_user.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index 59e1766..1b3f0a0 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -52,7 +52,7 @@
 
                 <label class="form-label" style="padding-top: 10px;">过期时间</label>
                 <div>
-                    <input type="date" name="expiry_time" placeholder="YYYY-MM-DD" pattern="yyyyMMdd">
+                    <input type="date" id="expiry_date" name="expiry_time" placeholder="YYYY-MM-DD" pattern="yyyyMMdd">
                 </div>
 
             </div>
@@ -80,4 +80,12 @@
     })
 </script>
 
-</html>
\ No newline at end of file
+<script>
+    // Give the user another 365 days
+    const date = new Date();
+    date.setDate(date.getDate() + 365);
+    document.getElementById("expiry_date").value = date.toISOString().split('T')[0];
+</script>
+
+
+</html>

From a220450b038dfeaefca83d957b9811c22c7ab9a0 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 23 Mar 2023 22:05:36 +0800
Subject: [PATCH 37/72] =?UTF-8?q?mainpage=5Fget.html:=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=AE=A1=E7=90=86=E9=93=BE=E6=8E=A5?=
 =?UTF-8?q?=EF=BC=88=E5=8F=AF=E8=83=BD=E4=BC=9A=E5=AE=89=E5=85=A8=E7=82=B9?=
 =?UTF-8?q?=EF=BC=89.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/mainpage_get.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html
index 15da6c4..0590eec 100644
--- a/app/templates/mainpage_get.html
+++ b/app/templates/mainpage_get.html
@@ -28,7 +28,7 @@
             <a href="/admin">管理</a></p>
             {% endif %}
         {% else %}
-            <p><a href="/admin">管理</a> <a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
+            <p><a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
             <p><b>{{random_ads|safe}}</b></p>
         {% endif %}
         <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇</div>

From 99aa4e0990b7d32756c92b9163c4ab83e5db021f Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Sat, 25 Mar 2023 20:41:09 +0800
Subject: [PATCH 38/72] fix: fix article title show

---
 app/admin_service.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/admin_service.py b/app/admin_service.py
index 9cbb75e..0e2a308 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -70,6 +70,10 @@ def article():
         article_len = get_number_of_articles()
         context["article_number"] = article_len
         context["text_list"] = get_page_articles(_cur_page, _page_size)
+        _articles = get_page_articles(_cur_page, _page_size)
+        for article in _articles:   # 获取每篇文章的title
+            article.title = article.text.split("\n")[0]
+        context["text_list"] = _articles
 
     if request.method == "GET":
         try:

From ce28a5bf65d9bf71f7ef5e6ac931b719dd09c5fa Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Sat, 25 Mar 2023 21:20:19 +0800
Subject: [PATCH 39/72] feat: auto select expiry_date when select user

---
 app/templates/admin_manage_user.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index 1b3f0a0..99af604 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -36,7 +36,7 @@
         <form id="user_form" action="" method="post" class="container mb-3">
             <div>
                 <label class="form-label" style="padding-top: 10px;">用户</label>
-                <select id="username" name="username" class="form-select" aria-label="Default select example">
+                <select onchange="select_user()" id="username" name="username" class="form-select" aria-label="Default select example">
                     <option selected>选择用户</option>
                     {% for user in user_list %}
                     <option value="{{ user.name }}">{{ user.name }}</option>
@@ -78,6 +78,19 @@
         let pwd = generatePassword(12)
         document.getElementById("new_password").value = pwd
     })
+    // 选择用户后更新其过期时间
+    function select_user() {
+        let cur_user = $('#username').val();
+        {% for user in user_list %}
+            if (cur_user == "{{ user.name }}") {
+                const dateString = "{{ user.expiry_date }}"
+                const year = dateString.substr(0,4);
+                const month = dateString.substr(4,2);
+                const day = dateString.substr(6,2);
+                document.getElementById("expiry_date").value = year + '-' + month + '-' + day
+            }
+        {% endfor %}
+    }
 </script>
 
 <script>

From f17995a35caa1821c73cc03e84ba716d42820ba6 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Sat, 25 Mar 2023 21:31:32 +0800
Subject: [PATCH 40/72] fix: using new pagination mod func

---
 app/admin_service.py                    | 2 +-
 app/templates/admin_manage_article.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 0e2a308..92150bd 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -49,7 +49,7 @@ def article():
             max(1, int(request.args.get("size", 5))), _article_number
         )  # 最小的size是1
         _cur_page = min(
-            max(1, int(request.args.get("page", 1))), _article_number // _page_size + 1
+            max(1, int(request.args.get("page", 1))), _article_number // _page_size + (_article_number % _page_size > 0)
         )  # 最小的page是1
     except ValueError:
         return "page parmas must be int!"
diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index ef1542c..99c2ef6 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -83,7 +83,7 @@
         <ul class="pagination pagination-sm justify-content-center">
             <li class="page-item"><a class="page-link" href="/admin/article?page={{ cur_page - 1 }}&size={{ page_size }}">Previous</a>
             </li>
-            {% for i in range(1, article_number // page_size + 2) %}
+            {% for i in range(1, article_number // page_size + (article_number % page_size > 0) + 1) %}
             {% if cur_page == i %}
             <li class="page-item active"><a class="page-link" href="/admin/article?page={{ i }}&size={{ page_size }}">{{ i }}</a>
             </li>

From c6010ccbbda5693e72fe1c58cb4db4a4e67d55c9 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Sat, 25 Mar 2023 21:45:37 +0800
Subject: [PATCH 41/72] =?UTF-8?q?admin=5Fmanage=5Fuser.html:=20=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E9=9C=80=E8=A6=81=EF=BC=8C=E6=89=80=E4=BB=A5=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_user.html | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index 99af604..32aa149 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -93,12 +93,4 @@
     }
 </script>
 
-<script>
-    // Give the user another 365 days
-    const date = new Date();
-    date.setDate(date.getDate() + 365);
-    document.getElementById("expiry_date").value = date.toISOString().split('T')[0];
-</script>
-
-
 </html>

From fb6d0b23ce5a23d593ed5c11211476e8bf0d0ce3 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Sat, 25 Mar 2023 22:21:49 +0800
Subject: [PATCH 42/72] =?UTF-8?q?admin=5Fmanage=5Fuser.html:=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20JavaScript=20=E5=87=BD=E6=95=B0=E5=90=8D.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_user.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index 32aa149..a3a1755 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -36,7 +36,7 @@
         <form id="user_form" action="" method="post" class="container mb-3">
             <div>
                 <label class="form-label" style="padding-top: 10px;">用户</label>
-                <select onchange="select_user()" id="username" name="username" class="form-select" aria-label="Default select example">
+                <select onchange="loadUserExpiryDate()" id="username" name="username" class="form-select" aria-label="Default select example">
                     <option selected>选择用户</option>
                     {% for user in user_list %}
                     <option value="{{ user.name }}">{{ user.name }}</option>
@@ -79,7 +79,7 @@
         document.getElementById("new_password").value = pwd
     })
     // 选择用户后更新其过期时间
-    function select_user() {
+    function loadUserExpiryDate() {
         let cur_user = $('#username').val();
         {% for user in user_list %}
             if (cur_user == "{{ user.name }}") {

From 3bc61a602f1ae4d7675e75dbecc4a3616ce63dd5 Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 09:44:39 +0800
Subject: [PATCH 43/72] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E6=88=90=E5=8A=9F=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=98=BE=E7=A4=BA=E6=88=90=E5=8A=9F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=88flash=20messages=EF=BC=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin_service.py                    | 8 +++++---
 app/templates/admin_manage_article.html | 6 ++++++
 app/templates/admin_manage_user.html    | 6 ++++++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 92150bd..8632b43 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -97,7 +97,8 @@ def article():
                 return "Level must be between 1 and 5"
             add_article(content, source, level, question)
             _update_context()
-
+            title = content.split('\n')[0]
+            flash(f'Article added. Title: {title}')
     return render_template("admin_manage_article.html", **context)
 
 
@@ -119,7 +120,8 @@ def user():
         if username:
             if new_password:
                 update_password_by_username(username, new_password)
+                flash(f'Password updated to {new_password}')
             if expiry_time:
                 update_expiry_time_by_username(username, "".join(expiry_time.split("-")))
-    
-    return render_template("admin_manage_user.html", **context)
\ No newline at end of file
+                flash(f'Expiry date updated to {expiry_time}.')
+    return render_template("admin_manage_user.html", **context)
diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index 99c2ef6..7e476e6 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -30,6 +30,12 @@
         </div>
     </nav>
 
+    {% for message in get_flashed_messages() %}
+      <div class="alert alert-success" role="alert">
+        {{ message }}
+      </div>
+    {% endfor %}
+
     <div class="card" style="margin-top:24px;">
         {% if tips %}
         <div class="alert alert-success" role="alert">
diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index a3a1755..c5c98ca 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -31,6 +31,12 @@
         </div>
     </nav>
 
+    {% for message in get_flashed_messages() %}
+      <div class="alert alert-success" role="alert">
+        {{ message }}
+      </div>
+    {% endfor %}
+
     <div class="card" style="margin-top:24px;">
         <h5 style="margin-top: 10px;padding-left: 10px;">重置选中用户的信息</h5>
         <form id="user_form" action="" method="post" class="container mb-3">

From 8d8b9197b614b595bbba1ecf95c189ea1389780c Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 09:59:06 +0800
Subject: [PATCH 44/72] =?UTF-8?q?=E6=89=8B=E5=8A=A8=E8=BE=93=E5=85=A5?=
 =?UTF-8?q?=E7=9A=84=E6=96=87=E5=AD=97=E6=9C=80=E9=AB=98=E9=9A=BE=E5=BA=A6?=
 =?UTF-8?q?=E7=AD=89=E7=BA=A7=E6=98=AF4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin_service.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 8632b43..30d622f 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -88,13 +88,13 @@ def article():
         content = data.get("content", "")
         source = data.get("source", "")
         question = data.get("question", "")
-        level = data.get("level", "5")
+        level = data.get("level", "4")
         if content:
             try:  # check level
-                if level not in [str(x + 1) for x in range(5)]:
+                if level not in ['1', '2', '3', '4']:
                     raise ValueError
             except ValueError:
-                return "Level must be between 1 and 5"
+                return "Level must be between 1 and 4."
             add_article(content, source, level, question)
             _update_context()
             title = content.split('\n')[0]

From 4d99405bfaf2f87abdf4bfa1291083419c6df502 Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 18:59:15 +0800
Subject: [PATCH 45/72] =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF=E3=80=82=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=AF=E4=BB=A5=E8=BF=94=E5=9B=9E=E5=88=B0=E5=89=8D?=
 =?UTF-8?q?=E4=B8=80=E9=A1=B5=E5=90=8E=E5=86=8D=E9=80=80=E5=87=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E5=BD=B1=E5=93=8D=E4=BD=BF=E7=94=A8=E4=BD=93=E9=AA=8C?=
 =?UTF-8?q?=E3=80=82=E5=88=A0=E9=99=A4'=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=82=A8=E5=A5=BD'=E6=AC=A2=E8=BF=8E=E8=AF=8D=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E5=95=A5=E6=84=8F=E4=B9=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_index.html | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index 4d3f436..68ee68f 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -23,7 +23,6 @@
 <body class="container" style="width: 800px; margin: auto; margin-top:24px;">
     <nav class="navbar navbar-expand-lg bg-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="#">管理员 {{ username }} 您好！</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
                 aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
@@ -31,10 +30,7 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <a class="nav-link" href="/{{ username }}">返回主页</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="/logout">退出登录</a>
+                        <a class="nav-link" href="/{{ username }}">返回 {{ username }}</a>
                     </li>
                 </ul>
             </div>
@@ -56,4 +52,4 @@
     </div>
 </body>
 
-</html>
\ No newline at end of file
+</html>

From b3b154a24f9bb267146712e6020903a6e574c976 Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 19:06:04 +0800
Subject: [PATCH 46/72] =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E4=B8=8E=E7=AE=A1=E7=90=86=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=A1=E6=81=AF=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_article.html | 6 +-----
 app/templates/admin_manage_user.html    | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index 7e476e6..a856182 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -12,7 +12,6 @@
 <body class="container" style="width: 800px; margin: auto; margin-top:24px;">
     <nav class="navbar navbar-expand-lg bg-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="#">管理员 {{ username }} 您好！</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
                 aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
@@ -20,10 +19,7 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <a class="nav-link" href="/{{ username }}">返回主页</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="/logout">退出登录</a>
+                        <a class="nav-link" href="/admin">前一页</a>
                     </li>
                 </ul>
             </div>
diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index c5c98ca..585fc82 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -13,7 +13,6 @@
 <body class="container" style="width: 800px; margin: auto; margin-top:24px;">
     <nav class="navbar navbar-expand-lg bg-light">
         <div class="container-fluid">
-            <a class="navbar-brand" href="#">管理员 {{ username }} 您好！</a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
                 aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
@@ -21,10 +20,7 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <a class="nav-link" href="/{{ username }}">返回主页</a>
-                    </li>
-                    <li class="nav-item">
-                        <a class="nav-link" href="/logout">退出登录</a>
+                        <a class="nav-link" href="/admin">前一页</a>
                     </li>
                 </ul>
             </div>

From 0e257373816ee365d41e78b0b13ba807e0230aac Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 20:56:08 +0800
Subject: [PATCH 47/72] =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=96=87=E7=AB=A0=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E6=AF=8F=E7=AF=87=E6=96=87=E7=AB=A0=E4=B8=8D?=
 =?UTF-8?q?=E5=86=8D=E5=9C=A8=E5=86=85=E5=AE=B9=E9=83=A8=E5=88=86=E9=87=8D?=
 =?UTF-8?q?=E6=96=B0=E6=98=BE=E7=A4=BA=E6=A0=87=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin_service.py                    | 1 +
 app/templates/admin_manage_article.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 30d622f..1899002 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -57,6 +57,7 @@ def article():
     _articles = get_page_articles(_cur_page, _page_size)
     for article in _articles:   # 获取每篇文章的title
         article.title = article.text.split("\n")[0]
+        article.content = ''.join(article.text.split("\n")[1:])
     
     context = {
         "article_number": _article_number,
diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index a856182..e324b71 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -76,7 +76,7 @@
                     <small>Level:{{text.level }}</small>
                     <small>Date:{{ text.date }}</small>
                 </div>
-                <p style="padding-top: 5px;" class="mb-1">{{ text.text }}</p>
+                <p style="padding-top: 5px;" class="mb-1">{{ text.content }}</p>
             </div>
             {% endfor %}
         </div>

From 9eb5210d3f11211abe756597518d09b1cfd8f3e4 Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 20:58:37 +0800
Subject: [PATCH 48/72] =?UTF-8?q?Level=E4=B8=8EDate=E7=9A=84=E5=86=92?=
 =?UTF-8?q?=E5=8F=B7=E5=90=8E=E9=9D=A2=E5=8A=A0=E4=B8=AA=E7=A9=BA=E6=A0=BC?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E5=BE=97=E5=90=8E=E9=9D=A2=E7=9A=84=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9B=B4=E5=8A=A0=E7=9C=8B=E5=BE=97=E6=B8=85=E6=A5=9A?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_article.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index e324b71..2b2b7a2 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -73,8 +73,8 @@
                 </div>
                 <div><small>{{ text.source }}</small></div>
                 <div class="d-flex w-100 justify-content-between">
-                    <small>Level:{{text.level }}</small>
-                    <small>Date:{{ text.date }}</small>
+                    <small>Level: {{text.level }}</small>
+                    <small>Date: {{ text.date }}</small>
                 </div>
                 <p style="padding-top: 5px;" class="mb-1">{{ text.content }}</p>
             </div>

From d4ac7093859d400f77f24c7cf5b6d39dd67b2e9a Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 21:05:05 +0800
Subject: [PATCH 49/72] =?UTF-8?q?=E5=B0=86=E5=88=A0=E9=99=A4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=A7=BB=E5=88=B0=E7=AC=AC=E4=B8=80=E8=A1=8C=EF=BC=8C?=
 =?UTF-8?q?=E9=81=BF=E5=85=8D=E5=9B=A0=E4=B8=BA=E6=96=87=E7=AB=A0=E7=9A=84?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E8=BF=87=E9=95=BF=E8=B7=A8=E8=A1=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E5=BD=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=94=B9=E5=8F=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_manage_article.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index 2b2b7a2..1a07133 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -66,10 +66,11 @@
         <div class="list-group">
             {% for text in text_list %}
             <div class="list-group-item list-group-item-action" aria-current="true">
+                <div>
+                    <a type="button" href="/admin/article?delete_id={{text.article_id}}" class="btn btn-outline-danger btn-sm">删除</a>
+                </div>
                 <div class="d-flex w-100 justify-content-between">
                     <h5 class="mb-1">{{ text.title }}</h5>
-                    <a type="button" href="/admin/article?delete_id={{text.article_id}}"
-                        class="btn btn-outline-danger btn-sm">删除</a>
                 </div>
                 <div><small>{{ text.source }}</small></div>
                 <div class="d-flex w-100 justify-content-between">

From 0ce1c6eb6e5707ccfb47113b2c58c9961f2eae48 Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sun, 26 Mar 2023 21:14:29 +0800
Subject: [PATCH 50/72] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=9A=E6=AF=8F=E7=AF=87=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E4=B8=AD=E4=BF=9D=E7=95=99=E6=8D=A2=E8=A1=8C=EF=BC=8C=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E6=9F=A5=E7=9C=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin_service.py                    | 2 +-
 app/templates/admin_manage_article.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 1899002..16e80db 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -57,7 +57,7 @@ def article():
     _articles = get_page_articles(_cur_page, _page_size)
     for article in _articles:   # 获取每篇文章的title
         article.title = article.text.split("\n")[0]
-        article.content = ''.join(article.text.split("\n")[1:])
+        article.content = '<br/>'.join(article.text.split("\n")[1:])
     
     context = {
         "article_number": _article_number,
diff --git a/app/templates/admin_manage_article.html b/app/templates/admin_manage_article.html
index 1a07133..272b54e 100644
--- a/app/templates/admin_manage_article.html
+++ b/app/templates/admin_manage_article.html
@@ -77,7 +77,7 @@
                     <small>Level: {{text.level }}</small>
                     <small>Date: {{ text.date }}</small>
                 </div>
-                <p style="padding-top: 5px;" class="mb-1">{{ text.content }}</p>
+                {{ text.content | safe }}
             </div>
             {% endfor %}
         </div>

From 5b2f5199a82be7cdb7bb3ac57f7b54b5ea0f4034 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Mon, 27 Mar 2023 14:28:54 +0800
Subject: [PATCH 51/72] =?UTF-8?q?1.=20=E5=8F=96=E6=B6=88userpage=5Fget.htm?=
 =?UTF-8?q?l=E4=B8=AD=E6=8F=90=E7=A4=BA=E5=88=A0=E9=99=A4=E5=8D=95?=
 =?UTF-8?q?=E8=AF=8D=E4=BF=A1=E6=81=AF=E7=9A=84=E4=BB=A3=E7=A0=81=20?=
 =?UTF-8?q?=E5=92=8C=20=E5=8F=96=E6=B6=88user=5Fservice.userpage=E4=B8=ADr?=
 =?UTF-8?q?ender=5Ftemplate=E7=9A=84flashed=5Fmessages=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E3=80=82=E5=9B=A0=E4=B8=BA=E5=88=A0=E9=99=A4=E5=8D=95=E8=AF=8D?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=B7=B2=E7=BB=8F=E6=98=AF=E5=BC=82=E6=AD=A5?=
 =?UTF-8?q?=E4=BA=86=EF=BC=8C=E8=80=8C=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E5=87=BA=E7=8E=B0=E6=98=AF=E5=90=8C=E6=AD=A5=E6=89=A7?=
 =?UTF-8?q?=E8=A1=8C=EF=BC=8C=E6=89=80=E4=BB=A5=E5=B0=B1=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BA=86=E4=BB=A3=E7=A0=81=E4=B8=94=E6=B2=A1=E6=9C=89=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E5=A4=AA=E5=A4=A7=E5=BD=B1=E5=93=8D=E3=80=82=202.=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=96=E6=B6=88user=5Fservice.deleteword?=
 =?UTF-8?q?=E4=B8=AD=E5=AF=B9=E6=B3=A8=E9=87=8Aflash=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=9A=84=E6=B3=A8=E9=87=8A=EF=BC=8C=E6=A0=B9=E6=8D=AE=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E8=BF=9B=E8=A1=8C=E4=BA=86=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E8=A7=A3=E9=87=8A=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/userpage_get.html | 6 +++---
 app/user_service.py             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 5ef86c7..c9a04c1 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -40,9 +40,9 @@
         <a class="btn btn-secondary" href="/logout" role="button">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button">重设密码</a>
     </p>
-    {% for message in messages %}
-        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>
-    {% endfor %}
+{#    {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #}
+{#        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
+{#    {% endfor %}#}
 
     <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
     {% if session.get('existing_articles')[0] != None and session.get('existing_articles')[0] !=0 %}
diff --git a/app/user_service.py b/app/user_service.py
index 94a522a..1b47d74 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -92,8 +92,8 @@ def deleteword(username, word):
     '''
     user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
     pickle_idea2.deleteRecord(user_freq_record, word)
-    # 模板 userpage_get.html 中已经没有对flash信息的获取了，而且会影响 signup.html的显示，因为其中去获取了flash。在删除单词，退出，注册，页面就会出现提示信息
-    # flash(f'<strong>{word}</strong> is no longer in your word list.')
+    # 模板userpage_get.html中删除单词是异步执行，而flash的信息后续是同步执行的，所以注释这段代码；同时如果这里使用flash但不提取信息，则会影响 signup.html的显示。bug复现：删除单词后，点击退出，点击注册，注册页面就会出现提示信息
+    # flash(f'{word} is no longer in your word list.')
     return "success"
 
 
@@ -140,7 +140,7 @@ def userpage(username):
         return render_template('userpage_get.html',
                                username=username,
                                session=session,
-                               flashed_messages=get_flashed_messages(),
+                               # flashed_messages=get_flashed_messages(), 仅有删除单词的时候使用到flash，而删除单词是异步执行，这里的信息提示是同步执行，所以就没有存在的必要了
                                today_article=today_article,
                                d_len=len(d),
                                lst3=lst3,

From 0c16a4dc6f21849915cdad92c7189e37ccb9a289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Wed, 29 Mar 2023 20:53:38 +0800
Subject: [PATCH 52/72] =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=96=87=E7=AB=A0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=B7=B2=E7=BB=8F=E5=87=BA=E7=8E=B0=E7=9A=84?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5=E5=86=99=E9=94=99=E4=BD=8D=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=EF=BC=8C=E6=94=B9=E6=AD=A3=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Article.py b/app/Article.py
index 707ad91..d67995b 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -59,7 +59,8 @@ def get_today_article(user_word_list, existing_articles):
             text_level = text_difficulty_level(reading['text'], d3)
             factor = random.gauss(0.8,
                                   0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            if within_range(reading['article_id'] not in existing_articles[1] and text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
+            print("factor:{}, text_level:{}, user_level:{}, range:{}".format(factor, text_level, user_level, (8.0 - user_level) * factor))
+            if reading['article_id'] not in existing_articles[1] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                 d = reading
                 existing_articles[1].append(d['article_id'])  # 列表添加新的文章id；下面进行
                 flag = True

From 4417cf7017d50f20d99e1a274b48ad5d3b32e8e6 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Thu, 30 Mar 2023 16:10:22 +0800
Subject: [PATCH 53/72] Article.py: remove debug statement.

---
 app/Article.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index d67995b..6281c38 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -59,7 +59,6 @@ def get_today_article(user_word_list, existing_articles):
             text_level = text_difficulty_level(reading['text'], d3)
             factor = random.gauss(0.8,
                                   0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            print("factor:{}, text_level:{}, user_level:{}, range:{}".format(factor, text_level, user_level, (8.0 - user_level) * factor))
             if reading['article_id'] not in existing_articles[1] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                 d = reading
                 existing_articles[1].append(d['article_id'])  # 列表添加新的文章id；下面进行
@@ -125,4 +124,4 @@ def get_answer_part(s):
             flag = 1
         elif flag == 1:
             result.append(line)
-    return '\n'.join(result)
\ No newline at end of file
+    return '\n'.join(result)

From 6f1dd134193cb3f9fa1d3502b286d3be1f22c1ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Fri, 31 Mar 2023 04:50:41 +0800
Subject: [PATCH 54/72] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E7=9A=84print=E5=BF=98?=
 =?UTF-8?q?=E5=88=A0=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Article.py b/app/Article.py
index d67995b..32bb605 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -59,7 +59,6 @@ def get_today_article(user_word_list, existing_articles):
             text_level = text_difficulty_level(reading['text'], d3)
             factor = random.gauss(0.8,
                                   0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            print("factor:{}, text_level:{}, user_level:{}, range:{}".format(factor, text_level, user_level, (8.0 - user_level) * factor))
             if reading['article_id'] not in existing_articles[1] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                 d = reading
                 existing_articles[1].append(d['article_id'])  # 列表添加新的文章id；下面进行

From 1f150fc847d0fc70947261ff45843ccc116117c2 Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Fri, 31 Mar 2023 13:39:28 +0800
Subject: [PATCH 55/72] refactor: use ajax to get expiry_date

---
 app/admin_service.py                 | 17 +++++++++++++++++
 app/model/user.py                    |  5 +++++
 app/templates/admin_manage_user.html | 17 +++++++++--------
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 16e80db..efbaf6d 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -126,3 +126,20 @@ def user():
                 update_expiry_time_by_username(username, "".join(expiry_time.split("-")))
                 flash(f'Expiry date updated to {expiry_time}.')
     return render_template("admin_manage_user.html", **context)
+
+
+@adminService.route("/admin/expiry", methods=["GET"])
+def user_expiry_time():
+    is_admin = check_is_admin()
+    if is_admin != "pass":
+        return is_admin
+    
+    username = request.args.get("username", "")
+    if not username:
+        return "Username can't empty"
+    
+    user = get_user_by_username(username)
+    if not user:
+        return "User not exist"
+    
+    return user.expiry_date
\ No newline at end of file
diff --git a/app/model/user.py b/app/model/user.py
index 6c030c2..28173b9 100644
--- a/app/model/user.py
+++ b/app/model/user.py
@@ -5,6 +5,11 @@ def get_users():
     with db_session:
         return User.select().order_by(User.name)[:]
 
+def get_user_by_username(username):
+    with db_session:
+        user = User.select(name=username)
+        if user:
+            return user.first()
 
 def update_password_by_username(username, password="123456"):
     with db_session:
diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index 585fc82..a3f0ca0 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -82,16 +82,17 @@
     })
     // 选择用户后更新其过期时间
     function loadUserExpiryDate() {
-        let cur_user = $('#username').val();
-        {% for user in user_list %}
-            if (cur_user == "{{ user.name }}") {
-                const dateString = "{{ user.expiry_date }}"
-                const year = dateString.substr(0,4);
-                const month = dateString.substr(4,2);
-                const day = dateString.substr(6,2);
+        const cur_user = $('#username').val();
+        $.ajax({
+            type: "GET",
+            url: `/admin/expiry?username=${cur_user}`,
+            success: function(resp) {
+                const year = resp.substr(0,4);
+                const month = resp.substr(4,2);
+                const day = resp.substr(6,2);
                 document.getElementById("expiry_date").value = year + '-' + month + '-' + day
             }
-        {% endfor %}
+        })
     }
 </script>
 

From 688ed724734fddb4a07e9dd0dc5b6b2ace16e645 Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Sat, 1 Apr 2023 16:07:59 +0800
Subject: [PATCH 56/72] =?UTF-8?q?Correct=20grammar=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin_service.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index efbaf6d..1d1ba6e 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -133,13 +133,13 @@ def user_expiry_time():
     is_admin = check_is_admin()
     if is_admin != "pass":
         return is_admin
-    
+
     username = request.args.get("username", "")
     if not username:
-        return "Username can't empty"
-    
+        return "Username can't be empty."
+
     user = get_user_by_username(username)
     if not user:
-        return "User not exist"
-    
-    return user.expiry_date
\ No newline at end of file
+        return "User does not exist."
+
+    return user.expiry_date

From 15bb9250248aa6feb249be72c53d3fa6d7005d52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Tue, 4 Apr 2023 22:31:53 +0800
Subject: [PATCH 57/72] =?UTF-8?q?=E5=B0=86=E8=AE=B0=E5=BD=95=E9=98=85?=
 =?UTF-8?q?=E8=AF=BB=E8=BF=87=E6=96=87=E7=AB=A0=E7=9A=84=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=94=B9=E4=B8=BA=E5=AD=97=E5=85=B8=EF=BC=8C?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E4=BA=86flag=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py                  | 28 +++++++++++++++-------------
 app/templates/userpage_get.html |  2 +-
 app/user_service.py             |  4 ++--
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index 6281c38..e0f006a 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -35,11 +35,14 @@ def get_article_body(s):
 def get_today_article(user_word_list, existing_articles):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
     if existing_articles is None:
-        existing_articles = [0, []]  # existing_articles[0]：为existing_articles[1]的索引；existing_articles[1]:之前显示文章的id列表，越后越新
-    if existing_articles[0] > len(existing_articles[1])-1:
+        existing_articles = {
+            "index" : 0,  # 为 article_ids 的索引
+            "article_ids": []  # 之前显示文章的id列表，越后越新
+        }
+    if existing_articles["index"] > len(existing_articles["article_ids"])-1:
         rq.instructions("SELECT * FROM article")
     else:
-        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles[1][existing_articles[0]]))
+        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles["article_ids"][existing_articles["index"]]))
     rq.do()
     result = rq.get_results()
     random.shuffle(result)
@@ -49,28 +52,29 @@ def get_today_article(user_word_list, existing_articles):
     d2 = load_freq_history(path_prefix + 'static/words_and_tests.p')
     d3 = get_difficulty_level(d1, d2)
 
-    d = {}
+    d = None
     d_user = load_freq_history(user_word_list)
     user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
     text_level = 0
-    flag = False
-    if existing_articles[0] > len(existing_articles[1])-1:  # 下一篇
+    if existing_articles["index"] > len(existing_articles["article_ids"])-1:  # 下一篇
+        flag_get_article = False
         for reading in result:
             text_level = text_difficulty_level(reading['text'], d3)
             factor = random.gauss(0.8,
                                   0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            if reading['article_id'] not in existing_articles[1] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
+            if reading['article_id'] not in existing_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                 d = reading
-                existing_articles[1].append(d['article_id'])  # 列表添加新的文章id；下面进行
-                flag = True
+                existing_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
+                flag_get_article = True
                 break
+        if not flag_get_article:
+            existing_articles["index"] -= 1
     else:  # 上一篇
         d = random.choice(result)
         text_level = text_difficulty_level(d['text'], d3)
-        flag = True
 
     today_article = None
-    if flag:
+    if d:
         today_article = {
             "user_level": '%4.2f' % user_level,
             "text_level": '%4.2f' % text_level,
@@ -81,8 +85,6 @@ def get_today_article(user_word_list, existing_articles):
             "question": get_question_part(d['question']),
             "answer": get_answer_part(d['question'])
         }
-    else:
-        existing_articles[0] -= 1
 
     return existing_articles, today_article
 
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index c9a04c1..298b559 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -45,7 +45,7 @@
 {#    {% endfor %}#}
 
     <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
-    {% if session.get('existing_articles')[0] != None and session.get('existing_articles')[0] !=0 %}
+    {% if session.get('existing_articles') != None and session.get('existing_articles')["index"] !=0 %}
         <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
     {% endif %}
 
diff --git a/app/user_service.py b/app/user_service.py
index 1b47d74..8d1dbfc 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -31,7 +31,7 @@ def user_reset(username):
     '''
     if request.method == 'GET':
         existing_articles = session.get("existing_articles")
-        existing_articles[0] += 1
+        existing_articles["index"] += 1
         session["existing_articles"] = existing_articles
         return redirect(url_for('user_bp.userpage', username=username))
     else:
@@ -46,7 +46,7 @@ def user_back(username):
     '''
     if request.method == 'GET':
         existing_articles = session.get("existing_articles")
-        existing_articles[0] -= 1
+        existing_articles["index"] -= 1
         session["existing_articles"] = existing_articles
         return redirect(url_for('user_bp.userpage', username=username))
 

From cc8ca47f8c96eedaf2ce7ec61f5480123663953f Mon Sep 17 00:00:00 2001
From: zzhaofisher <10839192+zzhaofisher@user.noreply.gitee.com>
Date: Tue, 18 Apr 2023 21:50:54 +0800
Subject: [PATCH 58/72] refactor: remove sql sentences

---
 app/Login.py      | 64 +++++++++++++++++------------------------------
 app/model/user.py |  6 +++++
 2 files changed, 29 insertions(+), 41 deletions(-)

diff --git a/app/Login.py b/app/Login.py
index db4df18..cd750d1 100644
--- a/app/Login.py
+++ b/app/Login.py
@@ -3,6 +3,18 @@ import string
 from datetime import datetime, timedelta
 from UseSqlite import InsertQuery, RecordQuery
 
+def md5(s):
+    '''
+    MD5摘要
+    :param str: 字符串
+    :return: 经MD5以后的字符串
+    '''
+    h = hashlib.md5(s.encode(encoding='utf-8'))
+    return h.hexdigest()
+
+# import model.user after the defination of md5(s) to avoid circular import
+from model.user import get_user_by_username, insert_user, update_password_by_username
+
 path_prefix = '/var/www/wordfreq/wordfreq/'
 path_prefix = './'  # comment this line in deployment
 
@@ -12,13 +24,9 @@ def verify_pass(newpass,oldpass):
 
 
 def verify_user(username, password):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    password = md5(username + password)
-    rq.instructions_with_parameters("SELECT * FROM user WHERE name=:username AND password=:password", dict(
-        username=username, password=password))  # the named style https://docs.python.org/3/library/sqlite3.html
-    rq.do_with_parameters()
-    result = rq.get_results()
-    return result != []
+    user = get_user_by_username(username)
+    encoded_password = md5(username + password)
+    return user is not None and user.password == encoded_password
 
 
 def add_user(username, password):
@@ -26,19 +34,12 @@ def add_user(username, password):
     expiry_date = (datetime.now() + timedelta(days=30)).strftime('%Y%m%d') # will expire after 30 days
     # 将用户名和密码一起加密，以免暴露不同用户的相同密码
     password = md5(username + password)
-    rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
-    rq.instructions_with_parameters("INSERT INTO user VALUES (:username, :password, :start_date, :expiry_date)", dict(
-        username=username, password=password, start_date=start_date, expiry_date=expiry_date))
-    rq.do_with_parameters()
+    insert_user(username=username, password=password, start_date=start_date, expiry_date=expiry_date)
 
 
 def check_username_availability(username):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    rq.instructions_with_parameters(
-        "SELECT * FROM user WHERE name=:username", dict(username=username))
-    rq.do_with_parameters()
-    result = rq.get_results()
-    return result == []
+    existed_user = get_user_by_username(username)
+    return existed_user is None
 
 
 def change_password(username, old_password, new_password):
@@ -54,35 +55,16 @@ def change_password(username, old_password, new_password):
     # 将用户名和密码一起加密，以免暴露不同用户的相同密码
     if verify_pass(new_password,old_password): #新旧密码一致
         return False
-    password = md5(username + new_password)
-    rq = InsertQuery(path_prefix + 'static/wordfreqapp.db')
-    rq.instructions_with_parameters("UPDATE user SET password=:password WHERE name=:username", dict(
-        password=password, username=username))
-    rq.do_with_parameters()
+    update_password_by_username(username, new_password)
     return True
 
 
 def get_expiry_date(username):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    rq.instructions_with_parameters(
-        "SELECT expiry_date FROM user WHERE name=:username", dict(username=username))
-    rq.do_with_parameters()
-    result = rq.get_results()
-    if len(result) > 0:
-        return result[0]['expiry_date']
-    else:
+    user = get_user_by_username(username)
+    if user is None:
         return '20191024'
-
-
-def md5(s):
-    '''
-    MD5摘要
-    :param str: 字符串
-    :return: 经MD5以后的字符串
-    '''
-    h = hashlib.md5(s.encode(encoding='utf-8'))
-    return h.hexdigest()
-
+    else:
+        return user.expiry_date
 
 class UserName:
     def __init__(self, username):
diff --git a/app/model/user.py b/app/model/user.py
index 28173b9..d684332 100644
--- a/app/model/user.py
+++ b/app/model/user.py
@@ -1,5 +1,6 @@
 from model import *
 from Login import md5
+from pony import orm
 
 def get_users():
     with db_session:
@@ -11,6 +12,11 @@ def get_user_by_username(username):
         if user:
             return user.first()
 
+def insert_user(username, password, start_date, expiry_date):
+    with db_session:
+        user = User(name=username, password=password, start_date=start_date, expiry_date=expiry_date)
+        orm.commit()
+
 def update_password_by_username(username, password="123456"):
     with db_session:
         user = User.select(name=username)

From 16de0a7fd99a26d331e23eac7c1fd22594b7c50f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Thu, 20 Apr 2023 15:40:11 +0800
Subject: [PATCH 59/72] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=EF=BC=9Aexisting=5Farticles=20=E2=86=92=20ha?=
 =?UTF-8?q?d=5Fread=5Farticles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py                  | 20 ++++++++++----------
 app/account_service.py          |  4 ++--
 app/templates/userpage_get.html |  2 +-
 app/user_service.py             | 16 ++++++++--------
 4 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index e0f006a..b4df54c 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -32,17 +32,17 @@ def get_article_body(s):
     return '\n'.join(lst)
 
 
-def get_today_article(user_word_list, existing_articles):
+def get_today_article(user_word_list, had_read_articles):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    if existing_articles is None:
-        existing_articles = {
+    if had_read_articles is None:
+        had_read_articles = {
             "index" : 0,  # 为 article_ids 的索引
             "article_ids": []  # 之前显示文章的id列表，越后越新
         }
-    if existing_articles["index"] > len(existing_articles["article_ids"])-1:
+    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:
         rq.instructions("SELECT * FROM article")
     else:
-        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (existing_articles["article_ids"][existing_articles["index"]]))
+        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]]))
     rq.do()
     result = rq.get_results()
     random.shuffle(result)
@@ -56,19 +56,19 @@ def get_today_article(user_word_list, existing_articles):
     d_user = load_freq_history(user_word_list)
     user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
     text_level = 0
-    if existing_articles["index"] > len(existing_articles["article_ids"])-1:  # 下一篇
+    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 下一篇
         flag_get_article = False
         for reading in result:
             text_level = text_difficulty_level(reading['text'], d3)
             factor = random.gauss(0.8,
                                   0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            if reading['article_id'] not in existing_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
+            if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                 d = reading
-                existing_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
+                had_read_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
                 flag_get_article = True
                 break
         if not flag_get_article:
-            existing_articles["index"] -= 1
+            had_read_articles["index"] -= 1
     else:  # 上一篇
         d = random.choice(result)
         text_level = text_difficulty_level(d['text'], d3)
@@ -86,7 +86,7 @@ def get_today_article(user_word_list, existing_articles):
             "answer": get_answer_part(d['question'])
         }
 
-    return existing_articles, today_article
+    return had_read_articles, today_article
 
 
 def load_freq_history(path):
diff --git a/app/account_service.py b/app/account_service.py
index c1bd64c..8de9a03 100644
--- a/app/account_service.py
+++ b/app/account_service.py
@@ -37,7 +37,7 @@ def signup():
                 session[username] = username
                 session['username'] = username
                 session['expiry_date'] = get_expiry_date(username)
-                session['existing_articles'] = None
+                session['had_read_articles'] = None
                 return jsonify({'status': '2'})
             else:
                 return jsonify({'status': '1'})
@@ -66,7 +66,7 @@ def login():
             session['username'] = username
             user_expiry_date = get_expiry_date(username)
             session['expiry_date'] = user_expiry_date
-            session['existing_articles'] = None
+            session['had_read_articles'] = None
             return jsonify({'status': '1'})
         else:
             return jsonify({'status': '0'})
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 298b559..428bb3b 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -45,7 +45,7 @@
 {#    {% endfor %}#}
 
     <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
-    {% if session.get('existing_articles') != None and session.get('existing_articles')["index"] !=0 %}
+    {% if session.get('had_read_articles') != None and session.get('had_read_articles')["index"] !=0 %}
         <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
     {% endif %}
 
diff --git a/app/user_service.py b/app/user_service.py
index 8d1dbfc..61b129d 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -30,9 +30,9 @@ def user_reset(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        existing_articles = session.get("existing_articles")
-        existing_articles["index"] += 1
-        session["existing_articles"] = existing_articles
+        had_read_articles = session.get("had_read_articles")
+        had_read_articles["index"] += 1
+        session["had_read_articles"] = had_read_articles
         return redirect(url_for('user_bp.userpage', username=username))
     else:
         return 'Under construction'
@@ -45,9 +45,9 @@ def user_back(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        existing_articles = session.get("existing_articles")
-        existing_articles["index"] -= 1
-        session["existing_articles"] = existing_articles
+        had_read_articles = session.get("had_read_articles")
+        had_read_articles["index"] -= 1
+        session["had_read_articles"] = had_read_articles
         return redirect(url_for('user_bp.userpage', username=username))
 
 
@@ -134,8 +134,8 @@ def userpage(username):
         words = ''
         for x in lst3:
             words += x[0] + ' '
-        existing_articles, today_article = get_today_article(user_freq_record, session.get('existing_articles'))
-        session['existing_articles'] = existing_articles
+        had_read_articles, today_article = get_today_article(user_freq_record, session.get('had_read_articles'))
+        session['had_read_articles'] = had_read_articles
         # 通过 today_article，加载前端的显示页面
         return render_template('userpage_get.html',
                                username=username,

From 84affaeb69fdecb155cdf4daa4f57c4b29dbea55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Thu, 20 Apr 2023 20:30:14 +0800
Subject: [PATCH 60/72] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20/<username>=20?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=AD=98=E5=9C=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=88=E6=AF=8F=E6=AC=A1=E8=B0=83=E7=94=A8=E5=88=AB=E7=9A=84?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=BB=96=E9=83=BD=E4=BC=9A=E8=A2=AB=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=EF=BC=89=EF=BC=8C=E6=96=B0=E8=B7=AF=E7=94=B1=E4=B8=BA?=
 =?UTF-8?q?=20/<username>/userpage;=E5=90=8C=E6=97=B6=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=B7=AF=E7=94=B1=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AEuserpage=5Fget=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E4=BC=9A=E5=AF=BC=E8=87=B4=E9=9D=99=E6=80=81=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E7=94=9F=E6=88=90=E9=94=99=E8=AF=AF=EF=BC=8C?=
 =?UTF-8?q?=E8=BF=99=E9=87=8C=E4=BF=AE=E6=94=B9=E4=BA=86\static\config.yml?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=90=8E=E4=B9=9F=E9=83=BD?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8=E8=AE=BF=E9=97=AE=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/static/config.yml           | 10 +++++-----
 app/templates/login.html        |  2 +-
 app/templates/reset.html        |  2 +-
 app/templates/signup.html       |  2 +-
 app/templates/userpage_get.html |  2 +-
 app/user_service.py             |  3 ++-
 6 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/static/config.yml b/app/static/config.yml
index 20aa396..e6f7ef1 100644
--- a/app/static/config.yml
+++ b/app/static/config.yml
@@ -1,16 +1,16 @@
 # 全局引入的css文件地址
 css:
   item:
-    - static/css/bootstrap.css
+    - ../static/css/bootstrap.css
 
 # 全局引入的js文件地址
 js:
   head: # 在页面加载之前加载
-    - static/js/jquery.js
-    - static/js/word_operation.js
+    - ../static/js/jquery.js
+    - ../static/js/word_operation.js
   bottom: # 在页面加载完之后加载
-    - static/js/fillword.js
-    - static/js/highlight.js
+    - ../static/js/fillword.js
+    - ../static/js/highlight.js
 
 # 高亮样式，目前仅支持修改颜色
 highlight:
diff --git a/app/templates/login.html b/app/templates/login.html
index ccf6f34..2507f75 100644
--- a/app/templates/login.html
+++ b/app/templates/login.html
@@ -22,7 +22,7 @@
                     alert('无法通过验证。');
                     window.location.href = "/login";
                 } else if (response.status === '1') {
-                    window.location.href = "/"+username;
+                    window.location.href = "/"+username+"/userpage";
                 }
             }
         )
diff --git a/app/templates/reset.html b/app/templates/reset.html
index d29855b..3425c97 100644
--- a/app/templates/reset.html
+++ b/app/templates/reset.html
@@ -45,7 +45,7 @@
         <input type="password" placeholder="新密码" class="new-password" name="new-password" id="new-password"/>
         <input type="password" placeholder="确认新密码" class="re-new-password" name="re-new-password" id="re-new-password"/>
         <button id="submit" class="btn" onclick="reset()">提交</button>
-        <button class="btn" onclick="window.location.href='/{{ username }}'">放弃修改</button>
+        <button class="btn" onclick="window.location.href='/{{ username }}/userpage'">放弃修改</button>
 
     </div>
 {% endblock %}
\ No newline at end of file
diff --git a/app/templates/signup.html b/app/templates/signup.html
index c70e4ba..9030d41 100644
--- a/app/templates/signup.html
+++ b/app/templates/signup.html
@@ -35,7 +35,7 @@ You're logged in already! <a href="/logout">Logout</a>.
                     } else if (response.status === '2') {
                         let f = confirm("恭喜，你已成功注册，你的用户名是"+username+'.\n点击“确认”开始使用，或点击“取消”返回首页');
                         if (f) {
-                            window.location.href = '/'+username;
+                            window.location.href = '/'+username+'/userpage';
                         } else {
                             window.location.href = '/';
                         }
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 428bb3b..8936ff7 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -90,7 +90,7 @@
         </div>
     </div>
     <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
-    <form method="post" action="/{{ username }}">
+    <form method="post" action="/{{ username }}/userpage">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
         <input type="submit" value="把生词加入我的生词库"/>
         <input type="reset" value="清除"/>
diff --git a/app/user_service.py b/app/user_service.py
index 61b129d..b9f8d26 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -97,7 +97,7 @@ def deleteword(username, word):
     return "success"
 
 
-@userService.route("/<username>", methods=['GET', 'POST'])
+@userService.route("/<username>/userpage", methods=['GET', 'POST'])
 def userpage(username):
     '''
     用户界面
@@ -105,6 +105,7 @@ def userpage(username):
     :return: 返回用户界面
     '''
     # 未登录，跳转到未登录界面
+    print("123123")
     if not session.get('logged_in'):
         return render_template('not_login.html')
 

From da13e5bbd5da2a1ceb838c5a4836a0cabd8bdf69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Thu, 20 Apr 2023 21:28:29 +0800
Subject: [PATCH 61/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8DBug=EF=BC=88=E6=B2=A1?=
 =?UTF-8?q?=E6=89=BE=E5=88=B0=E6=96=87=E7=AB=A0=E5=90=8E=E7=AB=8B=E5=8D=B3?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=80=E7=AF=87=E4=BC=9A=E5=9B=9E=E5=88=B0=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8A=E7=AF=87=E6=96=87=E7=AB=A0=EF=BC=89=20&=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E6=B7=BB=E5=8A=A0id=E6=96=B9=E4=BE=BF=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/userpage_get.html |  4 ++--
 app/user_service.py             | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 8936ff7..6264ef0 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -44,9 +44,9 @@
 {#        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
 {#    {% endfor %}#}
 
-    <a class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
+    <a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
     {% if session.get('had_read_articles') != None and session.get('had_read_articles')["index"] !=0 %}
-        <a class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
+        <a id="pre_btn" class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
     {% endif %}
 
     <p><b>阅读文章并回答问题</b></p>
diff --git a/app/user_service.py b/app/user_service.py
index b9f8d26..712fd13 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -45,9 +45,10 @@ def user_back(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        had_read_articles = session.get("had_read_articles")
-        had_read_articles["index"] -= 1
-        session["had_read_articles"] = had_read_articles
+        if session.get("found_article"):
+            had_read_articles = session.get("had_read_articles")
+            had_read_articles["index"] -= 1
+            session["had_read_articles"] = had_read_articles
         return redirect(url_for('user_bp.userpage', username=username))
 
 
@@ -105,7 +106,6 @@ def userpage(username):
     :return: 返回用户界面
     '''
     # 未登录，跳转到未登录界面
-    print("123123")
     if not session.get('logged_in'):
         return render_template('not_login.html')
 
@@ -137,6 +137,10 @@ def userpage(username):
             words += x[0] + ' '
         had_read_articles, today_article = get_today_article(user_freq_record, session.get('had_read_articles'))
         session['had_read_articles'] = had_read_articles
+        if today_article is None:
+            session["found_article"] = False
+        else:
+            session["found_article"] = True
         # 通过 today_article，加载前端的显示页面
         return render_template('userpage_get.html',
                                username=username,

From 8f132ed87bfc00e321214dd4a4d6ed2a3ff4a8cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Thu, 20 Apr 2023 22:53:30 +0800
Subject: [PATCH 62/72] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=98=85?=
 =?UTF-8?q?=E8=AF=BB=E5=AE=8C=E6=89=80=E6=9C=89=E6=96=87=E7=AB=A0=E7=9A=84?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py                  | 42 ++++++++++++++++++++-------------
 app/templates/userpage_get.html |  6 ++++-
 app/user_service.py             |  3 ++-
 3 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index b4df54c..bfef595 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -39,9 +39,9 @@ def get_today_article(user_word_list, had_read_articles):
             "index" : 0,  # 为 article_ids 的索引
             "article_ids": []  # 之前显示文章的id列表，越后越新
         }
-    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:
+    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 生成新的文章，因此查找所有的文章
         rq.instructions("SELECT * FROM article")
-    else:
+    else:  # 生成阅读过的文章，因此查询指定 article_id 的文章
         rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]]))
     rq.do()
     result = rq.get_results()
@@ -53,23 +53,33 @@ def get_today_article(user_word_list, had_read_articles):
     d3 = get_difficulty_level(d1, d2)
 
     d = None
+    result_of_generate_article = "not found"
     d_user = load_freq_history(user_word_list)
     user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
     text_level = 0
-    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 下一篇
-        flag_get_article = False
-        for reading in result:
-            text_level = text_difficulty_level(reading['text'], d3)
-            factor = random.gauss(0.8,
-                                  0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-            if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
-                d = reading
-                had_read_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
-                flag_get_article = True
-                break
-        if not flag_get_article:
+    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 生成新的文章
+        amount_of_had_read_articles = len(had_read_articles["article_ids"])
+        amount_of_existing_articles = result.__len__()
+        if amount_of_had_read_articles == amount_of_existing_articles:  # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
+            result_of_generate_article = "had read all articles"
+        else:
+            test_count = 0
+            for k in range(3):  # 最多尝试3次
+                test_count += 1
+                for reading in result:
+                    text_level = text_difficulty_level(reading['text'], d3)
+                    factor = random.gauss(0.8, 0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
+                    if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
+                        d = reading
+                        had_read_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
+                        result_of_generate_article = "found"
+                        break
+                if result_of_generate_article == "found":  # 用于成功找到文章后及时退出外层循环
+                    break
+            print(test_count)
+        if result_of_generate_article != "found":  # 阅读完所有文章，或者循环3次没有找到适合的文章，则对 index+=1 进行回滚
             had_read_articles["index"] -= 1
-    else:  # 上一篇
+    else:  # 生成已经阅读过的文章
         d = random.choice(result)
         text_level = text_difficulty_level(d['text'], d3)
 
@@ -86,7 +96,7 @@ def get_today_article(user_word_list, had_read_articles):
             "answer": get_answer_part(d['question'])
         }
 
-    return had_read_articles, today_article
+    return had_read_articles, today_article, result_of_generate_article
 
 
 def load_freq_history(path):
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 6264ef0..e2cb9d4 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -71,10 +71,14 @@
                 <button onclick="toggle_visibility('answer');">ANSWER</button>
                 <div id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
             </div>
-        {% else %}
+        {% elif result_of_generate_article == "not found" %}
             <div class="alert alert-success" role="alert">
                 <p class="text-muted"><span class="badge bg-success">Notes:</span><br>No article is currently available for you. You can try again a few times or mark new words in the passage to improve your level.</p>
             </div>
+        {% elif result_of_generate_article == "had read all articles" %}
+            <div class="alert alert-success" role="alert">
+                <p class="text-muted"><span class="badge bg-success">Notes:</span><br>You've read all the articles.</p>
+            </div>
         {% endif %}
     </div>
 
diff --git a/app/user_service.py b/app/user_service.py
index 712fd13..a306724 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -135,7 +135,7 @@ def userpage(username):
         words = ''
         for x in lst3:
             words += x[0] + ' '
-        had_read_articles, today_article = get_today_article(user_freq_record, session.get('had_read_articles'))
+        had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles'))
         session['had_read_articles'] = had_read_articles
         if today_article is None:
             session["found_article"] = False
@@ -147,6 +147,7 @@ def userpage(username):
                                session=session,
                                # flashed_messages=get_flashed_messages(), 仅有删除单词的时候使用到flash，而删除单词是异步执行，这里的信息提示是同步执行，所以就没有存在的必要了
                                today_article=today_article,
+                               result_of_generate_article=result_of_generate_article,
                                d_len=len(d),
                                lst3=lst3,
                                yml=Yaml.yml,

From 70917df47b91f7fbb16870b15f2a2ecdbdad6135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Thu, 20 Apr 2023 23:15:12 +0800
Subject: [PATCH 63/72] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index bfef595..9fc9c07 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -63,9 +63,7 @@ def get_today_article(user_word_list, had_read_articles):
         if amount_of_had_read_articles == amount_of_existing_articles:  # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
             result_of_generate_article = "had read all articles"
         else:
-            test_count = 0
             for k in range(3):  # 最多尝试3次
-                test_count += 1
                 for reading in result:
                     text_level = text_difficulty_level(reading['text'], d3)
                     factor = random.gauss(0.8, 0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
@@ -76,7 +74,6 @@ def get_today_article(user_word_list, had_read_articles):
                         break
                 if result_of_generate_article == "found":  # 用于成功找到文章后及时退出外层循环
                     break
-            print(test_count)
         if result_of_generate_article != "found":  # 阅读完所有文章，或者循环3次没有找到适合的文章，则对 index+=1 进行回滚
             had_read_articles["index"] -= 1
     else:  # 生成已经阅读过的文章

From 03145b57d98c29ae04948281e8e4e67512e75829 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Fri, 21 Apr 2023 02:36:51 +0800
Subject: [PATCH 64/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=B9=E7=95=8C?=
 =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98=EF=BC=88=E5=BD=93=E5=88=9A=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E5=B0=B1=E6=B2=A1=E6=9C=89=E6=89=BE=E5=88=B0=E6=96=87?=
 =?UTF-8?q?=E7=AB=A0=E6=88=96=E8=80=85=E5=B0=B1=E6=A0=B9=E6=9C=AC=E8=A2=AB?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=96=87=E7=AB=A0=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=EF=BC=8C=E4=BC=9A=E5=87=BA=E7=8E=B0=E4=B8=8A=E4=B8=80=E7=AF=87?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py                  |  5 +++--
 app/templates/userpage_get.html |  8 +++++---
 app/user_service.py             | 18 +++++++++---------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index 9fc9c07..aac2c81 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -74,11 +74,12 @@ def get_today_article(user_word_list, had_read_articles):
                         break
                 if result_of_generate_article == "found":  # 用于成功找到文章后及时退出外层循环
                     break
-        if result_of_generate_article != "found":  # 阅读完所有文章，或者循环3次没有找到适合的文章，则对 index+=1 进行回滚
-            had_read_articles["index"] -= 1
+        if result_of_generate_article != "found":  # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”）
+            had_read_articles["article_ids"].append('null')
     else:  # 生成已经阅读过的文章
         d = random.choice(result)
         text_level = text_difficulty_level(d['text'], d3)
+        result_of_generate_article = "found"
 
     today_article = None
     if d:
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index e2cb9d4..68948df 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -44,14 +44,16 @@
 {#        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
 {#    {% endfor %}#}
 
-    <a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
-    {% if session.get('had_read_articles') != None and session.get('had_read_articles')["index"] !=0 %}
+    {% if result_of_generate_article != "had read all articles" %}
+        <a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
+    {% endif %}
+    {% if session.get('had_read_articles') and session.get('had_read_articles')['index']>0 %}
         <a id="pre_btn" class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
     {% endif %}
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">
-        {% if today_article %}
+        {% if result_of_generate_article == 'found' %}
             <div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="badge bg-success">{{ today_article["text_level"] }}</span> for you.</div>
                 <p class="text-muted">Article added on: {{ today_article["date"] }}</p><br/>
             <div class="p-3 mb-2 bg-light text-dark"><br/>
diff --git a/app/user_service.py b/app/user_service.py
index a306724..4f81c6e 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -31,7 +31,10 @@ def user_reset(username):
     '''
     if request.method == 'GET':
         had_read_articles = session.get("had_read_articles")
-        had_read_articles["index"] += 1
+        if had_read_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来,无需index+=1
+            had_read_articles['article_ids'].pop()
+        else:  # 当前不为“null”，直接 index+=1
+            had_read_articles["index"] += 1
         session["had_read_articles"] = had_read_articles
         return redirect(url_for('user_bp.userpage', username=username))
     else:
@@ -45,10 +48,11 @@ def user_back(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        if session.get("found_article"):
-            had_read_articles = session.get("had_read_articles")
-            had_read_articles["index"] -= 1
-            session["had_read_articles"] = had_read_articles
+        had_read_articles = session.get("had_read_articles")
+        had_read_articles["index"] -= 1  # 上一篇，index-=1
+        if had_read_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来
+            had_read_articles['article_ids'].pop()
+        session["had_read_articles"] = had_read_articles
         return redirect(url_for('user_bp.userpage', username=username))
 
 
@@ -137,10 +141,6 @@ def userpage(username):
             words += x[0] + ' '
         had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles'))
         session['had_read_articles'] = had_read_articles
-        if today_article is None:
-            session["found_article"] = False
-        else:
-            session["found_article"] = True
         # 通过 today_article，加载前端的显示页面
         return render_template('userpage_get.html',
                                username=username,

From fc3e27488b3b55c1013a970e6abb95b88caff9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Fri, 21 Apr 2023 05:33:26 +0800
Subject: [PATCH 65/72] =?UTF-8?q?=E7=BB=99=E6=A0=87=E7=AD=BE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0id=EF=BC=8C=E6=96=B9=E4=BE=BF=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/userpage_get.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 68948df..cb892db 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -37,7 +37,7 @@
 <body>
 <div class="container-fluid">
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
-        <a class="btn btn-secondary" href="/logout" role="button">退出</a>
+        <a id="quit" class="btn btn-secondary" href="/logout" role="button">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button">重设密码</a>
     </p>
 {#    {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #}

From 58d7349afe69c5934754cb7a5145b33382326c37 Mon Sep 17 00:00:00 2001
From: Hui Lan <lanhui@zjnu.edu.cn>
Date: Tue, 25 Apr 2023 08:40:26 +0800
Subject: [PATCH 66/72] Change from bug359-zhangkeli

---
 app/pickle_idea2.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/pickle_idea2.py b/app/pickle_idea2.py
index 4055fc4..0da55bc 100644
--- a/app/pickle_idea2.py
+++ b/app/pickle_idea2.py
@@ -68,7 +68,7 @@ def save_frequency_to_pickle(d, pickle_fname):
     d2 = {}
     for k in d:
         if not k in exclusion_lst and not k.isnumeric() and not len(k) < 2:
-            d2[k] = list(sorted(set(d[k])))
+            d2[k] = list(sorted(d[k])) # 原先这里是d2[k] = list(sorted(set(d[k])))
     pickle.dump(d2, f)
     f.close()
 

From 6be035f2828286b5cd59f15ec04336b86c3cb0fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Tue, 25 Apr 2023 11:38:01 +0800
Subject: [PATCH 67/72] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=89=BE=E5=88=B0=E6=96=87=E7=AB=A0=E6=88=96=E8=80=85?=
 =?UTF-8?q?=E6=96=87=E7=AB=A0=E8=AF=BB=E5=AE=8C=E6=97=B6=EF=BC=8C=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E6=88=96=E8=80=85?=
 =?UTF-8?q?session=E4=B8=8D=E5=85=B3=E9=97=AD=E9=87=8D=E6=96=B0=E8=BF=9B?=
 =?UTF-8?q?=E5=85=A5=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AF=BC=E8=87=B4=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/Article.py b/app/Article.py
index aac2c81..35a06a4 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -42,6 +42,9 @@ def get_today_article(user_word_list, had_read_articles):
     if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 生成新的文章，因此查找所有的文章
         rq.instructions("SELECT * FROM article")
     else:  # 生成阅读过的文章，因此查询指定 article_id 的文章
+        if had_read_articles["article_ids"][had_read_articles["index"]] == 'null':  # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作
+            had_read_articles["index"] -= 1
+            had_read_articles["article_ids"].pop()
         rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]]))
     rq.do()
     result = rq.get_results()

From d30a434b2a0dce5247bb005c5c245529d5a542d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Tue, 25 Apr 2023 17:47:51 +0800
Subject: [PATCH 68/72] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E5=90=8Dhad=5Fread=5Farticles->visited=5Farticles?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Article.py                  | 30 +++++++++++++++---------------
 app/account_service.py          |  4 ++--
 app/templates/userpage_get.html |  2 +-
 app/user_service.py             | 24 ++++++++++++------------
 4 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/app/Article.py b/app/Article.py
index 35a06a4..e40717f 100644
--- a/app/Article.py
+++ b/app/Article.py
@@ -32,20 +32,20 @@ def get_article_body(s):
     return '\n'.join(lst)
 
 
-def get_today_article(user_word_list, had_read_articles):
+def get_today_article(user_word_list, visited_articles):
     rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
-    if had_read_articles is None:
-        had_read_articles = {
+    if visited_articles is None:
+        visited_articles = {
             "index" : 0,  # 为 article_ids 的索引
             "article_ids": []  # 之前显示文章的id列表，越后越新
         }
-    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 生成新的文章，因此查找所有的文章
+    if visited_articles["index"] > len(visited_articles["article_ids"])-1:  # 生成新的文章，因此查找所有的文章
         rq.instructions("SELECT * FROM article")
     else:  # 生成阅读过的文章，因此查询指定 article_id 的文章
-        if had_read_articles["article_ids"][had_read_articles["index"]] == 'null':  # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作
-            had_read_articles["index"] -= 1
-            had_read_articles["article_ids"].pop()
-        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (had_read_articles["article_ids"][had_read_articles["index"]]))
+        if visited_articles["article_ids"][visited_articles["index"]] == 'null':  # 可能因为直接刷新页面导致直接去查询了'null'，因此当刷新的页面的时候，需要直接进行“上一篇”操作
+            visited_articles["index"] -= 1
+            visited_articles["article_ids"].pop()
+        rq.instructions('SELECT * FROM article WHERE article_id=%d' % (visited_articles["article_ids"][visited_articles["index"]]))
     rq.do()
     result = rq.get_results()
     random.shuffle(result)
@@ -60,25 +60,25 @@ def get_today_article(user_word_list, had_read_articles):
     d_user = load_freq_history(user_word_list)
     user_level = user_difficulty_level(d_user, d3)  # more consideration as user's behaviour is dynamic. Time factor should be considered.
     text_level = 0
-    if had_read_articles["index"] > len(had_read_articles["article_ids"])-1:  # 生成新的文章
-        amount_of_had_read_articles = len(had_read_articles["article_ids"])
+    if visited_articles["index"] > len(visited_articles["article_ids"])-1:  # 生成新的文章
+        amount_of_visited_articles = len(visited_articles["article_ids"])
         amount_of_existing_articles = result.__len__()
-        if amount_of_had_read_articles == amount_of_existing_articles:  # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
+        if amount_of_visited_articles == amount_of_existing_articles:  # 如果当前阅读过的文章的数量 == 存在的文章的数量，即所有的书本都阅读过了
             result_of_generate_article = "had read all articles"
         else:
             for k in range(3):  # 最多尝试3次
                 for reading in result:
                     text_level = text_difficulty_level(reading['text'], d3)
                     factor = random.gauss(0.8, 0.1)  # a number drawn from Gaussian distribution with a mean of 0.8 and a stand deviation of 1
-                    if reading['article_id'] not in had_read_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
+                    if reading['article_id'] not in visited_articles["article_ids"] and within_range(text_level, user_level, (8.0 - user_level) * factor):  # 新的文章之前没有出现过且符合一定范围的水平
                         d = reading
-                        had_read_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
+                        visited_articles["article_ids"].append(d['article_id'])  # 列表添加新的文章id；下面进行
                         result_of_generate_article = "found"
                         break
                 if result_of_generate_article == "found":  # 用于成功找到文章后及时退出外层循环
                     break
         if result_of_generate_article != "found":  # 阅读完所有文章，或者循环3次没有找到适合的文章，则放入空（“null”）
-            had_read_articles["article_ids"].append('null')
+            visited_articles["article_ids"].append('null')
     else:  # 生成已经阅读过的文章
         d = random.choice(result)
         text_level = text_difficulty_level(d['text'], d3)
@@ -97,7 +97,7 @@ def get_today_article(user_word_list, had_read_articles):
             "answer": get_answer_part(d['question'])
         }
 
-    return had_read_articles, today_article, result_of_generate_article
+    return visited_articles, today_article, result_of_generate_article
 
 
 def load_freq_history(path):
diff --git a/app/account_service.py b/app/account_service.py
index 8de9a03..a7ed0c4 100644
--- a/app/account_service.py
+++ b/app/account_service.py
@@ -37,7 +37,7 @@ def signup():
                 session[username] = username
                 session['username'] = username
                 session['expiry_date'] = get_expiry_date(username)
-                session['had_read_articles'] = None
+                session['visited_articles'] = None
                 return jsonify({'status': '2'})
             else:
                 return jsonify({'status': '1'})
@@ -66,7 +66,7 @@ def login():
             session['username'] = username
             user_expiry_date = get_expiry_date(username)
             session['expiry_date'] = user_expiry_date
-            session['had_read_articles'] = None
+            session['visited_articles'] = None
             return jsonify({'status': '1'})
         else:
             return jsonify({'status': '0'})
diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index cb892db..8620b19 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -47,7 +47,7 @@
     {% if result_of_generate_article != "had read all articles" %}
         <a id="next_btn" class="btn btn-success" href="/{{ username }}/reset" role="button"> 下一篇 Next Article </a>
     {% endif %}
-    {% if session.get('had_read_articles') and session.get('had_read_articles')['index']>0 %}
+    {% if session.get('visited_articles') and session.get('visited_articles')['index']>0 %}
         <a id="pre_btn" class="btn btn-success" href="/{{ username }}/back" role="button"> 上一篇 Previous Article </a>
     {% endif %}
 
diff --git a/app/user_service.py b/app/user_service.py
index 4f81c6e..f514d45 100644
--- a/app/user_service.py
+++ b/app/user_service.py
@@ -30,12 +30,12 @@ def user_reset(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        had_read_articles = session.get("had_read_articles")
-        if had_read_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来,无需index+=1
-            had_read_articles['article_ids'].pop()
+        visited_articles = session.get("visited_articles")
+        if visited_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来,无需index+=1
+            visited_articles['article_ids'].pop()
         else:  # 当前不为“null”，直接 index+=1
-            had_read_articles["index"] += 1
-        session["had_read_articles"] = had_read_articles
+            visited_articles["index"] += 1
+        session["visited_articles"] = visited_articles
         return redirect(url_for('user_bp.userpage', username=username))
     else:
         return 'Under construction'
@@ -48,11 +48,11 @@ def user_back(username):
     :return: 返回页面内容
     '''
     if request.method == 'GET':
-        had_read_articles = session.get("had_read_articles")
-        had_read_articles["index"] -= 1  # 上一篇，index-=1
-        if had_read_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来
-            had_read_articles['article_ids'].pop()
-        session["had_read_articles"] = had_read_articles
+        visited_articles = session.get("visited_articles")
+        visited_articles["index"] -= 1  # 上一篇，index-=1
+        if visited_articles['article_ids'][-1] == "null":  # 如果当前还是“null”，则将“null”pop出来
+            visited_articles['article_ids'].pop()
+        session["visited_articles"] = visited_articles
         return redirect(url_for('user_bp.userpage', username=username))
 
 
@@ -139,8 +139,8 @@ def userpage(username):
         words = ''
         for x in lst3:
             words += x[0] + ' '
-        had_read_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('had_read_articles'))
-        session['had_read_articles'] = had_read_articles
+        visited_articles, today_article, result_of_generate_article = get_today_article(user_freq_record, session.get('visited_articles'))
+        session['visited_articles'] = visited_articles
         # 通过 today_article，加载前端的显示页面
         return render_template('userpage_get.html',
                                username=username,

From 5654fbf9bc3ae85eec621a4e6e2ecd1f6c6c3b30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=80=E9=97=AE=E4=B8=89=E4=B8=8D=E7=9F=A5?=
 <178428409@qq.com>
Date: Wed, 26 Apr 2023 18:49:59 +0800
Subject: [PATCH 69/72] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=96=B0=E7=9A=84/<username>/userpage=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/templates/admin_index.html  | 2 +-
 app/templates/mainpage_get.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/templates/admin_index.html b/app/templates/admin_index.html
index 68ee68f..f62a137 100644
--- a/app/templates/admin_index.html
+++ b/app/templates/admin_index.html
@@ -30,7 +30,7 @@
             <div class="collapse navbar-collapse" id="navbarNav">
                 <ul class="navbar-nav">
                     <li class="nav-item">
-                        <a class="nav-link" href="/{{ username }}">返回 {{ username }}</a>
+                        <a class="nav-link" href="/{{ username }}/userpage">返回 {{ username }}</a>
                     </li>
                 </ul>
             </div>
diff --git a/app/templates/mainpage_get.html b/app/templates/mainpage_get.html
index 3594571..344943d 100644
--- a/app/templates/mainpage_get.html
+++ b/app/templates/mainpage_get.html
@@ -23,7 +23,7 @@
     <div class="container-fluid">
         <p><b><font size="+3" color="red">English Pal - Learn English smartly!</font></b></p>
         {% if session['logged_in'] %}
-            <a href="/{{ session['username'] }}">{{ session['username'] }}</a>
+            <a href="/{{ session['username'] }}/userpage">{{ session['username'] }}</a>
             {% if session['username'] == admin_name %}
             <a href="/admin">管理</a></p>
             {% endif %}

From a80b062b8707fb6a73554b8500b8c5ae17775ed3 Mon Sep 17 00:00:00 2001
From: ZhuZhihao <1287365321@qq.com>
Date: Fri, 5 May 2023 17:20:58 +0800
Subject: [PATCH 70/72] refactor: remove variable 'count'

---
 app/static/js/highlight.js | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js
index 13b9865..555f76b 100644
--- a/app/static/js/highlight.js
+++ b/app/static/js/highlight.js
@@ -34,17 +34,12 @@ function highLight() {
 
             //修改代码
             let articleContent_fb = articleContent;  //文章副本
-            let count = 1000;  //简单计数器，防止陷入死循环。
             while(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()) !== -1 && list[i]!=""){
-                //针对同一篇文章中可能存在相同单词的不同大小写问题，采用while循环判断副本中是否还存在匹配单词。
-
-                count--;
-                if(count <= 0)break;   //TimeOut!
-
                 //找到副本中和list[i]匹配的第一个单词(第一种匹配情况),并赋值给list[i]。
-                list[i] = articleContent_fb.substr(articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase()),list[i].length);
+                const index = articleContent_fb.toLowerCase().indexOf(list[i].toLowerCase());
+                list[i] = articleContent_fb.substring(index, index + list[i].length);
 
-                articleContent_fb = articleContent_fb.replace(list[i],""); //删除副本中和list[i]匹配的单词
+                articleContent_fb = articleContent_fb.substring(index + list[i].length);    // 使用副本中list[i]之后的子串替换掉副本
                 articleContent = articleContent.replace(new RegExp("\\b"+list[i]+"\\b","g"),"<mark>" + list[i] + "</mark>");
             }
         }

From f64d06fbbf00255fc21f141d852d8995e588785e Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Sat, 6 May 2023 17:24:51 +0800
Subject: [PATCH 71/72] fix: fix Bug 531 and use ES6 grammar

---
 app/templates/admin_manage_user.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/templates/admin_manage_user.html b/app/templates/admin_manage_user.html
index a3f0ca0..cee4667 100644
--- a/app/templates/admin_manage_user.html
+++ b/app/templates/admin_manage_user.html
@@ -68,9 +68,9 @@
 <script>
     // 密码生成器
     function generatePassword(length) {
-        var charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^&*()_+~`|}{[]\:;?><,./-=";
-        var password = "";
-        for (var i = 0; i < length; i++) {
+        const charset = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^*()_+~`|}{[]\:;?,./-=";
+        let password = "";
+        for (let i = 0; i < length; i++) {
             password += charset.charAt(Math.floor(Math.random() * charset.length));
         }
         return password;

From 01ecc8376893404cb026e34e7f8fecbefcd082cf Mon Sep 17 00:00:00 2001
From: Awoodwhale <woodwhale@qq.com>
Date: Sat, 6 May 2023 17:42:04 +0800
Subject: [PATCH 72/72] refactor: refactor the way to check article level

---
 app/admin_service.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/admin_service.py b/app/admin_service.py
index 1d1ba6e..a604b5e 100644
--- a/app/admin_service.py
+++ b/app/admin_service.py
@@ -91,10 +91,7 @@ def article():
         question = data.get("question", "")
         level = data.get("level", "4")
         if content:
-            try:  # check level
-                if level not in ['1', '2', '3', '4']:
-                    raise ValueError
-            except ValueError:
+            if level not in ['1', '2', '3', '4']:
                 return "Level must be between 1 and 4."
             add_article(content, source, level, question)
             _update_context()