forked from mrlan/EnglishPal
Compare commits
3 Commits
Bug534-Nin
...
master
Author | SHA1 | Date |
---|---|---|
李思楠 | 8cbc7c9a0c | |
丁晟晔 | ff6286cf01 | |
丁晟晔 | 1d7e61d751 |
|
@ -23,39 +23,11 @@ def signup():
|
||||||
#! 添加如下代码为了过滤注册时的非法字符
|
#! 添加如下代码为了过滤注册时的非法字符
|
||||||
warn = WarningMessage(username)
|
warn = WarningMessage(username)
|
||||||
if str(warn) != 'OK':
|
if str(warn) != 'OK':
|
||||||
return str(warn)
|
return jsonify({'status': '3', 'warn': str(warn)})
|
||||||
# return jsonify({'status': '3', 'warn': str(warn)})
|
|
||||||
|
|
||||||
available = check_username_availability(username)
|
available = check_username_availability(username)
|
||||||
if not available: # 用户名不可用
|
if not available: # 用户名不可用
|
||||||
flash('用户名 %s 已经被注册。' %(username))
|
return jsonify({'status': '0'})
|
||||||
return render_template('signup.html')
|
|
||||||
elif len(password.strip()) < 8: # 密码过短
|
|
||||||
return '密码少于8位。'
|
|
||||||
# return jsonify({'status': '0'})
|
|
||||||
|
|
||||||
has_specialchar = False
|
|
||||||
specialchar_list = ['+', '-', '*', '/', '_', '&', '%', ',']
|
|
||||||
for c in password.strip():
|
|
||||||
if c in specialchar_list:
|
|
||||||
has_specialchar = True
|
|
||||||
break
|
|
||||||
if not has_specialchar:
|
|
||||||
return '密码必须包含特殊字符'
|
|
||||||
|
|
||||||
has_upper_letter = False
|
|
||||||
has_lower_letter = False
|
|
||||||
for c in password.strip():
|
|
||||||
if c.isupper():
|
|
||||||
has_upper_letter = True
|
|
||||||
elif c.islower():
|
|
||||||
has_lower_letter = True
|
|
||||||
has_both_letter = has_upper_letter and has_lower_letter
|
|
||||||
if has_both_letter:
|
|
||||||
break
|
|
||||||
if not has_both_letter:
|
|
||||||
return '密码必须同时包含大写字母和小写字母'
|
|
||||||
|
|
||||||
else: # 添加账户信息
|
else: # 添加账户信息
|
||||||
add_user(username, password)
|
add_user(username, password)
|
||||||
verified = verify_user(username, password)
|
verified = verify_user(username, password)
|
||||||
|
|
|
@ -1,48 +0,0 @@
|
||||||
|
|
||||||
from random import randint
|
|
||||||
from PIL import Image, ImageDraw, ImageFont
|
|
||||||
|
|
||||||
|
|
||||||
def get_random_color():
|
|
||||||
# 随机颜色RGB
|
|
||||||
return randint(120, 200), randint(120, 200), randint(120, 200)
|
|
||||||
|
|
||||||
|
|
||||||
def get_random_code():
|
|
||||||
# 随机字符
|
|
||||||
codes = [[chr(i) for i in range(48, 58)], [chr(i) for i in range(65, 91)], [chr(i) for i in range(97, 123)]]
|
|
||||||
codes = codes[randint(0, 2)]
|
|
||||||
return codes[randint(0, len(codes)-1)]
|
|
||||||
|
|
||||||
|
|
||||||
def generate_captcha(width=140, height=60, length=4):
|
|
||||||
# 生成验证码
|
|
||||||
img = Image.new("RGB", (width, height), (250, 250, 250))
|
|
||||||
draw = ImageDraw.Draw(img)
|
|
||||||
font = ImageFont.truetype("static/font/font.ttf", size=36)
|
|
||||||
# 验证码文本
|
|
||||||
text = ""
|
|
||||||
for i in range(length):
|
|
||||||
c = get_random_code()
|
|
||||||
text += c
|
|
||||||
|
|
||||||
rand_len = randint(-5, 5)
|
|
||||||
draw.text((width * 0.2 * (i+1) + rand_len, height * 0.2 + rand_len), c, font=font, fill=get_random_color())
|
|
||||||
# 加入干扰线
|
|
||||||
for i in range(3):
|
|
||||||
x1 = randint(0, width)
|
|
||||||
y1 = randint(0, height)
|
|
||||||
x2 = randint(0, width)
|
|
||||||
y2 = randint(0, height)
|
|
||||||
draw.line((x1, y1, x2, y2), fill=get_random_color())
|
|
||||||
# 加入干扰点
|
|
||||||
for i in range(16):
|
|
||||||
draw.point((randint(0, width), randint(0, height)), fill=get_random_color())
|
|
||||||
# 保存图片
|
|
||||||
img.save("static/captcha/" + text + ".jpg")
|
|
||||||
return text + ".jpg"
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
for i in range(1000):
|
|
||||||
generate_captcha()
|
|
11
app/main.py
11
app/main.py
|
@ -105,17 +105,6 @@ def mainpage():
|
||||||
yml=Yaml.yml,
|
yml=Yaml.yml,
|
||||||
number_of_essays=number_of_essays)
|
number_of_essays=number_of_essays)
|
||||||
|
|
||||||
@app.route('/index')
|
|
||||||
def index():
|
|
||||||
return render_template("signup.html")
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/get_captcha', methods=['GET'])
|
|
||||||
def get_captcha():
|
|
||||||
img_list = os.listdir("static/captcha")
|
|
||||||
img = img_list[random.randint(0, 1000)]
|
|
||||||
return os.path.join("static/captcha", img)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
'''
|
'''
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
.container {
|
.container {
|
||||||
background-color: #FFFFFF;
|
background-color: #FFFFFF;
|
||||||
width: 400px;
|
width: 400px;
|
||||||
height: 700px;
|
height: 500px;
|
||||||
margin: 7em auto;
|
margin: 7em auto;
|
||||||
border-radius: 1.5em;
|
border-radius: 1.5em;
|
||||||
box-shadow: 0px 11px 35px 2px rgba(0, 0, 0, 0.14);
|
box-shadow: 0px 11px 35px 2px rgba(0, 0, 0, 0.14);
|
||||||
|
@ -40,27 +40,6 @@
|
||||||
font-family: 'Ubuntu', sans-serif;
|
font-family: 'Ubuntu', sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*增加1个类.image*/
|
|
||||||
.image{
|
|
||||||
width: 39%;
|
|
||||||
color: rgb(38, 50, 56);
|
|
||||||
font-weight: 700;
|
|
||||||
font-size: 14px;
|
|
||||||
letter-spacing: 1px;
|
|
||||||
background: rgba(136, 126, 126, 0.04);
|
|
||||||
padding: 10px 20px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 20px;
|
|
||||||
outline: none;
|
|
||||||
box-sizing: border-box;
|
|
||||||
border: 2px solid rgba(124, 16, 97, 0.02);
|
|
||||||
margin-bottom: 50px;
|
|
||||||
margin-left: 46px;
|
|
||||||
text-align: center;
|
|
||||||
margin-bottom: 27px;
|
|
||||||
font-family: 'Ubuntu', sans-serif;
|
|
||||||
}
|
|
||||||
|
|
||||||
.btn {
|
.btn {
|
||||||
width: 50%;
|
width: 50%;
|
||||||
border: none;
|
border: none;
|
||||||
|
|
Binary file not shown.
|
@ -6,7 +6,7 @@ You're logged in already! <a href="/logout">Logout</a>.
|
||||||
{% else %}
|
{% else %}
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=0.5, maximum-scale=3.0, user-scalable=yes" />
|
||||||
<link rel="stylesheet" href="static/css/login_service.css">
|
<link rel="stylesheet" href="static/css/login_service.css">
|
||||||
<script src="../static/js/jquery.js"></script>
|
<script src="static/js/jquery.js"></script>
|
||||||
<script>
|
<script>
|
||||||
function signup() {
|
function signup() {
|
||||||
let username = $("#username").val();
|
let username = $("#username").val();
|
||||||
|
@ -47,37 +47,6 @@ You're logged in already! <a href="/logout">Logout</a>.
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<!--增加两个js函数,Change()用于检测用户刷新验证码的请求并发送给后端以切换验证码图片,Check()用以检查用户输入的验证码是否与图片匹配-->
|
|
||||||
<script>
|
|
||||||
function Change() {
|
|
||||||
$.ajax({
|
|
||||||
url: '{{ url_for('get_captcha') }}',
|
|
||||||
async: true,
|
|
||||||
type: "GET",
|
|
||||||
success: function (data) {
|
|
||||||
document.getElementById("captcha").src = data;
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
<script>
|
|
||||||
function Check() {
|
|
||||||
var img = document.getElementById("captcha").src;
|
|
||||||
var img_path = img.replace("\\", "/").split("/");
|
|
||||||
var img_name = img_path[img_path.length - 1];
|
|
||||||
img_name = img_name.split(".")[0];
|
|
||||||
var your_in = document.getElementById("your_in").value;
|
|
||||||
if(img_name.toLowerCase() == your_in.toLowerCase()){
|
|
||||||
alert("验证成功!");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
alert("验证错误!");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
window.onload = Change();
|
|
||||||
</script>
|
|
||||||
<p>{{ get_flashed_messages()[0] | safe }}</p>
|
<p>{{ get_flashed_messages()[0] | safe }}</p>
|
||||||
|
|
||||||
|
|
||||||
|
@ -87,17 +56,10 @@ You're logged in already! <a href="/logout">Logout</a>.
|
||||||
<h1>Sign Up</h1>
|
<h1>Sign Up</h1>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<form action="/signup" method="POST" onsubmit="return Check()">
|
<p><input type="username" id="username" placeholder="输入用户名" class="username"></p>
|
||||||
<p><input type="username" name="username" placeholder="输入用户名" required="required" class="username"></p>
|
<p><input type="password" id="password" placeholder="输入密码" class="password"></p>
|
||||||
<p><input type="password" name="password" placeholder="输入密码" class="password"></p>
|
<p><input type="password" id="password2" placeholder="确认密码" class="password" ></p>
|
||||||
<p><input type="password" name="password2" placeholder="确认密码" class="password"></p>
|
<button type="button" class="btn" onclick="signup()">注册</button>
|
||||||
<div style="font-size: medium">
|
|
||||||
<p align="center"><img src="" id="captcha" class="image"></p>
|
|
||||||
<p align="center"><a href="javascript:void(0)" onclick="Change()">看不清楚,换一张</a></p>
|
|
||||||
<input id="your_in" placeholder="输入验证码" class="password">
|
|
||||||
</div>
|
|
||||||
<button type="submit" class="btn" >注册</button>
|
|
||||||
</form>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,8 @@
|
||||||
<meta name="viewport"
|
<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"/>
|
<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 }}
|
{{ yml['header'] | safe }}
|
||||||
{% if yml['css']['item'] %}
|
{% if yml['css']['item'] %}
|
||||||
|
@ -26,12 +28,40 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
@keyframes shakes {
|
@keyframes shakes {
|
||||||
10%, 90% { transform: translate3d(-1px, 0, 0); }
|
10%, 90% {
|
||||||
20%, 50% { transform: translate3d(+2px, 0, 0); }
|
transform: translate3d(-1px, 0, 0);
|
||||||
30%, 70% { transform: translate3d(-4px, 0, 0); }
|
}
|
||||||
40%, 60% { transform: translate3d(+4px, 0, 0); }
|
20%, 50% {
|
||||||
50% { transform: translate3d(-4px, 0, 0); }
|
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>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
@ -39,53 +69,70 @@
|
||||||
<p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
|
<p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
|
||||||
|
|
||||||
{% if username == admin_name %}
|
{% 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 %}
|
{% endif %}
|
||||||
<a id="quit" class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
|
<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>
|
<a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
{# {% for message in flashed_messages %}#} {# 根据user_service.userpage,取消了参数flashed_messages,因此注释了这段代码 #}
|
{% for message in get_flashed_messages() %}
|
||||||
{# <div class="alert alert-warning" role="alert">Congratulations! {{ message }}</div>#}
|
<div class="alert alert-warning alert-dismissible fade show" role="alert">
|
||||||
{# {% endfor %}#}
|
{{ 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="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()"
|
||||||
<button class="btn btn-success" id="load_pre_article" onclick="load_pre_article()" > 上一篇 Previous Article </button>
|
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>
|
<p><b>阅读文章并回答问题</b></p>
|
||||||
<div id="text-content">
|
<div id="text-content">
|
||||||
<div id="found">
|
<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
|
||||||
<p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
|
class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
|
||||||
<div class="p-3 mb-2 bg-light text-dark"><br/>
|
have chosen an article with a difficulty level of <span class="text-decoration-underline"
|
||||||
<p class="display-5" id="article_title">{{ today_article["article_title"] }}</p><br/>
|
id="text_level">{{ today_article["text_level"] }}</span>
|
||||||
<p class="lead"><font id="article" size=2>{{ today_article["article_body"] }}</font></p><br/>
|
for you.
|
||||||
<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 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/>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
|
function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
|
||||||
const e = document.getElementById(id);
|
const e = document.getElementById(id);
|
||||||
if(e.style.display === 'block')
|
if (e.style.display === 'block')
|
||||||
e.style.display = 'none';
|
e.style.display = 'none';
|
||||||
else
|
else
|
||||||
e.style.display = 'block';
|
e.style.display = 'block';
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<button onclick="toggle_visibility('answer');">ANSWER</button>
|
<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>
|
</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>
|
<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>
|
||||||
<div class="alert alert-success" role="alert" id="read_all" style="display:none;">
|
<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>
|
<p class="text-muted"><span class="badge bg-success">Notes:</span><br>You've read all the articles.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<input type="checkbox" onclick="toggleHighlighting()" checked/>生词高亮
|
<input type="checkbox" id="highlightCheckbox" onclick="toggleHighlighting()"/>生词高亮
|
||||||
<input type="checkbox" onclick="onReadClick()" checked/>大声朗读
|
<input type="checkbox" id="readCheckbox" onclick="onReadClick()"/>大声朗读
|
||||||
<input type="checkbox" onclick="onChooseClick()" checked/>划词入库
|
<input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()"/>划词入库
|
||||||
<div class="range">
|
<div class="range">
|
||||||
<div class="field">
|
<div class="field">
|
||||||
<div class="sliderValue">
|
<div class="sliderValue">
|
||||||
|
@ -97,8 +144,8 @@
|
||||||
<p><b>收集生词吧</b> (可以在正文中划词,也可以复制黏贴)</p>
|
<p><b>收集生词吧</b> (可以在正文中划词,也可以复制黏贴)</p>
|
||||||
<form method="post" action="/{{ username }}/userpage">
|
<form method="post" action="/{{ username }}/userpage">
|
||||||
<textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
|
<textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
|
||||||
<input type="submit" value="把生词加入我的生词库"/>
|
<button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
|
||||||
<input type="reset" value="清除"/>
|
<button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
|
||||||
</form>
|
</form>
|
||||||
{% if session.get['thisWord'] %}
|
{% if session.get['thisWord'] %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
@ -126,9 +173,10 @@
|
||||||
{% set freq = x[1] %}
|
{% set freq = x[1] %}
|
||||||
{% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
|
{% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<p id='p_{{ word }}' class="new-word" >
|
<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'
|
<a id="word_{{ word }}" class="btn btn-light"
|
||||||
role="button">{{ word }}</a>
|
href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
|
||||||
|
role="button">{{ word }}</a>
|
||||||
( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
|
( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
|
||||||
<a class="btn btn-success" onclick="familiar('{{ word }}')" role="button">熟悉</a>
|
<a class="btn btn-success" onclick="familiar('{{ word }}')" role="button">熟悉</a>
|
||||||
<a class="btn btn-warning" onclick="unfamiliar('{{ word }}')" role="button">不熟悉</a>
|
<a class="btn btn-warning" onclick="unfamiliar('{{ word }}')" role="button">不熟悉</a>
|
||||||
|
@ -147,60 +195,127 @@
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
function load_next_article(){
|
window.onload = function () { // 页面加载时执行
|
||||||
|
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({
|
$.ajax({
|
||||||
url: '/get_next_article/{{username}}',
|
url: '/get_next_article/{{username}}',
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data) {
|
success: function (data) {
|
||||||
// 更新页面内容
|
// 更新页面内容
|
||||||
if(data['today_article']){
|
if (data['today_article']) {
|
||||||
update(data['today_article']);
|
update(data['today_article']);
|
||||||
check_pre(data['visited_articles']);
|
check_pre(data['visited_articles']);
|
||||||
check_next(data['result_of_generate_article']);
|
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({
|
$.ajax({
|
||||||
url: '/get_pre_article/{{username}}',
|
url: '/get_pre_article/{{username}}',
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
success: function(data) {
|
success: function (data) {
|
||||||
// 更新页面内容
|
// 更新页面内容
|
||||||
if(data['today_article']){
|
if (data['today_article']) {
|
||||||
update(data['today_article']);
|
update(data['today_article']);
|
||||||
check_pre(data['visited_articles']);
|
check_pre(data['visited_articles']);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
function update(today_article){
|
|
||||||
$('#user-level').html(today_article['user_level']);
|
function update(today_article) {
|
||||||
|
$('#user_level').html(today_article['user_level']);
|
||||||
$('#text_level').html(today_article["text_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_title').html(today_article["article_title"]);
|
||||||
$('#article').html(today_article["article_body"]);
|
$('#article').html(today_article["article_body"]);
|
||||||
$('#source').html(today_article['source']);
|
$('#source').html(today_article['source']);
|
||||||
$('#question').html(today_article["question"]);
|
$('#question').html(today_article["question"]);
|
||||||
$('#answer').html(today_article["answer"]);
|
$('#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)){
|
function check_pre(visited_articles) {
|
||||||
|
if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
|
||||||
$('#load_pre_article').hide();
|
$('#load_pre_article').hide();
|
||||||
}else{
|
sessionStorage.setItem('pre_page_button', 'display')
|
||||||
|
} else {
|
||||||
$('#load_pre_article').show();
|
$('#load_pre_article').show();
|
||||||
|
sessionStorage.setItem('pre_page_button', 'show')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function check_next(result_of_generate_article){
|
|
||||||
if(result_of_generate_article == "found"){
|
function check_next(result_of_generate_article) {
|
||||||
$('#found').show();$('#not_found').hide();
|
if (result_of_generate_article == "found") {
|
||||||
|
$('#found').show();
|
||||||
|
$('#not_found').hide();
|
||||||
$('#read_all').hide();
|
$('#read_all').hide();
|
||||||
}else if(result_of_generate_article == "not found"){
|
} else if (result_of_generate_article == "not found") {
|
||||||
$('#found').hide();
|
$('#found').hide();
|
||||||
$('#not_found').show();
|
$('#not_found').show();
|
||||||
$('#read_all').hide();
|
$('#read_all').hide();
|
||||||
}else{
|
} else {
|
||||||
$('#found').hide();
|
$('#found').hide();
|
||||||
$('#not_found').hide();
|
$('#not_found').hide();
|
||||||
$('#read_all').show();
|
$('#read_all').show();
|
||||||
|
|
|
@ -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)
|
|
@ -1,6 +1,8 @@
|
||||||
Flask==1.1.2
|
Flask==2.0.3
|
||||||
selenium==3.141.0
|
selenium==3.141.0
|
||||||
PyYAML~=6.0
|
PyYAML~=6.0
|
||||||
pony==0.7.16
|
pony==0.7.16
|
||||||
snowballstemmer==2.2.0
|
snowballstemmer==2.2.0
|
||||||
PIL==8.3.2
|
Werkzeug==2.2.2
|
||||||
|
|
||||||
|
pytest~=8.1.1
|
Loading…
Reference in New Issue