yeyang
/
EnglishPal
forked from mrlan/EnglishPal
1
0
Fork 0
Code Pull Requests 1 Activity

Alpha-snapshot20240618 #1

Open
yeyang wants to merge 278 commits from Alpha-snapshot20240618 into Bug585-YeYang
pull from: Alpha-snapshot20240618
merge into: yeyang:Bug585-YeYang
Conversation 0 Commits 278 Files Changed 59

278 Commits (master)

Author SHA1 Message Date
Lan Hui d9512c929b Add dependency for api_service.py 2025-04-21 15:19:06 +08:00
mrlan ce58f14406 Merge pull request 'Fix bug 580' (#188) from Bug580-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#188
 2024-09-08 12:19:02 +08:00
Lan Hui 05dc0ecbb7 Fix bug 580 2024-09-08 12:18:07 +08:00
mrlan 8859827eac Merge pull request 'Fix bug 565' (#187) from Bug565-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#187
 2024-09-07 09:04:35 +08:00
Lan Hui b6a36b1d1a Fix bug 565 2024-09-07 09:03:59 +08:00
mrlan 12752341db Merge pull request 'Fix bug 394' (#185) from Bug394-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#185
 2024-09-06 08:55:35 +08:00
Lan Hui 3abebdfb21 Fix bug 394 2024-09-06 08:54:11 +08:00
mrlan 92331ca7a0 Merge pull request 'Fix bug 478' (#184) from Bug478-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#184
 2024-09-05 10:12:21 +08:00
Lan Hui 1166d3499f Fix bug 478 2024-09-05 10:11:20 +08:00
mrlan fe1d4c29ff Merge pull request 'Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes.' (#183) from Bug501-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#183
 2024-09-04 15:17:23 +08:00
Lan Hui aaf2db8657 Fix Bug 501. The key fix is the first line in funciton wordTemplate() from word_operation.js, i.e., using double quotes instead of single quotes. 2024-09-04 15:15:03 +08:00
mrlan e478217343 Merge pull request 'main.py: fix Bug 511' (#182) from Bug511-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#182
 2024-09-04 10:22:56 +08:00
Lan Hui 4f95935037 main.py: fix Bug 511 2024-09-04 10:21:55 +08:00
mrlan 370a215d08 Merge pull request 'pickle_idea.py: Make funciton unfamiliar() more robust' (#181) from Bug518-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#181
 2024-09-03 11:43:10 +08:00
Lan Hui de81f5966d pickle_idea.py: Make funciton unfamiliar() more robust 2024-09-03 11:42:14 +08:00
Lan Hui 38206271c6 Ignore words with length less than or equal to 2 2024-09-02 15:24:19 +08:00
mrlan 172727f95f Merge pull request 'Fix Bug 563' (#180) from Bug563-Hui into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#180
 2024-09-02 15:18:12 +08:00
Lan Hui 46d1793397 Fix Bug 563 2024-09-02 15:16:11 +08:00
mrlan 74186df292 Merge pull request 'DONE: bug555-fangchen' (#123) from bug555-fangchen into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#123
 2024-09-01 07:39:04 +08:00
Lan Hui db652d3bf2 conftest.py: remove the extra blank line in the file 2024-09-01 07:38:49 +08:00
Lan Hui b43174ffba Resolve merge conflicts 2024-09-01 07:35:50 +08:00
mrlan 74f47b786e Merge pull request 'Fix bug 547' (#146) from Bug547-FanWenQi-Adapted into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#146
 2024-09-01 07:28:15 +08:00
Lan Hui d00432cee1 Resolve merge conflicts 2024-09-01 07:27:46 +08:00
mrlan 19ea14b38c Merge pull request '提供更便利的获取用户单词表的方法，以json数据格式返回' (#93) from SPM2023S-QianJunQi into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#93
 2024-08-31 07:39:00 +08:00
Lan Hui 621ac24991 Give the blueprint a better name: apiService 2024-08-31 07:38:30 +08:00
Lan Hui ceb5f14ee9 Simplify wordCMD.py and rename it to api_service.py 2024-08-31 07:35:50 +08:00
Lan Hui 8f31b030ea Resolve merge conflicts 2024-08-31 06:59:46 +08:00
mrlan 909119b587 Merge pull request 'DONE: Bug536-Jiangwangzhe' (#138) from Bug536-Jiangwangzhe into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#138
 2024-08-30 08:32:48 +08:00
Lan Hui e6c945bac7 fillword.js & highlight.js: fix JavaScript errors on the front page 2024-08-30 08:32:09 +08:00
Lan Hui 0c6616d52c Resolve merge conflicts 2024-08-30 08:11:03 +08:00
mrlan 44d9c39d4b Merge pull request 'DONE: Bug540-XiongJiaming' (#125) from Bug540-XiongJiaming into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#125
 2024-08-29 07:53:48 +08:00
Lan Hui b2e11aea6f 将标记文章按钮移到页面上方；标记文章时不要alert 2024-08-29 07:52:58 +08:00
Lan Hui 2bec0642dd Resolve merge conflicts 2024-08-29 07:34:32 +08:00
Lan Hui 62dd580974 在加入生词簿前，去掉全角方括号【】 2024-08-28 08:08:31 +08:00
mrlan 47a359c798 Merge pull request 'Bug579-LuKangyang' (#172) from Bug579-LuKangyang into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#172
 2024-08-28 07:56:09 +08:00
Lan Hui fb190b0563 Resolve merge conflict 2024-08-28 07:53:26 +08:00
mrlan 262604e761 Merge pull request 'BUG543-JiWenkai' (#153) from BUG543-JiWenkai into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#153
 2024-08-28 07:50:49 +08:00
Lan Hui 61a0b39507 Resolve merge conflict 2024-08-28 07:48:50 +08:00
mrlan 391e859d30 Merge pull request 'Bug574-ChenLingjie2' (#160) from Bug574-ChenLingjie2 into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#160
 2024-08-28 07:43:37 +08:00
Lan Hui c453317ad8 Make sure the user name is not on the black list before proceeding 2024-08-28 07:42:05 +08:00
Lan Hui f9003ece69 Remove unused import 2024-08-28 07:23:52 +08:00
Lan Hui 146781df50 Resolve merge conflict 2024-08-28 07:23:30 +08:00
mrlan 329732038f Merge pull request 'Bug573-PanBinjie' (#169) from Bug573-PanBinjie into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#169
 2024-08-27 11:30:23 +08:00
Lan Hui 0bfb35b978 Make translation tooltip work 2024-08-27 11:29:09 +08:00
Lan Hui 13a091be72 Merge branch 'Bug573-PanBinjie' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug573-PanBinjie 2024-08-27 10:41:33 +08:00
mrlan 30ff57909e Merge pull request 'word_operation.js: do not alert each time' (#179) from Bug570_CaiShuHuang into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#179
 2024-08-27 08:19:54 +08:00
Lan Hui fb1f927e83 word_operation.js: do not alert each time 2024-08-27 08:19:22 +08:00
mrlan 3b6d88bd68 Merge pull request 'Bug570_CaiShuHuang' (#170) from Bug570_CaiShuHuang into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#170
 2024-08-27 08:18:44 +08:00
Lan Hui eff0d01fa0 word_operation.js: Resolve conflict 2024-08-27 08:15:18 +08:00
mrlan 8f38e5fd87 Merge pull request 'Bug571-TongQi' (#166) from Bug571-TongQi into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#166
 2024-08-27 08:03:04 +08:00
mrlan b39cf2e4fa Merge pull request 'Remove wordfreqapp.db from app/static' (#178) from Bug578-ChenChen2 into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#178
 2024-08-27 07:59:02 +08:00
Lan Hui 6f4b91fd73 Remove wordfreqapp.db from app/static 2024-08-27 07:58:26 +08:00
mrlan 09beaff831 Merge pull request 'Bug578-ChenChen' (#167) from Bug578-ChenChen into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#167
 2024-08-27 07:53:20 +08:00
Lan Hui ebfe7416e6 userpaget_get.html: Resolve conflict 2024-08-27 07:43:57 +08:00
mrlan 98027158b5 Merge pull request 'Bug577-JiangXueQin' (#163) from Bug577-JiangXueQin into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#163
 2024-08-27 07:39:25 +08:00
Lan Hui 92a1af4222 userpaget_get.html: Resolve conflict 2024-08-27 07:39:04 +08:00
mrlan 79dff9a3b5 Merge pull request 'Bug576-XiaBaizhi' (#162) from Bug576-XiaBaizhi into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#162
 2024-08-27 07:21:05 +08:00
Lan Hui bd4fb6846b userpaget_get.html: Do not disable the 'Next Article' button 2024-08-27 07:20:20 +08:00
Lan Hui 2e203699c0 userpaget_get.html: Resolve merge conflicts 2024-08-27 07:15:22 +08:00
mrlan d502b3f474 Merge pull request 'Bug564-JiangChao' (#152) from Bug564-JiangChao into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#152
 2024-08-26 10:29:26 +08:00
Lan Hui 66899376c3 userpaget_get.html: Resolve merge conflicts 2024-08-26 10:27:43 +08:00
mrlan 6cc7f043da Merge pull request 'Bug572-ZhongYi2' (#159) from Bug572-ZhongYi2 into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#159
 2024-08-26 10:05:45 +08:00
Lan Hui 1d80fa8886 userpaget_get.html: Resolve merge conflicts 2024-08-26 10:03:47 +08:00
mrlan dc3ef2bc9f Merge pull request 'Bug533-ZhangXuDong' (#161) from Bug533-ZhangXuDong into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#161
 2024-08-26 09:49:38 +08:00
Lan Hui 9eac40493b userpaget_get.html and mainpage_gethtml: improve display information. 2024-08-26 09:49:00 +08:00
Lan Hui fe6a28a81d userpaget_get.html: Resolve merge conflicts 2024-08-26 09:41:53 +08:00
mrlan bf8bb1a6bc Merge pull request 'Bug568-SongHaiyan' (#158) from Bug568-SongHaiyan into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#158
 2024-08-26 09:28:18 +08:00
mrlan 7a97e25b8c Merge pull request 'Bug567-YuZheChen' (#155) from Bug567-YuZheChen into Alpha-snapshot20240618 
Reviewed-on: mrlan/EnglishPal#155
 2024-08-26 09:18:24 +08:00
卢康阳 eb3268a139 Fix bug 579 2024-07-06 16:34:54 +08:00
卢康阳 220e108ee1 解决合并冲突 2024-07-06 16:33:43 +08:00
潘彬杰 af59afc7e0 解决合并冲突 2024-07-05 17:54:11 +08:00
蔡书煌 3049a4314a 只是修改名字 2024-07-05 13:35:16 +08:00
Caroline d8263d17e0 Fix bug 570 2024-07-04 19:50:34 +08:00
宋海燕 794dcf399c fix Bug571 2024-07-04 19:22:20 +08:00
陈宇航 9bbd3a978d Fix bug 533 2024-07-04 15:37:37 +08:00
夏栢芝 6b3efad1dc Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug576-XiaBaizhi 2024-07-04 15:05:36 +08:00
陈晨 faf5ec14a4 Fix bug 578 2024-07-04 15:04:34 +08:00
“jxq” 70fc469f5e Fix bug 577 2024-07-04 15:03:31 +08:00
陈晨 9dab83219a Fix bug 578 2024-07-04 15:02:57 +08:00
“jxq” 7bf1a958b5 Fix bug 577 2024-07-04 15:01:22 +08:00
“jxq” 55eac68160 Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug577-JiangXueQin 2024-07-04 14:56:26 +08:00
“jxq” dc3fd67b02 解决合并冲突 2024-07-04 14:56:20 +08:00
Kikky666 02f3c4fdfa Fix bug 576-XiaBaizhi 2024-07-04 11:35:59 +08:00
陈灵婕 109a9447a7 Fix bug 574 2024-07-04 11:16:32 +08:00
陈灵婕 84e0fc51f7 解决合并冲突 2024-07-04 11:13:47 +08:00
钟埸 18472acd3d Fix bug 572 2024-07-04 11:04:38 +08:00
钟埸 75c96a60df 解决合并冲突 2024-07-04 11:00:17 +08:00
张旭东 5657d8d5ee Fix Bug533 2024-07-04 10:44:41 +08:00
张旭东 1f718e201f init 2024-07-04 10:18:47 +08:00
宋海燕 7cf9c7cf56 fix Bug568 2024-07-04 09:54:09 +08:00
Yzccc 6633df7b70 Fix bug 567 2024-07-04 09:33:30 +08:00
Yzccc ccf22af9df Fix bug 567 2024-07-04 09:29:55 +08:00
姜潮 3383e411ec Fix bug 564 添加注释版 2024-07-03 15:19:42 +08:00
Fighoh db66c8ed86 fix BUG543 2024-07-03 14:36:01 +08:00
Caroline 9215339b1e Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug570_CaiShuHuang 2024-07-03 10:11:16 +08:00
Fighoh cb576b40ed init 2024-07-03 10:03:55 +08:00
姜潮 f4488672ec Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug564-JiangChao 2024-07-03 09:46:06 +08:00
Caroline eb2051ca3f Fix bug 570 2024-07-03 09:45:44 +08:00
Lan Hui 00ae770195 Merge branch 'Alpha-snapshot20240618' of http://118.25.96.118:3000/mrlan/EnglishPal into Alpha-snapshot20240618 2024-07-03 07:40:38 +08:00
Lan Hui 3db629b57d Update version flag on the front page 2024-07-03 07:39:33 +08:00
姜潮 54d09469f5 修复Bug564 2024-07-02 16:19:24 +08:00
姜潮 4b06915dc4 解决合并冲突 2024-07-02 16:17:43 +08:00
Caroline 8664da12de 删了几条注释 2024-07-02 16:07:26 +08:00
Caroline 2d765b5c63 随机抽取10个生词，并显示 2024-07-02 16:03:03 +08:00
梁自月 be7ae9e296 fix bug561 2024-06-27 17:06:54 +08:00
Lan Hui 2095550f33 Fix bug 547 2024-06-22 09:04:25 +08:00
Fuxinyan 1c08e80236 Fix Bug 536 2024-06-04 13:58:47 +08:00
熊佳明 d2d383f21a Fix bug 540 2024-06-03 14:03:27 +08:00
熊佳明 d83809dcc7 Fix bug 540 2024-06-03 13:49:53 +08:00
熊佳明 2785ded52b 解决冲突 2024-06-03 11:58:03 +08:00
lixiaofeng e3db7c30b0 上传文件至 app/static/js 2024-05-28 19:55:38 +08:00
lixiaofeng 9f03cc49fa 上传文件至 app/static/js 2024-05-28 19:55:26 +08:00
lixiaofeng eed852cd66 上传文件至 app/templates 2024-05-28 19:55:07 +08:00
lixiaofeng c6f8a3448d 上传文件至 app/test 2024-05-28 19:54:46 +08:00
黄慧玲 d8af2a7e54 Merge pull request 'Bug545-HuangHuiLing' (#122) from Bug545-HuangHuiLing into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#122
 2024-05-28 13:36:01 +08:00
1994836463@qq.com a0c9b82ee7 参考了一下tangxinyuan小组的写法，将选取单词的方法由模拟鼠标选取单词改为根据id获取文章，随机从文章中挑选一个单词放入生词框中，这样是一定可以选取到文章中的单词。 
然后根据span标签定位到选择的生词，双击再次选择，从而在生词框中删除该单词
 2024-05-27 14:35:56 +08:00
1994836463@qq.com 4a42c5c22c 我又将tangxinyuan小组的测试代码改回去了，我改完我的测试代码之后，只有使用未经我修改的tangxinyuan小组的测试代码才能通过。 2024-05-27 14:26:54 +08:00
1994836463@qq.com 101c359596 我将tangxinyuan小组的测试文件改了一下，只是改了一下点击按钮的方法，将点击退出按钮，使用ActionChains去点击，因为我测试的时候，用driver去点击大部分会报出'退出'的按钮被浏览器拦截的错误， 2024-05-26 11:32:39 +08:00
1994836463@qq.com 64a82bee22 测试文件也进行了修改，为了避免选择的单词出现空格的情况，增加了一个判断，若选中空格，则更换文章再次选择，这样总会选择到非空格的单词。 2024-05-26 11:27:15 +08:00
1994836463@qq.com 9537024339 再次选择高亮单词，由于标记高亮单词的标签由<mark>改为了<span>，所以在取消单词高亮状态时将标签均改为了<span>，替换时的代码也冗余了，所以也进行了一部分删除。 2024-05-26 11:22:20 +08:00
1994836463@qq.com 85a3a9ce6a 这里的代码写多余了，删除了一部分 2024-05-26 11:19:28 +08:00
1994836463@qq.com f3b9fd8790 change 2024-05-25 15:24:49 +08:00
1994836463@qq.com 624426b6cf change 2024-05-25 15:20:31 +08:00
1994836463@qq.com d1589f6062 time.sleep(1) 2024-05-25 15:14:31 +08:00
1994836463@qq.com fcd2c83904 change 2024-05-25 12:03:37 +08:00
1994836463@qq.com 29a673cd92 change 2024-05-25 11:59:38 +08:00
1994836463@qq.com 1bec0bd107 Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing 2024-05-21 20:35:38 +08:00
1994836463@qq.com 630cb6befa delete 2024-05-21 20:34:28 +08:00
黄慧玲 5dbdf60a2c Merge branch 'Alpha-snapshot20230621' into Bug545-HuangHuiLing 2024-05-21 20:02:08 +08:00
1994836463@qq.com 101506a511 test and fix 2024-05-21 20:00:32 +08:00
方晨 35a6f1c828 fix 2024-05-20 21:25:51 +08:00
方晨 a42e63dc27 test bug555 2024-05-20 19:23:31 +08:00
方晨 6500eeca84 test bug 2024-05-20 19:03:33 +08:00
方晨 7d65782728 fixbug555 2024-05-20 18:31:40 +08:00
丁晟晔 d8e4fbbb2d Merge pull request 'Bug551-DingZeYu' (#114) from Bug551-DingZeYu into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#114
 2024-05-20 16:12:25 +08:00
1994836463@qq.com 9b3551bbc8 fix 2024-05-20 15:30:38 +08:00
1994836463@qq.com 90ac789bb4 Merge remote-tracking branch 'origin/Bug545-HuangHuiLing' into Bug545-HuangHuiLing 
# Conflicts:
#	app/static/js/fillword.js
#	app/static/js/highlight.js
 2024-05-20 15:26:30 +08:00
1994836463@qq.com 8575a0dc33 fix 2024-05-20 15:25:34 +08:00
黄慧玲 3373ba1429 Merge pull request 'Bug545-HuangHuiLing' (#120) from Bug545-HuangHuiLing into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#120
 2024-05-20 15:16:09 +08:00
黄慧玲 d296580b3b Merge branch 'Alpha-snapshot20230621' into Bug545-HuangHuiLing 2024-05-20 15:13:50 +08:00
Lan Hui a4db1edffb Close the web browswer after finishing each test case 2024-05-20 13:28:23 +08:00
丁晟晔 49ead93bcb 更新 app/test/test_bug551_DingZeYu.py 2024-05-20 08:24:36 +08:00
丁晟晔 9afd38a09a 更新 app/test/test_bug551_DingZeYu.py 2024-05-20 08:21:02 +08:00
丁晟晔 d97743649a 更新 app/test/test_bug551_DingZeYu.py 2024-05-19 22:51:32 +08:00
丁晟晔 9f6a007426 更新 app/test/test_bug551_DingZeYu.py 2024-05-19 21:21:25 +08:00
丁晟晔 7fe3feae9a 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:23:36 +08:00
丁晟晔 b2a53a0e40 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:18:22 +08:00
丁晟晔 0301c39cf0 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:14:05 +08:00
丁晟晔 5857395251 更新 app/test/test_bug551_DingZeYu.py 2024-05-18 09:08:10 +08:00
丁晟晔 77ed63441b 更新 app/static/css/bootstrap.css 2024-05-14 23:26:53 +08:00
丁晟晔 b19eabd225 更新 app/static/config.yml 2024-05-14 23:26:11 +08:00
丁晟晔 b9d0ad4a15 上传文件至 app/static/css 2024-05-14 23:24:26 +08:00
丁晟晔 aca827a912 更新 app/static/css/bootstrap.css 2024-05-14 23:24:06 +08:00
丁晟晔 23f0dfd8ca 更新 app/test/test_bug551_DingZeYu.py 
我这边好像没有helper文件所以我直接判断有没有这个账号，如果没有就注册一个来进行测试。这样子可以吗
 2024-05-12 13:39:14 +08:00
丁晟晔 6ee94d1610 上传文件至 app/test 2024-05-06 11:48:19 +08:00
丁晟晔 416f40222e 删除 app/test/test_bug551_DingZeYu.py 2024-05-06 11:46:39 +08:00
丁晟晔 66f5c28ead 上传文件至 app/test 2024-05-06 11:46:15 +08:00
丁晟晔 c9c0ef60d8 Merge branch 'Alpha-snapshot20230621' into Bug551-DingZeYu 2024-05-06 11:34:44 +08:00
唐娇 a4e64ee4a0 Merge pull request 'Bug528-TangJiao' (#103) from Bug528-TangJiao into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#103
 2024-05-05 21:27:38 +08:00
唐娇 1d23062c47 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-29 13:41:09 +08:00
林杉 df34770af0 Merge pull request 'Bug553_LinShan' (#104) from Bug553_LinShan into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#104
 2024-04-25 15:12:54 +08:00
林杉 b626df7c4b Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-24 18:15:04 +08:00
唐娇 184656230f Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-23 17:35:07 +08:00
唐欣媛 2d9aa8fa61 Merge pull request 'Bug544-TangXinyuan' (#105) from Bug544-TangXinyuan into Alpha-snapshot20230621 
Reviewed-on: mrlan/EnglishPal#105
 2024-04-22 23:06:54 +08:00
林杉 bd5f8f63f5 Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-22 12:47:50 +08:00
林杉 2500fa5fc8 Fix bug553 2024-04-22 12:46:31 +08:00
AliasJeff ddcc5206d5 Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
merge latest branch
 2024-04-22 10:37:33 +08:00
林杉 6b3ad77c44 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-22 09:11:29 +08:00
唐娇 739094e844 Fix Test File 2024-04-22 04:59:51 +08:00
唐娇 8d76133cca Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-22 04:57:36 +08:00
Lan Hui 6dbb1e2c06 No webdriver manager 2024-04-21 15:40:35 +08:00
Lan Hui 8ef62395ed Revise README.md 2024-04-21 15:33:45 +08:00
Lan Hui 374da86174 Why not use PyPI's webdriver-manager? 2024-04-21 15:31:39 +08:00
丁晟晔 393264a6fe 更新 app/static/js/highlight.js 2024-04-19 10:51:18 +08:00
丁晟晔 d5c76674da 更新 app/static/css/bootstrap.css 2024-04-19 10:50:43 +08:00
丁晟晔 b8222c951b revert 4120e7e54b 
revert Fix bug 551
 2024-04-19 10:49:41 +08:00
dingchengye 4120e7e54b Fix bug 551 2024-04-19 10:06:48 +08:00
AliasJeff 8e769587cf simplify module import path 2024-04-19 08:50:41 +08:00
Lan Hui 9aa718b236 Simplify the test code, use the Edge WebDriver 2024-04-18 20:06:02 +08:00
Lan Hui 230e8e92dc Merge branch 'Bug553_LinShan' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-04-18 19:39:53 +08:00
林杉 4ea6d9aeed Fix Bug553 2024-04-16 08:48:55 +08:00
林杉 768c81828d Fix Bug553 2024-04-16 08:46:16 +08:00
AliasJeff 9901d887e0 revert conftest.py 2024-04-15 11:12:35 +08:00
AliasJeff 498639a753 signup in unit test 2024-04-15 11:08:06 +08:00
唐娇 1ded133056 Fix bug 528 2024-04-15 06:23:48 +08:00
唐娇 db66b59513 Fix Test Files 2024-04-15 06:17:01 +08:00
唐娇 692d8cf453 Merge branch 'Bug528-TangJiao' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug528-TangJiao 2024-04-15 06:14:30 +08:00
唐娇 426d131f64 Fix Text Files 2024-04-15 06:12:41 +08:00
AliasJeff 4fe96cfc9c refactor: Implicitly use fixtures in conftest.py 2024-04-11 17:09:12 +08:00
Lan Hui e8fbccdcf7 README.md: do not forget to run launch the web app first before running the test 2024-04-11 07:08:49 +08:00
AliasJeff 93264da3d9 Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
# Conflicts:
#	app/test/conftest.py
 2024-04-10 22:09:27 +08:00
Lan Hui 64b9c51fab Define a fixture that restarts flask app for each test run 2024-04-10 14:44:23 +08:00
AliasJeff 0fd1592036 rename unit test file 2024-04-10 08:55:57 +08:00
AliasJeff 46233ead1e Merge branch 'Alpha-snapshot20230621' into Bug544-TangXinyuan 
# Conflicts:
#	app/test/conftest.py
 2024-04-09 22:17:54 +08:00
AliasJeff b5bde9d33d test: update test file, update username/password config, add pytest to requirements.txt 2024-04-09 22:09:50 +08:00
AliasJeff 83491ce28c refactor: Add comments & optimize code 2024-04-09 21:21:19 +08:00
Lan Hui 77a3adb546 Define fixture 'restore_sqlite_database' that will be automatically used to restore the database before starting each test 2024-04-09 20:06:30 +08:00
Lan Hui 4f91659713 How to run pytest 2024-04-09 16:13:05 +08:00
Lan Hui 083cbfd040 Ignore app/test/assets 2024-04-09 16:01:44 +08:00
Lan Hui 0dc253bc19 Ignore pytest_report.html 2024-04-09 15:58:47 +08:00
Lan Hui a4608db424 Correct code comments 2024-04-09 13:21:44 +08:00
Lan Hui 0a63c5354a Make test_add_word.py work again 2024-04-09 12:11:30 +08:00
林杉 b7fe68c54d test_bug553 2024-04-08 16:37:15 +08:00
唐娇 85a3faaa9f Fix bug 528 2024-04-06 00:18:44 +08:00
唐欣媛 2966a8162f Fix bug 544 2024-03-27 12:39:42 +08:00
林杉 b8f2919959 Fix bug 553 2024-03-25 10:15:11 +08:00
林杉 f164465903 Merge branch 'Alpha-snapshot20230621' of http://118.25.96.118:3000/mrlan/EnglishPal into Bug553_LinShan 2024-03-25 10:14:32 +08:00
唐娇 292972c0ce Fix bug 528 2024-03-19 14:59:36 +08:00
林杉 04c4064c68 Fix bug 553 2024-03-18 13:21:46 +08:00
Hui Lan 7d5b1c0ed4 Fix ImportError: cannot import name 'url_quote' 2024-02-22 16:27:31 +08:00
Lan Hui d9e28e3a2b Tweak button size so it looks better on tablets. 2023-08-13 21:08:13 +08:00
Lan Hui 41d1d9619d Stress test code contributed by students 2023-08-13 16:14:43 +08:00
Lan Hui 30b54f8023 Tweak button style 2023-08-12 17:59:49 +08:00
Lan Hui 1e3ac7a379 Use larger buttons 2023-08-12 17:42:25 +08:00
Lan Hui 8dd6a2a343 Use an arrow for Next Article or Previsou Article 2023-08-12 17:36:49 +08:00
Lan Hui d2f30daab1 Use PonyORM instead of class RecordQuery from UseSqlite.py. Incorporated changes from Pull Request 91 contributed by He Zhengzheng. 2023-08-12 15:29:12 +08:00
Lan Hui ed1d0fd714 Show only one place after the decimal point. 2023-08-11 21:02:22 +08:00
Lan Hui f3aa407c56 Use small letters for In and Up. 2023-08-11 19:32:34 +08:00
Lan Hui e9ac50422b Make the flash message dismissible. 2023-08-11 19:28:53 +08:00
Lan Hui f4df263d6e Flash message is informative. Why not add it? 2023-08-11 19:14:51 +08:00
Lan Hui dff560cc73 Indent code using web-mode. 2023-08-11 18:39:36 +08:00
Lan Hui c110de0393 Better spacing. 2023-08-11 18:38:35 +08:00
Lan Hui aaabd3e3bb Enlarge button size so it is more table-friendly. 2023-08-11 18:34:48 +08:00
Lan Hui 9da1a1cae6 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 2023-08-11 18:29:54 +08:00
Hui Lan 9b1d60748d Increase button size so that it is easier to use on tablets . 2023-08-11 18:29:35 +08:00
Lan Hui 83bbd8f600 Improve the speed of loading the next article further after incorporating Chen Qiuwei et al.'s suggestions. 2023-08-11 15:48:53 +08:00
Lan Hui 1b211f107d Speed up loading next article 
The key change is replacing "d1 = load_freq_history(path_prefix + 'static/frequency/ferquency.p)" with "d1 = load_freq_history(user_word_list)"
in function get_today_article() from Article.py.  Now, with a user_word_list of size about 500, the next article can be loaded within 100ms.
The new d1 is much smaller than the old one, therefore the following computation "d3 = get_difficulty_level_for_user(d1, d2)" is much faster.
The students did not feel that loading next article is slow; this is because their frequency.p is quite small.

Also log information in app/log.txt
 2023-08-11 11:59:48 +08:00
Lan Hui 10c291bed2 Highlight user difficulty level too. 2023-08-10 19:12:30 +08:00
Lan Hui 6d15b65e3c Make highlighting text difficulty level work. 2023-08-10 19:09:15 +08:00
Lan Hui e4f870c995 Create folder app/db with a README file. 2023-08-10 15:25:42 +08:00
Lan Hui 06f896a33a Update .gitignore 2023-08-10 15:22:30 +08:00
Hui Lan 25c2e0aca8 README.md: update the path to wordfreqapp.db. 2023-08-10 14:24:00 +08:00
Hui Lan dca76969eb 解决程序源文件更新了，但是 docker container 中的程序源文件没有更新的问题 
问题出在 build.sh 中的 --mount type=volume,src=englishpal-db,target=/app 。
运行 docker container 时，会将整个 englishpal-db 对应的文件夹 /var/lib/docker/volumes/englishpal-db/_data
下面的内容拷贝到  docker container 里面的 /app 文件夹下面。

然而，/var/lib/docker/volumes/englishpal-db/_data 下面的源程序文件并不是最新的（比如其 main.py 是 7月17日的）。
将 target=/app 改为 target=/app/db。即可解决问题。
 2023-08-10 14:19:37 +08:00
Hui Lan 00ae957b27 Try to figure out how to rebuild the image after updating the source code. 2023-08-10 10:47:57 +08:00
Hui Lan a397c756cf Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 2023-08-10 10:05:29 +08:00
Lan Hui 14ab63c85c 文章段落正确分段（在 lead class 中添加 white-space: pre-wrap;） 2023-08-10 10:03:02 +08:00
Hui Lan b8c3d9bda7 No cache while building docker image 2023-07-17 17:46:55 +08:00
Lan Hui 43419ab4b6 Enlarge text difficult level for one second (make it work using vanilla JavaScript) 2023-07-17 16:28:08 +08:00
Hui Lan 78d9a66e88 After loading the next article, show its difficulty level in a larger size for one second. 2023-07-17 16:13:56 +08:00
Hui Lan 79bdec2a7d Dockerfile: update docker image version. 2023-07-17 10:38:17 +08:00
Hui Lan fb80e952b9 Simplify the docker run options 2023-07-17 10:25:07 +08:00
Hui Lan 6ea0b970a2 (1) Downgrade Flask version from 2.3.2 to 2.0.3 as installing the higher version reports errors. This is probably due to my outdated python version (3.6). (2) Persist SQLite database data in a docker volume. Created a docker volume called englishpal-db using command 'docker volume create englishpal-db' and associate this volume with the docker image file directory /app. So, now what happens in /app will be mirrored to englishpal-db. Where is englishpal-db located? Use command 'docker volume inspect englishpal-db' to find out. 2023-07-17 07:45:38 +08:00
Lan Hui 20051e1a93 article.py: correct data format 2023-07-14 09:17:11 +08:00
Lan Hui 5711f0e826 Update flask version in requirements.txt, use escape from markupsafe package. 2023-07-14 09:11:02 +08:00
Lan Hui cc92e5e29a admin_service.py: non-programmers probably do not know int. So, use integer instead. 2023-07-14 08:32:20 +08:00
Lan Hui cd562a745c admin_service.py: do not need to have seperate lines for a statement. 2023-07-14 08:30:58 +08:00
Lan Hui c284893097 admin_service.py: correct typo parmas. 2023-07-14 08:27:33 +08:00
Lan Hui 87fd594636 admin_service.py: refactor view function article(). 2023-07-14 08:26:37 +08:00
Lan Hui 18c37d583a admin_service.py: show article content for the newly added article after clicking the button '保存'. 2023-07-14 08:15:15 +08:00
Lan Hui 472c0c115f Fix Bug 541 2023-07-09 20:26:32 +08:00
Lan Hui 9a156ebf7e Fix Bug 539 2023-07-08 18:23:45 +08:00
Hui Lan 807d74741b 修复 Bug 493。不要转义（escape）表单提交的内容。否则类 WordFreq 不能正确工作，比如转义会把单引号变成 &#39;，这不利于 WordFreq 类处理。 2023-07-07 16:13:48 +08:00
Hui Lan 287d496ae9 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 2023-07-01 15:17:34 +08:00
张艺腾 582f399f73 Bug537 and Bug538 2023-06-21 16:48:45 +08:00
Hui Lan c37ee98b77 Merge branch 'fix-vuln' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230619b 2023-06-19 21:50:48 +08:00
徐宣 f40a388277 Fix: Move wordfreqapp.db to new location 2023-06-19 14:48:35 +08:00
徐宣 2277473afe Fix: Add import for 'abort' function 2023-06-18 19:49:33 +08:00
徐宣 f01c334827 Fix: no-random secret key generation and XSS vulnerability 2023-06-18 19:44:19 +08:00
Laugh 4d2535a6e8 Merge branch 'Alpha-snapshot20230605' into Bug527-ZhouZhifang 2023-06-15 15:59:29 +08:00
Laugh bb2d0363e4 Feat: update fontsize and margin of some elements 2023-06-15 15:54:46 +08:00
poincareS 0ed7657747 Merge remote-tracking branch 'origin/SPM2023S-QianJunQi' into SPM2023S-QianJunQi 
# Conflicts:
#	app/wordCMD.py
 2023-06-04 10:42:40 +08:00
poincareS 2fb3003808 fix: 2023.6.1 
1. 删去了wordCMD.py中：
from flask import ....,Blueprint,....
改为：
from flask import *
2. 修改了代码的格式，包括：等号两边的空格、加号两边的空格
3. 更新了访问用户单词的token验证
3.1 使用Authorization的字段值（Bearer xxx)验证token
3.2 取消了路由访问用户单词的功能，只能在终端命令行中输入: "curl -H "Authorization: Bearer 密钥" http://127.0.0.1:5000/show/用户名/"获取单词
 2023-06-04 10:41:24 +08:00
黄子睿 9816596cf8 删除 'app/static/js/tanyanmei-fillword.js' 2023-06-02 21:34:27 +08:00
黄子睿 682247bff1 refactor partial function and code writing specifications 2023-06-02 21:33:21 +08:00
Hui Lan b22c654f0f Merge branch 'Bug529-GuHan' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230601 2023-06-01 07:40:27 +08:00
倪玲丽 d402bb45cb 刷新屏幕，点击上下篇，加入生词库，停止阅读(更改) 2023-05-31 18:37:05 +08:00
倪玲丽 cdf6180901 刷新屏幕，点击上下篇，加入生词库，停止阅读 2023-05-30 18:48:37 +08:00
倪玲丽 38837c9c2f 合并最新的Alpha-snapshot20230529 2023-05-30 18:45:23 +08:00
黄子睿 a0ddf4bdad 上传文件至 'app/static/js' 
修复了 Bug492 选中问号出现多个问号的问题。
解决了选中紧跟标点符号的单词，单词能正常显示。
优化了选中较长的文章时页面容易出现卡顿的问题。
 2023-05-27 17:33:37 +08:00
poincareS dc37f5f229 提供更便利的获取用户单词表的方法，以json数据格式范围 
1、注册了一个新的蓝图路径以供功能实现
2、wordCMD中完成功能的代码代码实现
 2023-05-26 17:34:43 +08:00
poincareS e9ec65e7a5 提供更便利的获取用户单词表的方法，以json数据格式范围 
1、注册了一个新的蓝图路径以供功能实现
2、wordCMD中完成功能的代码代码实现
 2023-05-26 17:29:59 +08:00
倪玲丽 df64065dcc 点击上下篇，停止阅读 2023-05-06 18:19:24 +08:00
倪玲丽 ce28b91bd5 屏幕刷新，停止阅读 2023-05-06 18:18:12 +08:00
倪玲丽 d6bd24ee1c Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug393-TanYanMei 
merge alpha
 2023-04-24 12:01:08 +08:00
Hui Lan e9e2bd3d23 Remove static\js 2023-04-24 11:43:43 +08:00
Hui Lan 320a99d479 Move Tan Yanmei's fillword.js to app/static/js/tanyanmei-fillword.js. Delete the strange folder static js. 2023-04-24 11:38:16 +08:00
Hui Lan 3eca9234a9 Merge branch 'Bug393-TanYanMei' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug393-TanYanMei 2023-04-24 11:32:15 +08:00
覃艳美 8924166975 上传文件至 'static\js' 2022-06-12 21:23:34 +08:00