Fixed Bug 562

Fix bug 476
2024-05-30 21:19:28 +08:00 · 2024-05-27 19:46:52 +08:00
7 changed files with 106 additions and 168 deletions
--- a/app/account_service.py
+++ b/app/account_service.py
@ -1,5 +1,6 @@
 from flask import *
 from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, WarningMessage
 from markupsafe import escape
 # 初始化蓝图
--- 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 flask import escape
+from markupsafe import escape
 from Login import *
 from Article import *
 import Yaml
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@ -5,8 +5,6 @@
    <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="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css" rel="stylesheet">
    <script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/js/bootstrap.bundle.min.js"></script>
    {{ yml['header'] | safe }}
    {% if yml['css']['item'] %}
@ -28,40 +26,12 @@
        }
        @keyframes shakes {
-            10%, 90% {
+            10%, 90% { transform: translate3d(-1px, 0, 0); }
-                transform: translate3d(-1px, 0, 0);
+            20%, 50% { transform: translate3d(+2px, 0, 0); }
-            }
+            30%, 70% { transform: translate3d(-4px, 0, 0); }
-            20%, 50% {
+            40%, 60% { transform: translate3d(+4px, 0, 0); }
-                transform: translate3d(+2px, 0, 0);
+            50% { transform: translate3d(-4px, 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;
        }
    </style>
 </head>
 <body>
@ -69,70 +39,53 @@
    <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() %}
+{#    {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #}
-        <div class="alert alert-warning alert-dismissible fade show" role="alert">
+{#        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
-            {{ message }}
+{#    {% endfor %}#}
            <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()"
+        <button class="btn btn-success" id="load_next_article" onclick="load_next_article()"> 下一篇 Next Article </button>
-            title="下一篇 Next Article">⇨
+        <button class="btn btn-success" id="load_pre_article" onclick="load_pre_article()" > 上一篇 Previous Article </button>
    </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
+            <div class="alert alert-success" role="alert">According to your word list, your level is <span class="badge bg-success" id="user-level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="badge bg-success" id="text_level">{{ today_article["text_level"] }}</span> for you.</div>
-                    class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
+                <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
-                have chosen an article with a difficulty level of <span class="text-decoration-underline"
+            <div class="p-3 mb-2 bg-light text-dark"><br/>
-                                                                        id="text_level">{{ today_article["text_level"] }}</span>
+            <p class="display-5" id="article_title">{{ today_article["article_title"] }}</p><br/>
-                for you.
+            <p class="lead"><font id="article" size=2>{{ today_article["article_body"] }}</font></p><br/>
-            </div>
+            <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
-            <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
+            <p><b id="question">{{ today_article['question'] }}</b></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/>
                <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>
+                <div id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
                <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
+            <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>
                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" onclick="toggleHighlighting()" checked/>生词高亮
-    <input type="checkbox" id="readCheckbox" onclick="onReadClick()"/>大声朗读
+    <input type="checkbox" onclick="onReadClick()" checked/>大声朗读
-    <input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()"/>划词入库
+    <input type="checkbox" onclick="onChooseClick()" checked/>划词入库
    <div class="range">
        <div class="field">
            <div class="sliderValue">
@ -144,8 +97,8 @@
    <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>
+        <input type="submit" value="把生词加入我的生词库"/>
-        <button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
+        <input type="reset" value="清除"/>
    </form>
    {% if session.get['thisWord'] %}
        <script type="text/javascript">
@ -173,10 +126,9 @@
                {% set freq = x[1] %}
                {% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
                {% endif %}
-                <p id='p_{{ word }}' class="new-word">
+                <p id='p_{{ word }}' class="new-word" >
-                    <a id="word_{{ word }}" class="btn btn-light"
+                    <a id="word_{{ word }}"  class="btn btn-light" href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
-                       href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
+                    role="button">{{ word }}</a>
                       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>
@ -195,127 +147,60 @@
    {% endfor %}
 {% endif %}
 <script type="text/javascript">
-    window.onload = function () { // 页面加载时执行
+    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)
        $.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']);
        $('#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);
        document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
        setTimeout(() => {
            document.querySelector('#user_level').classList.remove('mark');
        }, 2000);
    }
-
+<!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
-    <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
+    function check_pre(visited_articles){
-    function check_pre(visited_articles) {
+        if((visited_articles=='')||(visited_articles['index']<=0)){
        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){
-    function check_next(result_of_generate_article) {
+        if(result_of_generate_article == "found"){
-        if (result_of_generate_article == "found") {
+            $('#found').show();$('#not_found').hide();
            $('#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();
--- a/app/test/test_bug562_Wuyichen.py
+++ b/app/test/test_bug562_Wuyichen.py
@ -0,0 +1,54 @@
 # -*- coding: utf-8 -*-
 # Run the docker image using the following command:
 # docker run -d -p 4444:4444 selenium/standalone-chrome
 from selenium import webdriver
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 import random, string, time
 driver = webdriver.Remote('http://localhost:4444/wd/hub', DesiredCapabilities.FIREFOX)
 driver.implicitly_wait(10)
 HOME_PAGE = 'http://121.4.94.30:91/'
 def test_generate_article():
    try:
        driver.get(HOME_PAGE)
        assert 'English Pal -' in driver.page_source
        # login
        elem = driver.find_element_by_link_text('登录')
        elem.click()
        uname = 'lanhui'
        password = 'l0ve1t'
        elem = driver.find_element_by_name('username')
        elem.send_keys(uname)
        elem = driver.find_element_by_name('password')
        elem.send_keys(password)
        elem = driver.find_element_by_xpath('//form[1]/p[3]/input[1]') # 找到登录按钮
        elem.click()
        assert 'EnglishPal Study Room for ' + uname in driver.title
        # get initial essay content
        driver.save_screenshot('./app/test/test_generate_article_pic0.png')
        elem = driver.find_element_by_id('text-content')
        initial_essay_content = elem.text
        # generate article
        driver.save_screenshot('./app/test/test_generate_article_pic1.png')
        elem = driver.find_element_by_link_text('下一篇')
        elem.click()
        # get generated essay content
        driver.save_screenshot('./app/test/test_generate_article_pic2.png')
        elem = driver.find_element_by_id('text-content')
        generated_essay_content = elem.text
        assert generated_essay_content != initial_essay_content  # Check if a new article is generated
    finally:
        driver.quit()
--- a/app/user_service.py
+++ b/app/user_service.py
@ -1,6 +1,7 @@
 from datetime import datetime
 from admin_service import ADMIN_NAME
 from flask import *
 from markupsafe import escape
 # from app import Yaml
 # from app.Article import get_today_article, load_freq_history
--- a/identifier.sqlite
+++ b/identifier.sqlite
--- a/requirements.txt
+++ b/requirements.txt
@ -1,8 +1,5 @@
-Flask==2.0.3
+Flask==3.0.0
 selenium==3.141.0
 PyYAML~=6.0
 pony==0.7.16
 snowballstemmer==2.2.0
 Werkzeug==2.2.2
 pytest~=8.1.1
Author	SHA1	Message	Date
heyang	3f200e5384	Fixed Bug 562	2024-05-30 21:19:28 +08:00
heyang	6a0f52e214	Fix bug 476	2024-05-27 19:46:52 +08:00