Merge branch 'Bug587-yingzhizhao' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug587-yingzhizhao

fix BUG 587
修复了userpage_get.html 使其在ratio和today_article为空时不报错
2025-06-24 18:29:30 +08:00 · 2025-06-24 18:28:21 +08:00 · 2025-06-24 18:27:11 +08:00 · 2025-06-24 18:16:47 +08:00 · 2025-06-24 17:59:27 +08:00
6 changed files with 67 additions and 54 deletions
--- a/README.md
+++ b/README.md
@ -18,7 +18,7 @@ picked from articles selected for him to read according his vocabulary level.  E

 `python3 main.py`

-Make sure you have put the SQLite database file in the path `app/db` (see below).
+Make sure you have put the SQLite database file in the path `app/static` (see below).


 ## Run it as a Docker container
@ -214,5 +214,5 @@ Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=215
 Bug report: http://118.25.96.118/bugzilla/show_bug.cgi?id=489


-*Last modified on 2026-03-12*
+*Last modified on 2023-01-30*

--- a/app/Article.py
+++ b/app/Article.py
@ -106,7 +106,7 @@ def get_today_article(user_word_list, visited_articles):
        text_level = text_difficulty_level(d['text'], d3)
        result_of_generate_article = "found"

-    today_article = {}
+    today_article = None
    if d:
        oxford_words = load_oxford_words(oxford_words_path)
        oxford_word_count, total_words = count_oxford_words(d['text'],oxford_words)
--- a/app/main.py
+++ b/app/main.py
@ -144,8 +144,8 @@ if __name__ == '__main__':
    运行程序
    '''
    # app.secret_key = os.urandom(16)
-    app.run(debug=True, port=5000)
-    # app.run(debug=True)
+    # app.run(debug=False, port='6000')
+    app.run(host='127.0.0.1', port=5000, debug=True)
    # app.run(debug=True, port='6000')
    # app.run(host='0.0.0.0', debug=True, port='6000')
    # print(mod5('123'))
--- a/app/static/js/password.js
+++ b/app/static/js/password.js
@ -11,7 +11,7 @@ function containsDigitsLettersSpecialCharacters(s) {
    resultL =  /[a-z]/i.test(s);

    // Special charater test
-    '+-*/,.:;/\[]<>$%&()!?^~'.split('').forEach((x) => {
+    '+-*/,.:;/\[]<>$%&()!?^~@'.split('').forEach((x) => {
 	if (s.includes(x))
 	    resultS = 1;
    });
--- a/app/templates/mainpage_get.html
+++ b/app/templates/mainpage_get.html
@ -31,7 +31,7 @@
            <p><a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></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> 篇，Oxford 5000 单词占比 <span class="badge bg-success"> {{ (ratio * 100) | int }}%  </span> </div>
+        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇，覆盖 <span class="badge bg-success"> {{ (ratio * 100) | int }}%  </span> 的 Oxford5000 单词</div>
        <p>粘贴1篇文章 (English only)</p>
        <form method="post" action="/">
            <textarea name="content" id="article" rows="10" cols="120"></textarea><br/>
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@ -3,7 +3,7 @@
 <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"/>
+        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="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
@ -25,34 +25,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,32 +69,43 @@
    </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>
+    {{ message }}
+    <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
    </div>
    {% endfor %}

        <div class="pagination">
-          <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" title="Previous Article">
+        <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" title="Previous Article">
            <i class="fas fa-chevron-left"></i> 上一篇
-          </button>
-          <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="Next Article">
-             下一篇 <i class="fas fa-chevron-right"></i>
-          </button>
+        </button>
+        <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="Next Article">
+            下一篇 <i class="fas fa-chevron-right"></i>
+        </button>
        </div>

    <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. <span class="text-decoration-underline" id="ratio">{{ (today_article["ratio"] * 100) | int }}%</span> of the words in this article are in Oxford Word 5000.</div>
-            <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
+            {% if today_article and today_article["ratio"] is not none %}
+            <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. The Oxford word coverage is 
+                <span class="text-decoration-underline" id="ratio">{{ (today_article["ratio"] * 100) | int }}%.</span>
+            </div>
+            {% else %}
+                <div class="alert alert-warning">No article or article is incomplete.</div>
+            {% endif %}
+        <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>

-	    <button onclick="saveArticle()" >标记文章</button>
-	    <select id="saved_articles_dropdown">
-	      <!-- 这里将显示已经保存的文章 -->
-	      <option></option>
-	    </select>
+        <button onclick="saveArticle()" >标记文章</button>
+        <select id="saved_articles_dropdown">
+        <!-- 这里将显示已经保存的文章 -->
+        <option></option>
+        </select>

            <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/>
@ -114,11 +125,13 @@
                    }
                </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 id="tooltip"></div>
+        <div id="tooltip"></div>
        </div>
-        <div class="alert alert-success" role="alert" id="not_found" style="display:none;">
+        <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>
        </div>
        <div class="alert alert-success" role="alert" id="read_all" style="display:none;">
@ -163,7 +176,7 @@
                允许动态调整顺序
            </label>
            <br>
-              <a class="btn btn-primary btn-lg"  onclick="random_select_word('{{ word }}')"   role="button">随机选取10个</a>
+            <a class="btn btn-primary btn-lg"  onclick="random_select_word('{{ word }}')"   role="button">随机选取10个</a>
            <a class="btn btn-primary btn-lg"  onclick="location.reload();"   role="button">显示所有生词</a>
        </p>
        <!--添加导出按钮-->
@ -367,7 +380,7 @@
    savedArticlesDropdown.appendChild(option);
    localStorage.setItem(articleTitle, articleJSON); // 以文章标题为键，序列化的JSON字符串为值存储
 }
-  function loadSelectedArticle() {
+function loadSelectedArticle() {
    const selectedOption = document.getElementById('saved_articles_dropdown');
    const selectedTitle = selectedOption.options[selectedOption.selectedIndex].text;
    const articleJSON = localStorage.getItem(selectedTitle);
@ -378,9 +391,9 @@
    }
 }

-   window.onload = function() {
-     const savedArticlesDropdown = document.getElementById('saved_articles_dropdown');
-     savedArticlesDropdown.addEventListener('change', loadSelectedArticle);
+window.onload = function() {
+    const savedArticlesDropdown = document.getElementById('saved_articles_dropdown');
+    savedArticlesDropdown.addEventListener('change', loadSelectedArticle);

    // 先清空dropdown，以防有多余的选项或重新加载页面时出现重复
    savedArticlesDropdown.innerHTML = '';
Author	SHA1	Message	Date
yzzob	6bd60c3eaf	Merge branch 'Bug587-yingzhizhao' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug587-yingzhizhao	2025-06-24 18:29:30 +08:00
yzzob	a424704496	fix BUG 587	2025-06-24 18:28:21 +08:00
yzzob	d53231f58a	修复了userpage_get.html 使其在ratio和today_article为空时不报错	2025-06-24 18:27:11 +08:00
yzzob	bc21a05b29	fix BUG 587	2025-06-24 18:16:47 +08:00
yzzob	8149392fa6	修复了userpage_get.html 使其在ratio和today_article为空时不报错	2025-06-24 17:59:27 +08:00