Compare commits
No commits in common. "c56e8d272ccfdb06038b021fa19453180b8ee556" and "5447d570e0e5c34e45d5ded7d4885f2fef04d294" have entirely different histories.
c56e8d272c
...
5447d570e0
|
|
@ -23,10 +23,37 @@
|
||||||
<title>EnglishPal Study Room for {{ username }}</title>
|
<title>EnglishPal Study Room for {{ username }}</title>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
.shaking {
|
.shaking {
|
||||||
animation: shakes 1600ms ease-in-out;
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
@keyframes shakes {
|
@keyframes shakes {
|
||||||
10%, 90% {
|
10%, 90% {
|
||||||
transform: translate3d(-1px, 0, 0);
|
transform: translate3d(-1px, 0, 0);
|
||||||
|
|
@ -62,6 +89,7 @@
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
|
|
@ -76,6 +104,16 @@
|
||||||
|
|
||||||
</p>
|
</p>
|
||||||
{% for message in get_flashed_messages() %}
|
{% for message in get_flashed_messages() %}
|
||||||
|
<<<<<<< HEAD
|
||||||
|
<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="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>
|
||||||
|
=======
|
||||||
<div class="alert alert-warning alert-dismissible fade show" role="alert">
|
<div class="alert alert-warning alert-dismissible fade show" role="alert">
|
||||||
{{ message }}
|
{{ message }}
|
||||||
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
|
||||||
|
|
@ -88,10 +126,23 @@
|
||||||
<button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
|
<button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
|
||||||
title="上一篇 Previous Article">⇦
|
title="上一篇 Previous Article">⇦
|
||||||
</button>
|
</button>
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
|
|
||||||
<p><b>阅读文章并回答问题</b></p>
|
<p><b>阅读文章并回答问题</b></p>
|
||||||
<div id="text-content">
|
<div id="text-content">
|
||||||
<div id="found">
|
<div id="found">
|
||||||
|
<<<<<<< HEAD
|
||||||
|
<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" 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/>
|
||||||
|
=======
|
||||||
<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
|
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"
|
have chosen an article with a difficulty level of <span class="text-decoration-underline"
|
||||||
|
|
@ -107,6 +158,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<p><b id="question">{{ today_article['question'] }}</b></p><br/>
|
<p><b id="question">{{ today_article['question'] }}</b></p><br/>
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
<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);
|
||||||
|
|
@ -145,7 +197,11 @@
|
||||||
<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/>
|
||||||
<button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
|
<button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
|
||||||
|
<<<<<<< HEAD
|
||||||
|
<button class="btn btn-primary btn-lg" type="reset">清除</button>
|
||||||
|
=======
|
||||||
<button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
|
<button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
</form>
|
</form>
|
||||||
{% if session.get['thisWord'] %}
|
{% if session.get['thisWord'] %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
|
|
@ -196,6 +252,14 @@
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
window.onload = function () { // 页面加载时执行
|
window.onload = function () { // 页面加载时执行
|
||||||
|
<<<<<<< HEAD
|
||||||
|
// 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
|
||||||
|
if(sessionStorage.getItem('pre_page_button')!="display" && sessionStorage.getItem('pre_page_button')){
|
||||||
|
$('#load_pre_article').show();
|
||||||
|
}
|
||||||
|
};
|
||||||
|
function load_next_article(){
|
||||||
|
=======
|
||||||
const settings = {
|
const settings = {
|
||||||
// initialize settings from localStorage
|
// initialize settings from localStorage
|
||||||
highlightChecked: localStorage.getItem('highlightChecked') !== 'false', // localStorage stores strings, default to true. same below
|
highlightChecked: localStorage.getItem('highlightChecked') !== 'false', // localStorage stores strings, default to true. same below
|
||||||
|
|
@ -246,6 +310,7 @@
|
||||||
|
|
||||||
function load_next_article() {
|
function load_next_article() {
|
||||||
$("#load_next_article").prop("disabled", true)
|
$("#load_next_article").prop("disabled", true)
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: '/get_next_article/{{username}}',
|
url: '/get_next_article/{{username}}',
|
||||||
dataType: 'json',
|
dataType: 'json',
|
||||||
|
|
@ -275,8 +340,12 @@
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
<<<<<<< HEAD
|
||||||
|
function update(today_article){
|
||||||
|
=======
|
||||||
|
|
||||||
function update(today_article) {
|
function update(today_article) {
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
$('#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"]);
|
||||||
$('#date').html('Article added on: ' + today_article["date"]);
|
$('#date').html('Article added on: ' + today_article["date"]);
|
||||||
|
|
@ -286,6 +355,11 @@
|
||||||
$('#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
|
||||||
|
<<<<<<< HEAD
|
||||||
|
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);
|
||||||
|
=======
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
document.querySelector('#text_level').classList.remove('mark');
|
document.querySelector('#text_level').classList.remove('mark');
|
||||||
}, 2000);
|
}, 2000);
|
||||||
|
|
@ -293,6 +367,7 @@
|
||||||
setTimeout(() => {
|
setTimeout(() => {
|
||||||
document.querySelector('#user_level').classList.remove('mark');
|
document.querySelector('#user_level').classList.remove('mark');
|
||||||
}, 2000);
|
}, 2000);
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
}
|
}
|
||||||
|
|
||||||
<!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
|
<!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
|
||||||
|
|
@ -300,7 +375,11 @@
|
||||||
if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
|
if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
|
||||||
$('#load_pre_article').hide();
|
$('#load_pre_article').hide();
|
||||||
sessionStorage.setItem('pre_page_button', 'display')
|
sessionStorage.setItem('pre_page_button', 'display')
|
||||||
|
<<<<<<< HEAD
|
||||||
|
}else{
|
||||||
|
=======
|
||||||
} else {
|
} else {
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
$('#load_pre_article').show();
|
$('#load_pre_article').show();
|
||||||
sessionStorage.setItem('pre_page_button', 'show')
|
sessionStorage.setItem('pre_page_button', 'show')
|
||||||
}
|
}
|
||||||
|
|
@ -331,4 +410,3 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,11 @@ PyYAML~=6.0
|
||||||
pony==0.7.16
|
pony==0.7.16
|
||||||
snowballstemmer==2.2.0
|
snowballstemmer==2.2.0
|
||||||
Werkzeug==2.2.2
|
Werkzeug==2.2.2
|
||||||
|
<<<<<<< HEAD
|
||||||
|
=======
|
||||||
|
|
||||||
pytest~=8.1.1
|
pytest~=8.1.1
|
||||||
|
<<<<<<< HEAD
|
||||||
|
>>>>>>> 8cbc7c9 (修复快速点击下一页按钮点击频率过快时页面跳转到未知名页面)
|
||||||
|
=======
|
||||||
|
>>>>>>> fa65055 (Fix bug 511)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue