101506a511 
								
							
								 
							
						 
						
							
							
								
								test and fix  
							
							
							
						 
						
							2024-05-21 20:00:32 +08:00  
				
					
						
							
							
								
								AliasJeff 
							
						 
						
							
							
								83491ce28c 
								
							
								 
							
						 
						
							
							
								
								refactor: Add comments & optimize code  
							
							
							
						 
						
							2024-04-09 21:21:19 +08:00  
				
					
						
							
							
								
									
								
								唐欣媛 
							
						 
						
							
							
								2966a8162f 
								
							
								 
							
						 
						
							
							
								
								Fix bug 544  
							
							
							
						 
						
							2024-03-27 12:39:42 +08:00  
				
					
						
							
							
								 
						
							
							
								d9e28e3a2b 
								
							
								 
							
						 
						
							
							
								
								Tweak button size so it looks better on tablets.  
							
							
							
						 
						
							2023-08-13 21:08:13 +08:00  
				
					
						
							
							
								 
						
							
							
								30b54f8023 
								
							
								 
							
						 
						
							
							
								
								Tweak button style  
							
							
							
						 
						
							2023-08-12 17:59:49 +08:00  
				
					
						
							
							
								 
						
							
							
								1e3ac7a379 
								
							
								 
							
						 
						
							
							
								
								Use larger buttons  
							
							
							
						 
						
							2023-08-12 17:42:25 +08:00  
				
					
						
							
							
								 
						
							
							
								8dd6a2a343 
								
							
								 
							
						 
						
							
							
								
								Use an arrow for Next Article or Previsou Article  
							
							
							
						 
						
							2023-08-12 17:36:49 +08:00  
				
					
						
							
							
								 
						
							
							
								e9ac50422b 
								
							
								 
							
						 
						
							
							
								
								Make the flash message dismissible.  
							
							
							
						 
						
							2023-08-11 19:28:53 +08:00  
				
					
						
							
							
								 
						
							
							
								f4df263d6e 
								
							
								 
							
						 
						
							
							
								
								Flash message is informative. Why not add it?  
							
							
							
						 
						
							2023-08-11 19:14:51 +08:00  
				
					
						
							
							
								 
						
							
							
								10c291bed2 
								
							
								 
							
						 
						
							
							
								
								Highlight user difficulty level too.  
							
							
							
						 
						
							2023-08-10 19:12:30 +08:00  
				
					
						
							
							
								 
						
							
							
								6d15b65e3c 
								
							
								 
							
						 
						
							
							
								
								Make highlighting text difficulty level work.  
							
							
							
						 
						
							2023-08-10 19:09:15 +08:00  
				
					
						
							
							
								 
						
							
							
								14ab63c85c 
								
							
								 
							
						 
						
							
							
								
								文章段落正确分段(在 lead class 中添加 white-space: pre-wrap;)  
							
							
							
						 
						
							2023-08-10 10:03:02 +08:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								
									
								
								张艺腾 
							
						 
						
							
							
								582f399f73 
								
							
								 
							
						 
						
							
							
								
								Bug537 and Bug538  
							
							
							
						 
						
							2023-06-21 16:48:45 +08:00  
				
					
						
							
							
								 
						
							
							
								bb2d0363e4 
								
							
								 
							
						 
						
							
							
								
								Feat: update fontsize and margin of some elements  
							
							
							
						 
						
							2023-06-15 15:54:46 +08:00  
				
					
						
							
							
								
									
								
								寻宇灿 
							
						 
						
							
							
								1543b3095d 
								
							
								 
							
						 
						
							
							
								
								Merge remote-tracking branch 'origin/Alpha-snapshot20230519' into Refactor-XunYucan  
							
							
							
						 
						
							2023-05-25 22:30:06 +08:00  
				
					
						
							
							
								
									
								
								寻宇灿 
							
						 
						
							
							
								03ccb3527a 
								
							
								 
							
						 
						
							
							
								
								重构前端阅读js,新增阅读器全局对象,新增生词朗读按钮  
							
							
							
						 
						
							2023-05-25 17:35:31 +08:00  
				
					
						
							
							
								 
						
							
							
								d9f6df7fbe 
								
							
								 
							
						 
						
							
							
								
								AJAX载入文章数据  
							
							
							
						 
						
							2023-05-11 15:51:10 +08:00  
				
					
						
							
							
								 
						
							
							
								5039f5710e 
								
							
								 
							
						 
						
							
							
								
								AJAX载入文章数据  
							
							
							
						 
						
							2023-05-08 14:33:48 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								779dafefe8 
								
							
								 
							
						 
						
							
							
								
								Merge branch 'Bug509-XieQiuHan-WangZiming' of  http://121.4.94.30:3000/mrlan/EnglishPal  into Alpha-snapshot20230427  
							
							
							
						 
						
							2023-04-27 07:21:15 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								d30a434b2a 
								
							
								 
							
						 
						
							
							
								
								修改变量名had_read_articles->visited_articles  
							
							
							
						 
						
							2023-04-25 17:47:51 +08:00  
				
					
						
							
							
								
								Hui Lan 
							
						 
						
							
							
								ef786795e2 
								
							
								 
							
						 
						
							
							
								
								Resolve merge conflict  
							
							
							
						 
						
							2023-04-25 08:47:22 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								fc3e27488b 
								
							
								 
							
						 
						
							
							
								
								给标签添加id,方便测试  
							
							
							
						 
						
							2023-04-21 05:33:26 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								03145b57d9 
								
							
								 
							
						 
						
							
							
								
								修复边界值问题(当刚开始就没有找到文章或者就根本被没有文章的时候,会出现上一篇按钮)  
							
							
							
						 
						
							2023-04-21 02:36:51 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								8f132ed87b 
								
							
								 
							
						 
						
							
							
								
								添加了阅读完所有文章的提示  
							
							
							
						 
						
							2023-04-20 22:53:30 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								da13e5bbd5 
								
							
								 
							
						 
						
							
							
								
								修复Bug(没找到文章后立即上一篇会回到上上篇文章) & 标签添加id方便测试  
							
							
							
						 
						
							2023-04-20 21:28:29 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								84affaeb69 
								
							
								 
							
						 
						
							
							
								
								修改 /<username> 路由存在的问题(每次调用别的路由他都会被调用),新路由为 /<username>/userpage;同时因为修改了路由导致访问userpage_get的时候会导致静态文件路径生成错误,这里修改了\static\config.yml中的静态资源路径,修改后也都可以正常访问到的  
							
							
							
						 
						
							2023-04-20 20:30:14 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								16de0a7fd9 
								
							
								 
							
						 
						
							
							
								
								修改变量命名:existing_articles → had_read_articles  
							
							
							
						 
						
							2023-04-20 15:40:11 +08:00  
				
					
						
							
							
								 
						
							
							
								f3d609c92b 
								
							
								 
							
						 
						
							
							
								
								Merge Wang Ziming's work and Wu Yuhan's work.  
							
							
							
						 
						
							2023-04-07 06:41:49 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								15bb925024 
								
							
								 
							
						 
						
							
							
								
								将记录阅读过文章的数据结果改为字典,以及修改了flag的问题  
							
							
							
						 
						
							2023-04-04 22:31:53 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								5b2f5199a8 
								
							
								 
							
						 
						
							
							
								
								1. 取消userpage_get.html中提示删除单词信息的代码 和 取消user_service.userpage中render_template的flashed_messages参数。因为删除单词操作已经是异步了,而提示信息的出现是同步执行,所以就注释了代码且没有产生太大影响。  
							
							... 
							
							
							
							2. 修改取消user_service.deleteword中对注释flash代码的注释,根据上一步进行了重新解释。 
							
						 
						
							2023-03-27 14:28:54 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								52025d55bc 
								
							
								 
							
						 
						
							
							
								
								fix: add a blankspace  
							
							
							
						 
						
							2023-03-23 13:35:10 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								13d8977636 
								
							
								 
							
						 
						
							
							
								
								fix: set specific management displays for admin  
							
							
							
						 
						
							2023-03-20 20:15:58 +08:00  
				
					
						
							
							
								
									
								
								吴宇涵 
							
						 
						
							
							
								90db6534ab 
								
							
								 
							
						 
						
							
							
								
								fix: merge latest remote master branch code  
							
							
							
						 
						
							2023-03-20 15:08:06 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								944c931c9b 
								
							
								 
							
						 
						
							
							
								
								完成了对bug509的修复,以及重构项目(去掉了业务中的前端脚本)  
							
							
							
						 
						
							2023-03-08 16:33:13 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								cb0132fd31 
								
							
								 
							
						 
						
							
							
								
								pull master代码,并成功运行  
							
							
							
						 
						
							2023-02-21 20:23:24 +08:00  
				
					
						
							
							
								
									
								
								王梓铭 
							
						 
						
							
							
								93390374ad 
								
							
								 
							
						 
						
							
							
								
								标注之前队伍的改动  
							
							
							
						 
						
							2023-02-21 20:05:48 +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  
				
					
						
							
							
								 
						
							
							
								0209548896 
								
							
								 
							
						 
						
							
							
								
								提交作业  
							
							
							
						 
						
							2022-12-31 18:25:13 +08:00  
				
					
						
							
							
								
									
								
								徐嘉辉 
							
						 
						
							
							
								74eccfbebd 
								
							
								 
							
						 
						
							
							
								
								重复文章刷新  
							
							
							
						 
						
							2022-12-20 19:55:02 +08:00  
				
					
						
							
							
								
									
								
								任榆 
							
						 
						
							
							
								5c85041135 
								
							
								 
							
						 
						
							
							
								
								Bug 512 - 文章朗读问题  
							
							... 
							
							
							
							在fillwowrd.js中添加了stopRead()函数,将其添加给对应按钮或超链接以终止朗读。 
							
						 
						
							2022-11-25 15:42:37 +08:00  
				
					
						
							
							
								 
						
							
							
								ecc354bc0d 
								
							
								 
							
						 
						
							
							
								
								Refactor: use better function  
							
							
							
						 
						
							2022-08-02 12:33:41 +08:00  
				
					
						
							
							
								
									
								
								徐幸 
							
						 
						
							
							
								2c1bc98833 
								
							
								 
							
						 
						
							
							
								
								Bug422-XuXing ( #46 )  
							
							... 
							
							
							
							增加了返回上一篇的按钮及相关功能的实现,当点击下一篇文章跳转至下一篇时,页面中会增加一个返回上一篇按钮,点击返回上一篇按钮后可以回到上一篇。
Co-authored-by: Lan Hui <1348141770@qq.com>
Reviewed-on: http://121.4.94.30:3000/mrlan/EnglishPal/pulls/46 
Co-authored-by: 徐幸 <2567198082@qq.com>
Co-committed-by: 徐幸 <2567198082@qq.com> 
							
						 
						
							2022-07-21 23:13:33 +08:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								f675870401 
								
							
								 
							
						 
						
							
							
								
								templates/mainpage_get.html: Use more appropriate word. 将'登出'按钮改为'退出' -- 陈天乐  
							
							
							
						 
						
							2022-01-27 20:15:26 +08:00  
				
					
						
							
							
								 
						
							
							
								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  
				
					
						
							
							
								 
						
							
							
								b0d80096d6 
								
							
								 
							
						 
						
							
							
								
								templates/userpage_get.html: change the position and order of the checkboxes.  
							
							
							
						 
						
							2022-01-27 11:27:26 +08:00