linshan
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests Activity
379 Commits
131 Branches
4 Tags
10 MiB
Commit Graph

266 Commits (refactor-huangzirui)

Author SHA1 Message Date
Hui Lan c71b156203 app/main.py: larger font for article title. 2021-08-01 21:22:45 +08:00
Hui Lan 7043518721 app/main.py: use lighter color for article date. 2021-08-01 21:12:15 +08:00
Hui Lan 0efd2b420b app/main.py: light grey background for the article. 2021-08-01 21:09:38 +08:00
Hui Lan 81e1e795be app/main.py: use container, and use a button for logout. 2021-08-01 20:25:58 +08:00
Hui Lan 58383a51ad app/main.py: use buttons for all words (strange?). 2021-07-31 21:51:48 +08:00
Hui Lan c40f9b61a3 app/main.py: use buttons instead of links for familiar, unfamiliar and delete (for all words). 2021-07-31 21:43:42 +08:00
Hui Lan e65b443f01 app/main.py: use buttons instead of links for familiar, unfamiliar and delete. 2021-07-31 21:41:55 +08:00
Hui Lan 61a848e7d4 app/main.py: use alert for total number of articles. 2021-07-31 21:30:19 +08:00
Hui Lan bef218953b app/main.py: adjust badge color. 2021-07-31 21:22:09 +08:00
Hui Lan 20386033bc app/main.py: green button may look better, more consistent. 2021-07-31 21:18:35 +08:00
Hui Lan aad7f8016e app/main.py: change link to button. 2021-07-31 21:16:38 +08:00
Hui Lan 22af30bc88 app/main.py: move alert bar above 阅读文章并回答问题 (revision). 2021-07-31 21:12:04 +08:00
Hui Lan fbf054d174 app/main.py: move alert bar above 阅读文章并回答问题. 2021-07-31 21:10:27 +08:00
Hui Lan e9c7d0fc00 app/main.py: use a green alert bar. 2021-07-31 21:03:57 +08:00
Hui Lan 1936d2aec5 app/main.py: use alert while showing vocabulary level. 2021-07-31 21:02:17 +08:00
Hui Lan adfc2796da app/main.py: use a different color for badge. 2021-07-31 20:59:08 +08:00
Hui Lan 29f0d02327 app/main.py: bootstrap elements. 2021-07-31 20:54:19 +08:00
Hui Lan c581601bf3 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal into BugFix254-Author-ZhanJianhao 2021-07-30 12:18:39 +08:00
Zjh-jc 6d8b30e631 fix the bug (After logging in, jump directly to the vocabulary, not to the article.) 2021-07-22 00:11:06 +08:00
Hui Lan c3dfcba4d0 app/static/wordfreqapp.sql: one article on taking photos. 
Now we have 50 articles to choose from.
 2021-07-17 10:47:12 +08:00
Hui Lan c04bd016d0 app/static/wordfreqapp.sql: one more article 2021-07-17 09:39:51 +08:00
Hui Lan 57451717ee app/README.md: delete. 2021-07-16 20:10:06 +08:00
Hui Lan 09bd6b9ddf build.sh: remove redundant build.sh in app/. 2021-07-16 19:20:31 +08:00
Hui Lan 317c12e827 wordfreqapp.sql: more articles. 2021-07-16 18:30:32 +08:00
Hui Lan 2584de860d main.py: article count. 2021-07-16 18:13:07 +08:00
Hui Lan fa8fd4e414 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:29:32 +08:00
Hui Lan b13df92bf7 (1) test_page_position.py: reduce the number of click_by_random. (2) Jenkinsfile: trigger build after each push. 2021-07-14 21:22:56 +08:00
Hui Lan cfb8dc6c78 test_page_position.py: let it pass for now (temporary fix). 2021-07-14 18:55:16 +08:00
Hui Lan bbb0c5396e test_page_position.py: change click order. 2021-07-14 18:50:34 +08:00
Hui Lan 5c7096a96b test_add_word.py: do not print many things out. 2021-07-14 18:47:55 +08:00
Hui Lan 1786651aa5 test_add_word.py: use a longer word 2021-07-14 18:06:12 +08:00
Hui Lan 5ce9b6167c test_*.py: use FIREFOX instead of CHROME 2021-07-14 17:50:38 +08:00
Hui Lan e9358a627f Learn english smartly. 2021-07-13 12:56:05 +08:00
Hui Lan 7f69d9a14d test scripts: change port from 5000 to 91. 2021-07-13 12:46:31 +08:00
Hui Lan 905e85f201 Merge branch 'SPM-Spring2021-2597-占健豪201831990539' of https://github.com/lanlab-org/EnglishPal 2021-07-13 11:46:37 +08:00
Hui Lan d431c0cb4b update .gitignore to ignore the folder .idea 2021-07-13 11:19:35 +08:00
mmmmmkj ad52e5a90b
change the password 2021-06-23 00:36:34 +08:00
mmmmmkj 515128caab
upload the test code of the function called delete 2021-06-23 00:33:19 +08:00
张小飞 b53b5ed4c3 修改main.py,使得主页显示English Pal -(SPM-Spring2021-2599-张小飞201831990641) 2021-06-22 12:35:01 +08:00
张小飞 10fd9afa6f 修改访问端口，避免和其他组冲突，同时修改main.py,主页显示 English Pal(SPM-Spring2021-2599-张小飞201831990641) 2021-06-22 12:24:34 +08:00
Zjh-jc 2ee854285c Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:51:53 +08:00
Zjh-jc f7629f4d1c Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:41:33 +08:00
Zjh-jc 006a144ec0 Test the page position after clicking the Familiar or Unfamiliar button. 2021-06-17 09:21:13 +08:00
Zjh-jc b17ef9c331 Solve the problem of page position jump after clicking the familiar or unfamiliar button 2021-06-16 02:17:30 +08:00
张小飞 46dc9328cf 在test_add测试文件里添加输出语句，寻找测试不通过的原因 2021-06-13 11:10:56 +08:00
张小飞 d6e64e3465 删除test_login.py中添加的代码，添加test_login_security_fix.py用来检验bug是否修复 2021-06-11 15:16:28 +08:00
张小飞 d21dfc8da3 Merge branch 'master' of https://github.com/lanlab-org/EnglishPal into SPM-Spring2021-2599-张小飞201831990641 2021-06-09 22:58:30 +08:00
张小飞 fdb3259e3c 修改测试代码里的端口和master统一为91 2021-06-09 21:44:47 +08:00
张小飞 a9b2bc6fee 和新的master分支合并 2021-06-09 21:39:13 +08:00
张小飞 be0c9f1c8b 修改test_next_eassy.py，修复语法错误 2021-06-09 20:57:09 +08:00
张小飞 ebfd780497 添加wordfreqapp.sql文件，用于生成数据库 2021-06-09 20:39:48 +08:00
Lan Hui 90ab0be3d6 app/test/test_next_essay.py: click Next 5 times. 2021-06-09 09:17:19 +08:00
Lan Hui 783a0b22e1 app/test/test_next_essay.py: correct the variable name 'differ'. 2021-06-09 08:05:30 +08:00
Lan Hui f4a6921297 app/test/test_add_word_and_essay_does_not_change.py: remove unnecessary test. 2021-06-08 21:48:38 +08:00
Lan Hui 68e8102e12 Add app/static/wordfreqapp.sql for reconstructing the database. 2021-06-08 21:29:39 +08:00
张小飞 f44a4ce90f 修改app\test\test_login.py添加若干代码，测试bug是否修复 2021-06-04 14:58:29 +08:00
张小飞 3aaaa90c6a 修改app\test\test_login.py添加若干代码，测试bug是否修复 2021-06-04 12:22:53 +08:00
张小飞 ae6c44e942 修改app\test\test_login.py访问端口 2021-06-04 12:01:19 +08:00
张小飞 03446abe22 修改测试文件中访问端口，删除jenkinsfile中不必要的阶段 2021-06-01 11:35:23 +08:00
张小飞 8c8866548b 修改gitignore,不在推送数据库文件wordfreqapp.db 2021-06-01 09:49:44 +08:00
vicky-ZhuWenqi 643e0c4eee
Update pickle_idea.py 
在生词簿每个单词后面，加上两个按钮，熟悉与不熟悉。如果点熟悉，就将生词簿中该单词后面记录的添加次数减一，直至减为0，就将该单词从生词簿中移除；如果点不熟悉，就将生词簿中该单词后面记录的添加次数加一。
 2021-05-31 08:48:03 +08:00
vicky-ZhuWenqi 9b7b5279db
Update main.py 
添加熟悉和不熟悉按钮功能，如果点熟悉，就将生词簿中该单词后面记录的添加次数减一，直至减为0，就将该单词从生词簿中移除；如果点不熟悉，就将生词簿中该单词后面记录的添加次数加1。
 2021-05-31 08:46:34 +08:00
ArrayYang 0379c7e978 添加删除单词功能 
用户登录后可以删除自己已经认识的单词
 2021-05-30 21:30:18 +08:00
张小飞 aa182609ae 1.修改main.py文件中的verify_user函数 2.在UseSqlite.py文件中的Sqlite3Template类下添加了三个函数instructions_with_parameters do_with_parameters operate_with_parameters 2021-05-29 21:39:28 +08:00
张小飞 5d87bb8bae 添加数据库文件app/static/wordfreqapp.db,同时修改了gitignore文件使得数据库文件可以上传至远程仓库 2021-05-29 21:01:39 +08:00
Hui Lan 843ed03d4f Publish EnglishPal source code 2021-04-06 16:22:03 +08:00