Fix: Move wordfreqapp.db to new location

.gitignore

@@ -7,7 +7,7 @@ app/static/usr/*.jpg
 app/static/img/
 app/static/frequency/frequency_*.pickle
 app/static/frequency/frequency.p
-app/static/wordfreqapp.db
+app/wordfreqapp.db
 app/static/donate-the-author.jpg
 app/static/donate-the-author-hidden.jpg
 app/model/__pycache__/

Jenkinsfile

@@ -10,8 +10,8 @@ pipeline {
     stages {
         stage('MakeDatabasefile') {
 	    steps {
-	        sh 'touch ./app/static/wordfreqapp.db && rm -f ./app/static/wordfreqapp.db' 
+	        sh 'touch ./app/wordfreqapp.db && rm -f ./app/wordfreqapp.db' 
-	        sh 'cat ./app/static/wordfreqapp.sql | sqlite3 ./app/static/wordfreqapp.db'
+	        sh 'cat ./app/static/wordfreqapp.sql | sqlite3 ./app/wordfreqapp.db'
 	    }
 	}
         stage('BuildIt') {

README.md

@@ -61,15 +61,15 @@ My steps for deploying English on a Ubuntu server.
 
 
 All articles are stored in the `article` table in a SQLite file called
-`app/static/wordfreqapp.db`.
+`app/wordfreqapp.db`.
 
 ### Adding new articles
 
-To add articles, open and edit `app/static/wordfreqapp.db` using DB Browser for SQLite (https://sqlitebrowser.org).
+To add articles, open and edit `app/wordfreqapp.db` using DB Browser for SQLite (https://sqlitebrowser.org).
 
 ### Extending an account's expiry date
 
-By default, an account's expiry is 30 days after first sign-up.  To extend account's expiry date, open and edit `user` table in `app/static/wordfreqapp.db`.  Simply update field `expiry_date`.
+By default, an account's expiry is 30 days after first sign-up.  To extend account's expiry date, open and edit `user` table in `app/wordfreqapp.db`.  Simply update field `expiry_date`.
 
 ### Exporting the database
 

app/Article.py

@@ -15,7 +15,7 @@ path_prefix = './'  # comment this line in deployment
 
 
 def total_number_of_essays():
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
+    rq = RecordQuery(path_prefix + 'wordfreqapp.db')
     rq.instructions("SELECT * FROM article")
     rq.do()
     result = rq.get_results()
@@ -33,7 +33,7 @@ def get_article_body(s):
 
 
 def get_today_article(user_word_list, visited_articles):
-    rq = RecordQuery(path_prefix + 'static/wordfreqapp.db')
+    rq = RecordQuery(path_prefix + 'wordfreqapp.db')
     if visited_articles is None:
         visited_articles = {
             "index" : 0,  # 为 article_ids 的索引

app/admin_service.py

@@ -56,6 +56,7 @@ def article():
     
     _articles = get_page_articles(_cur_page, _page_size)
     for article in _articles:   # 获取每篇文章的title
+        article = escape(article)
         article.title = article.text.split("\n")[0]
         article.content = '<br/>'.join(article.text.split("\n")[1:])
     

app/main.py

@@ -5,15 +5,17 @@
 # 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 flask import escape, abort
 from Login import *
 from Article import *
 import Yaml
 from user_service import userService
 from account_service import accountService
 from admin_service import adminService, ADMIN_NAME
+import os
+
 app = Flask(__name__)
-app.secret_key = 'lunch.time!'
+app.secret_key = os.urandom(32)
 
 # 将蓝图注册到Lab app
 app.register_blueprint(userService)
@@ -54,7 +56,6 @@ def appears_in_test(word, d):
     else:
         return ','.join(d[word])
 
-
 @app.route("/mark", methods=['GET', 'POST'])
 def mark_word():
     '''

app/model/__init__.py

@@ -1,7 +1,7 @@
 from pony.orm import *
 
 db = Database()
-db.bind("sqlite", "../static/wordfreqapp.db", create_db=True)  # bind sqlite file
+db.bind("sqlite", "../wordfreqapp.db", create_db=True)  # bind sqlite file
 
 
 class User(db.Entity):

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); }
+            40%, 60% { transform: translate3d(+4px, 0, 0); }
+            50% { transform: translate3d(-4px, 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;
-        }
-
     </style>
 </head>
 <body>
@@ -75,64 +45,47 @@
         <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
-                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/>
+            <div class="p-3 mb-2 bg-light text-dark"><br/>
-                <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
+            <p class="display-5" id="article_title">{{ today_article["article_title"] }}</p><br/>
-                <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
+            <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/>
-                </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,9 +126,8 @@
                 {% 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>
                     ( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
                     <a class="btn btn-success" onclick="familiar('{{ 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();

app/test/test_next_article.py

@@ -1,85 +0,0 @@
-''' 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)

requirements.txt

@@ -1,8 +1,5 @@
-Flask==2.0.3
+Flask==1.1.2
 selenium==3.141.0
 PyYAML~=6.0
 pony==0.7.16
 snowballstemmer==2.2.0
-Werkzeug==2.2.2
-
-pytest~=8.1.1