From e40ebac452bf8536e3f2746b75a15c9322bbba77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=87=AF?= <1183989703@qq.com> Date: Sat, 11 Jun 2022 23:08:29 +0800 Subject: [PATCH 01/51] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'app/static/css/boot?= =?UTF-8?q?strap.css'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/css/bootstrap.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/static/css/bootstrap.css b/app/static/css/bootstrap.css index dcde7a8..cd8af32 100644 --- a/app/static/css/bootstrap.css +++ b/app/static/css/bootstrap.css @@ -417,7 +417,7 @@ progress { } .lead { - font-size: 1.25rem; + font-size: 2rem; font-weight: 300 } From 4817557099617b241489a5d3cd423c1925f5218a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=87=AF?= <1183989703@qq.com> Date: Sat, 11 Jun 2022 23:20:41 +0800 Subject: [PATCH 02/51] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'app/Article.py'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Article.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Article.py b/app/Article.py index 774d25a..04a32ea 100644 --- a/app/Article.py +++ b/app/Article.py @@ -68,7 +68,7 @@ def get_today_article(user_word_list, articleID): s += '
' article_title = get_article_title(d['text']) article_body = get_article_body(d['text']) - s += '

%s

' % (article_title) + s += '

%s

' % (article_title) s += '

%s

' % (article_body) s += '

%s

' % (d['source']) s += '

%s

' % (get_question_part(d['question'])) From b53e7031e5d1a21d300c8a40821694469e282e66 Mon Sep 17 00:00:00 2001 From: lin <1002171145@qq.com> Date: Mon, 13 Jun 2022 11:40:20 +0800 Subject: [PATCH 03/51] Bug412-JiangLetian --- app/static/js/highlight.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index 2e0d84a..d91fb24 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -29,9 +29,10 @@ function highLight() { if (sel_word1 != null) { var list = sel_word1.value.split(" "); for (var i = 0; i < list.length; ++i) { - list[i] = list[i].replace(/(^\s*)|(\s*$)/g, ""); + list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");//消除字符串两边空字符 if (list[i] != "" && "".indexOf(list[i]) == -1 && "".indexOf(list[i]) == -1) { - txt = txt.replace(new RegExp(list[i], "g"), "" + list[i] + ""); + + txt = txt.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " "); } } } @@ -40,7 +41,7 @@ function highLight() { for (var i = 0; i < list2.length; ++i) { list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, ""); if (list2[i] != "" && "".indexOf(list2[i]) == -1 && "".indexOf(list2[i]) == -1) { - txt = txt.replace(new RegExp(list2[i], "g"), "" + list2[i] + ""); + txt = txt.replace(new RegExp("\\s"+list2[i]+"\\s", "g"), " " + list2[i] + " "); } } } From 041cbd97fc9e0b48126ed4dd633fac709599297b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=92=8B=E4=B9=90=E5=A4=A9?= <1249355696@qq.com> Date: Mon, 13 Jun 2022 21:32:49 +0800 Subject: [PATCH 04/51] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'app/static/js/highl?= =?UTF-8?q?ight.js'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/static/js/highlight.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/static/js/highlight.js b/app/static/js/highlight.js index d91fb24..21417c1 100644 --- a/app/static/js/highlight.js +++ b/app/static/js/highlight.js @@ -31,7 +31,7 @@ function highLight() { for (var i = 0; i < list.length; ++i) { list[i] = list[i].replace(/(^\s*)|(\s*$)/g, "");//消除字符串两边空字符 if (list[i] != "" && "".indexOf(list[i]) == -1 && "".indexOf(list[i]) == -1) { - + //将正则表达式进行修改 表示搜索的是两端带有空格的list[i] 那么搜索的便为一个完整单词 然后在mark标签的前后各加了一个空格对其进行替换 txt = txt.replace(new RegExp("\\s"+list[i]+"\\s", "g"), " " + list[i] + " "); } } @@ -41,6 +41,7 @@ function highLight() { for (var i = 0; i < list2.length; ++i) { list2[i] = list2[i].replace(/(^\s*)|(\s*$)/g, ""); if (list2[i] != "" && "".indexOf(list2[i]) == -1 && "".indexOf(list2[i]) == -1) { + //将正则表达式进行修改 表示搜索的是两端带有空格的list2[i] 那么搜索的便为一个完整单词 然后在mark标签的前后各加了一个空格对其进行替换 txt = txt.replace(new RegExp("\\s"+list2[i]+"\\s", "g"), " " + list2[i] + " "); } } From ee44372848027a477a322386c323110851d67879 Mon Sep 17 00:00:00 2001 From: stewy Date: Tue, 14 Jun 2022 12:37:28 +0800 Subject: [PATCH 05/51] improved --- app/templates/login.html | 148 +++++++++++++++++++++++++++++++++++--- app/templates/signup.html | 143 ++++++++++++++++++++++++++++++++++-- 2 files changed, 278 insertions(+), 13 deletions(-) diff --git a/app/templates/login.html b/app/templates/login.html index e56b678..028e004 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -5,17 +5,147 @@ You're logged in already! {% else %} + + +
+
+ +
-

- -

-

- -

-

- -

+ + + + + + +
+ + {% endif %} {% endblock %} +jjj \ No newline at end of file diff --git a/app/templates/signup.html b/app/templates/signup.html index eb3e301..0252c18 100644 --- a/app/templates/signup.html +++ b/app/templates/signup.html @@ -7,13 +7,148 @@ You're logged in already! Logout.

{{ get_flashed_messages()[0] | safe }}

-

Sign up here.

+ + + +
+
+
-

-

-

+

+ +

+ +

+ + +
+ {% endif %} {% endblock %} From 6823c1004313b0b697caa9c0dc245825fa9f33b2 Mon Sep 17 00:00:00 2001 From: stewy Date: Tue, 14 Jun 2022 13:25:42 +0800 Subject: [PATCH 06/51] improved --- app/templates/login.html | 16 +--------------- app/templates/signup.html | 16 ---------------- 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/app/templates/login.html b/app/templates/login.html index 028e004..15b9ec3 100644 --- a/app/templates/login.html +++ b/app/templates/login.html @@ -6,20 +6,7 @@ You're logged in already! {% else %} -