mrlan
/
EnglishPal
4
0
Fork 11
Code Issues Pull Requests 22 Projects Releases Wiki Activity

解决合并冲突

Bug577-JiangXueQin^2
“jxq” 2024-07-04 14:56:20 +08:00
parent 8cbc7c9a0c
commit dc3fd67b02
1 changed files with 71 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
app/templates/userpage_get.html
View File

@ -28,21 +28,11 @@
} }
@keyframes shakes { @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{ .lead{
@ -82,22 +72,13 @@
</div> </div>
{% endfor %} {% endfor %}
<button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="下一篇 Next Article">⇨</button>
title="下一篇 Next Article">⇨ <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none" title="上一篇 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> <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 <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>
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/> <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" style="margin: 0 0.5%;"><br/>
<p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/> <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
@ -117,13 +98,11 @@
} }
</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> <div id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
<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 <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>
<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>
@ -174,8 +153,7 @@
{% 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" <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 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>
@ -188,6 +166,7 @@
<input id="selected-words2" type="hidden" value="{{ words }}"> <input id="selected-words2" type="hidden" value="{{ words }}">
{% endif %} {% endif %}
</div> </div>
<label id="selected-words3" type="hidden"></label>
{{ yml['footer'] | safe }} {{ yml['footer'] | safe }}
{% if yml['js']['bottom'] %} {% if yml['js']['bottom'] %}
{% for js in yml['js']['bottom'] %} {% for js in yml['js']['bottom'] %}
@ -245,7 +224,6 @@
function load_next_article(){ 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',
@ -256,12 +234,9 @@
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}}',
@ -275,7 +250,6 @@
} }
}); });
} }
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"]); $('#text_level').html(today_article["text_level"]);
@ -286,15 +260,10 @@
$('#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 document.querySelector('#text_level').classList.add('mark'); // highlight text difficult level for 2 seconds
setTimeout(() => { setTimeout(() => {document.querySelector('#text_level').classList.remove('mark');}, 2000);
document.querySelector('#text_level').classList.remove('mark');
}, 2000);
document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
setTimeout(() => { setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
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)){
@ -305,11 +274,9 @@
sessionStorage.setItem('pre_page_button', '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(); $('#found').show();$('#not_found').hide();
$('#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();
@ -325,7 +292,7 @@
</body> </body>
<style> <style>
mark { mark {
color: #{{ yml['highlight']['color'] }}; color: red;
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
} }
</style> </style>