Bug493-GongKeCheng #76

mrlan · 2022-12-21T10:59:18+08:00

mrlan commented

2022-12-21 10:59:18 +08:00

龚科丞等人修复 Bug 493

比如“I haven't done”中的“haven't”会被识别成“haven&” 和“t”

龚科丞等人修复 Bug 493 > 比如“I haven't done”中的“haven't”会被识别成“haven&” 和“t”

mrlan added 12 commits 2022-12-21 10:59:18 +08:00

9e36644215 增加返回上一篇按钮

22775f9797 上传文件至 'app'

71cc627aad 更新 'app/templates/userpage_get.html'

69835c7f8d Merge branch 'Bug422-XuXing' into Bug422-XuXing

e73c66edd3 Re-arrange button positions (put Next Article before Previous Article).

4513a80bdd Remove unused code.

2a553e0f8f Use a better variable name.

4fb1cad745 Use a better variable name (fix session variable name error).

68b254f96c init me

071d1c968b init me again

0962d95ce1 Merge branch 'Bug422-XuXing' of http://121.4.94.30:3000/mrlan/EnglishPal into SPM2022F-CONTRIBUTORS-GONGKE

b9a6e4407e Bug493-Fix

tianqilu added 1 commit 2023-04-27 15:52:44 +08:00

61f46f7d58 first commit

tianqilu added 1 commit 2023-04-27 16:01:41 +08:00

705aa5efcb bug修改,前面提交的first commit是重构

tianqilu added 94 commits 2023-05-14 14:45:55 +08:00

5c85041135 Bug 512 - 文章朗读问题

在fillwowrd.js中添加了stopRead()函数，将其添加给对应按钮或超链接以终止朗读。

417dbc22f8 highlight.js: fix Bug 522.

5cc981b549 Merge branch 'master' into Bug512-RenYu

f0afd5f40f Merge pull request 'Bug 512 - 文章朗读问题' (#59 ) from Bug512-RenYu into master

Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/59

c76d4f21ec SPM2022F-CONTRIBUTORS-XieQiuHan

3bce450620 黄子睿: 修复 'Otherwise,' 这种情况无法高亮的问题，即 Otherwise 后面跟了个逗号

74eccfbebd 重复文章刷新

0209548896 提交作业

43bd0bd09d update requirement.txt

93390374ad 标注之前队伍的改动

cb0132fd31 pull master代码，并成功运行

944c931c9b 完成了对bug509的修复，以及重构项目（去掉了业务中的前端脚本）

90db6534ab fix: merge latest remote master branch code

376ef9bcbc feat: add pong orm requirement

df82748518 feat: create classes necessary for orm operations

e2b165ada8 fix: add url 'admin' into banned url list

13d8977636 fix: set specific management displays for admin

ade10e5843 feat: add admin_service blueprint

b80fbc936c fix: fix admin_name

70d44fcf5c Login.py: fix SyntaxWrning: 'is not' with a literal.

b34f260d98 requirements.txt: use an older version of Flask to avoid deployment ERROR: No matching distribution found for Flask==2.1.0.

cabf6702a7 fix: add one way to set article level & rename some functions and vars

1015704e23 fix: fix the way to check article level

48de496caa fix: Remove 'Assignment Expresions' & Fix annotation words

44db2218c1 fix: Use better conditional judgment methods

691c5b0d43 build.sh: Install requirements first.

9075fe9eea Resolve merge conflicts.

2909b4d973 admin_service.py: 管理员页面显示的用户名按照名字排序。

6df25c58b4 查漏，业务中的两处前端标签不做修改，因为不被使用了

c9bfa08658 注释flash的使用，因为其对页面会有影响

5cffa1fada fix: use single quotation mark 'admin'

52025d55bc fix: add a blankspace

bdda754af6 fix: check current user is admin

ec6a2249ae fix: fix the pagination

13ccbaf25c fix: use select to choose article level

82896de336 update .gitignore

3e35679a91 refactor: refactor the model

2cf65123e9 feat: admin can manage articles and users without interfering with each other

7941e5d1eb fix: fix the way to show article title

e27985127a admin_manage_article.html: 文章最高难度等级是4.

b97210a9e0 admin_manage_article.html: 更为详细的 placeholder 内容.

7eb276937a admin_manage_user.html: 将默认过期时间设为365天以后.

a220450b03 mainpage_get.html: 首页不显示管理链接（可能会安全点）.

99aa4e0990 fix: fix article title show

ce28a5bf65 feat: auto select expiry_date when select user

f17995a35c fix: using new pagination mod func

c6010ccbbd admin_manage_user.html: 不再需要，所以删除.

fb6d0b23ce admin_manage_user.html: 修改 JavaScript 函数名.

3bc61a602f 添加文章成功后，修改用户信息成功后，页面显示成功信息（flash messages）。

8d8b9197b6 手动输入的文字最高难度等级是4

4d99405bfa 简化管理员页面信息。删除退出登录按钮，可以返回到前一页后再退出，不影响使用体验。删除'管理员您好'欢迎词，没啥意义。

b3b154a24f 简化管理文章与管理用户页面信息。

0e25737381 管理文章页面的文章列表中，每篇文章不再在内容部分重新显示标题。

9eb5210d3f Level与Date的冒号后面加个空格，使得后面的信息更加看得清楚。

d4ac709385 将删除按钮移到第一行，避免因为文章的标题过长跨行导致删除按钮形状改变。

0ce1c6eb6e 文章管理页面：每篇文章中保留换行，方便查看。

5b2f5199a8 1. 取消userpage_get.html中提示删除单词信息的代码和取消user_service.userpage中render_template的flashed_messages参数。因为删除单词操作已经是异步了，而提示信息的出现是同步执行，所以就注释了代码且没有产生太大影响。

2. 修改取消user_service.deleteword中对注释flash代码的注释，根据上一步进行了重新解释。

0c16a4dc6f 判断文章是否已经出现的语句写错位置了，改正下

4417cf7017 Article.py: remove debug statement.

6f1dd13419 测试的print忘删了

7107f634c2 Merge branch 'test' into dev-fixBug509-reconstruction

1f150fc847 refactor: use ajax to get expiry_date

688ed72473 Correct grammar。

15bb925024 将记录阅读过文章的数据结果改为字典，以及修改了flag的问题

f3d609c92b Merge Wang Ziming's work and Wu Yuhan's work.

5d20e92061 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into DevLocal

cc8ca47f8c refactor: remove sql sentences

11ae093fd7 Merge branch 'Alpha' into Bug522-HuangZirui

ce2e1f2978 Merge branch 'DevLocal' into Bug522-HuangZirui

16de0a7fd9 修改变量命名：existing_articles → had_read_articles

84affaeb69 修改 /<username> 路由存在的问题（每次调用别的路由他都会被调用），新路由为 /<username>/userpage;同时因为修改了路由导致访问userpage_get的时候会导致静态文件路径生成错误，这里修改了\static\config.yml中的静态资源路径，修改后也都可以正常访问到的

da13e5bbd5 修复Bug（没找到文章后立即上一篇会回到上上篇文章） & 标签添加id方便测试

8f132ed87b 添加了阅读完所有文章的提示

70917df47b 删除测试代码

03145b57d9 修复边界值问题（当刚开始就没有找到文章或者就根本被没有文章的时候，会出现上一篇按钮）

fc3e27488b 给标签添加id，方便测试

58d7349afe Change from bug359-zhangkeli

21a77ef2df Merge branch 'Alpha' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha

ef786795e2 Resolve merge conflict

6be035f282 修复当没有找到文章或者文章读完时，直接刷新页面或者session不关闭重新进入页面，导致的错误；

b88bc8f36b Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230425

d30a434b2a 修改变量名had_read_articles->visited_articles

5654fbf9bc 修改：使用新的/<username>/userpage路由

e118d92659 Merge branch 'Alpha-snapshot20230425' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427

779dafefe8 Merge branch 'Bug509-XieQiuHan-WangZiming' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230427

a80b062b87 refactor: remove variable 'count'

18ca48b422 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui

a4cc4fd011 Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230506

f64d06fbbf fix: fix Bug 531 and use ES6 grammar

01ecc83768 refactor: refactor the way to check article level

becef7e343 Merge branch 'Bug502-YuGaoXiang' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230506

5039f5710e AJAX载入文章数据

d9f6df7fbe AJAX载入文章数据

0549bd9035 try

tianqilu added 1 commit 2023-05-14 21:13:17 +08:00

a5c792b782 重构

tianqilu added 1 commit 2023-05-14 21:18:24 +08:00

654fd52c44 1

tianqilu added 1 commit 2023-05-14 21:20:55 +08:00

4cf201095d fixBug

mrlan reviewed 2023-05-24 12:18:46 +08:00

app/user_service.py

													
				@ -179,3 +193,3 @@

				    :return: 包含HTML标签的提示信息

				    '''

				    messages = get_flashed_messages()

				    messages = get_flashed_messages

mrlan commented

2023-05-24 12:18:46 +08:00

Poster

@tianqilu

上面这行代码可以运行吗？

messages = get_flashed_messages

@tianqilu 上面这行代码可以运行吗？ ` messages = get_flashed_messages`

mrlan commented

2023-07-07 16:25:06 +08:00

Poster

已经在分支 Alpha-snapshot20230621 修复，见 commit 807d7，该修复更为简单，只需要删除 escape() 函数调用即可。

已经在分支 Alpha-snapshot20230621 修复，见 commit [807d7](http://121.4.94.30:3000/mrlan/EnglishPal/commit/807d74741bddbb3fdae16b2b08fd39da2876f2f8)，该修复更为简单，只需要删除 escape() 函数调用即可。

mrlan closed this pull request

2023-07-07 16:26:02 +08:00

Pull request closed

Please reopen this pull request to perform a merge.

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No project

No Assignees

3 Participants

Notifications

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: mrlan/EnglishPal#76