Commit Graph

  • e4f870c995 Create folder app/db with a README file. Lan Hui 2023-08-10 15:25:42 +0800
  • 06f896a33a Update .gitignore Lan Hui 2023-08-10 15:22:30 +0800
  • 25c2e0aca8 README.md: update the path to wordfreqapp.db. Hui Lan 2023-08-10 14:24:00 +0800
  • dca76969eb 解决程序源文件更新了,但是 docker container 中的程序源文件没有更新的问题 Hui Lan 2023-08-10 14:19:37 +0800
  • 00ae957b27 Try to figure out how to rebuild the image after updating the source code. Hui Lan 2023-08-10 10:47:57 +0800
  • a397c756cf Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 Hui Lan 2023-08-10 10:05:29 +0800
  • 14ab63c85c 文章段落正确分段(在 lead class 中添加 white-space: pre-wrap;) Lan Hui 2023-08-10 10:03:02 +0800
  • b8c3d9bda7 No cache while building docker image Hui Lan 2023-07-17 17:46:55 +0800
  • 43419ab4b6 Enlarge text difficult level for one second (make it work using vanilla JavaScript) Lan Hui 2023-07-17 16:28:08 +0800
  • 78d9a66e88 After loading the next article, show its difficulty level in a larger size for one second. Hui Lan 2023-07-17 16:13:56 +0800
  • 79bdec2a7d Dockerfile: update docker image version. Hui Lan 2023-07-17 10:38:17 +0800
  • fb80e952b9 Simplify the docker run options Hui Lan 2023-07-17 10:25:07 +0800
  • 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. Hui Lan 2023-07-17 07:45:38 +0800
  • 20051e1a93 article.py: correct data format Lan Hui 2023-07-14 09:17:11 +0800
  • 5711f0e826 Update flask version in requirements.txt, use escape from markupsafe package. Lan Hui 2023-07-14 09:11:02 +0800
  • cc92e5e29a admin_service.py: non-programmers probably do not know int. So, use integer instead. Lan Hui 2023-07-14 08:32:20 +0800
  • cd562a745c admin_service.py: do not need to have seperate lines for a statement. Lan Hui 2023-07-14 08:30:58 +0800
  • c284893097 admin_service.py: correct typo parmas. Lan Hui 2023-07-14 08:27:33 +0800
  • 87fd594636 admin_service.py: refactor view function article(). Lan Hui 2023-07-14 08:26:37 +0800
  • 18c37d583a admin_service.py: show article content for the newly added article after clicking the button '保存'. Lan Hui 2023-07-14 08:15:15 +0800
  • 472c0c115f Fix Bug 541 Lan Hui 2023-07-09 20:26:32 +0800
  • 9a156ebf7e Fix Bug 539 Lan Hui 2023-07-08 18:23:45 +0800
  • 807d74741b 修复 Bug 493。不要转义(escape)表单提交的内容。否则类 WordFreq 不能正确工作,比如转义会把单引号变成 ',这不利于 WordFreq 类处理。 Hui Lan 2023-07-07 16:13:48 +0800
  • 287d496ae9 Merge branch 'Alpha-snapshot20230621' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230621 Hui Lan 2023-07-01 15:17:34 +0800
  • 582f399f73 Bug537 and Bug538 张艺腾 2023-06-21 16:48:45 +0800
  • c37ee98b77 Merge branch 'fix-vuln' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230619b Hui Lan 2023-06-19 21:50:48 +0800
  • f40a388277 Fix: Move wordfreqapp.db to new location #101 fix-vuln 徐宣 2023-06-19 14:48:35 +0800
  • 4e1e19d71d 为系统添加一个全局变量记录数据库的单词及其等级,使得数据库单词等级只需在登录时进行一次评级,大致能将点击下一篇的时间缩减为原来的10^-15次以下,感谢章翊、赵煜涵、唐伟、宋江涛同学的建议,没有他们我懒得改的 Bug476-Yuhuangtao 俞黄焘 2023-06-18 21:43:00 +0800
  • 2277473afe Fix: Add import for 'abort' function 徐宣 2023-06-18 19:49:33 +0800
  • f01c334827 Fix: no-random secret key generation and XSS vulnerability 徐宣 2023-06-18 19:44:19 +0800
  • 3361e4ba79 添加测试convert_test_type_to_difficulty_level和get_difficulty_level_for_user函数运行所需时间的几行代码 俞黄焘 2023-06-18 13:21:49 +0800
  • 4d2535a6e8 Merge branch 'Alpha-snapshot20230605' into Bug527-ZhouZhifang #100 Bug527-ZhouZhifang Alpha-snapshot20230615 Laugh 2023-06-15 15:59:29 +0800
  • bb2d0363e4 Feat: update fontsize and margin of some elements Laugh 2023-06-15 15:54:46 +0800
  • 8890e4250a added api_bp.py and change in main.py #99 Bug473-Buya shakil 2023-06-15 07:03:06 +0800
  • 144c750cfd Merge branch 'master' into Bug534-NingShushuang #90 Bug534-NingShushuang 周彦丰 2023-06-11 01:47:33 +0800
  • b923d805e3 小改了一下,可以正常去除单词前后多余的连字符 #98 improvment_GuHan 顾涵 2023-06-08 15:26:49 +0800
  • e19d1ae51b pylint:fixed 2 remove redundant comments #36 Bug393-TanYanMei 倪玲丽 2023-06-05 21:27:20 +0800
  • bb85237939 在signup.html中删除了jquery-3.1.1.js,使用了项目中原有的/static/js/jquery.js 周彦丰 2023-06-05 16:02:17 +0800
  • 1ce6dcf41b synced with Alpha-snapshot20230525 #89 improvment-NiWeiCong2 HAMED SALMA MOHAMED HUSSEIN 2023-06-05 11:28:51 +0800
  • 3ad9ab7351 Merge branch 'Alpha-snapshot20230525' of http://121.4.94.30:3000/mrlan/EnglishPal into improvment-NiWeiCong2 HAMED SALMA MOHAMED HUSSEIN 2023-06-05 11:20:30 +0800
  • 616d35a92f 增加了部分优化代码的注释 #97 refactor-huangzirui 黄子睿 2023-06-05 08:37:31 +0800
  • 708a6a2821 Merge pull request 'WIP:Bug529-GuHan' (#88) from Bug529-GuHan into master Bosh 顾涵 2023-06-04 12:39:34 +0800
  • 0ed7657747 Merge remote-tracking branch 'origin/SPM2023S-QianJunQi' into SPM2023S-QianJunQi #93 SPM2023S-QianJunQi poincareS 2023-06-04 10:42:40 +0800
  • 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/用户名/"获取单词 poincareS 2023-06-04 10:41:24 +0800
  • 782783040a pylint:fixed 1 倪玲丽 2023-06-04 01:50:13 +0800
  • 9a95842b7c delete tanyanmei-fillword.js 倪玲丽 2023-06-04 00:39:18 +0800
  • 3e0b8a0235 refactor:pylint 倪玲丽 2023-06-04 00:35:43 +0800
  • 05a31a3a48 添加了PIL的依赖 周彦丰 2023-06-03 14:35:53 +0800
  • 9816596cf8 删除 'app/static/js/tanyanmei-fillword.js' Alpha-snapshot20230605 黄子睿 2023-06-02 21:34:27 +0800
  • 682247bff1 refactor partial function and code writing specifications 黄子睿 2023-06-02 21:33:21 +0800
  • 66772b2f8b 修改了部分代码的书写规划,如注释,空格等 #96 refactor-wangyu 汪瑜 2023-06-01 20:51:58 +0800
  • 4241cc3a6d Refactoring parameter names and partial function names to make them more reasonable 杨昱晨 2023-06-01 19:13:39 +0800
  • ffd2d516fa Refactoring parameter names and partial function names to make them more reasonable 杨昱晨 2023-06-01 19:08:31 +0800
  • f741f84b4d commit 杨昱晨 2023-06-01 19:02:28 +0800
  • d136c93df6 通过正则表达式保留英文字符和'特殊字符 顾涵 2023-06-01 16:16:53 +0800
  • b22c654f0f Merge branch 'Bug529-GuHan' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230601 Alpha-snapshot20230601 Hui Lan 2023-06-01 07:40:27 +0800
  • d402bb45cb 刷新屏幕,点击上下篇,加入生词库,停止阅读(更改) Alpha-snapshot20230531 倪玲丽 2023-05-31 18:37:05 +0800
  • cdf6180901 刷新屏幕,点击上下篇,加入生词库,停止阅读 倪玲丽 2023-05-30 18:48:37 +0800
  • 38837c9c2f 合并最新的Alpha-snapshot20230529 倪玲丽 2023-05-30 18:45:23 +0800
  • 688a198768 已经与Alpha-snapshot20230525 分支同步,重新提交 #88 Bug529-GuHan 顾涵 2023-05-28 16:31:12 +0800
  • a0ddf4bdad 上传文件至 'app/static/js' #95 Bug492-XuHongJian-HuangZirui Alpha-snapshot20230529 黄子睿 2023-05-27 17:33:37 +0800
  • ea16ea6673 Pylint部分: 1. 补充module docstring,即文档顶部的简要说明 (我做的说明很简陋,只是为了通过pylint的检查而为之) 2. 优化了if-else-return,即删除了不必要的elif或else 3. 拆分了所有在同一行的模块引用(不同模块的引用需要放在不同行,以便理解和阅读) 4. 删除了部分没有被使用的引用(有的引用在文件A中被使用了,但import却写在了文件B,且文件B没有使用这些引用,而文件A引用了文件B,导致文件B的所有引用也被A引用,这似乎并不合理) 5. 修改了引用的顺序(os、random等系统引用应放在自定义模块引用的上方) 6. 修改了过长的代码,注释除外(每行限制在100个字符以内) 7. 优化了条件判断的判断符号: is和is not 用于判断两个变量是否指向同一个位置 == 和 !=用于比较两个变量 8. 为每个py文件添加了"last new line",删除了多余的尾部空行 #94 Refactor_qianjunqi 钱骏琪 2023-05-26 22:18:11 +0800
  • dc37f5f229 提供更便利的获取用户单词表的方法,以json数据格式范围 1、注册了一个新的蓝图路径以供功能实现 2、wordCMD中完成功能的代码代码实现 poincareS 2023-05-26 17:29:59 +0800
  • e9ec65e7a5 提供更便利的获取用户单词表的方法,以json数据格式范围 1、注册了一个新的蓝图路径以供功能实现 2、wordCMD中完成功能的代码代码实现 poincareS 2023-05-26 17:29:59 +0800
  • 683bdd0bb6 Merge branch 'Alpha-snapshot20230519' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui #66 Bug522-HuangZirui Hui Lan 2023-05-25 22:39:15 +0800
  • b608e01e9e Merge branch 'Bug522-HuangZirui' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug522-HuangZirui Hui Lan 2023-05-25 22:38:43 +0800
  • d90c4f4075 app/static/frequency/ Hui Lan 2023-05-25 22:38:34 +0800
  • 1543b3095d Merge remote-tracking branch 'origin/Alpha-snapshot20230519' into Refactor-XunYucan #92 Refactor-XunYucan Alpha-snapshot20230525 寻宇灿 2023-05-25 22:30:06 +0800
  • c6bf323c60 修改格式 寻宇灿 2023-05-25 21:23:25 +0800
  • 03ccb3527a 重构前端阅读js,新增阅读器全局对象,新增生词朗读按钮 寻宇灿 2023-05-25 17:35:31 +0800
  • e6ad877736 用ponyORM重构get_today_article函数的原生SQL语句 #91 Refactor-HeZhengzheng 何铮铮 2023-05-24 18:41:09 +0800
  • 6210ca432a 用ponyORM重构get_today_article函数的原生SQL语句 Alpha-snapshot20230511 何铮铮 2023-05-24 18:31:52 +0800
  • 46000f3959 Merge branch 'Alpha-snapshot20230511' of http://121.4.94.30:3000/mrlan/EnglishPal into Bug407-JinHaoLin #41 Bug407-JinHaoLin Appiah Lawrence Opoku 2023-05-24 14:41:42 +0800
  • b41e1044bc difficulty.py: add some stop words, hoping that getting the next article can be faster. Alpha-snapshot20230519 Hui Lan 2023-05-24 10:12:44 +0800
  • 67e921ba60 difficulty.py: todo. Hui Lan 2023-05-23 22:25:40 +0800
  • a5c3564f15 difficulty.py: do not stem a word twice. Hui Lan 2023-05-23 22:22:57 +0800
  • 497cb20b7e 密码复杂度,修改了源代码的 account_service.py 文件,添加 了对密码中特殊字符和大小写字母的包含要求检查,并将密码的最低长度限制提升到 8 位以提高用户密码的安全性。 但与该版本EnglishPal中jsonify函数起冲突。 周彦丰 2023-05-23 22:04:43 +0800
  • becd7e9d7d 密码复杂度,修改了源代码的 account_service.py 文件,添加 了对密码中特殊字符和大小写字母的包含要求检查,并将密码的最低长度限制提升到 8 位以提高用户密码的安全性。 但与该版本EnglishPal中jsonify函数起冲突。 周彦丰 2023-05-23 21:40:04 +0800
  • 1295616d5b Merge branch 'Bug476-YuHuangtao' of http://121.4.94.30:3000/mrlan/EnglishPal into Alpha-snapshot20230519 Hui Lan 2023-05-23 19:50:30 +0800
  • c151a0efaa 去掉了get_difficulty_level_for_user的多出的break #87 Bug476-YuHuangtao 俞黄焘 2023-05-23 19:40:33 +0800
  • fa3012920e improved show() function, and added show.html template HAMED SALMA MOHAMED HUSSEIN 2023-05-21 23:59:36 +0800
  • 030b89706e special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符,我将其中的“-”删去,使连字符没有被过滤,实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug,答案是肯定的,但是这段代码中的过滤字符虽然多,但是并没有完全过滤掉所有字符,(过滤的只是键盘上能打出的字符,不包括输入法中能打出的特殊字符),所以字符bug本身就一直存在,我认为减少一个“-”字符对程序的过滤过程不会造成问题。 顾涵 2023-05-20 15:29:12 +0800
  • 349488167b requirements.txt: install snowballstemmer for better computing a word's difficulty level. Hui Lan 2023-05-19 09:03:20 +0800
  • 39d96014d9 pull最新的snapshot-20230511,后更新了difficulty.py和Article.py的部分代码,提交了新的pickle文件 俞黄焘 2023-05-18 23:29:38 +0800
  • 6bd9fe9778 pull admin_service.py #85 Bug476-ZhangWeiHao-YuHuangtao 俞黄焘 2023-05-18 21:31:38 +0800
  • 38a923b3a3 修改了词库中错误的标签‘IETLS’,改为‘IELTS’ 俞黄焘 2023-05-18 21:20:25 +0800
  • a83f91a88d 1、添加误删的IELTS单词标签 2、简化评级流程(快很多,几乎与网站相同) 3、删除了原先用于提取词根的函数 俞黄焘 2023-05-18 20:36:31 +0800
  • c4378e73cd 1、删除了difficulty_level_from_frequency 2、修改了get_difficulty_level_for_user,按新的方式修改了单词的评级方式:CET4 等于 level 4, OXFORD3000 等于 level 5, CET6 等于 level 6, GRADUATE 等于 level 6, OXFORD5000 等于 level 7, BBC 等于 level 8,找不到等于 level 3 俞黄焘 2023-05-18 16:59:30 +0800
  • fc515a7b08 三改 俞黄焘 2023-05-16 19:02:16 +0800
  • df82f59297 新增token鉴权 #43 Bug473-LuXiaochen 谢思怡 2023-05-16 14:46:57 +0800
  • acd8db6e3e special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符,我将其中的“-”删去,使连字符没有被过滤,实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug,答案是肯定的,但是这段代码中的过滤字符虽然多,但是并没有完全过滤掉所有字符,(过滤的只是键盘上能打出的字符,不包括输入法中能打出的特殊字符),所以字符bug本身就一直存在,我认为减少一个对“1-”字符的过滤不会造成问题。 顾涵 2023-05-15 19:24:43 +0800
  • 9f3f5b43e1 special_characters = '\_©~<=>+/[]*&$%^@.,?!:;#()"“”—‘’{}|' 用于过滤字符,我将其中的“-”删去,使连字符没有被过滤,实现录入例如fifty-six等组合词的功能。另外对于删除过滤是否会引发字符bug,答案是肯定的,但是这段代码中的过滤字符虽然多,但是并没有完全过滤掉所有字符,(过滤的只是键盘上能打出的字符,不包括输入法中能打出的特殊字符),所以字符bug本身就一直存在,我认为减少一个对“-”字符的过滤不会造成问题。 顾涵 2023-05-15 19:15:30 +0800
  • 541f78c7ea 评审后的修改(words_and_tests.p文件没有提交,为防止版本的控制) 俞黄焘 2023-05-15 09:58:32 +0800
  • 4cf201095d fixBug #76 Bug493-GongKeCheng 田其鹭 2023-05-14 21:20:16 +0800
  • 654fd52c44 1 田其鹭 2023-05-14 21:17:24 +0800
  • a5c792b782 重构 田其鹭 2023-05-14 21:10:19 +0800
  • 0549bd9035 try 田其鹭 2023-05-14 14:43:16 +0800
  • b486b6b9db 新增可被分隔的中文符号 #68 Bug488-TangWei 汪瑜 2023-05-12 23:22:52 +0800
  • 848eaafc81 Refactor: raw SQL statements had been replaced with Pony ORM approach in Article.py (functions: total_number_of_essays and get_today_article) #102 SOFTARCH2023S-ZENOVIO Nze Avomo Zenovio Ndong 2023-05-12 01:14:59 +0800
  • 75d43137e0 Refactor: 2 helper functions added in article.py (get_article_by_id and get_all_articles) Nze Avomo Zenovio Ndong 2023-05-12 01:12:18 +0800