Fix Bug547

2024-04-11 23:21:24 +08:00 · 2024-04-11 23:21:24 +08:00 · b4a4bd6723
parent 708a6a2821
commit b4a4bd6723
2 changed files with 82 additions and 26 deletions
--- a/app/static/js/read.js
+++ b/app/static/js/read.js
@ -3,13 +3,14 @@ var Reader = (function() {
    let current_position = 0;
    let original_position = 0;
    let to_speak = "";
+    let current_rate = 1; // 添加这一行，设置默认速率为 1

    function makeUtterance(str, rate) {
        let msg = new SpeechSynthesisUtterance(str);
        msg.rate = rate;
        msg.lang = "en-US";
        msg.onboundary = ev => {
-            if (ev.name == "word") {
+            if (ev.name === "word") {
                current_position = ev.charIndex;
            }
        }
@ -24,12 +25,24 @@ var Reader = (function() {
        reader.speak(msg);
    }

+    function updateRate(rate) {
+        // 停止当前的朗读
+        stopRead();
+
+        // 更新当前速率
+        current_rate = rate;
+
+        // 重新开始朗读
+        read(to_speak, current_rate);
+    }
+
    function stopRead() {
        reader.cancel();
    }

    return {
        read: read,
-        stopRead: stopRead
+        stopRead: stopRead,
+        updateRate: updateRate // 添加这一行，将 updateRate 方法暴露出去
    };
 })();
--- a/app/templates/userpage_get.html
+++ b/app/templates/userpage_get.html
@ -5,6 +5,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="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'] %}
@ -21,17 +23,35 @@
    <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;
+      }

-        @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); }
-        }
    </style>
 </head>
 <body>
@ -45,22 +65,28 @@
        <a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>

    </p>
-{#    {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages，因此注释了这段代码 #}
-{#        <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
-{#    {% endfor %}#}
+    {% 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>
+    {% endfor %}

-        <button class="btn btn-success" id="load_next_article" onclick="load_next_article()"> 下一篇 Next Article </button>
-        <button class="btn btn-success" id="load_pre_article" onclick="load_pre_article()" > 上一篇 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="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>
+            <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"><br/>
-            <p class="display-5" id="article_title">{{ 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" id="source">{{ today_article['source'] }}</small></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/#}
@ -97,8 +123,8 @@
    <p><b>收集生词吧</b> （可以在正文中划词，也可以复制黏贴）</p>
    <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="清除"/>
+        <button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
+        <button class="btn btn-primary btn-lg" type="reset">清除</button>
    </form>
    {% if session.get['thisWord'] %}
        <script type="text/javascript">
@ -147,6 +173,12 @@
    {% endfor %}
 {% endif %}
 <script type="text/javascript">
+    window.onload = function () { // 页面加载时执行
+        // 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
+        if(sessionStorage.getItem('pre_page_button')!="display" && sessionStorage.getItem('pre_page_button')){
+            $('#load_pre_article').show();
+        }
+     };
    function load_next_article(){
        $.ajax({
            url: '/get_next_article/{{username}}',
@ -175,7 +207,7 @@
        });
    }
    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"]);
        $('#article_title').html(today_article["article_title"]);
@ -183,13 +215,19 @@
        $('#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){
        if((visited_articles=='')||(visited_articles['index']<=0)){
            $('#load_pre_article').hide();
+            sessionStorage.setItem('pre_page_button', 'display')
        }else{
            $('#load_pre_article').show();
+            sessionStorage.setItem('pre_page_button', 'show')
        }
    }
    function check_next(result_of_generate_article){
@ -206,11 +244,16 @@
            $('#read_all').show();
        }
    }
+    document.getElementById('rangeComponent').addEventListener('input', function() {
+    var rate = this.value;
+    Reader.updateRate(rate);
+});
+
 </script>
 </body>
 <style>
    mark {
-        color: #{{ yml['highlight']['color'] }};
+        color: {{ yml['highlight']['color'] }};
        background-color: rgba(0, 0, 0, 0);
    }
 </style>