stewart
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[REFACTOR] user_service.py: Added id to user name, word and frequency for click to execute AJAX request in JS

Bug400-QiuZhonghui
PeterQiu 2022-06-08 10:50:21 +08:00
parent b9cf94da74
commit 670e5a2083
5 changed files with 61 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/static/config.yml
View File

@ -6,6 +6,8 @@ css:
# 全局引入的js文件地址 # 全局引入的js文件地址
js: js:
head: # 在页面加载之前加载 head: # 在页面加载之前加载
- static/js/jquery.js
- static/js/word_operation.js
# - static/js/APlayer.js # - static/js/APlayer.js
# - static/js/Meting.js # - static/js/Meting.js
bottom: # 在页面加载完之后加载 bottom: # 在页面加载完之后加载

2
app/static/js/jquery.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

43
app/static/js/word_operation.js Normal file
View File

@ -0,0 +1,43 @@
function familiar(index) {
var username = $("#username").text();
var word = $("#word_" + index).text();
var freq = $("#freq_" + index).text();
$.ajax({
type:"get",
url:"/" + username + "/" + word + "/familiar",
success:function(resp){
var new_freq = freq - 1;
if(new_freq <1) {
$("#p_" + index).remove();
} else {
$("#freq_" + index).text(new_freq);
}
}
});
}
function unfamiliar(index) {
var username = $("#username").text();
var word = $("#word_" + index).text();
var freq = $("#freq_" + index).text();
$.ajax({
type:"get",
url:"/" + username + "/" + word + "/unfamiliar",
success:function(resp){
var new_freq = parseInt(freq) + 1;
$("#freq_" + index).text(new_freq);
}
});
}
function del_word(index) {
var username = $("#username").text();
var word = $("#word_" + index).text();
$.ajax({
type:"get",
url:"/" + username + "/" + word + "/del",
success:function(resp){
$("#p_" + index).remove();
}
});
}

31
app/templates/userpage_get.html
View File

@ -22,7 +22,7 @@
</head> </head>
<body> <body>
<div class="container-fluid"> <div class="container-fluid">
<p><b>English Pal for <font color="red">{{ username }}</font></b> <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
<a class="btn btn-secondary" href="/logout" role="button">退出</a> <a class="btn btn-secondary" href="/logout" role="button">退出</a>
<a class="btn btn-secondary" href="/reset" role="button">重设密码</a> <a class="btn btn-secondary" href="/reset" role="button">重设密码</a>
</p> </p>
@ -57,37 +57,20 @@
<p><b>我的生词簿</b></p> <p><b>我的生词簿</b></p>
{% for x in lst3 %} {% for x in lst3 %}
{% set word = x[0] %} {% set word = x[0] %}
{% 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 %}
<a name="aaa"></a> <a name="aaa"></a>
{% endif %} {% endif %}
{% if freq > 1 %} <p id='p_{{ loop.index0 }}' class="new-word" >
<p class="new-word"> <a id="word_{{ loop.index0 }}" class="btn btn-light" href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
<a class="btn btn-light" href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
role="button">{{ word }}</a> role="button">{{ word }}</a>
( (
<a title="{{ word }}">{{ freq }}</a> <a id="freq_{{ loop.index0 }}" title="{{ word }}">{{ freq }}</a>
) )
<a class="btn btn-success" onclick="familiar({{ loop.index0 }})" role="button">熟悉</a>
<a class="btn btn-success" href={{ username }}/{{ word }}/familiar role="button">熟悉</a> <a class="btn btn-warning" onclick="unfamiliar({{ loop.index0 }})" role="button">不熟悉</a>
<a class="btn btn-warning" href={{ username }}/{{ word }}/unfamiliar role="button">不熟悉</a> <a class="btn btn-danger" onclick="del_word({{ loop.index0 }})" role="button">删除</a>
<a class="btn btn-danger" href={{ username }}/{{ word }}/del role="button">删除</a>
</p> </p>
{% else %}
<p class="new-word">
<a class="btn btn-light" href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
role="button">{{ word }}</a>
(
<a title="{{ word }}">{{ freq }}</a>
)
<a class="btn btn-success" href={{ username }}/{{ word }}/familiar role="button">熟悉</a>
<a class="btn btn-warning" href={{ username }}/{{ word }}/unfamiliar role="button">不熟悉</a>
<a class="btn btn-danger" href={{ username }}/{{ word }}/del role="button">删除</a>
</p>
{% endif %}
{% else %}
<a href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'>{{ word }}</a>{{ freq }}
{% endfor %} {% endfor %}
<input id="selected-words2" type="hidden" value="{{ words }}"> <input id="selected-words2" type="hidden" value="{{ words }}">
{% endif %} {% endif %}

6
app/user_service.py
View File

@ -48,7 +48,7 @@ def unfamiliar(username, word):
pickle_idea.unfamiliar(user_freq_record, word) pickle_idea.unfamiliar(user_freq_record, word)
session['thisWord'] = word # 1. put a word into session session['thisWord'] = word # 1. put a word into session
session['time'] = 1 session['time'] = 1
return redirect(url_for('user_bp.userpage', username=username)) return "success"
@userService.route("/<username>/<word>/familiar", methods=['GET', 'POST']) @userService.route("/<username>/<word>/familiar", methods=['GET', 'POST'])
@ -63,7 +63,7 @@ def familiar(username, word):
pickle_idea.familiar(user_freq_record, word) pickle_idea.familiar(user_freq_record, word)
session['thisWord'] = word # 1. put a word into session session['thisWord'] = word # 1. put a word into session
session['time'] = 1 session['time'] = 1
return redirect(url_for('user_bp.userpage', username=username)) return "success"
@userService.route("/<username>/<word>/del", methods=['GET', 'POST']) @userService.route("/<username>/<word>/del", methods=['GET', 'POST'])
@ -77,7 +77,7 @@ def deleteword(username, word):
user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username) user_freq_record = path_prefix + 'static/frequency/' + 'frequency_%s.pickle' % (username)
pickle_idea2.deleteRecord(user_freq_record, word) pickle_idea2.deleteRecord(user_freq_record, word)
flash(f'<strong>{word}</strong> is no longer in your word list.') flash(f'<strong>{word}</strong> is no longer in your word list.')
return redirect(url_for('user_bp.userpage', username=username)) return "success"
@userService.route("/<username>", methods=['GET', 'POST']) @userService.route("/<username>", methods=['GET', 'POST'])