mrlan
/
EnglishPal
4
0
Fork 11
Code Issues Pull Requests 22 Projects Releases Wiki Activity
370 Commits
196 Branches
4 Tags
18 MiB
Commit Graph

44 Commits (3f200e538416ebb5e635a4c8d6d6581493e73732)

Author SHA1 Message Date
寻宇灿 1543b3095d Merge remote-tracking branch 'origin/Alpha-snapshot20230519' into Refactor-XunYucan 2023-05-25 22:30:06 +08:00
寻宇灿 c6bf323c60 修改格式 2023-05-25 21:23:25 +08:00
寻宇灿 03ccb3527a 重构前端阅读js，新增阅读器全局对象，新增生词朗读按钮 2023-05-25 17:35:31 +08:00
俞黄焘 39d96014d9 pull最新的snapshot-20230511，后更新了difficulty.py和Article.py的部分代码，提交了新的pickle文件 2023-05-18 23:29:38 +08:00
Hui Lan a4cc4fd011 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230506 2023-05-06 17:16:08 +08:00
ZhuZhihao 18ca48b422 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui 2023-05-05 17:21:49 +08:00
ZhuZhihao a80b062b87 refactor: remove variable 'count' 2023-05-05 17:20:58 +08:00
Hui Lan e118d92659 Merge branch 'Alpha-snapshot20230425' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427 2023-04-27 07:20:21 +08:00
王梓铭 84affaeb69 修改 /<username> 路由存在的问题（每次调用别的路由他都会被调用），新路由为 /<username>/userpage;同时因为修改了路由导致访问userpage_get的时候会导致静态文件路径生成错误，这里修改了\static\config.yml中的静态资源路径，修改后也都可以正常访问到的 2023-04-20 20:30:14 +08:00
zzhaofisher 11ae093fd7 Merge branch 'Alpha' into Bug522-HuangZirui 2023-04-18 21:52:01 +08:00
Hui Lan a1955341c6 Fix bug 501 - 特殊字符&加入生词库后删除按钮失效 2023-01-31 16:39:11 +08:00
王志豪 e10dbf9d67 Bug507-WuWenZhuo (#70) 
### 修复了生词簿为空时，双击文章单词无法高亮的问题
通过增加一个判断，判断生词簿为空时，不把生词簿的内容进行处理，仅处理选中单词。

### 修复了生词簿为空时，取消高亮后，导致文章格式混乱的问题
原代码中，从数据库提取文章放到网页上时，使用的是.innerText的方法，导致原文章里包含的<br>标签丢失，导致文章格式混乱的问题。

Co-authored-by: unknown <Alcatraz@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/70
Co-authored-by: 王志豪 <1594799762@qq.com>
Co-committed-by: 王志豪 <1594799762@qq.com>
 2023-01-29 12:48:52 +08:00
李雨峰 9cdc9c6f7f Bug521-LiYuFeng-Refactor (#72) 
@mrlan
蓝老师：

    本次改进内容如下：
        1. 对生词居中问题进行修改，现在已经不会居中了。
        2. 对于单词数量基数大而导致的排序速度慢的问题，我们进行了优化，提升了排序的速度。
        3. 对用户交互进行了优化，当用户点击“熟悉”或“不熟悉”之后，会自动进行排序，并会跳转到那个单词的位置，用抖动的效果来提示用户。

Co-authored-by: isaac <1141730046@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/72
Co-authored-by: 李雨峰 <1141730046@qq.com>
Co-committed-by: 李雨峰 <1141730046@qq.com>
 2023-01-29 12:01:19 +08:00
mrlan ca8c1bf8de Merge pull request 'Bug508-CenHaotian' (#62) from Bug508-CenHaotian into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/62
 2023-01-29 11:19:49 +08:00
mrlan febd0fc932 Merge pull request '用简单的方法（创建 frequency 文件夹）修复Bug 499' (#64) from Bug499-Hui into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/64
 2023-01-29 11:06:17 +08:00
Hui Lan 3bce450620 黄子睿: 修复 'Otherwise,' 这种情况无法高亮的问题，即 Otherwise 后面跟了个逗号 2022-12-15 10:50:04 +08:00
任榆 5cc981b549 Merge branch 'master' into Bug512-RenYu 2022-12-13 13:28:48 +08:00
Hui Lan 417dbc22f8 highlight.js: fix Bug 522. 2022-12-09 13:19:36 +08:00
MR LAN 6327b11711 Made folder 'frequency' under folder 'static', and added a README file under folder 'frequency' 2022-12-06 16:06:13 +08:00
岑昊天 d58dacd71c 修复Bug508,解决带有特殊字符|的单词在文章中的高亮问题 2022-12-06 14:40:50 +08:00
张艺腾 e74f1ff477 Bug505-ZhangYiteng (#61) 
bug修改只涉及到account_service.py中新增的5行。
其他增删都是重写reset.html(页面样式和login、signup页面相一致)，并将reset、signup、login三个页面的共同样式抽离出独立的css文件。

Co-authored-by: Q_yt <2483750517@qq.com>
Co-authored-by: Hui Lan <lanhui@zjnu.edu.cn>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/61
Co-authored-by: 张艺腾 <2483750517@qq.com>
Co-committed-by: 张艺腾 <2483750517@qq.com>
 2022-12-03 20:52:01 +08:00
任榆 5c85041135 Bug 512 - 文章朗读问题 
在fillwowrd.js中添加了stopRead()函数，将其添加给对应按钮或超链接以终止朗读。
 2022-11-25 15:42:37 +08:00
Lan Hui ecc354bc0d Refactor: use better function 2022-08-02 12:33:41 +08:00
Lan Hui 1d8671c5c7 Refactor: use better function name 2022-08-02 12:30:27 +08:00
Lan Hui 8cb34e56ba Refactor: remove duplicate code block 2022-08-02 12:26:18 +08:00
Lan Hui b5dacb9ad2 Improve comments 2022-08-02 11:52:40 +08:00
Lan Hui 47e745e774 Use better variable name (use articleContent instead of txt, and use camelCase) 2022-08-02 11:45:21 +08:00
Lan Hui 1dfe370983 Use better variable names 2022-08-02 11:39:35 +08:00
Lan Hui c15746bbb2 Resolve conflicts 2022-08-02 11:00:33 +08:00
mrlan b745da4c90 Merge pull request 'IMPROVE-WangWeiLong' (#35) from IMPROVE-WangWeiLong into master 
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/35
 2022-07-31 09:11:53 +08:00
Lan Hui 50a1093781 Remove loop.index0, as it is hard to understand. 2022-07-18 19:51:23 +08:00
陈靖毅 c21659ba7e Bug477 重构 and 增加功能 (#48) 
Co-authored-by: cjybyjk <cjybyjk@zjnu.edu.cn>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/48
Co-authored-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
Co-committed-by: 陈靖毅 <cjybyjk@zjnu.edu.cn>
 2022-07-18 16:00:08 +08:00
邱忠辉 9d420acd8b [REFACTOR] user_service.py: Added id to user name, word and frequency for click to execute AJAX request in JS (#30) 
1. Add jquery.js and word_operation.js to the static folder.

2. Changed the return type of the familiar, unfamiliar and deleteword methods of user_service.py.
    ```
    original: return redirect(url_for('userpage', username=username))
    now: return "success"
    ```
3. In order to get elements in JS to make ajax requests we add ids in userpage_get.html for familiar, unfamiliar, delete buttons and so on.

4. When the user's word book was retrieved, the list returned was already sorted in descending order of frequency, so redundant code was removed in userpage_get.html.

Co-authored-by: PeterQiu <www.1392993990@qq.com>
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/30
Co-authored-by: 邱忠辉 <1392993990@qq.com>
Co-committed-by: 邱忠辉 <1392993990@qq.com>
 2022-07-18 13:29:04 +08:00
蒋乐天 041cbd97fc 更新 'app/static/js/highlight.js' 2022-06-13 21:32:49 +08:00
lin b53e7031e5 Bug412-JiangLetian 2022-06-13 11:40:20 +08:00
李凯 e40ebac452 更新 'app/static/css/bootstrap.css' 2022-06-11 23:08:29 +08:00
Lan Hui a94a333366 Remove redundant css files. 2022-01-27 11:49:41 +08:00
Lan Hui ba2ff7dee2 Remove music player js because that is not the focus of EnglishPal. If people want to listen music, they have better options than EnglishPal. 2022-01-27 11:40:58 +08:00
Lan Hui 4d2dd2b68e Repalce old app folder with SoftArch王炫/english-pal-master/app/ 2022-01-26 21:10:09 +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 317c12e827 wordfreqapp.sql: more articles. 2021-07-16 18:30:32 +08:00
Lan Hui 68e8102e12 Add app/static/wordfreqapp.sql for reconstructing the database. 2021-06-08 21:29:39 +08:00
Hui Lan 843ed03d4f Publish EnglishPal source code 2021-04-06 16:22:03 +08:00