From 423826e6409b10b2c676844b048fa4e7175d237b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=99=9F=E6=99=94?= <759539128@qq.com>
Date: Mon, 6 May 2024 11:36:36 +0800
Subject: [PATCH 01/10] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=87=B3=20app/test?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/test/test_bug551_DingZeYu.py | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 app/test/test_bug551_DingZeYu.py

diff --git a/app/test/test_bug551_DingZeYu.py b/app/test/test_bug551_DingZeYu.py
new file mode 100644
index 0000000..799a562
--- /dev/null
+++ b/app/test/test_bug551_DingZeYu.py
@@ -0,0 +1,26 @@
+import time
+import pytest
+from selenium import webdriver
+from selenium.webdriver import ActionChains
+from selenium.webdriver.common.by import By
+
+
+def test_bug551():
+    driver = webdriver.Edge()
+    driver.maximize_window()
+    driver.get("http://127.0.0.1:5000/")
+
+    driver.find_element(By.CSS_SELECTOR, 'a[href="/login"]').click()
+    driver.find_element(By.CLASS_NAME, 'username').send_keys('dzy')
+    driver.find_element(By.CLASS_NAME, 'password').send_keys('123456')
+    driver.find_element(By.CLASS_NAME, 'btn').click()
+
+    article = driver.find_element(By.ID, 'article')
+    actions = ActionChains(driver)
+
+    actions.move_to_element(article)
+    actions.click_and_hold()
+    actions.move_by_offset(450, 200)
+    actions.release()
+    actions.perform()
+    time.sleep(5)
-- 
2.17.1


From fedf599c7bda206ca4838fae4c0271e8f4f42c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E6=99=9F=E6=99=94?= <759539128@qq.com>
Date: Mon, 6 May 2024 11:42:32 +0800
Subject: [PATCH 02/10] =?UTF-8?q?=E5=88=A0=E9=99=A4=20app/test/test=5Fbug5?=
 =?UTF-8?q?51=5FDingZeYu.py?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/test/test_bug551_DingZeYu.py | 26 --------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 app/test/test_bug551_DingZeYu.py

diff --git a/app/test/test_bug551_DingZeYu.py b/app/test/test_bug551_DingZeYu.py
deleted file mode 100644
index 799a562..0000000
--- a/app/test/test_bug551_DingZeYu.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import time
-import pytest
-from selenium import webdriver
-from selenium.webdriver import ActionChains
-from selenium.webdriver.common.by import By
-
-
-def test_bug551():
-    driver = webdriver.Edge()
-    driver.maximize_window()
-    driver.get("http://127.0.0.1:5000/")
-
-    driver.find_element(By.CSS_SELECTOR, 'a[href="/login"]').click()
-    driver.find_element(By.CLASS_NAME, 'username').send_keys('dzy')
-    driver.find_element(By.CLASS_NAME, 'password').send_keys('123456')
-    driver.find_element(By.CLASS_NAME, 'btn').click()
-
-    article = driver.find_element(By.ID, 'article')
-    actions = ActionChains(driver)
-
-    actions.move_to_element(article)
-    actions.click_and_hold()
-    actions.move_by_offset(450, 200)
-    actions.release()
-    actions.perform()
-    time.sleep(5)
-- 
2.17.1


From fb7adc3f222226e73f2d2a53d2612f1334c4e1b4 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Fri, 14 Jun 2024 20:28:28 +0800
Subject: [PATCH 03/10] Fix bug 511

---
 app/templates/userpage_get.html | 206 ++++++++++++++++++++++++++++----
 app/test/test_next_article.py   |  85 +++++++++++++
 requirements.txt                |   5 +
 3 files changed, 271 insertions(+), 25 deletions(-)
 create mode 100644 app/test/test_next_article.py

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index 8c684b6..220e7bf 100644
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -52,6 +52,44 @@
 	  cursor: pointer;
       }
 
+<<<<<<< HEAD
+=======
+        @keyframes shakes {
+            10%, 90% {
+                transform: translate3d(-1px, 0, 0);
+            }
+            20%, 50% {
+                transform: translate3d(+2px, 0, 0);
+            }
+            30%, 70% {
+                transform: translate3d(-4px, 0, 0);
+            }
+            40%, 60% {
+                transform: translate3d(+4px, 0, 0);
+            }
+            50% {
+                transform: translate3d(-4px, 0, 0);
+            }
+        }
+
+        .lead {
+            font-size: 22px;
+            font-family: Helvetica, sans-serif;
+            white-space: pre-wrap;
+        }
+
+        .arrow {
+            padding: 0;
+            font-size: 20px;
+            line-height: 21px;
+            display: inline-block;
+        }
+
+        .arrow:hover {
+            cursor: pointer;
+        }
+
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     </style>
 </head>
 <body>
@@ -59,13 +97,14 @@
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
 
         {% if username ==  admin_name %}
-        <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
+            <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
         {% endif %}
         <a id="quit" class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
 
     </p>
     {% for message in get_flashed_messages() %}
+<<<<<<< HEAD
     <div class="alert alert-warning alert-dismissible fade show" role="alert">
 	{{ message }}
 	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@@ -74,10 +113,25 @@
 
         <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="下一篇 Next Article">⇨</button>
         <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none" title="上一篇 Previous Article">⇦</button>
+=======
+        <div class="alert alert-warning alert-dismissible fade show" role="alert">
+            {{ message }}
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+        </div>
+    {% endfor %}
+
+    <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()"
+            title="下一篇 Next Article">⇨
+    </button>
+    <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
+            title="上一篇 Previous Article">⇦
+    </button>
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">
         <div id="found">
+<<<<<<< HEAD
             <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you.</div>
                 <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
             <div class="p-3 mb-2 bg-light text-dark" style="margin: 0 0.5%;"><br/>
@@ -88,30 +142,49 @@
             </div>
             
             <p><b id="question">{{ today_article['question'] }}</b></p><br/>
+=======
+            <div class="alert alert-success" role="alert">According to your word list, your level is <span
+                    class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
+                have chosen an article with a difficulty level of <span class="text-decoration-underline"
+                                                                        id="text_level">{{ today_article["text_level"] }}</span>
+                for you.
+            </div>
+            <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
+            <div class="p-3 mb-2 bg-light text-dark" style="margin: 0 0.5%;"><br/>
+                <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
+                <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
+                <div>
+                    <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
+                </div>
+
+                <p><b id="question">{{ today_article['question'] }}</b></p><br/>
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
                 <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')
+                        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 id="answer" style="display:none;">{{ today_article['answer'] }}</div>
+                <br/>
             </div>
         </div>
         <div class="alert alert-success" role="alert" id="not_found" style="display:none;">
-            <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>
+            <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>
         <div class="alert alert-success" role="alert" id="read_all" style="display:none;">
             <p class="text-muted"><span class="badge bg-success">Notes:</span><br>You've read all the articles.</p>
         </div>
     </div>
 
-    <input type="checkbox" onclick="toggleHighlighting()" checked/>生词高亮
-    <input type="checkbox" onclick="onReadClick()" checked/>大声朗读
-    <input type="checkbox" onclick="onChooseClick()" checked/>划词入库
+    <input type="checkbox" id="highlightCheckbox" onclick="toggleHighlighting()"/>生词高亮
+    <input type="checkbox" id="readCheckbox" onclick="onReadClick()"/>大声朗读
+    <input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()"/>划词入库
     <div class="range">
         <div class="field">
             <div class="sliderValue">
@@ -124,7 +197,11 @@
     <form method="post" action="/{{ username }}/userpage">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
         <button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
+<<<<<<< HEAD
         <button class="btn btn-primary btn-lg" type="reset">清除</button>
+=======
+        <button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     </form>
     {% if session.get['thisWord'] %}
         <script type="text/javascript">
@@ -139,7 +216,7 @@
 
     {% if d_len > 0 %}
         <p>
-            <b>我的生词簿</b> 
+            <b>我的生词簿</b>
             <label for="move_dynamiclly">
                 <input type="checkbox" name="move_dynamiclly" id="move_dynamiclly" checked>
                 允许动态调整顺序
@@ -152,9 +229,10 @@
                 {% set freq = x[1] %}
                 {% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
                 {% 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'
-                    role="button">{{ word }}</a>
+                <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>
                     <a class="btn btn-warning" onclick="unfamiliar('{{ word }}')" role="button">不熟悉</a>
@@ -174,71 +252,149 @@
 {% endif %}
 <script type="text/javascript">
     window.onload = function () { // 页面加载时执行
+<<<<<<< HEAD
         // 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
         if(sessionStorage.getItem('pre_page_button')!="display" && sessionStorage.getItem('pre_page_button')){
             $('#load_pre_article').show();
         }
      };
     function load_next_article(){
+=======
+        const settings = {
+            // initialize settings from localStorage
+            highlightChecked: localStorage.getItem('highlightChecked') !== 'false', // localStorage stores strings, default to true. same below
+            readChecked: localStorage.getItem('readChecked') !== 'false',
+            chooseChecked: localStorage.getItem('chooseChecked') !== 'false',
+            rangeValue: localStorage.getItem('rangeValue') || '1',
+            selectedWords: localStorage.getItem('selectedWords') || ''
+        };
+
+        const elements = {
+            highlightCheckbox: document.querySelector('#highlightCheckbox'),
+            readCheckbox: document.querySelector('#readCheckbox'),
+            chooseCheckbox: document.querySelector('#chooseCheckbox'),
+            rangeComponent: document.querySelector('#rangeComponent'),
+            rangeValueDisplay: document.querySelector('#rangeValue'),
+            selectedWordsInput: document.querySelector('#selected-words')
+        };
+        // 应用设置到页面元素
+        elements.highlightCheckbox.checked = settings.highlightChecked;
+        elements.readCheckbox.checked = settings.readChecked;
+        elements.chooseCheckbox.checked = settings.chooseChecked;
+        elements.rangeComponent.value = settings.rangeValue;
+        elements.rangeValueDisplay.textContent = `${settings.rangeValue}x`;
+        elements.selectedWordsInput.value = settings.selectedWords;
+
+        // 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
+        if (sessionStorage.getItem('pre_page_button') !== 'display' && sessionStorage.getItem('pre_page_button')) {
+            $('#load_pre_article').show();
+        }
+
+        // 事件监听器
+        elements.selectedWordsInput.addEventListener('input', () => {
+            localStorage.setItem('selectedWords', elements.selectedWordsInput.value);
+        });
+
+        elements.rangeComponent.addEventListener('input', () => {
+            const rangeValue = elements.rangeComponent.value;
+            elements.rangeValueDisplay.textContent = `${rangeValue}x`;
+            localStorage.setItem('rangeValue', rangeValue);
+        });
+    };
+
+    function clearSelectedWords() {
+        localStorage.removeItem('selectedWords');
+        document.querySelector('#selected-words').value = '';
+    }
+
+
+    function load_next_article() {
+        $("#load_next_article").prop("disabled", true)
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
         $.ajax({
             url: '/get_next_article/{{username}}',
             dataType: 'json',
-            success: function(data) {
+            success: function (data) {
                 // 更新页面内容
-                if(data['today_article']){
+                if (data['today_article']) {
                     update(data['today_article']);
                     check_pre(data['visited_articles']);
                     check_next(data['result_of_generate_article']);
                 }
+            }, complete: function (xhr, status) {
+                $("#load_next_article").prop("disabled", false)
             }
         });
     }
-    function load_pre_article(){
+
+    function load_pre_article() {
         $.ajax({
             url: '/get_pre_article/{{username}}',
             dataType: 'json',
-            success: function(data) {
+            success: function (data) {
                 // 更新页面内容
-                if(data['today_article']){
+                if (data['today_article']) {
                     update(data['today_article']);
                     check_pre(data['visited_articles']);
                 }
             }
         });
     }
+<<<<<<< HEAD
     function update(today_article){
+=======
+
+    function update(today_article) {
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
         $('#user_level').html(today_article['user_level']);
         $('#text_level').html(today_article["text_level"]);
-        $('#date').html('Article added on: '+today_article["date"]);
+        $('#date').html('Article added on: ' + today_article["date"]);
         $('#article_title').html(today_article["article_title"]);
         $('#article').html(today_article["article_body"]);
         $('#source').html(today_article['source']);
         $('#question').html(today_article["question"]);
         $('#answer').html(today_article["answer"]);
         document.querySelector('#text_level').classList.add('mark'); // highlight text difficult level for 2 seconds
+<<<<<<< HEAD
         setTimeout(() => {document.querySelector('#text_level').classList.remove('mark');}, 2000);
         document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
         setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
+=======
+        setTimeout(() => {
+            document.querySelector('#text_level').classList.remove('mark');
+        }, 2000);
+        document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
+        setTimeout(() => {
+            document.querySelector('#user_level').classList.remove('mark');
+        }, 2000);
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     }
-<!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
-    function check_pre(visited_articles){
-        if((visited_articles=='')||(visited_articles['index']<=0)){
+
+    <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
+    function check_pre(visited_articles) {
+        if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
             $('#load_pre_article').hide();
             sessionStorage.setItem('pre_page_button', 'display')
+<<<<<<< HEAD
         }else{
+=======
+        } else {
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
             $('#load_pre_article').show();
             sessionStorage.setItem('pre_page_button', 'show')
         }
     }
-    function check_next(result_of_generate_article){
-        if(result_of_generate_article == "found"){
-            $('#found').show();$('#not_found').hide();
+
+    function check_next(result_of_generate_article) {
+        if (result_of_generate_article == "found") {
+            $('#found').show();
+            $('#not_found').hide();
             $('#read_all').hide();
-        }else if(result_of_generate_article == "not found"){
+        } else if (result_of_generate_article == "not found") {
             $('#found').hide();
             $('#not_found').show();
             $('#read_all').hide();
-        }else{
+        } else {
             $('#found').hide();
             $('#not_found').hide();
             $('#read_all').show();
diff --git a/app/test/test_next_article.py b/app/test/test_next_article.py
new file mode 100644
index 0000000..3e470de
--- /dev/null
+++ b/app/test/test_next_article.py
@@ -0,0 +1,85 @@
+''' Contributed by Lin Junhong et al. 2023-06.'''
+
+from selenium import webdriver
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.common.exceptions import UnexpectedAlertPresentException, NoAlertPresentException
+import random, time
+import string
+
+# 初始化webdriver
+# driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.CHROME)
+# driver.implicitly_wait(10)
+driver = webdriver.Chrome("C:\\Users\\12993\AppData\Local\Programs\Python\Python38\\chromedriver.exe")
+
+
+def test_next_article():
+    try:
+        driver.get("http://118.25.96.118:90")
+        assert 'English Pal -' in driver.page_source
+        # login
+        elem = driver.find_element_by_link_text('登录')
+        elem.click()
+
+        uname = 'abcdefg'
+        password = 'abcdefg'
+        elem = driver.find_element_by_id('username')
+        elem.send_keys(uname)
+
+        elem = driver.find_element_by_id('password')
+        elem.send_keys(password)
+        elem = driver.find_element_by_xpath('/html/body/div/button')  # 找到登录按钮
+        elem.click()
+
+        time.sleep(0.5)
+        assert 'EnglishPal Study Room for ' + uname in driver.title
+        for i in range(50):
+            time.sleep(0.1)
+            # 找到固定按钮
+            elem = driver.find_element_by_xpath('//*[@id="load_next_article"]')
+            elem.click()
+    except Exception as e:
+        print(e)
+
+
+def test_local_next_article():
+    try:
+        driver.get("http://127.0.0.1:5000")
+        assert 'English Pal -' in driver.page_source
+        # login
+        elem = driver.find_element_by_link_text('注册')
+        elem.click()
+
+        uname = 'abcdefg'
+        password = 'abcdefg'
+        elem = driver.find_element_by_id('username')
+        elem.send_keys(uname)
+
+        elem = driver.find_element_by_id('password')
+        elem.send_keys(password)
+
+        elem = driver.find_element_by_id('password2')
+        elem.send_keys(password)
+
+        time.sleep(0.5)
+
+        elem = driver.find_element_by_class_name('btn')  # 找到提交按钮
+        elem.click()
+        time.sleep(0.5)
+        try:
+            WebDriverWait(driver, 1).until(EC.alert_is_present())
+            driver.switch_to.alert.accept()
+        except (UnexpectedAlertPresentException, NoAlertPresentException):
+            pass
+
+        time.sleep(0.5)
+        assert 'EnglishPal Study Room for ' + uname in driver.title
+        for i in range(50):
+            time.sleep(0.1)
+            # 找到固定按钮
+            elem = driver.find_element_by_xpath('//*[@id="load_next_article"]')
+            elem.click()
+    except Exception as e:
+        print(e)
diff --git a/requirements.txt b/requirements.txt
index 4322f80..ee6e128 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,8 @@ PyYAML~=6.0
 pony==0.7.16
 snowballstemmer==2.2.0
 Werkzeug==2.2.2
+<<<<<<< HEAD
+=======
+
+pytest~=8.1.1
+>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
-- 
2.17.1


From 5447d570e0e5c34e45d5ded7d4885f2fef04d294 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Fri, 14 Jun 2024 20:14:28 +0800
Subject: [PATCH 04/10] Fix bug 511

---
 app/WordFreq.py         | 12 ++++----
 app/test_bug511_Bosh.py | 56 +++++++++++++++++++++++++++++++++
 app/wordfreqCMD.py      | 68 ++++++++++++++++++++---------------------
 build.sh                |  2 +-
 requirements.txt        |  3 ++
 5 files changed, 99 insertions(+), 42 deletions(-)
 mode change 100644 => 100755 app/WordFreq.py
 create mode 100755 app/test_bug511_Bosh.py
 mode change 100644 => 100755 app/wordfreqCMD.py

diff --git a/app/WordFreq.py b/app/WordFreq.py
old mode 100644
new mode 100755
index 3620a41..eaf48c8
--- a/app/WordFreq.py
+++ b/app/WordFreq.py
@@ -2,24 +2,24 @@
 # Copyright 2019 (C) Hui Lan <hui.lan@cantab.net>
 # Written permission must be obtained from the author for commercial uses.
 ###########################################################################
-
 from wordfreqCMD import remove_punctuation, freq, sort_in_descending_order
 import string
 
+
 class WordFreq:
-    def __init__(self, s):
+    def __init__(self, s, max_word_length=30):
         self.s = remove_punctuation(s)
+        self.max_word_length = max_word_length
 
     def get_freq(self):
         lst = []
-        for t in freq(self.s):
+        for t in freq(self.s, self.max_word_length):
             word = t[0]
             if len(word) > 0 and word[0] in string.ascii_letters:
                 lst.append(t)
         return sort_in_descending_order(lst)
-    
+
 
 if __name__ == '__main__':
-    f = WordFreq('BANANA; Banana, apple ORANGE Banana banana.')
+    f = WordFreq('BANANA; Banana, apple ORANGE Banana banana.', max_word_length=30)
     print(f.get_freq())
-
diff --git a/app/test_bug511_Bosh.py b/app/test_bug511_Bosh.py
new file mode 100755
index 0000000..a4a80e8
--- /dev/null
+++ b/app/test_bug511_Bosh.py
@@ -0,0 +1,56 @@
+###########################################################################
+# Copyright 2019 (C) Hui Lan <hui.lan@cantab.net>
+# Written permission must be obtained from the author for commercial uses.
+###########################################################################
+import unittest
+from wordfreqCMD import remove_punctuation, freq, sort_in_descending_order
+from WordFreq import WordFreq
+
+
+class TestWordFrequency(unittest.TestCase):
+
+    def test_word_frequency_normal_case(self):
+        text = "BANANA; Banana, apple ORANGE Banana banana."
+        wf = WordFreq(text)
+        result = wf.get_freq()
+        expected = [('banana', 4), ('orange', 1), ('apple', 1)]
+        self.assertEqual(result, expected)
+
+    def test_word_frequency_with_long_word(self):
+        text = "apple banana " + "a" * 31 + " orange banana apple"
+        wf = WordFreq(text, max_word_length=30)
+        result = wf.get_freq()
+        expected = [('banana', 2), ('apple', 2), ('orange', 1)]
+        self.assertEqual(result, expected)
+
+    def test_word_frequency_all_long_words(self):
+        text = "a" * 31 + " " + "b" * 32 + " " + "c" * 33
+        wf = WordFreq(text, max_word_length=30)
+        result = wf.get_freq()
+        expected = []
+        self.assertEqual(result, expected)
+
+    def test_word_frequency_with_punctuation(self):
+        text = "Hello, world! Hello... hello; 'hello' --world--"
+        wf = WordFreq(text)
+        result = wf.get_freq()
+        expected = [('hello', 4), ('world', 2)]
+        self.assertEqual(result, expected)
+
+    def test_word_frequency_empty_string(self):
+        text = ""
+        wf = WordFreq(text)
+        result = wf.get_freq()
+        expected = []
+        self.assertEqual(result, expected)
+
+    def test_word_frequency_with_max_length_parameter(self):
+        text = "apple banana apple"
+        wf = WordFreq(text, max_word_length=5)
+        result = wf.get_freq()
+        expected = [('apple', 2)]
+        self.assertEqual(result, expected)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/app/wordfreqCMD.py b/app/wordfreqCMD.py
old mode 100644
new mode 100755
index dcee74e..34359d1
--- a/app/wordfreqCMD.py
+++ b/app/wordfreqCMD.py
@@ -2,56 +2,56 @@
 # Copyright 2019 (C) Hui Lan <hui.lan@cantab.net>
 # Written permission must be obtained from the author for commercial uses.
 ###########################################################################
-
 import collections
 import string
-import operator
-import os, sys # 引入模块sys，因为我要用里面的sys.argv列表中的信息来读取命令行参数。
+import os
+import sys
 import pickle_idea
 
-def freq(fruit):
+
+def freq(fruit, max_word_length=30):
     '''
     功能： 把字符串转成列表。 目的是得到每个单词的频率。
     输入： 字符串
     输出： 列表， 列表里包含一组元组，每个元组包含单词与单词的频率。 比如 [('apple', 2), ('banana', 1)]
-    注意事项： 首先要把字符串转成小写。原因是。。。
+    注意事项： 首先要把字符串转小写。
     '''
 
     result = []
-    
-    fruit = fruit.lower() # 字母转小写
+
+    fruit = fruit.lower()  # 字母转小写
     flst = fruit.split()  # 字符串转成list
     c = collections.Counter(flst)
-    result = c.most_common()
+    for word, count in c.most_common():
+        if len(word) <= max_word_length:
+            result.append((word, count))
     return result
 
-
-def youdao_link(s): # 有道链接
-    link = 'http://youdao.com/w/eng/' + s + '/#keyfrom=dict2.index'# 网址
+def youdao_link(s):  # 有道链接
+    link = 'http://youdao.com/w/eng/' + s + '/#keyfrom=dict2.index'  # 网址
     return link
 
 
-def file2str(fname):#文件转字符
-    f = open(fname) #打开
-    s = f.read()    #读取
-    f.close()       #关闭
+def file2str(fname):  # 文件转字符
+    with open(fname) as f:  # 使用with打开文件
+        s = f.read()  # 读取
     return s
 
 
-def remove_punctuation(s): # 这里是s是形参 (parameter)。函数被调用时才给s赋值。
-    special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' # 把里面的字符都去掉
+def remove_punctuation(s):  # 这里是s是形参(parameter)。函数被调用时才给s赋值。
+    special_characters = r'\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|'  # 把里面的字符都去掉
     for c in special_characters:
-        s = s.replace(c, ' ') # 防止出现把 apple,apple 移掉逗号后变成 appleapple 情况
+        s = s.replace(c, ' ')  # 防止出现把 apple,apple 移掉逗号后变成 appleapple 情况
     s = s.replace('--', ' ')
-    s = s.strip() # 去除前后的空格
-    
+    s = s.strip()  # 去除前后的空格
+
     if '\'' in s:
         n = len(s)
-        t = '' # 用来收集我需要保留的字符
-        for i in range(n): # 只有单引号前后都有英文字符，才保留
+        t = ''  # 用来收集我需要保留的字符
+        for i in range(n):  # 只有单引号前后都有英文字符，才保留
             if s[i] == '\'':
                 i_is_ok = i - 1 >= 0 and i + 1 < n
-                if i_is_ok and s[i-1] in string.ascii_letters and s[i+1] in string.ascii_letters:
+                if i_is_ok and s[i - 1] in string.ascii_letters and s[i + 1] in string.ascii_letters:
                     t += s[i]
             else:
                 t += s[i]
@@ -60,12 +60,12 @@ def remove_punctuation(s): # 这里是s是形参 (parameter)。函数被调用
         return s
 
 
-def sort_in_descending_order(lst):# 单词按频率降序排列
+def sort_in_descending_order(lst):  # 单词按频率降序排列
     lst2 = sorted(lst, reverse=True, key=lambda x: (x[1], x[0]))
     return lst2
 
 
-def sort_in_ascending_order(lst):# 单词按频率降序排列
+def sort_in_ascending_order(lst):  # 单词按频率降序排列
     lst2 = sorted(lst, reverse=False, key=lambda x: (x[1], x[0]))
     return lst2
 
@@ -80,31 +80,30 @@ def make_html_page(lst, fname):  # 只是在wordfreqCMD.py中的main函数中调
         # <a href="">word</a>
         s += '<p>%d <a href="%s">%s</a> (%d)</p>' % (count, youdao_link(x[0]), x[0], x[1])
         count += 1
-    f = open(fname, 'w')
-    f.write(s)
-    f.close()
+    with open(fname, 'w') as f:
+        f.write(s)
 
 
 ## main（程序入口）
 if __name__ == '__main__':
     num = len(sys.argv)
 
-    if num == 1: # 从键盘读入字符串
+    if num == 1:  # 从键盘读入字符串
         s = input()
-    elif num == 2: # 从文件读入字符串
+    elif num == 2:  # 从文件读入字符串
         fname = sys.argv[1]
         s = file2str(fname)
     else:
         print('I can accept at most 2 arguments.')
-        sys.exit()# 结束程序运行， 下面的代码不会被执行了。
+        sys.exit()  # 结束程序运行，下面的代码不会被执行了。
 
-    s = remove_punctuation(s) # 这里是s是实参(argument)，里面有值
+    s = remove_punctuation(s)  # 这里是s是实参(argument)，里面有值
     L = freq(s)
     for x in sort_in_descending_order(L):
-        print('%s\t%d\t%s' % (x[0], x[1], youdao_link(x[0])))#函数导出
+        print('%s\t%d\t%s' % (x[0], x[1], youdao_link(x[0])))  # 函数导出
 
     # 把频率的结果放result.html中
-    make_html_page(sort_in_descending_order(L), 'result.html') 
+    make_html_page(sort_in_descending_order(L), 'result.html')
 
     print('\nHistory:\n')
     if os.path.exists('frequency.p'):
@@ -120,4 +119,3 @@ if __name__ == '__main__':
     pickle_idea.save_frequency_to_pickle(d, 'frequency.p')
 
 
-
diff --git a/build.sh b/build.sh
index 158a86f..c42d77f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEPLOYMENT_DIR=/home/lanhui/englishpal2/EnglishPal
+DEPLOYMENT_DIR=/home/main/EnglishPal
 cd $DEPLOYMENT_DIR
 pwd
 
diff --git a/requirements.txt b/requirements.txt
index ee6e128..7e0c4a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,4 +8,7 @@ Werkzeug==2.2.2
 =======
 
 pytest~=8.1.1
+<<<<<<< HEAD
 >>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
+=======
+>>>>>>> fa65055 (Fix bug 511)
-- 
2.17.1


From 546286f0bf049dd9274264559222c5f189f4c3e5 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 20 Jun 2024 02:23:06 +0800
Subject: [PATCH 05/10] Fix bug 511

---
 requirements.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7e0c4a2..fb52918 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,5 @@ PyYAML~=6.0
 pony==0.7.16
 snowballstemmer==2.2.0
 Werkzeug==2.2.2
-<<<<<<< HEAD
-=======
 
 pytest~=8.1.1
-<<<<<<< HEAD
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
-=======
->>>>>>> fa65055 (Fix bug 511)
-- 
2.17.1


From c56e8d272ccfdb06038b021fa19453180b8ee556 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 20 Jun 2024 02:35:48 +0800
Subject: [PATCH 06/10] Fix bug 511

---
 app/templates/userpage_get.html | 86 ++-------------------------------
 1 file changed, 4 insertions(+), 82 deletions(-)
 mode change 100644 => 100755 app/templates/userpage_get.html

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
old mode 100644
new mode 100755
index 220e7bf..c19924b
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -23,37 +23,10 @@
     <title>EnglishPal Study Room for {{ username }}</title>
 
     <style>
-      .shaking {
-          animation: shakes 1600ms ease-in-out;
-      }
+        .shaking {
+            animation: shakes 1600ms ease-in-out;
+        }
 
-      @keyframes shakes {
-          10%, 90% { transform: translate3d(-1px, 0, 0); }
-          20%, 50% { transform: translate3d(+2px, 0, 0); }
-          30%, 70% { transform: translate3d(-4px, 0, 0); }
-          40%, 60% { transform: translate3d(+4px, 0, 0); }
-          50% { transform: translate3d(-4px, 0, 0); }
-      }
-
-      .lead{
-          font-size: 22px;
-          font-family: Helvetica, sans-serif;
-          white-space: pre-wrap;
-      }
-
-      .arrow {
-	  padding: 0;
-	  font-size: 20px;
-	  line-height: 21px;
-	  display: inline-block;
-      }
-
-      .arrow:hover {
-	  cursor: pointer;
-      }
-
-<<<<<<< HEAD
-=======
         @keyframes shakes {
             10%, 90% {
                 transform: translate3d(-1px, 0, 0);
@@ -89,7 +62,6 @@
             cursor: pointer;
         }
 
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     </style>
 </head>
 <body>
@@ -104,16 +76,6 @@
 
     </p>
     {% for message in get_flashed_messages() %}
-<<<<<<< HEAD
-    <div class="alert alert-warning alert-dismissible fade show" role="alert">
-	{{ message }}
-	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-    </div>
-    {% endfor %}
-
-        <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="下一篇 Next Article">⇨</button>
-        <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none" title="上一篇 Previous Article">⇦</button>
-=======
         <div class="alert alert-warning alert-dismissible fade show" role="alert">
             {{ message }}
             <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
@@ -126,23 +88,10 @@
     <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
             title="上一篇 Previous Article">⇦
     </button>
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">
         <div id="found">
-<<<<<<< HEAD
-            <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you.</div>
-                <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
-            <div class="p-3 mb-2 bg-light text-dark" style="margin: 0 0.5%;"><br/>
-            <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
-            <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
-            <div>
-                <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
-            </div>
-            
-            <p><b id="question">{{ today_article['question'] }}</b></p><br/>
-=======
             <div class="alert alert-success" role="alert">According to your word list, your level is <span
                     class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
                 have chosen an article with a difficulty level of <span class="text-decoration-underline"
@@ -158,7 +107,6 @@
                 </div>
 
                 <p><b id="question">{{ today_article['question'] }}</b></p><br/>
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
                 <script type="text/javascript">
                     function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
                         const e = document.getElementById(id);
@@ -197,11 +145,7 @@
     <form method="post" action="/{{ username }}/userpage">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
         <button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
-<<<<<<< HEAD
-        <button class="btn btn-primary btn-lg" type="reset">清除</button>
-=======
         <button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     </form>
     {% if session.get['thisWord'] %}
         <script type="text/javascript">
@@ -252,14 +196,6 @@
 {% endif %}
 <script type="text/javascript">
     window.onload = function () { // 页面加载时执行
-<<<<<<< HEAD
-        // 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
-        if(sessionStorage.getItem('pre_page_button')!="display" && sessionStorage.getItem('pre_page_button')){
-            $('#load_pre_article').show();
-        }
-     };
-    function load_next_article(){
-=======
         const settings = {
             // initialize settings from localStorage
             highlightChecked: localStorage.getItem('highlightChecked') !== 'false', // localStorage stores strings, default to true. same below
@@ -310,7 +246,6 @@
 
     function load_next_article() {
         $("#load_next_article").prop("disabled", true)
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
         $.ajax({
             url: '/get_next_article/{{username}}',
             dataType: 'json',
@@ -340,12 +275,8 @@
             }
         });
     }
-<<<<<<< HEAD
-    function update(today_article){
-=======
 
     function update(today_article) {
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
         $('#user_level').html(today_article['user_level']);
         $('#text_level').html(today_article["text_level"]);
         $('#date').html('Article added on: ' + today_article["date"]);
@@ -355,11 +286,6 @@
         $('#question').html(today_article["question"]);
         $('#answer').html(today_article["answer"]);
         document.querySelector('#text_level').classList.add('mark'); // highlight text difficult level for 2 seconds
-<<<<<<< HEAD
-        setTimeout(() => {document.querySelector('#text_level').classList.remove('mark');}, 2000);
-        document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
-        setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
-=======
         setTimeout(() => {
             document.querySelector('#text_level').classList.remove('mark');
         }, 2000);
@@ -367,7 +293,6 @@
         setTimeout(() => {
             document.querySelector('#user_level').classList.remove('mark');
         }, 2000);
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
     }
 
     <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
@@ -375,11 +300,7 @@
         if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
             $('#load_pre_article').hide();
             sessionStorage.setItem('pre_page_button', 'display')
-<<<<<<< HEAD
-        }else{
-=======
         } else {
->>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
             $('#load_pre_article').show();
             sessionStorage.setItem('pre_page_button', 'show')
         }
@@ -410,3 +331,4 @@
 </style>
 
 </html>
+
-- 
2.17.1


From c8f04cd725c24e980197d009d20e2e952d6afd94 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 20 Jun 2024 02:48:42 +0800
Subject: [PATCH 07/10] Fix bug 511

---
 app/templates/userpage_get.html | 176 +++++++++++++-------------------
 1 file changed, 71 insertions(+), 105 deletions(-)

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index c19924b..e5c8d95 100755
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -23,44 +23,34 @@
     <title>EnglishPal Study Room for {{ username }}</title>
 
     <style>
-        .shaking {
-            animation: shakes 1600ms ease-in-out;
-        }
+      .shaking {
+          animation: shakes 1600ms ease-in-out;
+      }
 
-        @keyframes shakes {
-            10%, 90% {
-                transform: translate3d(-1px, 0, 0);
-            }
-            20%, 50% {
-                transform: translate3d(+2px, 0, 0);
-            }
-            30%, 70% {
-                transform: translate3d(-4px, 0, 0);
-            }
-            40%, 60% {
-                transform: translate3d(+4px, 0, 0);
-            }
-            50% {
-                transform: translate3d(-4px, 0, 0);
-            }
-        }
+      @keyframes shakes {
+          10%, 90% { transform: translate3d(-1px, 0, 0); }
+          20%, 50% { transform: translate3d(+2px, 0, 0); }
+          30%, 70% { transform: translate3d(-4px, 0, 0); }
+          40%, 60% { transform: translate3d(+4px, 0, 0); }
+          50% { transform: translate3d(-4px, 0, 0); }
+      }
 
-        .lead {
-            font-size: 22px;
-            font-family: Helvetica, sans-serif;
-            white-space: pre-wrap;
-        }
+      .lead{
+          font-size: 22px;
+          font-family: Helvetica, sans-serif;
+          white-space: pre-wrap;
+      }
 
-        .arrow {
-            padding: 0;
-            font-size: 20px;
-            line-height: 21px;
-            display: inline-block;
-        }
+      .arrow {
+	  padding: 0;
+	  font-size: 20px;
+	  line-height: 21px;
+	  display: inline-block;
+      }
 
-        .arrow:hover {
-            cursor: pointer;
-        }
+      .arrow:hover {
+	  cursor: pointer;
+      }
 
     </style>
 </head>
@@ -69,83 +59,72 @@
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
 
         {% if username ==  admin_name %}
-            <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
+        <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
         {% endif %}
         <a id="quit" class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
 
     </p>
     {% for message in get_flashed_messages() %}
-        <div class="alert alert-warning alert-dismissible fade show" role="alert">
-            {{ message }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-        </div>
+    <div class="alert alert-warning alert-dismissible fade show" role="alert">
+	{{ message }}
+	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+    </div>
     {% endfor %}
 
-    <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()"
-            title="下一篇 Next Article">⇨
-    </button>
-    <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
-            title="上一篇 Previous Article">⇦
-    </button>
+        <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="下一篇 Next Article">⇨</button>
+        <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none" title="上一篇 Previous Article">⇦</button>
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">
         <div id="found">
-            <div class="alert alert-success" role="alert">According to your word list, your level is <span
-                    class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
-                have chosen an article with a difficulty level of <span class="text-decoration-underline"
-                                                                        id="text_level">{{ today_article["text_level"] }}</span>
-                for you.
-            </div>
-            <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
+            <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you.</div>
+                <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
             <div class="p-3 mb-2 bg-light text-dark" style="margin: 0 0.5%;"><br/>
-                <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
-                <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
-                <div>
-                    <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
-                </div>
+            <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
+            <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
+            <div>
+                <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
+            </div>
 
-                <p><b id="question">{{ today_article['question'] }}</b></p><br/>
+            <p><b id="question">{{ 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')
+                        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 id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
             </div>
         </div>
         <div class="alert alert-success" role="alert" id="not_found" style="display:none;">
-            <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>
+            <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>
         <div class="alert alert-success" role="alert" id="read_all" style="display:none;">
             <p class="text-muted"><span class="badge bg-success">Notes:</span><br>You've read all the articles.</p>
         </div>
     </div>
 
-    <input type="checkbox" id="highlightCheckbox" onclick="toggleHighlighting()"/>生词高亮
-    <input type="checkbox" id="readCheckbox" onclick="onReadClick()"/>大声朗读
-    <input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()"/>划词入库
+    <input type="checkbox" id="highlightCheckbox" onclick="toggleHighlighting()" />生词高亮
+    <input type="checkbox" id="readCheckbox" onclick="onReadClick()" />大声朗读
+    <input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()" />划词入库
     <div class="range">
         <div class="field">
             <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>
     <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
     <form method="post" action="/{{ username }}/userpage">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
         <button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
-        <button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
+        <button class="btn btn-primary btn-lg" type="reset"  onclick="clearSelectedWords()">清除</button>
     </form>
     {% if session.get['thisWord'] %}
         <script type="text/javascript">
@@ -173,10 +152,9 @@
                 {% set freq = x[1] %}
                 {% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
                 {% 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'
-                       role="button">{{ word }}</a>
+                <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>
                     <a class="btn btn-warning" onclick="unfamiliar('{{ word }}')" role="button">不熟悉</a>
@@ -188,6 +166,7 @@
         <input id="selected-words2" type="hidden" value="{{ words }}">
     {% endif %}
 </div>
+<label id="selected-words3" type="hidden"></label>
 {{ yml['footer'] | safe }}
 {% if yml['js']['bottom'] %}
     {% for js in yml['js']['bottom'] %}
@@ -244,78 +223,66 @@
     }
 
 
-    function load_next_article() {
-        $("#load_next_article").prop("disabled", true)
+    function load_next_article(){
         $.ajax({
             url: '/get_next_article/{{username}}',
             dataType: 'json',
-            success: function (data) {
+            success: function(data) {
                 // 更新页面内容
-                if (data['today_article']) {
+                if(data['today_article']){
                     update(data['today_article']);
                     check_pre(data['visited_articles']);
                     check_next(data['result_of_generate_article']);
                 }
-            }, complete: function (xhr, status) {
-                $("#load_next_article").prop("disabled", false)
             }
         });
     }
-
-    function load_pre_article() {
+    function load_pre_article(){
         $.ajax({
             url: '/get_pre_article/{{username}}',
             dataType: 'json',
-            success: function (data) {
+            success: function(data) {
                 // 更新页面内容
-                if (data['today_article']) {
+                if(data['today_article']){
                     update(data['today_article']);
                     check_pre(data['visited_articles']);
                 }
             }
         });
     }
-
-    function update(today_article) {
+    function update(today_article){
         $('#user_level').html(today_article['user_level']);
         $('#text_level').html(today_article["text_level"]);
-        $('#date').html('Article added on: ' + today_article["date"]);
+        $('#date').html('Article added on: '+today_article["date"]);
         $('#article_title').html(today_article["article_title"]);
         $('#article').html(today_article["article_body"]);
         $('#source').html(today_article['source']);
         $('#question').html(today_article["question"]);
         $('#answer').html(today_article["answer"]);
         document.querySelector('#text_level').classList.add('mark'); // highlight text difficult level for 2 seconds
-        setTimeout(() => {
-            document.querySelector('#text_level').classList.remove('mark');
-        }, 2000);
+        setTimeout(() => {document.querySelector('#text_level').classList.remove('mark');}, 2000);
         document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
-        setTimeout(() => {
-            document.querySelector('#user_level').classList.remove('mark');
-        }, 2000);
+        setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
     }
-
-    <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
-    function check_pre(visited_articles) {
-        if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
+<!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
+    function check_pre(visited_articles){
+        if((visited_articles=='')||(visited_articles['index']<=0)){
             $('#load_pre_article').hide();
             sessionStorage.setItem('pre_page_button', 'display')
-        } else {
+        }else{
             $('#load_pre_article').show();
             sessionStorage.setItem('pre_page_button', 'show')
         }
     }
-
-    function check_next(result_of_generate_article) {
-        if (result_of_generate_article == "found") {
-            $('#found').show();
-            $('#not_found').hide();
+    function check_next(result_of_generate_article){
+        if(result_of_generate_article == "found"){
+            $('#found').show();$('#not_found').hide();
             $('#read_all').hide();
-        } else if (result_of_generate_article == "not found") {
+        }else if(result_of_generate_article == "not found"){
             $('#found').hide();
             $('#not_found').show();
             $('#read_all').hide();
-        } else {
+        }else{
             $('#found').hide();
             $('#not_found').hide();
             $('#read_all').show();
@@ -325,10 +292,9 @@
 </body>
 <style>
     mark {
-        color: #{{ yml['highlight']['color'] }};
+        color: red;
         background-color: rgba(0, 0, 0, 0);
     }
 </style>
 
 </html>
-
-- 
2.17.1


From 8e7564bfc7beeb2e240b276f45bef900a82ff07a Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 20 Jun 2024 03:05:25 +0800
Subject: [PATCH 08/10] Fix Bug 511

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

diff --git a/app/templates/userpage_get.html b/app/templates/userpage_get.html
index e5c8d95..57461c1 100755
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@@ -166,7 +166,6 @@
         <input id="selected-words2" type="hidden" value="{{ words }}">
     {% endif %}
 </div>
-<label id="selected-words3" type="hidden"></label>
 {{ yml['footer'] | safe }}
 {% if yml['js']['bottom'] %}
     {% for js in yml['js']['bottom'] %}
-- 
2.17.1


From 5494fd9ba7c7d85e8203c9f352a7f085394a0382 Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 20 Jun 2024 03:23:20 +0800
Subject: [PATCH 09/10] build.sh default

---
 build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index c42d77f..158a86f 100755
--- a/build.sh
+++ b/build.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-DEPLOYMENT_DIR=/home/main/EnglishPal
+DEPLOYMENT_DIR=/home/lanhui/englishpal2/EnglishPal
 cd $DEPLOYMENT_DIR
 pwd
 
-- 
2.17.1


From 84388758a40458d8702314dd266ba55bbf911ebe Mon Sep 17 00:00:00 2001
From: Bosh <michael.bosh@yandex.ru>
Date: Thu, 27 Jun 2024 02:44:48 +0800
Subject: [PATCH 10/10] Fix Bug 511

---
 .../conftest.cpython-310-pytest-8.1.2.pyc        | Bin 0 -> 1401 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 app/test/__pycache__/conftest.cpython-310-pytest-8.1.2.pyc

diff --git a/app/test/__pycache__/conftest.cpython-310-pytest-8.1.2.pyc b/app/test/__pycache__/conftest.cpython-310-pytest-8.1.2.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..3bd7ad7d7b177369b26ae70555e74e86e5ca69f6
GIT binary patch
literal 1401
zcmZt`+iuiGbjF^w9cOoes8xX$$?8kBeOM=;sufff6jBK(+NLB`+m(>z^~`3Cd}C(Z
zkQIGOAB*}6yN~<>-_Q@3*FNzJl`8d|F@aDRYtEd@%()-egF#4O{q^wa{Dn)%-$<Na
zz$3R|t3Lp6!f8RK)Sgc1I)svvO?$MHcvH_x{HbrxU>d;b6dPqY4ecGb*ev_gJ|)6?
zG~kT)ekZ4NI<%C>eM?=iRKPbZb<t8G-+V@SpARhW5~l}bG<*pjk;#afjbkz6GXGUb
zAlQDY7a5AqFABt6*opzL&z;Hg!-dw(%{bn<{^fWZzMY$2Y;SKrClW8c0snj+FX~dn
zWtvy<Zgo`TYO$XdaoRMo7D~riUCj|0Hz&sZ@xfkzh8zIQksciHc!M(Q4c^pbMb`uZ
zqLYy$QDoRIKN4>o=&&A2ye`fG;MPLmNYwF`1&kG$)&d6vEpWP~zmccp&ubLm%HhtM
zzQWuyOuJYT?mcr>Y)z2+6X8B1jGVfZRKX5WpB)1izh7X3p57Wx?t}Ni@-&QK-D!1Q
zraI5kqBw~pq@|W3I{0BP*COJnPG_kS(L66igbC!c__&sQF2!RY$9!g$v?{NT@KL06
zszoU(t)jWCOZx_SdG^*j^|-JPmmiGB@9JD$z4zez{pj${w|l$M{qLgPpYI<W9z?AY
z^49X&du6Ev6NR|7yaEc}Z_uz-&%c6}3q+OG96X+kJmZ5a5b6!%Lt9iL(`F!^h^&PM
z$z<MW!|Fy<hDnif)60rl2~gp}<#PqMwf^W;@{&$ta+bU;D5)9(2tAL6@Li^#{M%;|
z`G=s(PoV@5TZWBrwh(t=+op&B(L~cz`pDt*W3qCwjGC=_U0ZN$M|ZLeA$II~XzZ7$
zVB|^EVS*&V0w#&^np8q@Ob;w(3&V6?3e!`C5Y32MkNzLk7DffxO++_IO<JHkb}+Y`
zA(dCr(3S~iZC>cSQl@{qIZ0kqSCZz$4qK|Ad^)eIu@uJ=Qf@Y0vy6Yn3*j+dPf`ia
zT2yX=1$h~O36v;AmA7R#cYXu^jv}9RQTp@ziEgE^Gi=AK3kV%N7nS{4*n$OLmo;w-
b@eSrm;k8dmKm*#ReTO+AWvtubU`YQ1Orlh6

literal 0
HcmV?d00001

-- 
2.17.1